feat(youtube): add hide-shorts-components patch

ReVanced · May 18, 2023 · 64868f4 · 64868f4
1 parent 6347146
commit 64868f4
Show file tree

Hide file tree

Showing 14 changed files with 265 additions and 176 deletions.
diff --git a/src/main/kotlin/app/revanced/extensions/Extensions.kt b/src/main/kotlin/app/revanced/extensions/Extensions.kt
@@ -1,6 +1,7 @@
 package app.revanced.extensions
 
 import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
+import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
@@ -41,4 +42,14 @@ fun MutableClass.transformMethods(transform: MutableMethod.() -> MutableMethod)
 internal fun Node.doRecursively(action: (Node) -> Unit) {
     action(this)
     for (i in 0 until this.childNodes.length) this.childNodes.item(i).doRecursively(action)
-}
+}
+
+fun MutableMethod.injectHideViewCall(
+    insertIndex: Int,
+    viewRegister: Int,
+    classDescriptor: String,
+    targetMethod: String
+) = addInstruction(
+    insertIndex,
+    "invoke-static { v$viewRegister }, $classDescriptor->$targetMethod(Landroid/view/View;)V"
+)
diff --git a/...p/revanced/patches/youtube/ad/general/bytecode/fingerprints/ReelConstructorFingerprint.kt b/...p/revanced/patches/youtube/ad/general/bytecode/fingerprints/ReelConstructorFingerprint.kt
diff --git a/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/HideAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/HideAdsPatch.kt
@@ -1,25 +1,20 @@
 package app.revanced.patches.youtube.ad.general.bytecode.patch
 
 import app.revanced.extensions.findMutableMethodOf
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.injectHideViewCall
 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.addInstruction
-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.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.shared.misc.fix.verticalscroll.patch.VerticalScrollPatch
 import app.revanced.patches.youtube.ad.general.annotation.HideAdsCompatibility
-import app.revanced.patches.youtube.ad.general.bytecode.fingerprints.ReelConstructorFingerprint
 import app.revanced.patches.youtube.ad.general.resource.patch.HideAdsResourcePatch
 import app.revanced.patches.youtube.misc.fix.backtoexitgesture.patch.FixBackToExitGesturePatch
-import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
 import org.jf.dexlib2.iface.instruction.formats.Instruction31i
 import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 
@@ -30,18 +25,8 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 @Description("Removes general ads.")
 @HideAdsCompatibility
 @Version("0.0.1")
-class HideAdsPatch : BytecodePatch(
-    listOf(ReelConstructorFingerprint)
-) {
+class HideAdsPatch : BytecodePatch() {
     override fun execute(context: BytecodeContext): PatchResult {
-        fun String.buildHideCall(viewRegister: Int) = "invoke-static { v$viewRegister }, " +
-                "Lapp/revanced/integrations/patches/litho/AdsFilter;" +
-                "->" +
-                "$this(Landroid/view/View;)V"
-
-        fun MutableMethod.injectHideCall(insertIndex: Int, viewRegister: Int, method: String) =
-            this.addInstruction(insertIndex, method.buildHideCall(viewRegister))
-
         context.classes.forEach { classDef ->
             classDef.methods.forEach { method ->
                 with(method.implementation) {
@@ -64,25 +49,18 @@ class HideAdsPatch : BytecodePatch(
                             context.proxy(classDef)
                                 .mutableClass
                                 .findMutableMethodOf(method)
-                                .injectHideCall(insertIndex, viewRegister, "hideAdAttributionView")
+                                .injectHideViewCall(
+                                    insertIndex,
+                                    viewRegister,
+                                    "Lapp/revanced/integrations/patches/components/AdsFilter;",
+                                    "hideAdAttributionView"
+                                )
                         }
                     }
                 }
             }
         }
 
-        ReelConstructorFingerprint.result?.let {
-            // iput-object v$viewRegister, ...
-            val insertIndex = it.scanResult.patternScanResult!!.startIndex + 2
-
-            it.mutableMethod.apply {
-                val viewRegister = instruction<TwoRegisterInstruction>(insertIndex).registerA
-
-                injectHideCall(insertIndex, viewRegister, "hideReelView")
-            }
-        } ?: return ReelConstructorFingerprint.toErrorResult()
-
         return PatchResultSuccess()
     }
-
 }
