feat(youtubevanced): general-ads patch (#1693)

2023-03-14 15:09:10 +01:00
parent 9ffcb97a90
commit 4d97ead9b7
11 changed files with 109 additions and 12 deletions
@@ -0,0 +1,8 @@
+package app.revanced.patches.youtubevanced.ad.general.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.vanced.android.youtube")])
+@Target(AnnotationTarget.CLASS)
+internal annotation class HideAdsCompatibility
@@ -0,0 +1,25 @@
+package app.revanced.patches.youtubevanced.ad.general.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 ContainsAdFingerprint:MethodFingerprint(
+    returnType = "Z",
+    parameters = listOf("L", "L"),
+    access = AccessFlags.STATIC or AccessFlags.PUBLIC,
+    opcodes = listOf(
+        Opcode.CONST_STRING,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.CONST_STRING,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.CONST_STRING,
+        Opcode.INVOKE_INTERFACE
+    ),
+    strings = listOf("ads_video_with_context"),
+    customFingerprint = { methodDef ->
+        methodDef.name == "containsAd" && methodDef.definingClass.endsWith("LithoAdRemoval;")
+    }
+) {
+}
@@ -0,0 +1,63 @@
+package app.revanced.patches.youtubevanced.ad.general.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.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.patches.shared.misc.fix.verticalscroll.patch.VerticalScrollPatch
+import app.revanced.patches.youtubevanced.ad.general.annotations.HideAdsCompatibility
+import app.revanced.patches.youtubevanced.ad.general.fingerprints.ContainsAdFingerprint
+import org.jf.dexlib2.iface.instruction.formats.Instruction21c
+
+@Patch
+@Name("hide-ads")
+@Description("Removes general ads.")
+@DependsOn([VerticalScrollPatch::class])
+@HideAdsCompatibility
+@Version("0.0.1")
+class HideAdsPatch : BytecodePatch(
+    listOf(
+        ContainsAdFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        ContainsAdFingerprint.result?.let { result ->
+            result.mutableMethod.apply {
+                val insertIndex = result.scanResult.patternScanResult!!.endIndex + 1
+                val adsListRegister = (instruction(insertIndex - 2) as Instruction21c).registerA
+
+                listOf(
+                    "video_display_full_buttoned_layout",
+                    "full_width_square_image_layout",
+                    "_ad_with",
+                    "landscape_image_wide_button_layout",
+                    "banner_text_icon",
+                    "cell_divider",
+                    "square_image_layout",
+                    "watch_metadata_app_promo",
+                    "video_display_full_layout",
+                    "hero_promo_image",
+                    "statement_banner",
+                    "primetime_promo"
+                ).forEach { component ->
+                    addInstructions(
+                        insertIndex, """
+                           const-string v$adsListRegister, "$component"
+                           invoke-interface {v0, v$adsListRegister}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+                        """
+                    )
+                }
+            }
+        } ?: return ContainsAdFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
+    }
+}