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

af_redditimgur: Rework retrieval of v.redd.it fallback URL. 

Use the v.redd.it redirects to identify the original Reddit post,
whose JSON should have the fallback_url we're looking for.
This commit is contained in:
wn_ 2017-09-17 13:34:49 -05:00
parent 81d83a68cd
commit 8352d7c6cb
1 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/af_redditimgur/init.php
View File

@ -159,17 +159,19 @@ class Af_RedditImgur extends Plugin {
$poster_url = false; $poster_url = false;
} }
// IMPORTANT: This assumes the article GUID is kept in "owner_uid,entry_guid" format, and // Get original article URL from v.redd.it redirects
// Reddit feed entries will keep the <id> element (so get_id returns it). $source_article_url = $this->get_location($matches[0]);
$feeditem_id = explode(",", $article["guid"])[1]; _debug("Resolved ".$matches[0]." to ".$source_article_url, $debug);
$source_stream = false; $source_stream = false;
$j = json_decode(fetch_file_contents($article["link"].".json"), true);
if ($source_article_url) {
$j = json_decode(fetch_file_contents($source_article_url.".json"), true);
if ($j) { if ($j) {
foreach ($j as $listing) { foreach ($j as $listing) {
foreach ($listing["data"]["children"] as $child) { foreach ($listing["data"]["children"] as $child) {
// Found the child object corresponding to the article (e.g. same name+ID like "t3_70j63a"). if ($child["data"]["url"] == $matches[0]) {
if ($child["data"]["name"] == $feeditem_id) {
try { try {
$source_stream = $child["data"]["media"]["reddit_video"]["fallback_url"]; $source_stream = $child["data"]["media"]["reddit_video"]["fallback_url"];
} }
@ -180,6 +182,7 @@ class Af_RedditImgur extends Plugin {
} }
} }
} }
}
if (!$source_stream) { if (!$source_stream) {
$source_stream = "https://v.redd.it/" . $matches[1] . "/DASH_600_K"; $source_stream = "https://v.redd.it/" . $matches[1] . "/DASH_600_K";
@ -495,6 +498,25 @@ class Af_RedditImgur extends Plugin {
return $content_type; return $content_type;
} }
private function get_location($url, $useragent = SELF_USER_AGENT) {
$location = false;
if (function_exists("curl_init") && !defined("NO_CURL")) {
$ch = curl_init($url);
curl_setopt($ch, CURLOPT_TIMEOUT, 5);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_HEADER, true);
curl_setopt($ch, CURLOPT_NOBODY, true);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("open_basedir"));
curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
@curl_exec($ch);
$location = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
}
return $location;
}
/** /**
* @SuppressWarnings(PHPMD.UnusedFormalParameter) * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/ */