various minor style updates, add danger buttons

[tt-rss.git] / plugins / af_redditimgur / init.php

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 6f2c7ff9891108e65c64b212b2630dd4170fdb83..9b3a999d30d864da7eea775ea9d3b980a12c9cc6 100644 (file)
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -43,9 +43,7 @@ class Af_RedditImgur extends Plugin {
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"save\">";
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin\" value=\"af_redditimgur\">";
 
-               print "<h3>" . __("Global settings") . "</h3>";
-
-               print_notice("Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>");
+               print "<p>" . __("Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>");
                print "<p/>";
 
                print "<input dojoType=\"dijit.form.CheckBox\" id=\"enable_readability\"
@@ -80,6 +78,10 @@ class Af_RedditImgur extends Plugin {
 
                                $matches = array();
 
+                               if (preg_match("/\.gfycat.com\/([a-z]+)?(\.[a-z]+)$/i", $entry->getAttribute("href"), $matches)) {
+                                       $entry->setAttribute("href", "http://www.gfycat.com/".$matches[1]);
+                               }
+
                                if (preg_match("/https?:\/\/(www\.)?gfycat.com\/([a-z]+)$/i", $entry->getAttribute("href"), $matches)) {
 
                                        $tmp = fetch_file_contents($entry->getAttribute("href"));
@@ -91,7 +93,7 @@ class Af_RedditImgur extends Plugin {
                                                if ($tmpdoc) {
                                                        $tmpxpath = new DOMXPath($tmpdoc);
 
-                                                       $source_meta = $tmpxpath->query("//meta[@property='og:video']")->item(0);
+                                                       $source_meta = $tmpxpath->query("//meta[@name='twitter:player:stream' and contains(@content, '.mp4')]")->item(0);
                                                        $poster_meta = $tmpxpath->query("//meta[@property='og:image' and contains(@content,'thumbs.gfycat.com')]")->item(0);
 
                                                        if ($source_meta) {
@@ -112,6 +114,12 @@ class Af_RedditImgur extends Plugin {
 
                                }
 
+                               // imgur .gif -> .gifv
+                               if (preg_match("/i\.imgur\.com\/(.*?)\.gif$/i", $entry->getAttribute("href"))) {
+                                       $entry->setAttribute("href",
+                                               str_replace(".gif", ".gifv", $entry->getAttribute("href")));
+                               }
+
                                if (preg_match("/\.(gifv)$/i", $entry->getAttribute("href"))) {
 
                                        $source_stream = str_replace(".gifv", ".mp4", $entry->getAttribute("href"));
@@ -159,44 +167,10 @@ class Af_RedditImgur extends Plugin {
                                        $found = true;
                                }
 
-                               // links to imgur pages
-                               $matches = array();
-                               if (preg_match("/^https?:\/\/(m\.)?imgur.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches)) {
+                               // linked albums & pages
 
-                                       $token = $matches[2];
-
-                                       $album_content = fetch_file_contents($entry->getAttribute("href"),
-                                               false, false, false, false, 10);
-
-                                       if ($album_content && $token) {
-                                               $adoc = new DOMDocument();
-                                               @$adoc->loadHTML($album_content);
-
-                                               if ($adoc) {
-                                                       $axpath = new DOMXPath($adoc);
-                                                       $aentries = $axpath->query('(//img[@src])');
-
-                                                       foreach ($aentries as $aentry) {
-                                                               if (preg_match("/\/\/i.imgur.com\/$token\./", $aentry->getAttribute("src"))) {
-                                                                       $img = $doc->createElement('img');
-                                                                       $img->setAttribute("src", $aentry->getAttribute("src"));
-
-                                                                       $br = $doc->createElement('br');
-
-                                                                       $entry->parentNode->insertBefore($img, $entry);
-                                                                       $entry->parentNode->insertBefore($br, $entry);
-
-                                                                       $found = true;
-
-                                                                       break;
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
-
-                               // linked albums, ffs
-                               if (preg_match("/^https?:\/\/imgur.com\/(a|album|gallery)\/[^\.]+$/", $entry->getAttribute("href"), $matches)) {
+                               if (preg_match("/^https?:\/\/(m\.)?imgur.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches) ||
+                                       preg_match("/^https?:\/\/imgur.com\/(a|album|gallery)\/[^\.]+$/", $entry->getAttribute("href"), $matches)) {
 
                                        $album_content = fetch_file_contents($entry->getAttribute("href"),
                                                false, false, false, false, 10);
@@ -212,9 +186,13 @@ class Af_RedditImgur extends Plugin {
 
                                                        foreach ($aentries as $aentry) {
 
-                                                               if (!in_array($aentry->getAttribute("content"), $urls)) {
+                                                               $url = str_replace("?fb", "", $aentry->getAttribute("content"));
+                                                               $check_url = basename($url);
+                                                               $check_url = mb_substr($check_url, 0, strrpos($check_url, "."));
+
+                                                               if (!in_array($check_url, $urls)) {
                                                                        $img = $doc->createElement('img');
-                                                                       $img->setAttribute("src", $aentry->getAttribute("content"));
+                                                                       $img->setAttribute("src", $url);
                                                                        $entry->parentNode->insertBefore($doc->createElement('br'), $entry);
 
                                                                        $br = $doc->createElement('br');
@@ -222,7 +200,7 @@ class Af_RedditImgur extends Plugin {
                                                                        $entry->parentNode->insertBefore($img, $entry);
                                                                        $entry->parentNode->insertBefore($br, $entry);
 
-                                                                       array_push($urls, $aentry->getAttribute("content"));
+                                                                       array_push($urls, $check_url);
 
                                                                        $found = true;
                                                                }
@@ -250,6 +228,8 @@ class Af_RedditImgur extends Plugin {
                        @$doc->loadHTML($article["content"]);
                        $xpath = new DOMXPath($doc);
 
+                       $content_link = $xpath->query("(//a[contains(., '[link]')])")->item(0);
+
                        $found = $this->inline_stuff($article, $doc, $xpath);
 
                        if (function_exists("curl_init") && !$found && $this->host->get($this, "enable_readability") &&
@@ -257,8 +237,6 @@ class Af_RedditImgur extends Plugin {
 
                                if (!class_exists("Readability")) require_once(dirname(dirname(__DIR__)). "/lib/readability/Readability.php");
 
-                               $content_link = $xpath->query("(//a[contains(., '[link]')])")->item(0);
-
                                if ($content_link &&
                                        strpos($content_link->getAttribute("href"), "twitter.com") === FALSE &&
                                        strpos($content_link->getAttribute("href"), "youtube.com") === FALSE &&