valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'af_redditimgur_update' of koffieanon/tt-rss into master

This commit is contained in:
fox 2020-01-05 05:44:00 +00:00 committed by Gogs
parent 5448a9462e 3a3c74dfa4
commit 67c7b6ef53
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
plugins/af_redditimgur/init.php
View File

@ -239,10 +239,10 @@ class Af_RedditImgur extends Plugin {
}
$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\/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];
@ -264,9 +264,9 @@ class Af_RedditImgur extends Plugin {
$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($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);
@ -280,36 +280,36 @@ class Af_RedditImgur extends Plugin {
$found = true;
}
// imgur via link rel="image_src" href="..."
if (!$found && preg_match("/imgur/", $entry->getAttribute("href"))) {
// imgur via link rel="image_src" 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"),
"http_accept" => "text/*"]);
$content = fetch_file_contents(["url" => $entry->getAttribute("href"),
"http_accept" => "text/*"]);
if ($content) {
$cdoc = new DOMDocument();
if ($content) {
$cdoc = new DOMDocument();
if (@$cdoc->loadHTML($content)) {
$cxpath = new DOMXPath($cdoc);
if (@$cdoc->loadHTML($content)) {
$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->setAttribute("src", $rel_image->getAttribute("href"));
$img = $doc->createElement('img');
$img->setAttribute("src", $rel_image->getAttribute("href"));
$br = $doc->createElement('br');
$entry->parentNode->insertBefore($img, $entry);
$entry->parentNode->insertBefore($br, $entry);
$br = $doc->createElement('br');
$entry->parentNode->insertBefore($img, $entry);
$entry->parentNode->insertBefore($br, $entry);
$found = true;
}
}
}
}
$found = true;
}
}
}
}
// wtf is this even
if (!$found && preg_match("/^https?:\/\/gyazo\.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches)) {