af_redditimgur: better handling of image urls with multiple-character numeric suffixes

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

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 1bf91e88a83f95b0c5f24f9f0056ff16071357d1..809792dd8ba219b896374bcf193520f66f523a5a 100644 (file)
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -28,59 +28,64 @@ class Af_RedditImgur extends Plugin {
 
                                        foreach ($entries as $entry) {
                                                if ($entry->hasAttribute("href")) {
-                                                                                                               
+
+                                                       $matches = array();
+
+                                                       if (preg_match("/https?:\/\/gfycat.com\/([a-z]+)$/i", $entry->getAttribute("href"), $matches)) {
+
+                                                               $tmp = fetch_file_contents($entry->getAttribute("href"));
+
+                                                               if ($tmp) {
+                                                                       $tmpdoc = new DOMDocument();
+                                                                       @$tmpdoc->loadHTML($tmp);
+
+                                                                       if ($tmpdoc) {
+                                                                               $tmpxpath = new DOMXPath($tmpdoc);
+                                                                               $source_meta = $tmpxpath->query("//meta[@property='og:video']")->item(0);
+
+                                                                               if ($source_meta) {
+                                                                                       $source_stream = $source_meta->getAttribute("content");
+
+                                                                                       if ($source_stream) {
+                                                                                               $this->handle_as_video($doc, $entry, $source_stream);
+                                                                                               $found = 1;
+                                                                                       }
+                                                                               }
+                                                                       }
+                                                               }
+
+                                                       }
+
                                                        if (preg_match("/\.(gifv)$/i", $entry->getAttribute("href"))) {
 
-                                                                $gifv_meta = fetch_file_contents($entry->getAttribute("href"),
-                                                                        false, false, false, false, 10);
-
-                                                                if ($gifv_meta) {
-                                                                        $adoc = new DOMDocument();
-                                                                        @$adoc->loadHTML($gifv_meta);
-
-                                                                        if ($adoc) {
-                                                                                $axpath = new DOMXPath($adoc);
-                                                                                $aentries = $axpath->query('(//meta)');
-
-                                                                                $width = false;
-                                                                                $height = false;
-
-                                                                                foreach ($aentries as $aentry) {
-                                                                                        if (strpos($aentry->getAttribute("property"), "og:image:width") !== FALSE) {
-                                                                                                $width = $aentry->getAttribute("content");
-                                                                                        }
-                                                                                        if (strpos($aentry->getAttribute("property"), "og:image:height") !== FALSE) {
-                                                                                                $height = $aentry->getAttribute("content");
-                                                                                        }
-                                                                                }
-                                                                        }
-                                                                }
-
-                                                                       if ($width && $height) {
-                                                                
-                                                                        $iframe = $doc->createElement('iframe');
-                                                                        $iframe->setAttribute("src", str_replace("http:", "", $entry->getAttribute("href")));
-                                                                        $iframe->setAttribute("frameborder", "0");
-                                                                        $iframe->setAttribute("width", $width);
-                                                                        $iframe->setAttribute("height", $height);
-
-                                                                        $br = $doc->createElement('br');
-                                                                        $entry->parentNode->insertBefore($iframe, $entry);
-                                                                        $entry->parentNode->insertBefore($br, $entry);
-
-                                                                        // add empty img tag to disable display of attachment
-                                                                        $img = $doc->createElement('img');
-                                                                        $img->setAttribute("src", "data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs%3D");
-                                                                        $img->setAttribute("width", "0");
-                                                                        $img->setAttribute("height", "0");
-                                                                        $entry->parentNode->insertBefore($img, $entry);
-                                                                        $found = true;
-                                                                }
-                                                        }
-
-                                                       if (preg_match("/\.(jpg|jpeg|gif|png)(\?[0-9])?$/i", $entry->getAttribute("href"))) {
-
-                                                               $img = $doc->createElement('img');
+                                                               /*$video = $doc->createElement('video');
+                                                               $video->setAttribute("autoplay", "1");
+                                                               $video->setAttribute("loop", "1");
+
+                                                               $source = $doc->createElement('source');
+                                                               $source->setAttribute("src", str_replace(".gifv", ".mp4", $entry->getAttribute("href")));
+                                                               $source->setAttribute("type", "video/mp4");
+
+                                                               $video->appendChild($source);
+
+                                                               $br = $doc->createElement('br');
+                                                               $entry->parentNode->insertBefore($video, $entry);
+                                                               $entry->parentNode->insertBefore($br, $entry);
+
+                                                               $img = $doc->createElement('img');
+                                                               $img->setAttribute("src",
+                                                                       "data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs%3D");
+
+                                                               $entry->parentNode->insertBefore($img, $entry);*/
+
+                                                               $source_stream = str_replace(".gifv", ".mp4", $entry->getAttribute("href"));
+                                                               $this->handle_as_video($doc, $entry, $source_stream);
+
+                                                               $found = true;
+                                                       }
+
+                                                       if (preg_match("/\.(jpg|jpeg|gif|png)(\?[0-9][0-9]*)?$/i", $entry->getAttribute("href"))) {
+                                                               $img = $doc->createElement('img');
                                                                $img->setAttribute("src", $entry->getAttribute("href"));
 
                                                                $br = $doc->createElement('br');
@@ -94,7 +99,7 @@ class Af_RedditImgur extends Plugin {
                                                        $matches = array();
                                                        if (preg_match("/^https?:\/\/(m\.)?imgur.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches)) {
 
-                                                               $token = $matches[1];
+                                                               $token = $matches[2];
 
                                                                $album_content = fetch_file_contents($entry->getAttribute("href"),
                                                                        false, false, false, false, 10);
@@ -139,18 +144,24 @@ class Af_RedditImgur extends Plugin {
                                                                        if ($adoc) {
                                                                                $axpath = new DOMXPath($adoc);
                                                                                $aentries = $axpath->query("//meta[@property='og:image']");
+                                                                               $urls = array();
 
                                                                                foreach ($aentries as $aentry) {
-                                                                                       $img = $doc->createElement('img');
-                                                                                       $img->setAttribute("src", $aentry->getAttribute("content"));
-                                                                                       $entry->parentNode->insertBefore($doc->createElement('br'), $entry);
 
-                                                                                       $br = $doc->createElement('br');
+                                                                                       if (!in_array($aentry->getAttribute("content"), $urls)) {
+                                                                                               $img = $doc->createElement('img');
+                                                                                               $img->setAttribute("src", $aentry->getAttribute("content"));
+                                                                                               $entry->parentNode->insertBefore($doc->createElement('br'), $entry);
+
+                                                                                               $br = $doc->createElement('br');
 
-                                                                                       $entry->parentNode->insertBefore($img, $entry);
-                                                                                       $entry->parentNode->insertBefore($br, $entry);
+                                                                                               $entry->parentNode->insertBefore($img, $entry);
+                                                                                               $entry->parentNode->insertBefore($br, $entry);
 
-                                                                                       $found = true;
+                                                                                               array_push($urls, $aentry->getAttribute("content"));
+
+                                                                                               $found = true;
+                                                                                       }
                                                                                }
                                                                        }
                                                                }
@@ -180,5 +191,27 @@ class Af_RedditImgur extends Plugin {
                return 2;
        }
 
+       private function handle_as_video($doc, $entry, $source_stream) {
+
+               $video = $doc->createElement('video');
+               $video->setAttribute("autoplay", "1");
+               $video->setAttribute("loop", "1");
+
+               $source = $doc->createElement('source');
+               $source->setAttribute("src", $source_stream);
+               $source->setAttribute("type", "video/mp4");
+
+               $video->appendChild($source);
+
+               $br = $doc->createElement('br');
+               $entry->parentNode->insertBefore($video, $entry);
+               $entry->parentNode->insertBefore($br, $entry);
+
+               $img = $doc->createElement('img');
+               $img->setAttribute("src",
+                       "data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs%3D");
+
+               $entry->parentNode->insertBefore($img, $entry);
+       }
 }
 ?>