mirror of
https://tt-rss.org/git/tt-rss.git
synced 2024-07-01 12:40:50 +02:00
Merge branch 'af_redditimgur_update' of koffieanon/tt-rss into master
This commit is contained in:
commit
67c7b6ef53
|
@ -239,10 +239,10 @@ class Af_RedditImgur extends Plugin {
|
||||||
}
|
}
|
||||||
|
|
||||||
$matches = array();
|
$matches = array();
|
||||||
if (!$found && preg_match("/youtube\.com\/v\/([\w-]+)/", $entry->getAttribute("href"), $matches) ||
|
if (!$found && (preg_match("/youtube\.com\/v\/([\w-]+)/", $entry->getAttribute("href"), $matches) ||
|
||||||
preg_match("/youtube\.com\/.*?[\&\?]v=([\w-]+)/", $entry->getAttribute("href"), $matches) ||
|
preg_match("/youtube\.com\/.*?[\&\?]v=([\w-]+)/", $entry->getAttribute("href"), $matches) ||
|
||||||
preg_match("/youtube\.com\/watch\?v=([\w-]+)/", $entry->getAttribute("href"), $matches) ||
|
preg_match("/youtube\.com\/watch\?v=([\w-]+)/", $entry->getAttribute("href"), $matches) ||
|
||||||
preg_match("/\/\/youtu.be\/([\w-]+)/", $entry->getAttribute("href"), $matches)) {
|
preg_match("/\/\/youtu.be\/([\w-]+)/", $entry->getAttribute("href"), $matches))) {
|
||||||
|
|
||||||
$vid_id = $matches[1];
|
$vid_id = $matches[1];
|
||||||
|
|
||||||
|
@ -264,9 +264,9 @@ class Af_RedditImgur extends Plugin {
|
||||||
$found = true;
|
$found = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$found && preg_match("/\.(jpg|jpeg|gif|png)(\?[0-9][0-9]*)?$/i", $entry->getAttribute("href")) ||
|
if (!$found && (preg_match("/\.(jpg|jpeg|gif|png)(\?[0-9][0-9]*)?[$\?]/i", $entry->getAttribute("href")) ||
|
||||||
mb_strpos($entry->getAttribute("href"), "i.reddituploads.com") !== FALSE ||
|
mb_strpos($entry->getAttribute("href"), "i.reddituploads.com") !== FALSE ||
|
||||||
mb_strpos($this->get_content_type($entry->getAttribute("href")), "image/") !== FALSE) {
|
mb_strpos($this->get_content_type($entry->getAttribute("href")), "image/") !== FALSE)) {
|
||||||
|
|
||||||
Debug::log("Handling as a picture", Debug::$LOG_VERBOSE);
|
Debug::log("Handling as a picture", Debug::$LOG_VERBOSE);
|
||||||
|
|
||||||
|
@ -280,36 +280,36 @@ class Af_RedditImgur extends Plugin {
|
||||||
$found = true;
|
$found = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// imgur via link rel="image_src" href="..."
|
// imgur via link rel="image_src" href="..."
|
||||||
if (!$found && preg_match("/imgur/", $entry->getAttribute("href"))) {
|
if (!$found && preg_match("/imgur/", $entry->getAttribute("href"))) {
|
||||||
|
|
||||||
Debug::log("handling as imgur page/whatever", Debug::$LOG_VERBOSE);
|
Debug::log("handling as imgur page/whatever", Debug::$LOG_VERBOSE);
|
||||||
|
|
||||||
$content = fetch_file_contents(["url" => $entry->getAttribute("href"),
|
$content = fetch_file_contents(["url" => $entry->getAttribute("href"),
|
||||||
"http_accept" => "text/*"]);
|
"http_accept" => "text/*"]);
|
||||||
|
|
||||||
if ($content) {
|
if ($content) {
|
||||||
$cdoc = new DOMDocument();
|
$cdoc = new DOMDocument();
|
||||||
|
|
||||||
if (@$cdoc->loadHTML($content)) {
|
if (@$cdoc->loadHTML($content)) {
|
||||||
$cxpath = new DOMXPath($cdoc);
|
$cxpath = new DOMXPath($cdoc);
|
||||||
|
|
||||||
$rel_image = $cxpath->query("//link[@rel='image_src']")->item(0);
|
$rel_image = $cxpath->query("//link[@rel='image_src']")->item(0);
|
||||||
|
|
||||||
if ($rel_image) {
|
if ($rel_image) {
|
||||||
|
|
||||||
$img = $doc->createElement('img');
|
$img = $doc->createElement('img');
|
||||||
$img->setAttribute("src", $rel_image->getAttribute("href"));
|
$img->setAttribute("src", $rel_image->getAttribute("href"));
|
||||||
|
|
||||||
$br = $doc->createElement('br');
|
$br = $doc->createElement('br');
|
||||||
$entry->parentNode->insertBefore($img, $entry);
|
$entry->parentNode->insertBefore($img, $entry);
|
||||||
$entry->parentNode->insertBefore($br, $entry);
|
$entry->parentNode->insertBefore($br, $entry);
|
||||||
|
|
||||||
$found = true;
|
$found = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// wtf is this even
|
// wtf is this even
|
||||||
if (!$found && preg_match("/^https?:\/\/gyazo\.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches)) {
|
if (!$found && preg_match("/^https?:\/\/gyazo\.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches)) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user