fix: unexpected and unknown promoted trend appears in some country

Dr-TSNG · Jun 24, 2023 · dbc5296 · dbc5296
1 parent 9977431
commit dbc5296
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/src/main/java/icu/nullptr/twifucker/Utils.kt b/app/src/main/java/icu/nullptr/twifucker/Utils.kt
@@ -80,7 +80,8 @@ fun writeJsonLog(content: String) {
 
 fun isEntryNeedsRemove(entryId: String): Boolean {
     // promoted tweet
-    if (entryId.startsWith("promotedTweet-") && modulePrefs.getBoolean(
+    // "superhero-superhero" == promoted trend
+    if ((entryId.startsWith("promotedTweet-") || entryId.startsWith("superhero-")) && modulePrefs.getBoolean(
             "disable_promoted_content", true
         )
     ) {

diff --git a/app/src/main/java/icu/nullptr/twifucker/hook/JsonHook.kt b/app/src/main/java/icu/nullptr/twifucker/hook/JsonHook.kt
@@ -137,7 +137,9 @@ object JsonHook : BaseHook() {
             ?.optJSONObject("tweet")
             ?.has("promotedMetadata") == true || optJSONObject("content")?.optJSONObject("content")
             ?.has("tweetPromotedMetadata") == true || optJSONObject("item")?.optJSONObject("content")
-            ?.has("tweetPromotedMetadata") == true
+            ?.has("tweetPromotedMetadata") == true || optJSONObject("content")?.optJSONObject("item")
+            ?.optJSONObject("content")?.optJSONObject("eventSummary")
+            ?.has("promotedMetadata") == true
 
     private fun JSONObject.entryIsWhoToFollow(): Boolean = optString("entryId").let {
         it.startsWith("whoToFollow-") || it.startsWith("who-to-follow-") || it.startsWith("connect-module-")