core: pass found enclosures to HOOK_ARTICLE_FILTER

af_redditimgur: remove enclosures if we found something to embed because it's going to be a low-res thumbnail

2 files changed, 35 insertions, 32 deletions

diff --git a/classes/rssutils.php b/classes/rssutils.php
index 61763928d..8a554946c 100755
--- a/classes/rssutils.php
+++ b/classes/rssutils.php
@@ -653,6 +653,38 @@ class RSSUtils {
 					$article_labels = array();
 				}
 
+				Debug::log("looking for enclosures...", Debug::$LOG_VERBOSE);
+
+				// enclosures
+
+				$enclosures = array();
+
+				$encs = $item->get_enclosures();
+
+				if (is_array($encs)) {
+					foreach ($encs as $e) {
+
+						foreach ($pluginhost->get_hooks(PluginHost::HOOK_ENCLOSURE_IMPORTED) as $plugin) {
+							$e = $plugin->hook_enclosure_imported($e, $feed);
+						}
+
+						$e_item = array(
+							rewrite_relative_url($site_url, $e->link),
+							$e->type, $e->length, $e->title, $e->width, $e->height);
+
+						// Yet another episode of "mysql utf8_general_ci is gimped"
+						if (DB_TYPE == "mysql" && MYSQL_CHARSET != "UTF8MB4") {
+							for ($i = 0; $i < count($e_item); $i++) {
+								if (is_string($e_item[$i])) {
+									$e_item[$i] = RSSUtils::strip_utf8mb4($e_item[$i]);
+								}
+							}
+						}
+
+						array_push($enclosures, $e_item);
+					}
+				}
+
 				$article = array("owner_uid" => $owner_uid, // read only
 					"guid" => $entry_guid, // read only
 					"guid_hashed" => $entry_guid_hashed, // read only
@@ -667,6 +699,7 @@ class RSSUtils {
 					"language" => $entry_language,
 					"timestamp" => $entry_timestamp,
 					"num_comments" => $num_comments,
+					"enclosures" => $enclosures,
 					"feed" => array("id" => $feed,
 						"fetch_url" => $fetch_url,
 						"site_url" => $site_url,
@@ -809,6 +842,7 @@ class RSSUtils {
 				$entry_language = $article["language"];
 				$entry_timestamp = $article["timestamp"];
 				$num_comments = $article["num_comments"];
+				$enclosures = $article["enclosures"];
 
 				if ($entry_timestamp == -1 || !$entry_timestamp || $entry_timestamp > time()) {
 					$entry_timestamp = time();
@@ -1027,38 +1061,6 @@ class RSSUtils {
 				RSSUtils::assign_article_to_label_filters($entry_ref_id, $article_filters,
 					$owner_uid, $article_labels);
 
-				Debug::log("looking for enclosures...", Debug::$LOG_VERBOSE);
-
-				// enclosures
-
-				$enclosures = array();
-
-				$encs = $item->get_enclosures();
-
-				if (is_array($encs)) {
-					foreach ($encs as $e) {
-
-						foreach ($pluginhost->get_hooks(PluginHost::HOOK_ENCLOSURE_IMPORTED) as $plugin) {
-							$e = $plugin->hook_enclosure_imported($e, $feed);
-						}
-
-						$e_item = array(
-							rewrite_relative_url($site_url, $e->link),
-							$e->type, $e->length, $e->title, $e->width, $e->height);
-
-						// Yet another episode of "mysql utf8_general_ci is gimped"
-						if (DB_TYPE == "mysql" && MYSQL_CHARSET != "UTF8MB4") {
-							for ($i = 0; $i < count($e_item); $i++) {
-								if (is_string($e_item[$i])) {
-									$e_item[$i] = RSSUtils::strip_utf8mb4($e_item[$i]);
-								}
-							}
-						}
-
-						array_push($enclosures, $e_item);
-					}
-				}
-
 				if ($cache_images)
 					RSSUtils::cache_enclosures($enclosures, $site_url);
 
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index d28e072f4..5c2df3194 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -437,6 +437,7 @@ class Af_RedditImgur extends Plugin {
 
 			if ($node && $found) {
 				$article["content"] = $doc->saveHTML($node);
+				$article["enclosures"] = [];
 			} else if ($content_link) {
 				$article = $this->readability($article, $content_link->getAttribute("href"), $doc, $xpath);
 			}