chore(release): 2.117.1 [skip ci]

## [2.117.1](https://github.com/revanced/revanced-patches/compare/v2.117.0...v2.117.1) (2022-11-22)

### Bug Fixes

* **youtube/general-ads:** hide reels shelf ([2f8b911](a4fd6603fe))

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.117.1](https://github.com/revanced/revanced-patches/compare/v2.117.0...v2.117.1) (2022-11-22)
+
+
+### Bug Fixes
+
+* **youtube/general-ads:** hide reels shelf ([a436663](https://github.com/revanced/revanced-patches/commit/a436663e7755fc714c735df626d39bbd94f83dbb))
+
 # [2.117.0](https://github.com/revanced/revanced-patches/compare/v2.116.0...v2.117.0) (2022-11-21)
 
 

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.117.0
+version = 2.117.1

src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/fingerprints/InitFingerprint.kt

@@ -2,13 +2,13 @@ package app.revanced.patches.tiktok.misc.integrations.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.tiktok.misc.integrations.annotations.TikTokIntegrationsCompatibility
+import app.revanced.shared.patches.AbstractIntegrationsPatch.IntegrationsFingerprint
 
 @Name("init-fingerprint")
 @TikTokIntegrationsCompatibility
 @Version("0.0.1")
-object InitFingerprint : MethodFingerprint(
+object InitFingerprint : IntegrationsFingerprint(
     customFingerprint = { methodDef ->
         methodDef.definingClass.endsWith("/AwemeHostApplication;") &&
                 methodDef.name == "onCreate"

src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/patch/TikTokIntegrationsPatch.kt

@@ -1,38 +1,13 @@
 package app.revanced.patches.tiktok.misc.integrations.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.addInstruction
-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.patches.tiktok.misc.integrations.annotations.TikTokIntegrationsCompatibility
 import app.revanced.patches.tiktok.misc.integrations.fingerprints.InitFingerprint
+import app.revanced.shared.patches.AbstractIntegrationsPatch
 
 @Name("tiktok-integrations")
-@Description("Applies mandatory patches to implement the ReVanced integrations into the application.")
 @TikTokIntegrationsCompatibility
-@Version("0.0.1")
-class TikTokIntegrationsPatch : BytecodePatch(
-    listOf(
-        InitFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        if (context.findClass("Lapp/revanced/tiktok/utils/ReVancedUtils") == null)
-            return PatchResultError("Integrations have not been merged yet. This patch can not succeed without the integrations.")
-        val result = InitFingerprint.result!!
-
-        val method = result.mutableMethod
-        val implementation = method.implementation!!
-        val count = implementation.registerCount - 1
-
-        method.addInstruction(
-            0, "sput-object v$count, Lapp/revanced/tiktok/utils/ReVancedUtils;->context:Landroid/content/Context;"
-        )
-        return PatchResultSuccess()
-    }
-}
+class TikTokIntegrationsPatch : AbstractIntegrationsPatch(
+    "Lapp/revanced/tiktok/utils/ReVancedUtils;",
+    listOf(InitFingerprint)
+)

src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/fingerprints/ReelConstructorFingerprint.kt

@@ -0,0 +1,23 @@
+package app.revanced.patches.youtube.ad.general.bytecode.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.ad.general.annotation.GeneralAdsCompatibility
+import app.revanced.patches.youtube.ad.general.resource.patch.GeneralAdsResourcePatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+
+@Name("reel-constructor-fingerprint")
+@GeneralAdsCompatibility
+@Version("0.0.1")
+object ReelConstructorFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.INVOKE_VIRTUAL
+    ),
+    customFingerprint = { method ->
+        method.implementation?.instructions?.any {
+            it.opcode == Opcode.CONST && (it as WideLiteralInstruction).wideLiteral == GeneralAdsResourcePatch.reelMultipleItemShelfId
+        } ?: false
+    }
+)

src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralAdsPatch.kt

@@ -5,17 +5,22 @@ 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.extensions.softCompareTo
 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.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.youtube.ad.general.annotation.GeneralAdsCompatibility
+import app.revanced.patches.youtube.ad.general.bytecode.fingerprints.ReelConstructorFingerprint
 import app.revanced.patches.youtube.ad.general.resource.patch.GeneralAdsResourcePatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.*
 import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
 import org.jf.dexlib2.iface.instruction.formats.Instruction31i
 import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 import org.jf.dexlib2.immutable.reference.ImmutableMethodReference
@@ -28,7 +33,9 @@ import java.util.*
 @Description("Removes general ads.")
 @GeneralAdsCompatibility
 @Version("0.0.1")
-class GeneralAdsPatch : BytecodePatch() {
+class GeneralAdsPatch : BytecodePatch(
+    listOf(ReelConstructorFingerprint)
+) {
     internal companion object {
         private fun MutableClass.findMutableMethodOf(
             method: Method
@@ -42,6 +49,14 @@ class GeneralAdsPatch : BytecodePatch() {
     }
 
     override fun execute(context: BytecodeContext): PatchResult {
+        fun String.buildHideCall(viewRegister: Int) = "invoke-static { v$viewRegister }, " +
+                "Lapp/revanced/integrations/patches/GeneralAdsPatch;" +
+                "->" +
+                "$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) {
@@ -61,19 +76,31 @@ class GeneralAdsPatch : BytecodePatch() {
 
                             // Hide the view
                             val viewRegister = (this as Instruction35c).registerC
-                            context.proxy(classDef).mutableClass.findMutableMethodOf(method).addInstruction(
-                                insertIndex,
-                                "invoke-static { v$viewRegister }, " +
-                                        "Lapp/revanced/integrations/patches/GeneralAdsPatch;" +
-                                        "->" +
-                                        "hideAdAttributionView(Landroid/view/View;)V"
-                            )
+                            context.proxy(classDef)
+                                .mutableClass
+                                .findMutableMethodOf(method)
+                                .injectHideCall(insertIndex, viewRegister, "hideAdAttributionView")
                         }
                     }
                 }
             }
         }
 
+        with(
+            ReelConstructorFingerprint.result
+                ?: return PatchResultError("Could not resolve fingerprint")
+        ) {
+            // iput-object v$viewRegister, ...
+            val insertIndex = this.scanResult.patternScanResult!!.startIndex + 2
+
+            with(this.mutableMethod) {
+                val viewRegister = (instruction(insertIndex) as TwoRegisterInstruction).registerA
+
+                injectHideCall(insertIndex, viewRegister, "hideReelView")
+            }
+
+        }
+
         return PatchResultSuccess()
     }
 

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

@@ -6,10 +6,10 @@ 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.patches.shared.mapping.patch.ResourceMappingPatch
 import app.revanced.patches.youtube.ad.general.annotation.GeneralAdsCompatibility
 import app.revanced.patches.youtube.misc.litho.filter.patch.LithoFilterPatch
 import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
-import app.revanced.patches.shared.mapping.patch.ResourceMappingPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.*
@@ -25,6 +25,7 @@ import app.revanced.patches.youtube.misc.settings.framework.components.impl.*
 class GeneralAdsResourcePatch : ResourcePatch {
     internal companion object {
         var adAttributionId: Long = -1
+        var reelMultipleItemShelfId: Long = -1
     }
 
     override fun execute(context: ResourceContext): PatchResult {
@@ -218,7 +219,11 @@ class GeneralAdsResourcePatch : ResourcePatch {
             )
         )
 
-        adAttributionId = ResourceMappingPatch.resourceMappings.single { it.name == "ad_attribution" }.id
+        fun String.getId() = ResourceMappingPatch.resourceMappings.single { it.name == this }.id
+
+        adAttributionId = "ad_attribution".getId()
+        reelMultipleItemShelfId = "reel_multiple_items_shelf".getId()
+
         return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/LithoThemePatch.kt

@@ -5,11 +5,9 @@ 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.util.smali.ExternalLabel
 import app.revanced.patches.youtube.layout.theme.annotations.ThemeCompatibility
 import app.revanced.patches.youtube.layout.theme.fingerprints.LithoThemeFingerprint
 

src/main/kotlin/app/revanced/patches/youtube/misc/integrations/fingerprints/InitFingerprint.kt

@@ -2,12 +2,12 @@ package app.revanced.patches.youtube.misc.integrations.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.integrations.annotations.IntegrationsCompatibility
+import app.revanced.shared.patches.AbstractIntegrationsPatch.IntegrationsFingerprint
 
 @Name("init-fingerprint")
 @IntegrationsCompatibility
 @Version("0.0.1")
-object InitFingerprint : MethodFingerprint(
-    strings = listOf("Application creation")
+object InitFingerprint : IntegrationsFingerprint(
+    strings = listOf("Application creation"),
 )

src/main/kotlin/app/revanced/patches/youtube/misc/integrations/fingerprints/ServiceFingerprint.kt

@@ -2,12 +2,13 @@ package app.revanced.patches.youtube.misc.integrations.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.integrations.annotations.IntegrationsCompatibility
+import app.revanced.shared.patches.AbstractIntegrationsPatch.IntegrationsFingerprint
 
 @Name("service-fingerprint")
 @IntegrationsCompatibility
 @Version("0.0.1")
-object ServiceFingerprint : MethodFingerprint(
-    customFingerprint = {  methodDef -> methodDef.definingClass.endsWith("ApiPlayerService;") && methodDef.name == "<init>" }
+object ServiceFingerprint : IntegrationsFingerprint(
+    customFingerprint = { methodDef -> methodDef.definingClass.endsWith("ApiPlayerService;") && methodDef.name == "<init>" },
+    contextRegisterResolver = { it.implementation!!.registerCount - it.parameters.size }
 )

src/main/kotlin/app/revanced/patches/youtube/misc/integrations/fingerprints/StandalonePlayerFingerprint.kt

@@ -2,15 +2,15 @@ package app.revanced.patches.youtube.misc.integrations.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.integrations.annotations.IntegrationsCompatibility
+import app.revanced.shared.patches.AbstractIntegrationsPatch.IntegrationsFingerprint
 
 @Name("standalone-player-fingerprint")
 @IntegrationsCompatibility
 @Version("0.0.1")
-object StandalonePlayerFingerprint : MethodFingerprint(
+object StandalonePlayerFingerprint : IntegrationsFingerprint(
     strings = listOf(
         "Invalid PlaybackStartDescriptor. Returning the instance itself.",
         "com.google.android.music",
-    )
+    ),
 )

src/main/kotlin/app/revanced/patches/youtube/misc/integrations/patch/IntegrationsPatch.kt

@@ -1,59 +1,15 @@
 package app.revanced.patches.youtube.misc.integrations.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.MethodFingerprintExtensions.name
-import app.revanced.patcher.extensions.addInstruction
-import app.revanced.patcher.extensions.or
-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.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
-import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.youtube.misc.integrations.annotations.IntegrationsCompatibility
 import app.revanced.patches.youtube.misc.integrations.fingerprints.InitFingerprint
 import app.revanced.patches.youtube.misc.integrations.fingerprints.ServiceFingerprint
 import app.revanced.patches.youtube.misc.integrations.fingerprints.StandalonePlayerFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.immutable.ImmutableMethod
-import org.jf.dexlib2.immutable.ImmutableMethodImplementation
+import app.revanced.shared.patches.AbstractIntegrationsPatch
 
 @Name("integrations")
-@Description("Applies mandatory patches to implement the ReVanced integrations into the application.")
 @IntegrationsCompatibility
-@Version("0.0.1")
-class IntegrationsPatch : BytecodePatch(
-    listOf(
-        InitFingerprint, StandalonePlayerFingerprint, ServiceFingerprint
-    )
-) {
-    companion object {
-        private const val INTEGRATIONS_DESCRIPTOR = "Lapp/revanced/integrations/utils/ReVancedUtils;"
-    }
-
-    override fun execute(context: BytecodeContext): PatchResult {
-        if (context.findClass(INTEGRATIONS_DESCRIPTOR) == null)
-            return PatchResultError("Integrations have not been merged yet. This patch can not succeed without merging the integrations.")
-
-        arrayOf(InitFingerprint, StandalonePlayerFingerprint, ServiceFingerprint).map {
-            it to (it.result ?: return PatchResultError("${it.name} failed to resolve"))
-        }.forEach { (fingerprint, result) ->
-            with(result.mutableMethod) {
-                // parameter which holds the context
-                val contextParameter = if (fingerprint == ServiceFingerprint) parameters.size else 1
-                // register which holds the context
-                val contextRegister = implementation!!.registerCount - contextParameter
-
-                addInstruction(
-                    0,
-                    "sput-object v$contextRegister, $INTEGRATIONS_DESCRIPTOR->context:Landroid/content/Context;"
-                )
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-}
+class IntegrationsPatch : AbstractIntegrationsPatch(
+    "Lapp/revanced/integrations/utils/ReVancedUtils;",
+    listOf(InitFingerprint, StandalonePlayerFingerprint, ServiceFingerprint),
+)

src/main/kotlin/app/revanced/shared/patches/IntegrationsFingerprint.kt

@@ -0,0 +1,67 @@
+package app.revanced.shared.patches
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+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.shared.patches.AbstractIntegrationsPatch.IntegrationsFingerprint.RegisterResolver
+import org.jf.dexlib2.iface.Method
+
+@Description("Applies mandatory patches to implement the ReVanced integrations into the application.")
+@Version("0.0.1")
+abstract class AbstractIntegrationsPatch(
+    private val integrationsDescriptor: String,
+    private val hooks: Iterable<IntegrationsFingerprint>
+) : BytecodePatch(hooks) {
+    /**
+     * [MethodFingerprint] for integrations.
+     *
+     * @param contextRegisterResolver A [RegisterResolver] to get the register.
+     * @see MethodFingerprint
+     */
+    abstract class IntegrationsFingerprint(
+        strings: Iterable<String>? = null,
+        customFingerprint: ((methodDef: Method) -> Boolean)? = null,
+        private val contextRegisterResolver: (Method) -> Int = object : RegisterResolver {}
+    ) : MethodFingerprint(strings = strings, customFingerprint = customFingerprint) {
+        fun invoke(integrationsDescriptor: String): PatchResult {
+            result?.mutableMethod?.let { method ->
+                val contextRegister = contextRegisterResolver(method)
+
+                method.addInstruction(
+                    0,
+                    "sput-object v$contextRegister, " +
+                            "$integrationsDescriptor->context:Landroid/content/Context;"
+                )
+            } ?: return PatchResultError("Could not find hook target fingerprint.")
+
+            return PatchResultSuccess()
+        }
+
+        interface RegisterResolver : (Method) -> Int {
+            override operator fun invoke(method: Method) = method.implementation!!.registerCount - 1
+        }
+    }
+
+    override fun execute(context: BytecodeContext): PatchResult {
+        if (context.findClass(integrationsDescriptor) == null) return MISSING_INTEGRATIONS
+
+        for (hook in hooks) hook.invoke(integrationsDescriptor).let {
+            if (it is PatchResultError) return it
+        }
+
+        return PatchResultSuccess()
+    }
+
+    private companion object {
+        val MISSING_INTEGRATIONS = PatchResultError(
+            "Integrations have not been merged yet. " +
+                    "This patch can not succeed without merging the integrations."
+        )
+    }
+}