chore(release): 2.165.1 [skip ci]

## [2.165.1](https://github.com/revanced/revanced-patches/compare/v2.165.0...v2.165.1) (2023-03-14)

### Bug Fixes

* **youtube/spoof-signature-verification:** use correct fingerprint ([e36902a](e36902a530))

.releaserc

@@ -39,7 +39,7 @@
     [
       "@saithodev/semantic-release-backmerge",
       {
-        backmergeBranches: ["dev"],
+        backmergeBranches: [{"from": "main", "to": "dev"}],
         clearWorkspace: true
       }
     ]

CHANGELOG.md

@@ -1,3 +1,103 @@
+## [2.165.1](https://github.com/revanced/revanced-patches/compare/v2.165.0...v2.165.1) (2023-03-14)
+
+
+### Bug Fixes
+
+* **youtube/spoof-signature-verification:** use correct fingerprint ([13090ee](https://github.com/revanced/revanced-patches/commit/13090eeb47660980cec8dc5bbb80447de5047a1d))
+
+# [2.165.0](https://github.com/revanced/revanced-patches/compare/v2.164.0...v2.165.0) (2023-03-14)
+
+
+### Features
+
+* **youtube:** `spoof-signature-verification` patch ([#1745](https://github.com/revanced/revanced-patches/issues/1745)) ([4306f25](https://github.com/revanced/revanced-patches/commit/4306f25d3f3b1afdbc75f48485b3897c15aa49e9))
+
+# [2.164.0](https://github.com/revanced/revanced-patches/compare/v2.163.0...v2.164.0) (2023-02-24)
+
+
+### Features
+
+* **photomath:** `unlock-plus` patch ([#1633](https://github.com/revanced/revanced-patches/issues/1633)) ([a673514](https://github.com/revanced/revanced-patches/commit/a673514f848e583513924a6a9b8cfbb56153cc3a))
+* **youtube/general-ads:** hide quick actions in fullscreen ([fff9670](https://github.com/revanced/revanced-patches/commit/fff9670a81108b8343d0b7913953fc6c2bb4a6f0))
+* **youtube/general-ads:** hide related videos in quick action ([d23c31a](https://github.com/revanced/revanced-patches/commit/d23c31a9ec39189e08474044ac5ca06d974add76))
+* **youtube/return-youtube-dislike:** support for shorts ([#1596](https://github.com/revanced/revanced-patches/issues/1596)) ([967c1cb](https://github.com/revanced/revanced-patches/commit/967c1cbd4b340a382a355f13d236d2881bafddbf))
+* **youtube:** remove patch `open-links-directly` ([79291a0](https://github.com/revanced/revanced-patches/commit/79291a0d34bd9514cbef5d97c21c59dfbffad287))
+
+# [2.164.0-dev.3](https://github.com/revanced/revanced-patches/compare/v2.164.0-dev.2...v2.164.0-dev.3) (2023-02-24)
+
+
+### Features
+
+* **youtube/return-youtube-dislike:** support for shorts ([#1596](https://github.com/revanced/revanced-patches/issues/1596)) ([967c1cb](https://github.com/revanced/revanced-patches/commit/967c1cbd4b340a382a355f13d236d2881bafddbf))
+
+# [2.164.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.164.0-dev.1...v2.164.0-dev.2) (2023-02-23)
+
+
+### Features
+
+* **youtube/general-ads:** hide quick actions in fullscreen ([fff9670](https://github.com/revanced/revanced-patches/commit/fff9670a81108b8343d0b7913953fc6c2bb4a6f0))
+* **youtube/general-ads:** hide related videos in quick action ([d23c31a](https://github.com/revanced/revanced-patches/commit/d23c31a9ec39189e08474044ac5ca06d974add76))
+
+# [2.164.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.163.0...v2.164.0-dev.1) (2023-02-22)
+
+
+### Features
+
+* **photomath:** `unlock-plus` patch ([#1633](https://github.com/revanced/revanced-patches/issues/1633)) ([a673514](https://github.com/revanced/revanced-patches/commit/a673514f848e583513924a6a9b8cfbb56153cc3a))
+* **youtube:** remove patch `open-links-directly` ([79291a0](https://github.com/revanced/revanced-patches/commit/79291a0d34bd9514cbef5d97c21c59dfbffad287))
+
+# [2.163.0](https://github.com/revanced/revanced-patches/compare/v2.162.0...v2.163.0) (2023-02-22)
+
+
+### Bug Fixes
+
+* **tiktok/show-seekbar:** fix crash when showing seekbar ([#1643](https://github.com/revanced/revanced-patches/issues/1643)) ([160b716](https://github.com/revanced/revanced-patches/commit/160b71644dfdf8efd1f19cdf8e9f572fe1b86d9d))
+* **twitter:** make `hide-promoted-ads` patch compatible with any version ([3dbc5ff](https://github.com/revanced/revanced-patches/commit/3dbc5ff2722559211232999ae29e7fabafe3b857))
+* use correct fingerprint ([84fe9c3](https://github.com/revanced/revanced-patches/commit/84fe9c36461586f25ace146e0e29597e3dfc99ca))
+* **youtube/disable-fullscreen-panels-auto-popup:** use proper descriptions ([4c82487](https://github.com/revanced/revanced-patches/commit/4c824876b45e32c5b79a9817b0a362f31bd13879))
+* **youtube/general-ads:** fix switch description wording ([9003977](https://github.com/revanced/revanced-patches/commit/9003977c00d8056c38fd31476d2e367fb3aa9030))
+* **youtube/hide-time:** use correct integrations class ([539ccf4](https://github.com/revanced/revanced-patches/commit/539ccf43a884ab3ff812884279aa75f42ba872d5))
+* **youtube/hide-watch-in-vr:** fix descriptions ([f261e64](https://github.com/revanced/revanced-patches/commit/f261e64b10db9cddee2a850feab16c8c7092c333))
+* **youtube/open-links-directly:** reference correct integrations method ([e14893e](https://github.com/revanced/revanced-patches/commit/e14893ec89d002287123196396946fff557b7ef4))
+
+
+### Features
+
+* **androidtwelvewidgets:** `unlock-paid-widgets` patch ([#1641](https://github.com/revanced/revanced-patches/issues/1641)) ([44b74ae](https://github.com/revanced/revanced-patches/commit/44b74ae268c3f534dbaecc0adc00767e9b9c0e51))
+* **music:** remove patches constraint on app version ([#1638](https://github.com/revanced/revanced-patches/issues/1638)) ([fe64881](https://github.com/revanced/revanced-patches/commit/fe64881c83a7dd42761dbd67689fbc0ddcb73d78))
+* **twitter:** `hide-recommended-users` patch ([e8c9a91](https://github.com/revanced/revanced-patches/commit/e8c9a91a92fafcc79ce521f62c3865827df55d0f))
+* **twitter:** constrain patches compatibility to working versions ([#1646](https://github.com/revanced/revanced-patches/issues/1646)) ([d984bdc](https://github.com/revanced/revanced-patches/commit/d984bdc8b17dea127880b696ee1bed1503762707))
+* use better patch descriptions ([931aa0f](https://github.com/revanced/revanced-patches/commit/931aa0fba631d1740986131219eff94c4c1b2306))
+* **youtube/general-ads:** hide channel bar ([c74c77d](https://github.com/revanced/revanced-patches/commit/c74c77d12568dda54d971d1998f7e73a45543a3b))
+* **youtube/general-ads:** hide horizontal video shelf ([169e2ba](https://github.com/revanced/revanced-patches/commit/169e2ba67024210450ef6cc74e734d3e7f162cbe))
+* **youtube/open-links-directly:** skip every redirect url ([f155e26](https://github.com/revanced/revanced-patches/commit/f155e261d4973d304c57e0144ddd8e115e6103ee))
+
+# [2.163.0-dev.5](https://github.com/revanced/revanced-patches/compare/v2.163.0-dev.4...v2.163.0-dev.5) (2023-02-22)
+
+
+### Bug Fixes
+
+* use correct fingerprint ([84fe9c3](https://github.com/revanced/revanced-patches/commit/84fe9c36461586f25ace146e0e29597e3dfc99ca))
+* **youtube/hide-time:** use correct integrations class ([539ccf4](https://github.com/revanced/revanced-patches/commit/539ccf43a884ab3ff812884279aa75f42ba872d5))
+
+
+### Features
+
+* use better patch descriptions ([931aa0f](https://github.com/revanced/revanced-patches/commit/931aa0fba631d1740986131219eff94c4c1b2306))
+
+# [2.163.0-dev.4](https://github.com/revanced/revanced-patches/compare/v2.163.0-dev.3...v2.163.0-dev.4) (2023-02-22)
+
+
+### Bug Fixes
+
+* **twitter:** make `hide-promoted-ads` patch compatible with any version ([3dbc5ff](https://github.com/revanced/revanced-patches/commit/3dbc5ff2722559211232999ae29e7fabafe3b857))
+* **youtube/open-links-directly:** reference correct integrations method ([e14893e](https://github.com/revanced/revanced-patches/commit/e14893ec89d002287123196396946fff557b7ef4))
+
+
+### Features
+
+* **twitter:** `hide-recommended-users` patch ([e8c9a91](https://github.com/revanced/revanced-patches/commit/e8c9a91a92fafcc79ce521f62c3865827df55d0f))
+
 # [2.163.0-dev.3](https://github.com/revanced/revanced-patches/compare/v2.163.0-dev.2...v2.163.0-dev.3) (2023-02-20)
 
 

README.md

@@ -36,7 +36,7 @@ The official Patch bundle provided by ReVanced and the community.
 | `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 18.03.36 |
 | `hide-email-address` | Hides the email address in the account switcher. | 18.03.36 |
 | `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 18.03.36 |
-| `hide-info-cards` | Hides info-cards in videos. | 18.03.36 |
+| `hide-info-cards` | Hides info cards in videos. | 18.03.36 |
 | `hide-my-mix` | Hides mix playlists. | 18.03.36 |
 | `hide-player-buttons` | Adds the option to hide video player previous and next buttons. | all |
 | `hide-seekbar` | Hides the seekbar. | 18.03.36 |
@@ -48,7 +48,6 @@ The official Patch bundle provided by ReVanced and the community.
 | `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 18.03.36 |
 | `minimized-playback` | Enables minimized and background playback. | 18.03.36 |
 | `old-quality-layout` | Enables the original video quality flyout in the video player settings | 18.03.36 |
-| `open-links-directly` | Skips over redirection URLs to external links. | 18.03.36 |
 | `open-links-externally` | Open links outside of the app directly in your browser. | 18.03.36 |
 | `premium-heading` | Shows premium branding on the home screen. | all |
 | `remember-playback-rate` | Adds the ability to remember the playback rate you chose in the video playback rate flyout. | 18.03.36 |
@@ -58,6 +57,7 @@ The official Patch bundle provided by ReVanced and the community.
 | `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 18.03.36 |
 | `sponsorblock` | Integrates SponsorBlock which allows skipping video segments such as sponsored content. | 18.03.36 |
 | `spoof-app-version` | Tricks YouTube into thinking, you are running an older version of the app. One of the side effects also includes restoring the old UI. | 18.03.36 |
+| `spoof-signature-verification` | Spoofs the client to prevent playback issues. | 18.03.36 |
 | `swipe-controls` | Adds volume and brightness swipe controls. | 18.03.36 |
 | `tablet-mini-player` | Enables the tablet mini player layout. | 18.03.36 |
 | `theme` | Applies a custom theme. | all |
@@ -132,9 +132,10 @@ The official Patch bundle provided by ReVanced and the community.
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
 | `dynamic-color` | Replaces the default Twitter Blue with the users Material You palette. | all |
+| `hide-ads` | Hides ads. | all |
+| `hide-recommended-users` | Hides recommended users. | all |
 | `hide-views-stats` | Hides the view stats under tweets. | 9.71.0-release.0 |
 | `monochrome-icon` | Adds a monochrome icon. | all |
-| `timeline-ads` | Removes ads from the Twitter timeline. Might require clearing app data to remove already cached ads. | 9.71.0-release.0 |
 </details>
 
 ### [📦 `com.spotify.music`](https://play.google.com/store/apps/details?id=com.spotify.music)
@@ -263,6 +264,14 @@ The official Patch bundle provided by ReVanced and the community.
 | `unlock-paid-widgets` | Unlocks paid widgets of the app | all |
 </details>
 
+### [📦 `com.microblink.photomath`](https://play.google.com/store/apps/details?id=com.microblink.photomath)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-plus` | Unlocks plus features. | all |
+</details>
+
 ### [📦 `io.yuka.android`](https://play.google.com/store/apps/details?id=io.yuka.android)
 <details>
 
@@ -287,6 +296,14 @@ The official Patch bundle provided by ReVanced and the community.
 | `unlock-pro` | Unlocks all pro features. | all |
 </details>
 
+### [📦 `com.ithebk.expensemanager`](https://play.google.com/store/apps/details?id=com.ithebk.expensemanager)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks pro features. | all |
+</details>
+
 ### [📦 `ginlemon.iconpackstudio`](https://play.google.com/store/apps/details?id=ginlemon.iconpackstudio)
 <details>
 
@@ -311,14 +328,6 @@ The official Patch bundle provided by ReVanced and the community.
 | `unlock-pro` | Unlocks all professional features. | all |
 </details>
 
-### [📦 `com.ithebk.expensemanager`](https://play.google.com/store/apps/details?id=com.ithebk.expensemanager)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks pro features. | all |
-</details>
-
 ### [📦 `com.ticktick.task`](https://play.google.com/store/apps/details?id=com.ticktick.task)
 <details>
 

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.163.0-dev.3
+version = 2.165.1

src/main/kotlin/app/revanced/patches/photomath/detection/signature/annotations/DisableSignatureDetectionCompatibility.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.photomath.detection.signature.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.microblink.photomath")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class DisableSignatureDetectionCompatibility

src/main/kotlin/app/revanced/patches/photomath/detection/signature/fingerprints/CheckSignatureFingerprint.kt

@@ -0,0 +1,21 @@
+package app.revanced.patches.photomath.detection.signature.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.Opcode
+
+object CheckSignatureFingerprint : MethodFingerprint(
+    strings = listOf(
+        "currentSignature"
+    ),
+    opcodes = listOf(
+        Opcode.CONST_STRING,
+        Opcode.CONST_STRING,
+        Opcode.INVOKE_STATIC,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT,
+    )
+)

src/main/kotlin/app/revanced/patches/photomath/detection/signature/fingerprints/MainOnCreateFingerprint.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.photomath.detection.signature.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object MainOnCreateFingerprint : MethodFingerprint(
+    returnType = "V",
+    access = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    customFingerprint = { methodDef ->
+        methodDef.definingClass == "Lcom/microblink/photomath/PhotoMath;" && methodDef.name == "onCreate"
+    }
+)

src/main/kotlin/app/revanced/patches/photomath/detection/signature/patch/SignatureDetectionPatch.kt

@@ -0,0 +1,42 @@
+package app.revanced.patches.photomath.detection.signature.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patches.photomath.detection.signature.annotations.DisableSignatureDetectionCompatibility
+import app.revanced.patches.photomath.detection.signature.fingerprints.CheckSignatureFingerprint
+import app.revanced.patches.photomath.detection.signature.fingerprints.MainOnCreateFingerprint
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Description("Disables detection of incorrect signature.")
+@DisableSignatureDetectionCompatibility
+@Version("0.0.1")
+class SignatureDetectionPatch : BytecodePatch(
+    listOf(
+        MainOnCreateFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        val mainOnCreate = MainOnCreateFingerprint.result!!
+
+        val patternResult = CheckSignatureFingerprint.also {
+            it.resolve(context, mainOnCreate.method, mainOnCreate.classDef)
+        }.result!!.scanResult.patternScanResult!!
+
+        mainOnCreate.mutableMethod.apply {
+            val signatureCheckInstruction = instruction(patternResult.endIndex)
+            val checkRegister = (signatureCheckInstruction as OneRegisterInstruction).registerA
+
+            replaceInstruction(signatureCheckInstruction.location.index, "const/4 v$checkRegister, 0x1")
+        }
+
+        return PatchResultSuccess()
+    }
+
+}

src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/annotations/UnlockPlusCompatibilty.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.photomath.misc.unlockplus.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.microblink.photomath")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class UnlockPlusCompatibilty

src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/fingerprints/IsPlusUnlockedFingerprint.kt

@@ -0,0 +1,16 @@
+package app.revanced.patches.photomath.misc.unlockplus.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object IsPlusUnlockedFingerprint : MethodFingerprint(
+    returnType = "Z",
+    access = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    strings = listOf(
+        "genius"
+    ),
+    customFingerprint = {
+        methodDef -> methodDef.definingClass.endsWith("/User;")
+    }
+)

src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/patch/UnlockPlusPatch.kt

@@ -0,0 +1,43 @@
+package app.revanced.patches.photomath.misc.unlockplus.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.photomath.detection.signature.patch.SignatureDetectionPatch
+import app.revanced.patches.photomath.misc.unlockplus.annotations.UnlockPlusCompatibilty
+import app.revanced.patches.photomath.misc.unlockplus.fingerprints.IsPlusUnlockedFingerprint
+
+@Patch
+@Name("unlock-plus")
+@DependsOn([SignatureDetectionPatch::class])
+@Description("Unlocks plus features.")
+@UnlockPlusCompatibilty
+@Version("0.0.1")
+class UnlockPlusPatch : BytecodePatch(
+    listOf(
+        IsPlusUnlockedFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        IsPlusUnlockedFingerprint.result?.mutableMethod?.apply {
+            addInstructions(
+                0,
+                """
+                const/4 v0, 0x1
+                return v0
+            """
+            )
+        } ?: return IsPlusUnlockedFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
+    }
+
+}

src/main/kotlin/app/revanced/patches/twitter/ad/timeline/fingerprints/TimelineTweetJsonParserFingerprint.kt

@@ -1,18 +0,0 @@
-package app.revanced.patches.twitter.ad.timeline.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object TimelineTweetJsonParserFingerprint : MethodFingerprint(
-    opcodes = listOf(
-        Opcode.IPUT_OBJECT,
-        Opcode.GOTO,
-        Opcode.SGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.IPUT_OBJECT,
-        Opcode.RETURN_VOID,
-    ), strings = listOf("tweetPromotedMetadata", "promotedMetadata", "hasModeratedReplies", "conversationAnnotation"),
-    customFingerprint = { methodDef -> methodDef.name == "parseField" }
-)

src/main/kotlin/app/revanced/patches/twitter/ad/timeline/patch/TimelineAdsPatch.kt

@@ -1,77 +0,0 @@
-package app.revanced.patches.twitter.ad.timeline.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.instruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.twitter.ad.timeline.annotations.TimelineAdsCompatibility
-import app.revanced.patches.twitter.ad.timeline.fingerprints.TimelineTweetJsonParserFingerprint
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.BuilderInstruction
-import org.jf.dexlib2.builder.instruction.BuilderInstruction22c
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.FieldReference
-import org.jf.dexlib2.iface.reference.StringReference
-
-@Patch
-@Name("timeline-ads")
-@Description("Removes ads from the Twitter timeline. Might require clearing app data to remove already cached ads.")
-@TimelineAdsCompatibility
-@Version("0.0.1")
-class TimelineAdsPatch : BytecodePatch(
-    listOf(TimelineTweetJsonParserFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        if (removePromotedAds())
-            return PatchResultError("The instruction for the tweet id field could not be found")
-
-        return PatchResultSuccess()
-    }
-
-    private fun removePromotedAds(): Boolean {
-        val (parserFingerprintResult, parserMethod, instructions) = TimelineTweetJsonParserFingerprint.unwrap()
-
-        // Anchor index
-        val tweetIdFieldInstructionIndex = instructions.indexOfFirst { instruction ->
-            if (instruction.opcode.ordinal != Opcode.CONST_STRING.ordinal) return@indexOfFirst false
-            if (((instruction as? ReferenceInstruction)?.reference as StringReference).string != "tweetSocialProof") return@indexOfFirst false
-
-            // Use the above conditions as an anchor to find the index for the instruction with the field we need
-            return@indexOfFirst true
-        } - 2 // This is where the instruction with the field is located
-
-        // Reference to the tweetId field for of the timeline tweet
-        val tweetIdFieldReference =
-            (parserMethod.instruction(tweetIdFieldInstructionIndex) as? BuilderInstruction22c)?.reference as? FieldReference
-                ?: return true
-
-        // Set the tweetId field to null
-        // This will cause twitter to not show the promoted ads, because we set it to null, when the tweet is promoted
-        parserFingerprintResult.mutableMethod.addInstructions(
-            parserFingerprintResult.scanResult.patternScanResult!!.startIndex + 1,
-            """
-                    const/4 v2, 0x0
-                    iput-object v2, p0, Lcom/twitter/model/json/timeline/urt/JsonTimelineTweet;->${tweetIdFieldReference.name}:Ljava/lang/String;
-                """
-        )
-        return false
-    }
-
-    private fun MethodFingerprint.unwrap(): Triple<MethodFingerprintResult, MutableMethod, MutableList<BuilderInstruction>> {
-        val parserFingerprintResult = this.result!!
-        val parserMethod = parserFingerprintResult.mutableMethod
-        val instructions = parserMethod.implementation!!.instructions
-
-        return Triple(parserFingerprintResult, parserMethod, instructions)
-    }
-}

src/main/kotlin/app/revanced/patches/twitter/misc/hook/json/fingerprints/JsonHookPatchFingerprint.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.twitter.misc.hook.json.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.Opcode
+
+object JsonHookPatchFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef -> methodDef.name == "<clinit>" },
+    opcodes = listOf(Opcode.IGET_OBJECT)
+)

src/main/kotlin/app/revanced/patches/twitter/misc/hook/json/fingerprints/JsonInputStreamFingerprint.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.twitter.misc.hook.json.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object JsonInputStreamFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        if (methodDef.parameterTypes.size == 0) false
+        else methodDef.parameterTypes.first() == "Ljava/io/InputStream;"
+    }
+)

src/main/kotlin/app/revanced/patches/twitter/misc/hook/json/fingerprints/LoganSquareFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.twitter.misc.hook.json.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object LoganSquareFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef -> methodDef.definingClass.endsWith("LoganSquare;") }
+)

src/main/kotlin/app/revanced/patches/twitter/misc/hook/json/patch/JsonHookPatch.kt

@@ -0,0 +1,114 @@
+package app.revanced.patches.twitter.misc.hook.json.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
+import app.revanced.patcher.patch.*
+import app.revanced.patches.twitter.misc.hook.json.fingerprints.JsonHookPatchFingerprint
+import app.revanced.patches.twitter.misc.hook.json.fingerprints.JsonInputStreamFingerprint
+import app.revanced.patches.twitter.misc.hook.json.fingerprints.LoganSquareFingerprint
+import java.io.InvalidClassException
+
+@Name("json-hook")
+@Description("Hooks the stream which reads JSON responses.")
+@Version("0.0.1")
+class JsonHookPatch : BytecodePatch(
+    listOf(LoganSquareFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        // Make sure the integrations are present.
+        val jsonHookPatch = context.findClass { it.type == JSON_HOOK_PATCH_CLASS_DESCRIPTOR }
+            ?: return PatchResultError("Could not find integrations.")
+
+        // Allow patch to inject hooks into the patches integrations.
+        jsonHookPatchFingerprintResult = JsonHookPatchFingerprint.also {
+            it.resolve(context, jsonHookPatch.immutableClass)
+        }.result ?: return PatchResultError("Unexpected integrations.")
+
+        // Conveniently find the type to hook a method in, via a named field.
+        val jsonFactory = LoganSquareFingerprint.result
+            ?.classDef
+            ?.fields
+            ?.firstOrNull { it.name == "JSON_FACTORY" }
+            ?.type
+            .let { type ->
+                context.findClass { it.type == type }?.mutableClass
+            } ?: return PatchResultError("Could not find required class.")
+
+        // Hook the methods first parameter.
+        JsonInputStreamFingerprint
+            .also { it.resolve(context, jsonFactory) }
+            .result
+            ?.mutableMethod
+            ?.addInstructions(
+                0,
+                """
+                    invoke-static { p1 }, $JSON_HOOK_PATCH_CLASS_DESCRIPTOR->parseJsonHook(Ljava/io/InputStream;)Ljava/io/InputStream;
+                    move-result-object p1
+                """
+            ) ?: return PatchResultError("Could not find method to hook.")
+
+        return PatchResultSuccess()
+    }
+
+    /**
+     * Create a hook class.
+     * The class has to extend on **JsonHook**.
+     * The class has to be a Kotlin object class, or at least have an INSTANCE field of itself.
+     *
+     * @param context The [BytecodeContext] of the current patch.
+     * @param descriptor The class descriptor of the hook.
+     */
+    internal class Hook(context: BytecodeContext, private val descriptor: String) {
+        private var added = false
+
+        /**
+         * Add the hook.
+         */
+        internal fun add() {
+            if (added) return
+
+            jsonHookPatchFingerprintResult.apply {
+                mutableMethod.apply {
+                    addInstructions(
+                        scanResult.patternScanResult!!.startIndex,
+                        """
+                            sget-object v1, $descriptor->INSTANCE:$descriptor
+                            invoke-virtual {v0, v1}, Lkotlin/collections/builders/ListBuilder;->add(Ljava/lang/Object;)Z
+                        """
+                    )
+                }
+            }
+
+            added = true
+        }
+
+        init {
+            context.findClass { it.type == descriptor }?.let {
+                it.mutableClass.also { classDef ->
+                    if (
+                        classDef.superclass != JSON_HOOK_CLASS_DESCRIPTOR ||
+                        !classDef.fields.any { field -> field.name == "INSTANCE" }
+                    ) throw InvalidClassException(classDef.type, "Not a hook class")
+
+                }
+            } ?: throw ClassNotFoundException("Failed to find hook class")
+        }
+    }
+
+    private companion object {
+        const val JSON_HOOK_CLASS_NAMESPACE = "app/revanced/twitter/patches/hook/json"
+
+        const val JSON_HOOK_PATCH_CLASS_DESCRIPTOR = "L$JSON_HOOK_CLASS_NAMESPACE/JsonHookPatch;"
+
+        const val BASE_PATCH_CLASS_NAME = "BaseJsonHook"
+
+        const val JSON_HOOK_CLASS_DESCRIPTOR = "L$JSON_HOOK_CLASS_NAMESPACE/$BASE_PATCH_CLASS_NAME;"
+
+        private lateinit var jsonHookPatchFingerprintResult: MethodFingerprintResult
+    }
+}

src/main/kotlin/app/revanced/patches/twitter/misc/hook/patch/BaseHookPatchPatch.kt

@@ -0,0 +1,17 @@
+package app.revanced.patches.twitter.misc.hook.patch
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patches.twitter.misc.hook.json.patch.JsonHookPatch
+
+@DependsOn([JsonHookPatch::class])
+abstract class BaseHookPatchPatch(private val hookClassDescriptor: String) : BytecodePatch() {
+    override fun execute(context: BytecodeContext) = try {
+        PatchResultSuccess().also { JsonHookPatch.Hook(context, hookClassDescriptor).add() }
+    } catch (ex: Exception) {
+        PatchResultError(ex)
+    }
+}

src/main/kotlin/app/revanced/patches/twitter/misc/hook/patch/ads/annotations/HideAdsCompatibility.kt

@@ -1,13 +1,13 @@
-package app.revanced.patches.twitter.ad.timeline.annotations
+package app.revanced.patches.twitter.misc.hook.patch.ads.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.twitter.android", arrayOf("9.65.3-release.0")
+        "com.twitter.android"
     )]
 )
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
-internal annotation class TimelineAdsCompatibility
+internal annotation class HideAdsCompatibility

src/main/kotlin/app/revanced/patches/twitter/misc/hook/patch/ads/patch/HideAdsPatch.kt

@@ -0,0 +1,22 @@
+package app.revanced.patches.twitter.misc.hook.patch.ads.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.twitter.misc.hook.json.patch.JsonHookPatch
+import app.revanced.patches.twitter.misc.hook.patch.BaseHookPatchPatch
+import app.revanced.patches.twitter.misc.hook.patch.ads.annotations.HideAdsCompatibility
+
+@Patch
+@Name("hide-ads")
+@DependsOn([JsonHookPatch::class])
+@Description("Hides ads.")
+@HideAdsCompatibility
+@Version("0.0.1")
+class HideAdsPatch : BaseHookPatchPatch(HOOK_CLASS_DESCRIPTOR) {
+    private companion object {
+        const val HOOK_CLASS_DESCRIPTOR = "Lapp/revanced/twitter/patches/hook/patch/ads/AdsHook;"
+    }
+}

src/main/kotlin/app/revanced/patches/twitter/misc/hook/patch/recommendation/annotations/HideRecommendedUsersCompatibility.kt

@@ -1,13 +1,13 @@
-package app.revanced.patches.youtube.misc.openlinksdirectly.annotations
+package app.revanced.patches.twitter.misc.hook.patch.recommendation.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.49.37", "18.03.36")
+        "com.twitter.android"
     )]
 )
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
-internal annotation class OpenLinksDirectlyCompatibility
+internal annotation class HideRecommendedUsersCompatibility

src/main/kotlin/app/revanced/patches/twitter/misc/hook/patch/recommendation/patch/HideRecommendedUsersPatch.kt

@@ -0,0 +1,23 @@
+package app.revanced.patches.twitter.misc.hook.patch.recommendation.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.twitter.misc.hook.json.patch.JsonHookPatch
+import app.revanced.patches.twitter.misc.hook.patch.BaseHookPatchPatch
+import app.revanced.patches.twitter.misc.hook.patch.recommendation.annotations.HideRecommendedUsersCompatibility
+
+@Patch
+@Name("hide-recommended-users")
+@DependsOn([JsonHookPatch::class])
+@Description("Hides recommended users.")
+@HideRecommendedUsersCompatibility
+@Version("0.0.1")
+class HideRecommendedUsersPatch : BaseHookPatchPatch(HOOK_CLASS_DESCRIPTOR) {
+    private companion object {
+        const val HOOK_CLASS_DESCRIPTOR =
+            "Lapp/revanced/twitter/patches/hook/patch/recommendation/RecommendedUsersHook;"
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/ad/general/resource/patch/GeneralAdsResourcePatch.kt

@@ -180,10 +180,10 @@ class GeneralAdsResourcePatch : ResourcePatch {
             ),
             SwitchPreference(
                 "revanced_adremover_info_panel",
-                StringResource("revanced_adremover_info_panel_enabled_title", "Hide info-panels"),
+                StringResource("revanced_adremover_info_panel_enabled_title", "Hide info panels"),
                 true,
-                StringResource("revanced_adremover_info_panel_enabled_summary_on", "Info-panels are hidden"),
-                StringResource("revanced_adremover_info_panel_enabled_summary_off", "Info-panels are shown")
+                StringResource("revanced_adremover_info_panel_enabled_summary_on", "Info panels are hidden"),
+                StringResource("revanced_adremover_info_panel_enabled_summary_off", "Info panels are shown")
             ),
             SwitchPreference(
                 "revanced_adremover_medical_panel",
@@ -199,6 +199,27 @@ class GeneralAdsResourcePatch : ResourcePatch {
                 StringResource("revanced_hide_channel_bar_summary_on", "Channel bar is hidden"),
                 StringResource("revanced_hide_channel_bar_summary_off", "Channel bar is shown")
             ),
+            SwitchPreference(
+                "revanced_hide_quick_actions",
+                StringResource("revanced_hide_quick_actions_title", "Hide quick actions in fullscreen"),
+                false,
+                StringResource("revanced_hide_quick_actions_summary_on", "Quick actions are hidden"),
+                StringResource("revanced_hide_quick_actions_summary_off", "Quick actions are shown")
+            ),
+            SwitchPreference(
+                "revanced_hide_related_videos",
+                StringResource("revanced_hide_related_videos_title", "Hide related videos in quick actions"),
+                false,
+                StringResource("revanced_hide_related_videos_summary_on", "Related videos are hidden"),
+                StringResource("revanced_hide_related_videos_summary_off", "Related videos are shown")
+            ),
+            SwitchPreference(
+                "revanced_hide_channel_bar",
+                StringResource("revanced_hide_channel_bar_title", "Hide channel bar"),
+                false,
+                StringResource("revanced_hide_channel_bar_summary_on", "Channel bar is hidden"),
+                StringResource("revanced_hide_channel_bar_summary_off", "Channel bar is shown")
+            ),
         )
 
         PreferenceScreen.ADS.addPreferences(

src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/patch/AutoCaptionsPatch.kt

@@ -34,10 +34,10 @@ class AutoCaptionsPatch : BytecodePatch(
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_autocaptions_enabled",
-                StringResource("revanced_autocaptions_enabled_title", "Disable auto-captions"),
+                StringResource("revanced_autocaptions_enabled_title", "Disable auto captions"),
                 false,
-                StringResource("revanced_autocaptions_summary_on", "Auto-captions are disabled"),
-                StringResource("revanced_autocaptions_summary_off", "Auto-captions are enabled")
+                StringResource("revanced_autocaptions_summary_on", "Auto captions are disabled"),
+                StringResource("revanced_autocaptions_summary_off", "Auto captions are enabled")
             )
         )
 

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/shared/patch/ResolvePivotBarFingerprintsPatch.kt

@@ -10,10 +10,10 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.music.layout.upgradebutton.fingerprints.PivotBarConstructorFingerprint
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
 import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.annotations.PivotBarCompatibility
 import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.fingerprints.InitializeButtonsFingerprint
+import app.revanced.patches.youtube.layout.buttons.pivotbar.shared.fingerprints.PivotBarConstructorFingerprint
 
 @DependsOn([ResourceMappingPatch::class])
 @PivotBarCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/patch/HidePlayerButtonsPatch.kt

@@ -44,11 +44,11 @@ class HidePlayerButtonsPatch : BytecodePatch(
                 false,
                 StringResource(
                     "revanced_hide_player_buttons_summary_on",
-                    "The buttons are hidden"
+                    "Buttons are hidden"
                 ),
                 StringResource(
                     "revanced_hide_player_buttons_summary_off",
-                    "The buttons are shown"
+                    "Buttons are shown"
                 )
             )
         )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/resource/patch/HideEndscreenCardsResourcePatch.kt

@@ -28,10 +28,10 @@ class HideEndscreenCardsResourcePatch : ResourcePatch {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_endscreen_cards",
-                StringResource("revanced_hide_endscreen_cards_title", "Hide end-screen cards"),
+                StringResource("revanced_hide_endscreen_cards_title", "Hide end screen cards"),
                 true,
-                StringResource("revanced_hide_endscreen_cards_summary_on", "End-screen cards are hidden"),
-                StringResource("revanced_hide_endscreen_cards_summary_off", "End-screen cards are shown")
+                StringResource("revanced_hide_endscreen_cards_summary_on", "End screen cards are hidden"),
+                StringResource("revanced_hide_endscreen_cards_summary_off", "End screen cards are shown")
             ),
         )
 

src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/patch/HideInfoCardsPatch.kt

@@ -25,10 +25,10 @@ import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
 @Patch
 @DependsOn([IntegrationsPatch::class, HideInfocardsResourcePatch::class])
 @Name("hide-info-cards")
-@Description("Hides info-cards in videos.")
+@Description("Hides info cards in videos.")
 @HideInfocardsCompatibility
 @Version("0.0.1")
-class HideInfocardsPatch : BytecodePatch(
+class HideInfoCardsPatch : BytecodePatch(
     listOf(
         InfocardsIncognitoParentFingerprint,
         InfocardsMethodCallFingerprint,
@@ -47,7 +47,7 @@ class HideInfocardsPatch : BytecodePatch(
             addInstructions(
                 invokeInstructionIndex,
                 "invoke-static {v${(instruction(invokeInstructionIndex) as? BuilderInstruction35c)?.registerC}}," +
-                        " Lapp/revanced/integrations/patches/HideInfocardsPatch;->hideInfocardsIncognito(Landroid/view/View;)V"
+                        " Lapp/revanced/integrations/patches/HideInfoCardsPatch;->hideInfoCardsIncognito(Landroid/view/View;)V"
             )
         }
 
@@ -59,7 +59,7 @@ class HideInfocardsPatch : BytecodePatch(
 
             hideInfocardsCallMethod.addInstructions(
                 invokeInterfaceIndex, """
-                    invoke-static {}, Lapp/revanced/integrations/patches/HideInfocardsPatch;->hideInfocardsMethodCall()Z
+                    invoke-static {}, Lapp/revanced/integrations/patches/HideInfoCardsPatch;->hideInfoCardsMethodCall()Z
                     move-result v$toggleRegister
                     if-nez v$toggleRegister, :hide_info_cards
                 """,

src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/resource/patch/HideInfocardsResourcePatch.kt

@@ -24,10 +24,10 @@ class HideInfocardsResourcePatch : ResourcePatch {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_infocards",
-                StringResource("revanced_hide_infocards_title", "Hide info-cards"),
+                StringResource("revanced_hide_infocards_title", "Hide info cards"),
                 true,
-                StringResource("revanced_hide_infocards_summary_on", "Info-cards are hidden"),
-                StringResource("revanced_hide_infocards_summary_off", "Info-cards are shown")
+                StringResource("revanced_hide_infocards_summary_on", "Info cards are hidden"),
+                StringResource("revanced_hide_infocards_summary_off", "Info cards are shown")
             )
         )
 

src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/patch/HideSeekbarPatch.kt

@@ -46,9 +46,9 @@ class HideSeekbarPatch : BytecodePatch(
             const/4 v0, 0x0
             invoke-static { }, Lapp/revanced/integrations/patches/HideSeekbarPatch;->hideSeekbar()Z
             move-result v0
-            if-eqz v0, :hide_time_and_seekbar
+            if-eqz v0, :hide_seekbar
             return-void
-            :hide_time_and_seekbar
+            :hide_seekbar
             nop
         """
         )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/patch/HideTimePatch.kt

@@ -41,11 +41,11 @@ class HideTimePatch : BytecodePatch(
 
         TimeCounterFingerprint.result!!.mutableMethod.addInstructions(
             0, """
-            invoke-static { }, Lapp/revanced/integrations/patches/HideTimeAndSeekbarPatch;->hideTimeAndSeekbar()Z
+            invoke-static { }, Lapp/revanced/integrations/patches/HideTimePatch;->hideTime()Z
             move-result v0
-            if-eqz v0, :hide_time_and_seekbar
+            if-eqz v0, :hide_time
             return-void
-            :hide_time_and_seekbar
+            :hide_time
             nop
         """
         )

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/ShortsTextComponentParentFingerprint.kt

@@ -0,0 +1,25 @@
+package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+object ShortsTextComponentParentFingerprint : MethodFingerprint(
+    returnType = "V",
+    access = AccessFlags.PROTECTED or AccessFlags.FINAL,
+    parameters = listOf("L", "L"),
+    opcodes = listOf(
+        Opcode.IF_EQZ,
+        Opcode.CONST_4,
+        Opcode.IF_EQ,
+        Opcode.CONST_4,
+        Opcode.IF_EQ,
+        Opcode.RETURN_VOID,
+        Opcode.IGET_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.IGET_BOOLEAN,
+        Opcode.IF_EQZ,
+        Opcode.INVOKE_STATIC
+    )
+)

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt

@@ -5,8 +5,10 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.instruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
@@ -15,12 +17,15 @@ import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.youtube.layout.returnyoutubedislike.annotations.ReturnYouTubeDislikeCompatibility
 import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.*
 import app.revanced.patches.youtube.layout.returnyoutubedislike.resource.patch.ReturnYouTubeDislikeResourcePatch
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
 import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
+import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch
 @DependsOn(
@@ -38,55 +43,103 @@ import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
 class ReturnYouTubeDislikePatch : BytecodePatch(
     listOf(
         TextComponentSpecParentFingerprint,
+        ShortsTextComponentParentFingerprint,
         LikeFingerprint,
         DislikeFingerprint,
         RemoveLikeFingerprint,
     )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
+        // region Inject newVideoLoaded event handler
+
+        VideoIdPatch.injectCall("$INTEGRATIONS_PATCH_CLASS_DESCRIPTOR->newVideoLoaded(Ljava/lang/String;)V")
+
+        // endregion
+
+        // region Hook interaction
+
         listOf(
             LikeFingerprint.toPatch(Vote.LIKE),
             DislikeFingerprint.toPatch(Vote.DISLIKE),
             RemoveLikeFingerprint.toPatch(Vote.REMOVE_LIKE)
         ).forEach { (fingerprint, vote) ->
-            with(fingerprint.result ?: return PatchResultError("Failed to find ${fingerprint.name} method.")) {
-                mutableMethod.addInstructions(
+            fingerprint.result?.mutableMethod?.apply {
+                addInstructions(
                     0,
                     """
                     const/4 v0, ${vote.value}
-                    invoke-static {v0}, Lapp/revanced/integrations/patches/ReturnYouTubeDislikePatch;->sendVote(I)V
+                    invoke-static {v0}, $INTEGRATIONS_PATCH_CLASS_DESCRIPTOR->sendVote(I)V
                     """
                 )
-            }
+            } ?: return PatchResultError("Failed to find ${fingerprint.name} method.")
         }
 
-        VideoIdPatch.injectCall("Lapp/revanced/integrations/patches/ReturnYouTubeDislikePatch;->newVideoLoaded(Ljava/lang/String;)V")
+        // endregion
 
-        with(TextComponentFingerprint
-            .apply { resolve(context, TextComponentSpecParentFingerprint.result!!.classDef) }
-            .result ?: return TextComponentFingerprint.toErrorResult()
-        ) {
-            val createComponentMethod = mutableMethod
+        // region Hook components
 
-            val conversionContextParam = 5
-            val textRefParam = createComponentMethod.parameters.size - 2
-            // insert index must be 0, otherwise UI does not updated correctly in some situations
-            // such as switching from full screen or when using previous/next overlay buttons.
-            val insertIndex = 0
+        TextComponentFingerprint.also { it.resolve(context, TextComponentSpecParentFingerprint.result!!.classDef) }
+            .result?.let {
+                with(it.mutableMethod) {
+                    val createComponentMethod = this
+
+                    val conversionContextParam = 5
+                    val textRefParam = createComponentMethod.parameters.size - 2
+                    // Insert index must be 0, otherwise UI does not updated correctly in some situations
+                    // such as switching from full screen or when using previous/next overlay buttons.
+                    val insertIndex = 0
+
+                    createComponentMethod.addInstructions(
+                        insertIndex,
+                        """
+                            move-object/from16 v7, p$conversionContextParam
+                            move-object/from16 v8, p$textRefParam
+                            invoke-static {v7, v8}, $INTEGRATIONS_PATCH_CLASS_DESCRIPTOR->onComponentCreated(Ljava/lang/Object;Ljava/util/concurrent/atomic/AtomicReference;)V
+                        """
+                    )
+                }
+            } ?: return TextComponentFingerprint.toErrorResult()
+
+        ShortsTextComponentParentFingerprint.result?.let {
+            context
+                .toMethodWalker(it.method)
+                .nextMethod(it.scanResult.patternScanResult!!.endIndex, true)
+                .getMethod().let { method ->
+                    with(method as MutableMethod) {
+                        // After walking, verify the found method is what's expected.
+                        if (returnType != ("Ljava/lang/CharSequence;") || parameterTypes.size != 1)
+                            return PatchResultError("Method signature did not match: $this $parameterTypes")
+
+                        val insertIndex = implementation!!.instructions.size - 1
+
+                        val spannedParameterRegister = (instruction(insertIndex) as OneRegisterInstruction).registerA
+                        val parameter = (instruction(insertIndex - 2) as BuilderInstruction35c).reference
+
+                        if (!parameter.toString().endsWith("Landroid/text/Spanned;"))
+                            return PatchResultError("Method signature parameter did not match: $parameter")
+
+                        addInstructions(
+                            insertIndex,
+                            """
+                                invoke-static {v$spannedParameterRegister}, $INTEGRATIONS_PATCH_CLASS_DESCRIPTOR->onShortsComponentCreated(Landroid/text/Spanned;)Landroid/text/Spanned;
+                                move-result-object v$spannedParameterRegister
+                            """
+                        )
+                    }
+                }
+        } ?: return ShortsTextComponentParentFingerprint.toErrorResult()
+
+        // endregion
 
-            createComponentMethod.addInstructions(
-                insertIndex,
-                """
-                    move-object/from16 v7, p$conversionContextParam
-                    move-object/from16 v8, p$textRefParam
-                    invoke-static {v7, v8}, Lapp/revanced/integrations/patches/ReturnYouTubeDislikePatch;->onComponentCreated(Ljava/lang/Object;Ljava/util/concurrent/atomic/AtomicReference;)V
-                """
-            )
-        }
         return PatchResultSuccess()
     }
 
-    private fun MethodFingerprint.toPatch(voteKind: Vote) = VotePatch(this, voteKind)
+    private companion object {
+        const val INTEGRATIONS_PATCH_CLASS_DESCRIPTOR =
+            "Lapp/revanced/integrations/patches/ReturnYouTubeDislikePatch;"
+
+        private fun MethodFingerprint.toPatch(voteKind: Vote) = VotePatch(this, voteKind)
+    }
 
     private data class VotePatch(val fingerprint: MethodFingerprint, val voteKind: Vote)
 

src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/patch/TabletMiniPlayerPatch.kt

@@ -13,6 +13,8 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.layout.tabletminiplayer.annotations.TabletMiniPlayerCompatibility
 import app.revanced.patches.youtube.layout.tabletminiplayer.fingerprints.MiniPlayerDimensionsCalculatorFingerprint
 import app.revanced.patches.youtube.layout.tabletminiplayer.fingerprints.MiniPlayerOverrideFingerprint
@@ -20,8 +22,6 @@ import app.revanced.patches.youtube.layout.tabletminiplayer.fingerprints.MiniPla
 import app.revanced.patches.youtube.layout.tabletminiplayer.fingerprints.MiniPlayerResponseModelSizeCheckFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch
@@ -40,10 +40,10 @@ class TabletMiniPlayerPatch : BytecodePatch(
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_tablet_miniplayer",
-                StringResource("revanced_tablet_miniplayer_title", "Enable the tablet Mini-player"),
+                StringResource("revanced_tablet_miniplayer_title", "Enable tablet mini player"),
                 false,
-                StringResource("revanced_tablet_miniplayer_summary_on", "Tablet Mini-player is enabled"),
-                StringResource("revanced_tablet_miniplayer_summary_off", "Tablet Mini-player is disabled")
+                StringResource("revanced_tablet_miniplayer_summary_on", "Mini player is enabled"),
+                StringResource("revanced_tablet_miniplayer_summary_off", "Mini player is disabled")
             )
         )
 

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/annotation/ProtobufSpoofCompatibility.kt

@@ -0,0 +1,21 @@
+package app.revanced.patches.youtube.misc.fix.playback.annotation
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf(
+            "17.49.37", 
+            "18.03.36",
+            "18.03.42",
+            "18.04.35",
+            "18.04.41",
+            "18.05.32",
+            "18.05.35",
+            "18.05.40"
+        )
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+internal annotation class ProtobufSpoofCompatibility

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ProtobufParameterBuilderFingerprint.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.misc.fix.playback.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.Opcode
+
+object ProtobufParameterBuilderFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.INVOKE_VIRTUAL_RANGE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IPUT_OBJECT
+    ),
+    strings = listOf("Unexpected empty videoId.", "Prefetch request are disabled.")
+)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationPatch.kt

@@ -0,0 +1,53 @@
+package app.revanced.patches.youtube.misc.fix.playback.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.data.toMethodWalker
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patcher.util.smali.ExternalLabel
+import app.revanced.patches.youtube.misc.fix.playback.annotation.ProtobufSpoofCompatibility
+import app.revanced.patches.youtube.misc.fix.playback.fingerprints.ProtobufParameterBuilderFingerprint
+
+@Patch
+@Name("spoof-signature-verification")
+@Description("Spoofs the client to prevent playback issues.")
+@ProtobufSpoofCompatibility
+@Version("0.0.1")
+class SpoofSignatureVerificationPatch : BytecodePatch(
+    listOf(ProtobufParameterBuilderFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        ProtobufParameterBuilderFingerprint.result?.let {
+            val setParamMethod = context
+                .toMethodWalker(it.method)
+                    .nextMethod(it.scanResult.patternScanResult!!.startIndex, true).getMethod() as MutableMethod
+
+            setParamMethod.apply {
+                val protobufParameterRegister = 3
+                val parameterValue = "8AEByAMTuAQP" /* Protobuf Parameter of shorts */
+
+                addInstructions(
+                    0,
+                    """
+                        invoke-virtual { p$protobufParameterRegister }, Ljava/lang/String;->length()I
+                        move-result v0
+                        const/16 v1, 0x10
+                        if-ge v0, v1, :not_spoof # bypass on feed 
+                        const-string p$protobufParameterRegister, "$parameterValue"
+                    """,
+                    listOf(ExternalLabel("not_spoof", instruction(0))))
+            }
+        } ?: return ProtobufParameterBuilderFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt

@@ -12,6 +12,7 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.fingerprints.WatchWhileActivityFingerprint
 import app.revanced.patches.youtube.layout.buttons.cast.patch.HideCastButtonPatch
 import app.revanced.patches.youtube.misc.fix.spoof.patch.ClientSpoofPatch
+import app.revanced.patches.youtube.misc.fix.playback.patch.SpoofSignatureVerificationPatch
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
 import app.revanced.patches.youtube.misc.microg.fingerprints.*
 import app.revanced.patches.youtube.misc.microg.patch.resource.MicroGResourcePatch
@@ -24,7 +25,8 @@ import app.revanced.util.microg.MicroGBytecodeHelper
     [
         MicroGResourcePatch::class,
         HideCastButtonPatch::class,
-        ClientSpoofPatch::class
+        ClientSpoofPatch::class,
+        SpoofSignatureVerificationPatch::class
     ]
 )
 @Name("microg-support")

src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/fingerprints/OpenLinksDirectlyPrimaryFingerprint.kt

@@ -1,19 +0,0 @@
-package app.revanced.patches.youtube.misc.openlinksdirectly.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.misc.openlinksdirectly.annotations.OpenLinksDirectlyCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@OpenLinksDirectlyCompatibility
-object OpenLinksDirectlyPrimaryFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"), listOf(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.RETURN_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.SGET,
-        Opcode.SGET_OBJECT
-    )
-)

src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/fingerprints/OpenLinksDirectlySecondaryFingerprint.kt

@@ -1,14 +0,0 @@
-package app.revanced.patches.youtube.misc.openlinksdirectly.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.misc.openlinksdirectly.annotations.OpenLinksDirectlyCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@OpenLinksDirectlyCompatibility
-object OpenLinksDirectlySecondaryFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"), listOf(
-        Opcode.INVOKE_STATIC, Opcode.MOVE_RESULT_OBJECT
-    ), listOf("://")
-)

src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/patch/OpenLinksDirectlyPatch.kt

@@ -1,61 +0,0 @@
-package app.revanced.patches.youtube.misc.openlinksdirectly.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.instruction
-import app.revanced.patcher.extensions.replaceInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.openlinksdirectly.annotations.OpenLinksDirectlyCompatibility
-import app.revanced.patches.youtube.misc.openlinksdirectly.fingerprints.OpenLinksDirectlyPrimaryFingerprint
-import app.revanced.patches.youtube.misc.openlinksdirectly.fingerprints.OpenLinksDirectlySecondaryFingerprint
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("open-links-directly")
-@Description("Skips over redirection URLs to external links.")
-@OpenLinksDirectlyCompatibility
-@Version("0.0.1")
-class OpenLinksDirectlyPatch : BytecodePatch(
-    listOf(OpenLinksDirectlyPrimaryFingerprint, OpenLinksDirectlySecondaryFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.MISC.addPreferences(
-            SwitchPreference(
-                "revanced_uri_redirect",
-                StringResource("revanced_uri_redirect_title", "Bypass URL redirects"),
-                true,
-                StringResource("revanced_uri_redirect_summary_on", "Bypassing URL redirects"),
-                StringResource("revanced_uri_redirect_summary_off", "Following default redirect policy")
-            )
-        )
-
-        arrayOf(OpenLinksDirectlyPrimaryFingerprint, OpenLinksDirectlySecondaryFingerprint)
-            .map { it.result ?: return it.toErrorResult() }
-            .forEach { result ->
-                result.mutableMethod.apply {
-                    val insertIndex = result.scanResult.patternScanResult!!.startIndex
-                    val uriRegister = (instruction(insertIndex) as Instruction35c).registerC
-                    replaceInstruction(
-                        insertIndex,
-                        "invoke-static {v$uriRegister}," +
-                                "Lapp/revanced/integrations/patches/OpenLinksDirectlyPatch;" +
-                                "->" +
-                                "transformRedirectUri(Ljava/lang/String;)Landroid/net/Uri;"
-                    )
-                }
-            }
-        return PatchResultSuccess()
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/misc/video/videoid/fingerprint/VideoIdFingerprint.kt

@@ -1,16 +1,31 @@
 package app.revanced.patches.youtube.misc.video.videoid.fingerprint
 
 import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
+@FuzzyPatternScanMethod(2)
 object VideoIdFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.DECLARED_SYNCHRONIZED or AccessFlags.FINAL or AccessFlags.PUBLIC,
-    listOf("L"),
-    listOf(Opcode.INVOKE_INTERFACE),
-    customFingerprint = {
-        it.definingClass.endsWith("PlaybackLifecycleMonitor;")
-    }
+    returnType = "V",
+    access = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf("L"),
+    opcodes = listOf(
+        Opcode.IF_EQZ,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IF_EQZ,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT
+    ),
+    null,
+    { it.definingClass.endsWith("SubtitlesOverlayPresenter;") }
 )

src/main/kotlin/app/revanced/patches/youtube/misc/video/videoid/patch/VideoIdPatch.kt

@@ -1,5 +1,6 @@
 package app.revanced.patches.youtube.misc.video.videoid.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -22,17 +23,18 @@ import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 @Version("0.0.1")
 @DependsOn([IntegrationsPatch::class])
 class VideoIdPatch : BytecodePatch(
-    listOf(
-        VideoIdFingerprint
-    )
+    listOf(VideoIdFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
-        with(VideoIdFingerprint.result!!) {
-            insertMethod = mutableMethod
-            insertIndex = scanResult.patternScanResult!!.endIndex + 2
+        VideoIdFingerprint.result?.let {
+            val videoIdRegisterInstructionIndex = it.scanResult.patternScanResult!!.endIndex
 
-            videoIdRegister = (insertMethod.instruction(insertIndex - 1) as OneRegisterInstruction).registerA
-        }
+            with(it.mutableMethod) {
+                insertMethod = this
+                videoIdRegister = (instruction(videoIdRegisterInstructionIndex) as OneRegisterInstruction).registerA
+                insertIndex = videoIdRegisterInstructionIndex + 1
+            }
+        } ?: return VideoIdFingerprint.toErrorResult()
 
         return PatchResultSuccess()
     }
@@ -49,10 +51,15 @@ class VideoIdPatch : BytecodePatch(
          */
         fun injectCall(
             methodDescriptor: String
-        ) = insertMethod.addInstructions(
-            insertIndex, // move-result-object offset
-            "invoke-static {v$videoIdRegister}, $methodDescriptor"
-        )
+        ) {
+            insertMethod.addInstructions(
+                // TODO: The order has been proven to not be required, so remove the logic for keeping order.
+                // Keep injection calls in the order they're added:
+                // Increment index. So if additional injection calls are added, those calls run after this injection call.
+                insertIndex++,
+                "invoke-static {v$videoIdRegister}, $methodDescriptor"
+            )
+        }
     }
 }