From 9dc31dfcfa991133ef46eb36eee23d09a6bf8f87 Mon Sep 17 00:00:00 2001 From: pirnz <96375165+pirnz@users.noreply.github.com> Date: Tue, 26 Apr 2022 10:10:10 +0000 Subject: [PATCH 1/4] [AsahiShimbunAJWBridge] Updated Asia section links (#2671) --- bridges/AsahiShimbunAJWBridge.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bridges/AsahiShimbunAJWBridge.php b/bridges/AsahiShimbunAJWBridge.php index 1c3cf59fd6d..2e7c5dc2384 100644 --- a/bridges/AsahiShimbunAJWBridge.php +++ b/bridges/AsahiShimbunAJWBridge.php @@ -20,9 +20,10 @@ class AsahiShimbunAJWBridge extends BridgeAbstract { 'Culture » Style' => 'culture/style', 'Culture » Movies' => 'culture/movies', 'Culture » Manga & Anime' => 'culture/manga_anime', - 'Asia » China' => 'asia/china', - 'Asia » Korean Peninsula' => 'asia/korean_peninsula', - 'Asia » Around Asia' => 'asia/around_asia', + 'Asia » China' => 'asia_world/china', + 'Asia » Korean Peninsula' => 'asia_world/korean_peninsula', + 'Asia » Around Asia' => 'asia_world/around_asia', + 'Asia » World' => 'asia_world/world', 'Opinion » Editorial' => 'opinion/editorial', 'Opinion » Vox Populi' => 'opinion/vox', ), From 4c26950b71dc6ccc0b27ebc5935c5ceb80cf2785 Mon Sep 17 00:00:00 2001 From: quickwick <2566133+quickwick@users.noreply.github.com> Date: Tue, 26 Apr 2022 03:11:26 -0700 Subject: [PATCH 2/4] [TwitterV2Bridge] Fix empty object check (#2673) --- bridges/TwitterV2Bridge.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bridges/TwitterV2Bridge.php b/bridges/TwitterV2Bridge.php index 124ecdeb7cc..acebe7589e7 100644 --- a/bridges/TwitterV2Bridge.php +++ b/bridges/TwitterV2Bridge.php @@ -362,6 +362,7 @@ public function collectData() { // Start setting values needed for HTML output if($isRetweet || is_null($user)) { + Debug::log('Tweet is retweet, or $user is null'); // Replace tweet object with original retweeted object if($isRetweet) { foreach($includesTweets as $includesTweet) { @@ -380,17 +381,21 @@ public function collectData() { // Get user object for retweeted tweet $originalUser = new stdClass(); // make the linters stop complaining if(isset($retweetedUsers)) { + Debug::log('Searching for tweet author_id in $retweetedUsers'); foreach($retweetedUsers as $retweetedUser) { if($retweetedUser->id === $tweet->author_id) { $originalUser = $retweetedUser; + Debug::log('Found author_id match in $retweetedUsers'); break; } } } - if(!$originalUser && isset($includesUsers)) { + if(!isset($originalUser->username) && isset($includesUsers)) { + Debug::log('Searching for tweet author_id in $includesUsers'); foreach($includesUsers as $includesUser) { if($includesUser->id === $tweet->author_id) { $originalUser = $includesUser; + Debug::log('Found author_id match in $includesUsers'); break; } } From 61cfbe6c531e17d70029c6d40d3215d036f958f4 Mon Sep 17 00:00:00 2001 From: Dag Date: Tue, 26 Apr 2022 22:41:34 +0200 Subject: [PATCH 3/4] Update app.json --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index f18479957f5..bb8c10eb03c 100644 --- a/app.json +++ b/app.json @@ -1,6 +1,6 @@ { "service": "Heroku", - "name": "RSS-Bridge", + "name": "rss-bridge-heroku", "description": "RSS-Bridge is a PHP project capable of generating RSS and Atom feeds for websites which don't have one.", "repository": "https://github.com/RSS-Bridge/rss-bridge", "keywords": ["php", "rss-bridge", "rss"] From 63b08f7da9a38b8db7a58cf5ffacb99a81bd80b1 Mon Sep 17 00:00:00 2001 From: Dag Date: Tue, 26 Apr 2022 22:43:13 +0200 Subject: [PATCH 4/4] Update app.json --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index bb8c10eb03c..f79d7138f87 100644 --- a/app.json +++ b/app.json @@ -2,7 +2,7 @@ "service": "Heroku", "name": "rss-bridge-heroku", "description": "RSS-Bridge is a PHP project capable of generating RSS and Atom feeds for websites which don't have one.", - "repository": "https://github.com/RSS-Bridge/rss-bridge", + "repository": "https://github.com/RSS-Bridge/rss-bridge?1651005770", "keywords": ["php", "rss-bridge", "rss"] }