feat(Instagram): Add Hide highlights tray patch (#6489)

Co-authored-by: oSumAtrIX <[email protected]>

Author: Swakshan

patches/api/patches.api

@@ -308,6 +308,10 @@ public final class app/revanced/patches/instagram/hide/explore/HideExploreFeedKt
 	public static final fun getHideExploreFeedPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/instagram/hide/highlightsTray/HideHighlightsTrayPatchKt {
+	public static final fun getHideHighlightsTrayPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/instagram/hide/navigation/HideNavigationButtonsKt {
 	public static final fun getHideNavigationButtonsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }

patches/src/main/kotlin/app/revanced/patches/instagram/hide/explore/HideExploreFeed.kt

@@ -1,29 +1,7 @@
 package app.revanced.patches.instagram.hide.explore
 
-import app.revanced.patcher.Fingerprint
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.patch.BytecodePatchContext
 import app.revanced.patcher.patch.bytecodePatch
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
-
-context(BytecodePatchContext)
-internal fun Fingerprint.replaceJsonFieldWithBogus(
-    key: String,
-) {
-    val targetStringIndex = stringMatches!!.first { match -> match.string == key }.index
-    val targetStringRegister = method.getInstruction<OneRegisterInstruction>(targetStringIndex).registerA
-
-    /**
-     * Replacing the JSON key we want to skip with a random string that is not a valid JSON key.
-     * This way the feeds array will never be populated.
-     * Received JSON keys that are not handled are simply ignored, so there are no side effects.
-     */
-    method.replaceInstruction(
-        targetStringIndex,
-        "const-string v$targetStringRegister, \"BOGUS\"",
-    )
-}
+import app.revanced.patches.instagram.shared.replaceStringWithBogus
 
 @Suppress("unused")
 val hideExploreFeedPatch = bytecodePatch(
@@ -34,6 +12,6 @@ val hideExploreFeedPatch = bytecodePatch(
     compatibleWith("com.instagram.android")
 
     execute {
-        exploreResponseJsonParserFingerprint.replaceJsonFieldWithBogus(EXPLORE_KEY_TO_BE_HIDDEN)
+        exploreResponseJsonParserFingerprint.replaceStringWithBogus(EXPLORE_KEY_TO_BE_HIDDEN)
     }
 }

patches/src/main/kotlin/app/revanced/patches/instagram/hide/highlightsTray/Fingerprints.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.instagram.hide.highlightsTray
+
+import app.revanced.patcher.fingerprint
+
+internal const val TARGET_STRING = "highlights_tray"
+
+internal val highlightsUrlBuilderFingerprint = fingerprint {
+    strings(TARGET_STRING,"X-IG-Accept-Hint")
+}

patches/src/main/kotlin/app/revanced/patches/instagram/hide/highlightsTray/HideHighlightsTrayPatch.kt

@@ -0,0 +1,17 @@
+package app.revanced.patches.instagram.hide.highlightsTray
+
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.instagram.shared.replaceStringWithBogus
+
+@Suppress("unused")
+val hideHighlightsTrayPatch = bytecodePatch(
+    name = "Hide highlights tray",
+    description = "Hides the highlights tray in profile section.",
+    use = false
+) {
+    compatibleWith("com.instagram.android")
+
+    execute {
+        highlightsUrlBuilderFingerprint.replaceStringWithBogus(TARGET_STRING)
+    }
+}

patches/src/main/kotlin/app/revanced/patches/instagram/hide/suggestions/HideSuggestedContent.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.instagram.hide.suggestions
 
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patches.instagram.hide.explore.replaceJsonFieldWithBogus
+import app.revanced.patches.instagram.shared.replaceStringWithBogus
 
 @Suppress("unused")
 val hideSuggestedContent = bytecodePatch(
@@ -13,7 +13,7 @@ val hideSuggestedContent = bytecodePatch(
 
     execute {
         FEED_ITEM_KEYS_TO_BE_HIDDEN.forEach { key ->
-            feedItemParseFromJsonFingerprint.replaceJsonFieldWithBogus(key)
+            feedItemParseFromJsonFingerprint.replaceStringWithBogus(key)
         }
     }
 }

patches/src/main/kotlin/app/revanced/patches/instagram/shared/Utils.kt

@@ -0,0 +1,25 @@
+package app.revanced.patches.instagram.shared
+
+import app.revanced.patcher.Fingerprint
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.patch.BytecodePatchContext
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+
+context(BytecodePatchContext)
+internal fun Fingerprint.replaceStringWithBogus(
+    targetString: String,
+) {
+    val targetStringIndex = stringMatches!!.first { match -> match.string == targetString }.index
+    val targetStringRegister = method.getInstruction<OneRegisterInstruction>(targetStringIndex).registerA
+
+    /**
+     * Replaces the 'target string' with 'BOGUS'.
+     * This is usually done when we need to override a JSON key or url,
+     * to skip with a random string that is not a valid JSON key.
+     */
+    method.replaceInstruction(
+        targetStringIndex,
+        "const-string v$targetStringRegister, \"BOGUS\"",
+    )
+}