diff --git a/...ain/kotlin/app/revanced/patches/youtube/ad/general/resource/patch/HideAdsResourcePatch.kt b/...ain/kotlin/app/revanced/patches/youtube/ad/general/resource/patch/HideAdsResourcePatch.kt
@@ -23,10 +23,6 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch.P
 @HideAdsCompatibility
 @Version("0.0.1")
 class HideAdsResourcePatch : ResourcePatch {
-    internal companion object {
-        var adAttributionId: Long = -1
-        var reelMultipleItemShelfId: Long = -1
-    }
 
     override fun execute(context: ResourceContext): PatchResult {
         PreferenceScreen.LAYOUT.addPreferences(
@@ -105,12 +101,6 @@ class HideAdsResourcePatch : ResourcePatch {
                 StringResource("revanced_hide_feed_survey_summary_on", "Feed surveys are hidden"),
                 StringResource("revanced_hide_feed_survey_summary_off", "Feed surveys are shown")
             ),
-            SwitchPreference(
-                "revanced_hide_shorts",
-                StringResource("revanced_hide_shorts_title", "Hide shorts"),
-                StringResource("revanced_hide_shorts_summary_on", "Shorts are hidden"),
-                StringResource("revanced_hide_shorts_summary_off", "Shorts are shown")
-            ),
             SwitchPreference(
                 "revanced_hide_community_guidelines",
                 StringResource("revanced_hide_community_guidelines_title", "Hide community guidelines"),
@@ -263,11 +253,12 @@ class HideAdsResourcePatch : ResourcePatch {
             )
         )
 
-        fun String.getId() = ResourceMappingPatch.resourceMappings.single { it.name == this }.id
-
-        adAttributionId = "ad_attribution".getId()
-        reelMultipleItemShelfId = "reel_multiple_items_shelf".getId()
+        adAttributionId = ResourceMappingPatch.resourceMappings.single { it.name == "ad_attribution" }.id
 
         return PatchResultSuccess()
     }
+
+    internal companion object {
+        var adAttributionId: Long = -1
+    }
 }
diff --git a/...ents/annotations/CommentsCompatibility.kt → .../annotations/HideCommentsCompatibility.kt b/...ents/annotations/CommentsCompatibility.kt → .../annotations/HideCommentsCompatibility.kt
@@ -21,4 +21,4 @@ import app.revanced.patcher.annotation.Package
     )]
 )
 @Target(AnnotationTarget.CLASS)
-internal annotation class CommentsCompatibility
+internal annotation class HideCommentsCompatibility
diff --git a/...hes/youtube/layout/hide/comments/bytecode/fingerprints/ShortsCommentsButtonFingerprint.kt b/...hes/youtube/layout/hide/comments/bytecode/fingerprints/ShortsCommentsButtonFingerprint.kt
diff --git a/.../kotlin/app/revanced/patches/youtube/layout/hide/comments/bytecode/patch/CommentsPatch.kt b/.../kotlin/app/revanced/patches/youtube/layout/hide/comments/bytecode/patch/CommentsPatch.kt
diff --git a/...s/resource/patch/CommentsResourcePatch.kt → ...yout/hide/comments/patch/CommentsPatch.kt b/...s/resource/patch/CommentsResourcePatch.kt → ...yout/hide/comments/patch/CommentsPatch.kt
@@ -1,28 +1,28 @@
-package app.revanced.patches.youtube.layout.hide.comments.resource.patch
+package app.revanced.patches.youtube.layout.hide.comments.patch
 
+import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
 import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.hide.comments.annotations.CommentsCompatibility
