limit maximum article length allowed for readability

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

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 59b97d6e527b2706f33743daf545de83440183d0..ded98d8cc04ce34d9a7bfcd35fb1c31fe94b94e1 100644 (file)
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -23,9 +23,6 @@ class Af_RedditImgur extends Plugin {
                $enable_readability = $this->host->get($this, "enable_readability");
                $enable_readability_checked = $enable_readability ? "checked" : "";
 
-               $enable_dupecheck = $this->host->get($this, "enable_dupecheck");
-               $enable_dupecheck_checked = $enable_dupecheck ? "checked" : "";
-               
                print "<form dojoType=\"dijit.form.Form\">";
 
                print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
@@ -46,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\"
@@ -56,13 +51,6 @@ class Af_RedditImgur extends Plugin {
 
                print "<label for=\"enable_readability\">" . __("Extract missing content using Readability") . "</label>";
 
-               print "<br/>";
-               
-               print "<input dojoType=\"dijit.form.CheckBox\" id=\"enable_dupecheck\"
-                       $enable_dupecheck_checked name=\"enable_dupecheck\">&nbsp;";
-
-               print "<label for=\"enable_dupecheck\">" . __("Mark duplicates as read using content links") . "</label>";
-               
                print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
                        __("Save")."</button>";
 
@@ -73,10 +61,8 @@ class Af_RedditImgur extends Plugin {
 
        function save() {
                $enable_readability = checkbox_to_sql_bool($_POST["enable_readability"]) == "true";
-               $enable_dupecheck = checkbox_to_sql_bool($_POST["enable_dupecheck"]) == "true";
-               
+
                $this->host->set($this, "enable_readability", $enable_readability);
-               $this->host->set($this, "enable_dupecheck", $enable_dupecheck);
 
                echo __("Configuration saved");
        }
@@ -107,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) {
@@ -201,8 +187,10 @@ class Af_RedditImgur extends Plugin {
                                                        foreach ($aentries as $aentry) {
 
                                                                $url = str_replace("?fb", "", $aentry->getAttribute("content"));
+                                                               $check_url = basename($url);
+                                                               $check_url = mb_substr($check_url, 0, strrpos($check_url, "."));
 
-                                                               if (!in_array($url, $urls)) {
+                                                               if (!in_array($check_url, $urls)) {
                                                                        $img = $doc->createElement('img');
                                                                        $img->setAttribute("src", $url);
                                                                        $entry->parentNode->insertBefore($doc->createElement('br'), $entry);
@@ -212,7 +200,7 @@ class Af_RedditImgur extends Plugin {
                                                                        $entry->parentNode->insertBefore($img, $entry);
                                                                        $entry->parentNode->insertBefore($br, $entry);
 
-                                                                       array_push($urls, $url);
+                                                                       array_push($urls, $check_url);
 
                                                                        $found = true;
                                                                }
@@ -242,34 +230,7 @@ class Af_RedditImgur extends Plugin {
 
                        $content_link = $xpath->query("(//a[contains(., '[link]')])")->item(0);
 
-                       if ($content_link && $this->host->get($this, "enable_dupecheck")) {
-
-                               if (DB_TYPE == "pgsql") {
-                                       $date_qpart = "date_entered < NOW() - INTERVAL '1 day' ";
-                               } else {
-                                       $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 DAY) ";
-                               }
-
-                               $content_href = db_escape_string($content_link->getAttribute("href"));
-                               $owner_uid = $article["owner_uid"];
-                               $guid = db_escape_string($article["guid_hashed"]);
-
-                               $result = db_query("SELECT id FROM ttrss_entries, ttrss_user_entries
-                                       WHERE
-                                               content LIKE '%$content_href%' AND
-                                               $date_qpart AND
-                                               ref_id = id AND
-                                               owner_uid = $owner_uid
-                                               AND guid != '$guid'
-                                       LIMIT 1");
-
-                               if (db_num_rows($result) != 0) {
-                                       $found = true;
-                                       $article["force_catchup"] = true;
-                               }
-                       }
-
-                       if (!$found) $found = $this->inline_stuff($article, $doc, $xpath);
+                       $found = $this->inline_stuff($article, $doc, $xpath);
 
                        if (function_exists("curl_init") && !$found && $this->host->get($this, "enable_readability") &&
                                mb_strlen(strip_tags($article["content"])) <= 150) {
@@ -300,7 +261,10 @@ class Af_RedditImgur extends Plugin {
 
                                                $tmp = fetch_file_contents($content_link->getAttribute("href"));
 
-                                               if ($tmp) {
+                                               //_debug("tmplen: " . mb_strlen($tmp));
+
+                                               if ($tmp && mb_strlen($tmp) < 65535 * 4) {
+
                                                        $r = new Readability($tmp, $content_link->getAttribute("href"));
 
                                                        if ($r->init()) {