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

af_redditimgur: add some last minute handling for generic preview media URLs provided in JSON

This commit is contained in:
Andrew Dolgov 2021-01-22 15:44:44 +03:00
parent 0d1336bd29
commit b30b354b53
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
plugins/af_redditimgur/init.php
View File

@ -4,6 +4,8 @@ class Af_RedditImgur extends Plugin {
/* @var PluginHost $host */ /* @var PluginHost $host */
private $host; private $host;
private $domain_blacklist = [ "github.com" ]; private $domain_blacklist = [ "github.com" ];
private $dump_json_data = false;
private $fallback_preview_urls = [];
function about() { function about() {
return array(1.0, return array(1.0,
@ -175,18 +177,22 @@ class Af_RedditImgur extends Plugin {
$found = 1; $found = 1;
} }
if (!$found && $data["post_hint"] == "self" && is_array($data["preview"]["images"])) { if (!$found && is_array($data["preview"]["images"])) {
foreach ($data["preview"]["images"] as $img) { foreach ($data["preview"]["images"] as $img) {
if (isset($img["source"]["url"])) { if (isset($img["source"]["url"])) {
$media_url = htmlspecialchars_decode($img["source"]["url"]); $media_url = htmlspecialchars_decode($img["source"]["url"]);
$target_url = $data["url"]; $target_url = $data["url"];
if ($media_url) { if ($media_url) {
if ($data["post_hint"] == "self") {
Debug::log("found preview image url: $media_url (link: $target_url)", Debug::$LOG_VERBOSE); Debug::log("found preview image url: $media_url (link: $target_url)", Debug::$LOG_VERBOSE);
$this->handle_as_image($doc, $anchor, $media_url, $target_url); $this->handle_as_image($doc, $anchor, $media_url, $target_url);
$found = 1; $found = 1;
} else { // gonna use this later if nothing is found using generic link processing
Debug::log("found fallback preview image url: $media_url (link: $target_url);", Debug::$LOG_VERBOSE);
array_push($this->fallback_preview_urls, $media_url);
}
} }
} }
} }
@ -199,14 +205,16 @@ class Af_RedditImgur extends Plugin {
$found = false; $found = false;
// embed before reddit <table> post layout
$anchor = $xpath->query('//body/*')->item(0);
// deal with json-provided media content first // deal with json-provided media content first
if ($article["link"]) { if ($article["link"] && $anchor) {
Debug::log("JSON: requesting from URL: " . $article["link"] . "/.json", Debug::$LOG_VERBOSE); Debug::log("JSON: requesting from URL: " . $article["link"] . "/.json", Debug::$LOG_VERBOSE);
$tmp = UrlHelper::fetch($article["link"] . "/.json"); $tmp = UrlHelper::fetch($article["link"] . "/.json");
// embed before reddit <table> post layout $this->fallback_preview_urls = [];
$anchor = $xpath->query('//body/*')->item(0);
if ($tmp && $anchor) { if ($tmp && $anchor) {
$json = json_decode($tmp, true); $json = json_decode($tmp, true);
@ -214,7 +222,7 @@ class Af_RedditImgur extends Plugin {
if ($json) { if ($json) {
Debug::log("JSON: processing media elements...", Debug::$LOG_EXTENDED); Debug::log("JSON: processing media elements...", Debug::$LOG_EXTENDED);
//print_r($json); if ($this->dump_json_data) print_r($json);
foreach ($json as $listing) { foreach ($json as $listing) {
foreach ($listing["data"]["children"] as $child) { foreach ($listing["data"]["children"] as $child) {
@ -250,12 +258,10 @@ class Af_RedditImgur extends Plugin {
global $fetch_last_error; global $fetch_last_error;
Debug::log("JSON: failed to fetch post:" . $fetch_last_error, Debug::$LOG_EXTENDED); Debug::log("JSON: failed to fetch post:" . $fetch_last_error, Debug::$LOG_EXTENDED);
} }
}
if (!$anchor) { } else if (!$anchor) {
Debug::log("JSON: anchor element not found, unable to embed", Debug::$LOG_EXTENDED); Debug::log("JSON: anchor element not found, unable to embed", Debug::$LOG_EXTENDED);
} }
}
}
if ($found) { if ($found) {
Debug::log("JSON: found media data, skipping further processing of content", Debug::$LOG_VERBOSE); Debug::log("JSON: found media data, skipping further processing of content", Debug::$LOG_VERBOSE);
@ -489,6 +495,16 @@ class Af_RedditImgur extends Plugin {
$this->remove_post_thumbnail($doc, $xpath); $this->remove_post_thumbnail($doc, $xpath);
} }
if (!$found && $anchor && count($this->fallback_preview_urls) > 0) {
Debug::log("JSON: processing fallback preview urls...", Debug::$LOG_VERBOSE);
foreach ($this->fallback_preview_urls as $media_url) {
$this->handle_as_image($doc, $anchor, $media_url);
$found = 1;
}
}
return $found; return $found;
} }
@ -613,6 +629,8 @@ class Af_RedditImgur extends Plugin {
$url = clean($_POST["url"]); $url = clean($_POST["url"]);
$article_url = clean($_POST["article_url"]); $article_url = clean($_POST["article_url"]);
$this->dump_json_data = true;
if (!$url && !$article_url) { if (!$url && !$article_url) {
header("Content-type: text/html"); header("Content-type: text/html");
?> ?>