feat(X): Add Open links as query patch (#570)

Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>
ReVanced · Feb 21, 2024 · 95ca632 · 95ca632
1 parent 608c520
commit 95ca632
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 17 deletions.
diff --git a/app/src/main/java/app/revanced/integrations/twitter/patches/hook/twifucker/TwiFucker.kt b/app/src/main/java/app/revanced/integrations/twitter/patches/hook/twifucker/TwiFucker.kt
@@ -9,8 +9,7 @@ import org.json.JSONObject
 // https://raw.githubusercontent.com/Dr-TSNG/TwiFucker/880cdf1c1622e54ab45561ffcb4f53d94ed97bae/app/src/main/java/icu/nullptr/twifucker/hook/JsonHook.kt
 internal object TwiFucker {
     // root
-    private fun JSONObject.jsonGetInstructions(): JSONArray? =
-        optJSONObject("timeline")?.optJSONArray("instructions")
+    private fun JSONObject.jsonGetInstructions(): JSONArray? = optJSONObject("timeline")?.optJSONArray("instructions")
 
     private fun JSONObject.jsonGetData(): JSONObject? = optJSONObject("data")
 
@@ -42,10 +41,11 @@ internal object TwiFucker {
 
     // data
     private fun JSONObject.dataGetInstructions(): JSONArray? {
-        val timeline = optJSONObject("user_result")?.optJSONObject("result")
-            ?.optJSONObject("timeline_response")?.optJSONObject("timeline")
-            ?: optJSONObject("timeline_response")?.optJSONObject("timeline")
-            ?: optJSONObject("timeline_response")
+        val timeline =
+            optJSONObject("user_result")?.optJSONObject("result")
+                ?.optJSONObject("timeline_response")?.optJSONObject("timeline")
+                ?: optJSONObject("timeline_response")?.optJSONObject("timeline")
+                ?: optJSONObject("timeline_response")
         return timeline?.optJSONArray("instructions")
     }
 
@@ -64,7 +64,6 @@ internal object TwiFucker {
             }
         }?.optJSONObject("legacy")
 
-
     // entry
     private fun JSONObject.entryHasPromotedMetadata(): Boolean =
         optJSONObject("content")?.optJSONObject("item")?.optJSONObject("content")
@@ -77,11 +76,9 @@ internal object TwiFucker {
         optJSONObject("content")?.optJSONArray("items")
             ?: optJSONObject("content")?.optJSONObject("timelineModule")?.optJSONArray("items")
 
-    private fun JSONObject.entryIsTweetDetailRelatedTweets(): Boolean =
-        optString("entryId").startsWith("tweetdetailrelatedtweets-")
+    private fun JSONObject.entryIsTweetDetailRelatedTweets(): Boolean = optString("entryId").startsWith("tweetdetailrelatedtweets-")
 
-    private fun JSONObject.entryGetTrends(): JSONArray? =
-        optJSONObject("content")?.optJSONObject("timelineModule")?.optJSONArray("items")
+    private fun JSONObject.entryGetTrends(): JSONArray? = optJSONObject("content")?.optJSONObject("timelineModule")?.optJSONArray("items")
 
     // trend
     private fun JSONObject.trendHasPromotedMetadata(): Boolean =
@@ -104,8 +101,7 @@ internal object TwiFucker {
     // instruction
     private fun JSONObject.instructionTimelineAddEntries(): JSONArray? = optJSONArray("entries")
 
-    private fun JSONObject.instructionGetAddEntries(): JSONArray? =
-        optJSONObject("addEntries")?.optJSONArray("entries")
+    private fun JSONObject.instructionGetAddEntries(): JSONArray? = optJSONObject("addEntries")?.optJSONArray("entries")
 
     private fun JSONObject.instructionCheckAndRemove(action: (JSONArray) -> Unit) {
         instructionTimelineAddEntries()?.let(action)
@@ -164,9 +160,10 @@ internal object TwiFucker {
         entriesRemoveTweetDetailRelatedTweets()
     }
 
-    private fun JSONObject.entryIsWhoToFollow(): Boolean = optString("entryId").let {
-        it.startsWith("whoToFollow-") || it.startsWith("who-to-follow-") || it.startsWith("connect-module-")
-    }
+    private fun JSONObject.entryIsWhoToFollow(): Boolean =
+        optString("entryId").let {
+            it.startsWith("whoToFollow-") || it.startsWith("who-to-follow-") || it.startsWith("connect-module-")
+        }
 
     private fun JSONObject.itemContainsPromotedUser(): Boolean =
         optJSONObject("item")?.optJSONObject("content")
@@ -217,4 +214,4 @@ internal object TwiFucker {
             instruction.instructionCheckAndRemove(action)
         }
     }
-}
+}
diff --git a/...in/java/app/revanced/integrations/twitter/patches/links/OpenLinksWithAppChooserPatch.java b/...in/java/app/revanced/integrations/twitter/patches/links/OpenLinksWithAppChooserPatch.java
@@ -0,0 +1,12 @@
+package app.revanced.integrations.twitter.patches.links;
+
+import android.content.Context;
+import android.content.Intent;
+
+public final class OpenLinksWithAppChooserPatch {
+    public static void openWithChooser(final Context context, final Intent intent) {
+        intent.setAction("android.intent.action.VIEW");
+
+        context.startActivity(Intent.createChooser(intent, null));
+    }
+}