chore(release): 2.111.0 [skip ci]

# [2.111.0](https://github.com/revanced/revanced-patches/compare/v2.110.0...v2.111.0) (2022-11-15)

### Features

* **iconpackstudio:** `unlock-pro` patch ([#1047](https://github.com/revanced/revanced-patches/issues/1047)) ([a48af3c](d4658c7056))

CHANGELOG.md

@@ -1,3 +1,29 @@
+# [2.111.0](https://github.com/revanced/revanced-patches/compare/v2.110.0...v2.111.0) (2022-11-15)
+
+
+### Features
+
+* **iconpackstudio:** `unlock-pro` patch ([#1047](https://github.com/revanced/revanced-patches/issues/1047)) ([fcbca9c](https://github.com/revanced/revanced-patches/commit/fcbca9cf0ff3940c48df53a9e5e4d06d65f9a1b1))
+
+# [2.110.0](https://github.com/revanced/revanced-patches/compare/v2.109.0...v2.110.0) (2022-11-15)
+
+
+### Features
+
+* **youtube/debugging:** include by default & add option to debug on Android ([9d6d5b2](https://github.com/revanced/revanced-patches/commit/9d6d5b29227980aacb4c1331161afb3fa265bbe4))
+* **youtube/debugging:** use more suitable preference title ([d182351](https://github.com/revanced/revanced-patches/commit/d182351e789bcbfb7982774406449e8d973765b2))
+* **youtube/general-ads:** hide chapter teaser under videos ([9cf415a](https://github.com/revanced/revanced-patches/commit/9cf415a894ab5458134ef1cd5a4c5bf7579e592c))
+* **youtube/general-ads:** hide self sponsored cards ([b627d75](https://github.com/revanced/revanced-patches/commit/b627d751b49c228e52f7f9fb5d2bcacb9d243a64))
+* **youtube/general-ads:** hide shorts in search ([c01ba5c](https://github.com/revanced/revanced-patches/commit/c01ba5cbcc694f8c9ee83a4e9eb081cf5b45753c))
+
+# [2.109.0](https://github.com/revanced/revanced-patches/compare/v2.108.0...v2.109.0) (2022-11-13)
+
+
+### Features
+
+* **twitch:** `block-audio-ads` patch ([#1041](https://github.com/revanced/revanced-patches/issues/1041)) ([3419bae](https://github.com/revanced/revanced-patches/commit/3419baed489ce231f84b3e2d600cf123cdfa7ff7))
+* **twitch:** `block-video-ads` patch  ([#1040](https://github.com/revanced/revanced-patches/issues/1040)) ([b47bf24](https://github.com/revanced/revanced-patches/commit/b47bf24d1b52cfa1883a942894a6216ae81b8325))
+
 # [2.108.0](https://github.com/revanced/revanced-patches/compare/v2.107.0...v2.108.0) (2022-11-13)
 
 

README.md

@@ -4,6 +4,14 @@ The official Patch bundle provided by ReVanced and the community.
 
 > Looking for the JSON variant of this? [Click here](patches.json).
 
+### 📦 `ginlemon.iconpackstudio`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks all pro features. | all |
+</details>
+
 ### 📦 `com.ss.android.ugc.trill`
 <details>
 
@@ -111,9 +119,9 @@ The official Patch bundle provided by ReVanced and the community.
 | `open-links-directly` | Bypasses redirect links and allows opening links directly. | 17.43.36 |
 | `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.43.36 |
 | `custom-video-buffer` | Lets you change the buffers of videos. | 17.43.36 |
+| `debugging` | Adds debugging options. | all |
 | `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
 | `always-autorepeat` | Always repeats the playing video again. | 17.43.36 |
-| `debugging` | Adds debugging options. | all |
 | `minimized-playback` | Enables minimized and background playback. | 17.43.36 |
 | `custom-video-speed` | Adds more video speed options. | 17.43.36 |
 | `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.43.36 |
@@ -142,6 +150,8 @@ The official Patch bundle provided by ReVanced and the community.
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
 | `debug-mode` | Enables Twitch's internal debugging mode. | all |
+| `block-audio-ads` | Blocks audio ads in streams and VODs. | all |
+| `block-video-ads` | Blocks video ads in streams and VODs. | all |
 | `show-deleted-messages` | Shows deleted chat messages behind a clickable spoiler. | all |
 </details>
 

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.108.0
+version = 2.111.0

src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/annotations/UnlockProCompatibility.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.iconpackstudio.misc.pro.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("ginlemon.iconpackstudio")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class UnlockProCompatibility

src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/fingerprints/CheckProFingerprint.kt

@@ -0,0 +1,14 @@
+package app.revanced.patches.iconpackstudio.misc.pro.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.iconpackstudio.misc.pro.annotations.UnlockProCompatibility
+
+@Name("check-pro-fingerprint")
+@UnlockProCompatibility
+@Version("0.0.1")
+object CheckProFingerprint : MethodFingerprint(
+    "Z",
+    customFingerprint = { it.definingClass.endsWith("IPSPurchaseRepository;")}
+)

src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/patch/UnlockProPatch.kt

@@ -0,0 +1,38 @@
+package app.revanced.patches.iconpackstudio.misc.pro.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.removeInstruction
+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.patches.iconpackstudio.misc.pro.annotations.UnlockProCompatibility
+import app.revanced.patches.iconpackstudio.misc.pro.fingerprints.CheckProFingerprint
+
+@Patch
+@Name("unlock-pro")
+@Description("Unlocks all pro features.")
+@UnlockProCompatibility
+@Version("0.0.1")
+class UnlockProPatch : BytecodePatch(
+    listOf(
+        CheckProFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        val method = CheckProFingerprint.result!!.mutableMethod
+        method.addInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """
+        )
+        
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/twitch/ad/audio/annotations/AudioAdsCompatibility.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.twitch.ad.audio.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("tv.twitch.android.app")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class AudioAdsCompatibility
+

src/main/kotlin/app/revanced/patches/twitch/ad/audio/fingerprints/AudioAdsPresenterPlayFingerprint.kt

@@ -0,0 +1,16 @@
+package app.revanced.patches.twitch.ad.audio.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.twitch.ad.audio.annotations.AudioAdsCompatibility
+
+@Name("audio-ads-presenter-play-fingerprint")
+@AudioAdsCompatibility
+@Version("0.0.1")
+object AudioAdsPresenterPlayFingerprint : MethodFingerprint(
+    customFingerprint = { method ->
+        method.definingClass.endsWith("AudioAdsPlayerPresenter;") && method.name == "playAd"
+    }
+)

src/main/kotlin/app/revanced/patches/twitch/ad/audio/patch/AudioAdsPatch.kt

@@ -0,0 +1,31 @@
+package app.revanced.patches.twitch.ad.audio.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.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.twitch.ad.audio.annotations.AudioAdsCompatibility
+import app.revanced.patches.twitch.ad.audio.fingerprints.AudioAdsPresenterPlayFingerprint
+
+@Patch
+@Name("block-audio-ads")
+@Description("Blocks audio ads in streams and VODs.")
+@AudioAdsCompatibility
+@Version("0.0.1")
+class AudioAdsPatch : BytecodePatch(
+    listOf(AudioAdsPresenterPlayFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        // Block playAds call
+        with(AudioAdsPresenterPlayFingerprint.result!!) {
+            mutableMethod.addInstruction(0, "return-void")
+        }
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/twitch/ad/video/annotations/VideoAdsCompatibility.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.twitch.ad.video.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("tv.twitch.android.app")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class VideoAdsCompatibility
+

src/main/kotlin/app/revanced/patches/twitch/ad/video/fingerprints/AdsManagerFingerprint.kt

@@ -0,0 +1,16 @@
+package app.revanced.patches.twitch.ad.video.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.twitch.ad.video.annotations.VideoAdsCompatibility
+
+@Name("ads-manager-play-fingerprint")
+@VideoAdsCompatibility
+@Version("0.0.1")
+object AdsManagerFingerprint : MethodFingerprint(
+    customFingerprint = { method ->
+        method.definingClass.endsWith("AdsManagerImpl;") && method.name == "playAds"
+    }
+)

src/main/kotlin/app/revanced/patches/twitch/ad/video/fingerprints/CheckAdEligibilityLambdaFingerprint.kt

@@ -0,0 +1,22 @@
+package app.revanced.patches.twitch.ad.video.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.twitch.ad.video.annotations.VideoAdsCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("check-ad-eligibility-fingerprint")
+@VideoAdsCompatibility
+@Version("0.0.1")
+object CheckAdEligibilityLambdaFingerprint : MethodFingerprint(
+    "L",
+    AccessFlags.PRIVATE or AccessFlags.FINAL or AccessFlags.STATIC,
+    listOf("L", "L", "L"),
+    customFingerprint = { method ->
+        method.definingClass.endsWith("AdEligibilityFetcher;") &&
+                method.name.contains("shouldRequestAd")
+    }
+)

src/main/kotlin/app/revanced/patches/twitch/ad/video/fingerprints/ContentConfigShowAdsFingerprint.kt

@@ -0,0 +1,16 @@
+package app.revanced.patches.twitch.ad.video.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.twitch.ad.video.annotations.VideoAdsCompatibility
+
+@Name("content-config-show-ads-fingerprint")
+@VideoAdsCompatibility
+@Version("0.0.1")
+object ContentConfigShowAdsFingerprint : MethodFingerprint(
+    customFingerprint = { method ->
+        method.definingClass.endsWith("ContentConfigData;") && method.name == "getShowAds"
+    }
+)

src/main/kotlin/app/revanced/patches/twitch/ad/video/patch/VideoAdsPatch.kt

@@ -0,0 +1,60 @@
+package app.revanced.patches.twitch.ad.video.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.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.Patch
+import app.revanced.patches.twitch.ad.video.annotations.VideoAdsCompatibility
+import app.revanced.patches.twitch.ad.video.fingerprints.AdsManagerFingerprint
+import app.revanced.patches.twitch.ad.video.fingerprints.CheckAdEligibilityLambdaFingerprint
+import app.revanced.patches.twitch.ad.video.fingerprints.ContentConfigShowAdsFingerprint
+
+@Patch
+@Name("block-video-ads")
+@Description("Blocks video ads in streams and VODs.")
+@VideoAdsCompatibility
+@Version("0.0.1")
+class VideoAdsPatch : BytecodePatch(
+    listOf(
+        ContentConfigShowAdsFingerprint,
+        AdsManagerFingerprint,
+        CheckAdEligibilityLambdaFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        // Pretend our player is ineligible for all ads
+        with(CheckAdEligibilityLambdaFingerprint.result!!) {
+            mutableMethod.addInstructions(
+                0,
+                """
+                    const/4 v0, 0
+                    invoke-static {v0}, Lio/reactivex/Single;->just(Ljava/lang/Object;)Lio/reactivex/Single;
+                    move-result-object p0
+                    return-object p0
+                """
+            )
+        }
+
+        // Spoof showAds JSON field
+        with(ContentConfigShowAdsFingerprint.result!!) {
+            mutableMethod.addInstructions(0, """
+                    const/4 v0, 0
+                    return v0
+                """
+            )
+        }
+
+        // Block playAds call
+        with(AdsManagerFingerprint.result!!) {
+            mutableMethod.addInstruction(0, "return-void")
+        }
+
+        return PatchResultSuccess()
+    }
+}

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

@@ -33,7 +33,10 @@ import org.jf.dexlib2.iface.Method
 import org.jf.dexlib2.iface.instruction.Instruction
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.instruction.formats.*
+import org.jf.dexlib2.iface.instruction.formats.Instruction21c
+import org.jf.dexlib2.iface.instruction.formats.Instruction22c
+import org.jf.dexlib2.iface.instruction.formats.Instruction31i
+import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 import org.jf.dexlib2.iface.reference.FieldReference
 import org.jf.dexlib2.iface.reference.MethodReference
 import org.jf.dexlib2.iface.reference.Reference
@@ -115,11 +118,11 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
                 StringResource("revanced_adremover_feed_survey_enabled_summary_off", "Feed surveys are shown")
             ),
             SwitchPreference(
-                "revanced_adremover_shorts_shelf",
-                StringResource("revanced_adremover_shorts_shelf_enabled_title", "Remove shorts shelf"),
+                "revanced_adremover_shorts",
+                StringResource("revanced_adremover_shorts_enabled_title", "Remove shorts"),
                 true,
-                StringResource("revanced_adremover_shorts_shelf_enabled_summary_on", "Shorts shelves are hidden"),
-                StringResource("revanced_adremover_shorts_shelf_enabled_summary_off", "Shorts shelves are shown")
+                StringResource("revanced_adremover_shorts_enabled_summary_on", "Shorts are hidden"),
+                StringResource("revanced_adremover_shorts_enabled_summary_off", "Shorts are shown")
             ),
             SwitchPreference(
                 "revanced_adremover_community_guidelines",
@@ -174,9 +177,38 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
                 "revanced_adremover_hide_channel_guidelines",
                 StringResource("revanced_adremover_hide_channel_guidelines_enabled_title", "Hide channel guidelines"),
                 true,
-                StringResource("revanced_adremover_hide_channel_guidelines_enabled_summary_on", "Channel guidelines are hidden"),
-                StringResource("revanced_adremover_hide_channel_guidelines_enabled_summary_off", "Channel guidelines are shown")
+                StringResource(
+                    "revanced_adremover_hide_channel_guidelines_enabled_summary_on",
+                    "Channel guidelines are hidden"
+                ),
+                StringResource(
+                    "revanced_adremover_hide_channel_guidelines_enabled_summary_off",
+                    "Channel guidelines are shown"
+                )
             ),
+            SwitchPreference(
+                "revanced_adremover_self_sponsor",
+                StringResource("revanced_adremover_self_sponsor_enabled_title", "Hide self sponsored cards"),
+                true,
+                StringResource("revanced_adremover_self_sponsor_enabled_summary_on", "Self sponsored cards are hidden"),
+                StringResource("revanced_adremover_self_sponsor_enabled_summary_off", "Self sponsored cards are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_chapter_teaser",
+                StringResource(
+                    "revanced_adremover_chapter_teaser_enabled_title",
+                    "Hide chapter teaser under videos"
+                ),
+                true,
+                StringResource(
+                    "revanced_adremover_chapter_teaser_enabled_summary_on",
+                    "Chapter teasers are hidden"
+                ),
+                StringResource(
+                    "revanced_adremover_chapter_teaser_enabled_summary_off",
+                    "Chapter teasers are shown"
+                )
+            )
         )
 
         // iterating through all classes is expensive

src/main/kotlin/app/revanced/patches/youtube/misc/debugging/annotations/DebuggingCompatibility.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.enabledebugging.annotations
+package app.revanced.patches.youtube.misc.debugging.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@@ -6,4 +6,4 @@ import app.revanced.patcher.annotation.Package
 @Compatibility([Package("com.google.android.youtube")])
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
-internal annotation class EnableDebuggingCompatibility
+internal annotation class DebuggingCompatibility

src/main/kotlin/app/revanced/patches/youtube/misc/debugging/patch/DebuggingPatch.kt

@@ -1,51 +1,60 @@
-package app.revanced.patches.youtube.misc.enabledebugging.patch
+package app.revanced.patches.youtube.misc.debugging.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.*
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.misc.enabledebugging.annotations.EnableDebuggingCompatibility
+import app.revanced.patches.youtube.misc.debugging.annotations.DebuggingCompatibility
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
 import org.w3c.dom.Element
 
-@Patch(false)
+@Patch
 @Name("debugging")
 @DependsOn([IntegrationsPatch::class, SettingsPatch::class])
 @Description("Adds debugging options.")
-@EnableDebuggingCompatibility
+@DebuggingCompatibility
 @Version("0.0.1")
-class EnableDebuggingPatch : ResourcePatch {
+class DebuggingPatch : ResourcePatch {
     override fun execute(context: ResourceContext): PatchResult {
         SettingsPatch.PreferenceScreen.MISC.addPreferences(
             SwitchPreference(
                 "revanced_debug_enabled",
-                StringResource("revanced_debug_title", "Debug"),
+                StringResource("revanced_debug_title", "Debugging"),
                 false,
                 StringResource("revanced_debug_on", "Debug logs are enabled"),
                 StringResource("revanced_debug_off", "Debug logs are disabled")
             )
         )
 
-        // create an xml editor instance
-        context.xmlEditor["AndroidManifest.xml"].use { dom ->
-            // get the application node
-            val applicationNode = dom
-                .file
-                .getElementsByTagName("application")
-                .item(0) as Element
+        if (debuggable == true) {
+            context.xmlEditor["AndroidManifest.xml"].use { dom ->
+                val applicationNode = dom
+                    .file
+                    .getElementsByTagName("application")
+                    .item(0) as Element
 
-            // set application as debuggable
-            applicationNode.setAttribute("android:debuggable", "true")
+                // set application as debuggable
+                applicationNode.setAttribute("android:debuggable", "true")
+            }
         }
 
         return PatchResultSuccess()
     }
+
+    companion object : OptionsContainer() {
+        var debuggable: Boolean? by option(
+            PatchOption.BooleanOption(
+                key = "debuggable",
+                default = false,
+                title = "App debugging",
+                description = "Whether to make the app debuggable on Android.",
+            )
+        )
+    }
 }