+import app.revanced.patches.youtube.layout.hide.comments.annotations.HideCommentsCompatibility
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 
-@Name("comments-resource-patch")
-@CommentsCompatibility
+@Patch
+@Name("comments")
+@Description("Hides components related to comments.")
+@HideCommentsCompatibility
 @DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
 @Version("0.0.1")
-class CommentsResourcePatch : ResourcePatch {
-    companion object {
-        internal var shortsCommentsButtonId: Long = -1
-    }
-
+class CommentsPatch : ResourcePatch {
     override fun execute(context: ResourceContext): PatchResult {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             PreferenceScreen(
@@ -40,22 +40,12 @@ class CommentsResourcePatch : ResourcePatch {
                         StringResource("revanced_hide_preview_comment_title", "Hide preview comment"),
                         StringResource("revanced_hide_preview_comment_on", "Preview comment is hidden"),
                         StringResource("revanced_hide_preview_comment_off", "Preview comment is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_shorts_comments_button",
-                        StringResource("revanced_hide_shorts_comments_button_title", "Hide shorts comments button"),
-                        StringResource("revanced_hide_shorts_comments_button_on", "Shorts comments button is hidden"),
-                        StringResource("revanced_hide_shorts_comments_button_off", "Shorts comments button is shown")
-                    ),
+                    )
                 ),
                 StringResource("revanced_comments_preference_screen_summary", "Manage the visibility of comments section components")
             )
         )
 
-        shortsCommentsButtonId = ResourceMappingPatch.resourceMappings.single {
-            it.type == "drawable" && it.name == "ic_right_comment_32c"
-        }.id
-
         return PatchResultSuccess()
     }
 }
diff --git a/...anced/patches/youtube/layout/hide/shorts/annotations/HideShortsComponentsCompatibility.kt b/...anced/patches/youtube/layout/hide/shorts/annotations/HideShortsComponentsCompatibility.kt
@@ -0,0 +1,8 @@
+package app.revanced.patches.youtube.layout.hide.shorts.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37"))])
+@Target(AnnotationTarget.CLASS)
+internal annotation class HideShortsComponentsCompatibility
diff --git a/...atches/youtube/layout/hide/shorts/bytecode/fingerprints/CreateShortsButtonsFingerprint.kt b/...atches/youtube/layout/hide/shorts/bytecode/fingerprints/CreateShortsButtonsFingerprint.kt
@@ -0,0 +1,19 @@
+package app.revanced.patches.youtube.layout.hide.shorts.bytecode.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.hide.shorts.resource.patch.HideShortsComponentsResourcePatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+
+object CreateShortsButtonsFingerprint : MethodFingerprint(
+    parameters = listOf("Z", "Z", "L"),
+    customFingerprint = { methodDef, _ ->
+        methodDef.implementation?.instructions?.any {
+            if (it.opcode != Opcode.CONST) return@any false
+
+            val literal = (it as WideLiteralInstruction).wideLiteral
+
+            literal == HideShortsComponentsResourcePatch.reelPlayerRightLargeIconSize
+        } ?: false
+    }
+)
diff --git a/...ed/patches/youtube/layout/hide/shorts/bytecode/fingerprints/ReelConstructorFingerprint.kt b/...ed/patches/youtube/layout/hide/shorts/bytecode/fingerprints/ReelConstructorFingerprint.kt
@@ -0,0 +1,19 @@
+package app.revanced.patches.youtube.layout.hide.shorts.bytecode.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.hide.shorts.resource.patch.HideShortsComponentsResourcePatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+
+object ReelConstructorFingerprint : MethodFingerprint(
+    opcodes = listOf(Opcode.INVOKE_VIRTUAL),
+    customFingerprint = { method, _ ->
+        method.implementation?.instructions?.any {
+            if (it.opcode != Opcode.CONST) return@any false
+
+            val literal = (it as WideLiteralInstruction).wideLiteral
+
+            literal == HideShortsComponentsResourcePatch.reelMultipleItemShelfId
+        } ?: false
+    }
+)