chore(release): 2.25.1 [skip ci]

## [2.25.1](https://github.com/revanced/revanced-patches/compare/v2.25.0...v2.25.1) (2022-07-26)

### Bug Fixes

* `default-video-quality` patch crashing ([#227](https://github.com/revanced/revanced-patches/issues/227)) ([dbf0668](dbf0668f28))

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -0,0 +1,61 @@
+name: 🐞 Bug report
+description: Report a very clearly broken issue.
+title: 'bug: <title>'
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # ReVanced bug report
+
+        Important to note that your issue may have already been reported before. Please check for existing issues [here](https://github.com/revanced/revanced-patches/labels/bug)
+
+  - type: dropdown
+    attributes:
+      label: Type
+      options:
+        - Error while patching
+        - Error at runtime
+        - Cosmetic
+        - Other
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Bug description
+      description: How did you find the bug? Any additional details that might help?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: Add the steps to reproduce this bug including your environment.
+      placeholder: Step 1. Download some files. Step 2. ...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Screenshots or videos
+      description: Add screenshots or videos that show the bug here.
+      placeholder: Drag and drop the screenshots/videos into this box.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Solution
+      description: If applicable, add a possible solution.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add additional context here.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,24 +0,0 @@
----
-name: Bug report
-about: Create a bug report on patches
-title: 'problem: `some-patch`'
-labels: bug
-assignees: ''
-
----
-
-## 🐞 Issue
-
-<!-- Describe your issue in detail here -->
-
-## ⚙ Reproduce
-
-<!-- Include your environment and steps to reproduce the issue as detailed as possible -->
-
-## 🛠 Solution
-
-<!-- If applicable, add a possible solution -->
-
-## ⚠ Additional context
-
-<!-- Add any other context about the problem here -->

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 📃 Documentation
+    url: https://github.com/revanced/revanced-documentation/
+    about: Don't know how or where to start? Check out our documentation!
+  - name: 🗨 Discussions
+    url: https://github.com/revanced/revanced-suggestions/discussions
+    about: Got something you think should change or be added? Search for or start a new discussion!

.github/ISSUE_TEMPLATE/feature-issue.yml

@@ -0,0 +1,46 @@
+name: ⭐ Feature request
+description: Create a detailed feature request.
+title: 'feat: <title>'
+labels: [feature-request]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # ReVanced feature request
+        
+        Do not submit requests for patches here. Please submit them [here](https://github.com/orgs/revanced/discussions/categories/patches) instead.
+        Important to note that your feature request may have already been made before. Please check for existing feature requests [here](https://github.com/revanced/revanced-patches/labels/feature-request)
+
+  - type: dropdown
+    attributes:
+      label: Type
+      options:
+        - Functionality
+        - Cosmetic
+        - Other
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Issue
+      description: What is the current problem. Why does it require a feature request?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Feature
+      description: Describe your feature in detail. How does it solve the issue?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Motivation
+      description: Why should your feature should be considered?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add additional context here.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,24 +0,0 @@
----
-name: Feature request
-about: Suggest a change to some patch. Do not submit suggestions for patches here.
-title: 'feat: some feature'
-labels: feature-request
-assignees: ''
-
----
-
-## 🐞 Issue
-
-<!-- Explain here, what the current problem is and why it leads you to request a feature change -->
-
-## ❗ Solution
-
-<!-- Explain how your current issue can be solved -->
-
-## ❓ Motivation
-
-<!-- Explain why your feature should be considered -->
-
-## ⚠ Additional context
-
-<!-- Add any other context or screenshots about the feature request here -->

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [2.25.1](https://github.com/revanced/revanced-patches/compare/v2.25.0...v2.25.1) (2022-07-26)
+
+
+### Bug Fixes
+
+* `default-video-quality` patch crashing ([#227](https://github.com/revanced/revanced-patches/issues/227)) ([379327a](https://github.com/revanced/revanced-patches/commit/379327a6b2325ef93c7107472343dd9fd85a0f56))
+
+# [2.25.0](https://github.com/revanced/revanced-patches/compare/v2.24.0...v2.25.0) (2022-07-26)
+
+
+### Features
+
+* `general-reddit-ads` patch ([#235](https://github.com/revanced/revanced-patches/issues/235)) ([d63c016](https://github.com/revanced/revanced-patches/commit/d63c016d38d2a5b1d152abccdb582990987a1911))
+
 # [2.24.0](https://github.com/revanced/revanced-patches/compare/v2.23.0...v2.24.0) (2022-07-26)
 
 

README.md

@@ -12,6 +12,14 @@ Official patches by ReVanced
 | `timeline-ads` | Removes ads from the Twitter timeline. | all |
 </details>
 
+### 📦 `com.reddit.frontpage`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | all |
+</details>
+
 ### 📦 `com.google.android.apps.youtube.music`
 <details>
 
@@ -23,7 +31,7 @@ Official patches by ReVanced
 | `compact-header` | Hides the music category bar at the top of the homepage. | 5.16.51 |
 | `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.16.51 |
 | `background-play` | Enables playing music in the background. | 5.16.51 |
-| `music-microg-support` | Patch to allow YouTube Music ReVanced to run without root and under a different package name. | 5.16.51 |
+| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.16.51 |
 | `music-video-ads` | Removes ads in the music player. | 5.16.51 |
 | `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.16.51 |
 | `exclusive-audio-playback` | Enables the option to play music without video. | 5.16.51 |
@@ -56,6 +64,7 @@ Official patches by ReVanced
 | `enable-debugging` | Enables app debugging by patching the manifest file. | all |
 | `custom-playback-speed` | Adds more video playback speed options. | 17.29.34 |
 | `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.29.34 |
+| `default-video-quality` | Adds the ability to select preferred video quality. | 17.29.34 |
 | `video-ads` | Removes ads in the video player. | 17.29.34 |
 | `general-ads` | Removes general ads. | 17.29.34 |
 | `hide-infocard-suggestions` | Hides infocards in videos. | 17.29.34 |

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.24.0
+version = 2.25.1

src/main/kotlin/app/revanced/patches/music/misc/microg/patch/bytecode/MusicMicroGBytecodePatch.kt

@@ -29,7 +29,7 @@ import org.jf.dexlib2.immutable.reference.ImmutableStringReference
 @Patch
 @Dependencies([MusicMicroGResourcePatch::class])
 @Name("music-microg-support")
-@Description("Patch to allow YouTube Music ReVanced to run without root and under a different package name.")
+@Description("Allows YouTube Music ReVanced to run without root and under a different package name.")
 @MusicMicroGPatchCompatibility
 @Version("0.0.1")
 class MusicMicroGBytecodePatch : BytecodePatch(
@@ -157,4 +157,4 @@ class MusicMicroGBytecodePatch : BytecodePatch(
         )
 
     }
-}
+}

src/main/kotlin/app/revanced/patches/reddit/ad/general/annotations/GeneralAdsCompatibility.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.reddit.ad.general.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.reddit.frontpage", arrayOf()
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class GeneralAdsCompatibility

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

@@ -0,0 +1,55 @@
+package app.revanced.patches.reddit.ad.general.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patches.reddit.ad.general.annotations.GeneralAdsCompatibility
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.reference.StringReference
+import org.jf.dexlib2.immutable.reference.ImmutableStringReference
+
+@Patch
+@Name("general-reddit-ads")
+@Description("Removes general ads from the Reddit frontpage and subreddits.")
+@GeneralAdsCompatibility
+@Version("0.0.1")
+class GeneralAdsPatch : BytecodePatch() {
+    override fun execute(data: BytecodeData): PatchResult {
+        data.classes.forEach { classDef ->
+            classDef.methods.forEach methodLoop@{ method ->
+                val implementation = method.implementation ?: return@methodLoop
+
+                implementation.instructions.forEachIndexed { i, instruction ->
+                    if (instruction.opcode != Opcode.CONST_STRING) return@forEachIndexed
+                    if (((instruction as ReferenceInstruction).reference as StringReference).string != "AdPost") return@forEachIndexed
+
+                    val proxiedClass = data.proxy(classDef).resolve()
+
+                    val proxiedImplementation = proxiedClass.methods.first {
+                        it.name == method.name && it.parameterTypes.containsAll(method.parameterTypes)
+                    }.implementation!!
+
+                    var newString = "AdPost1"
+                    if (proxiedImplementation.instructions[i - 1].opcode == Opcode.CONST_STRING) {
+                        newString = "SubredditPost"
+                    }
+                    proxiedImplementation.replaceInstruction(
+                        i, BuilderInstruction21c(
+                            Opcode.CONST_STRING, (proxiedImplementation.instructions[i] as BuilderInstruction21c).registerA, ImmutableStringReference(newString)
+                        )
+                    )
+                }
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/misc/quality/annotations/DefaultVideoQualityCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.22.36", "17.24.35", "17.26.35", "17.27.39")
+        "com.google.android.youtube", arrayOf("17.22.36", "17.24.35", "17.26.35", "17.27.39", "17.28.34", "17.29.34")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/quality/fingerprints/VideoQualitySetterFingerprint.kt

@@ -4,18 +4,18 @@ package app.revanced.patches.youtube.misc.quality.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.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.quality.annotations.DefaultVideoQualityCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("video-quality-setter-fingerprint")
 @MatchingMethod(
-    "Lkec", "a"
+    "Lkec;", "a"
 )
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
+@DirectPatternScanMethod
 @DefaultVideoQualityCompatibility
 @Version("0.0.1")
 object VideoQualitySetterFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/misc/quality/patch/DefaultVideoQualityPatch.kt

@@ -17,26 +17,22 @@ import app.revanced.patches.youtube.misc.quality.annotations.DefaultVideoQuality
 import app.revanced.patches.youtube.misc.quality.fingerprints.VideoQualityReferenceFingerprint
 import app.revanced.patches.youtube.misc.quality.fingerprints.VideoQualitySetterFingerprint
 import app.revanced.patches.youtube.misc.quality.fingerprints.VideoUserQualityChangeFingerprint
-import app.revanced.patches.youtube.misc.videoid.fingerprint.VideoIdFingerprint
+import app.revanced.patches.youtube.misc.videoid.patch.VideoIdPatch
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
 import org.jf.dexlib2.iface.reference.FieldReference
 
-@Dependencies(
-    dependencies = [IntegrationsPatch::class]
-)
+@Patch
+@Dependencies([IntegrationsPatch::class, VideoIdPatch::class])
 @Name("default-video-quality")
 @Description("Adds the ability to select preferred video quality.")
 @DefaultVideoQualityCompatibility
 @Version("0.0.1")
 class DefaultVideoQualityPatch : BytecodePatch(
     listOf(
-        VideoQualitySetterFingerprint,
-        VideoIdFingerprint
+        VideoQualitySetterFingerprint
     )
-
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val offset = 4
         val setterMethod = VideoQualitySetterFingerprint.result!!
 
         VideoUserQualityChangeFingerprint.resolve(data, setterMethod.classDef)
@@ -48,6 +44,8 @@ class DefaultVideoQualityPatch : BytecodePatch(
                 (method.implementation!!.instructions.elementAt(0) as ReferenceInstruction).reference as FieldReference
             }
 
+        VideoIdPatch.injectCall("Lapp/revanced/integrations/patches/VideoQualityPatch;->newVideoStarted(Ljava/lang/String;)V")
+
         val qIndexMethodName =
             data.classes.single { it.type == qualityFieldReference.type }.methods.single { it.parameterTypes.first() == "I" }.name
 
@@ -61,15 +59,6 @@ class DefaultVideoQualityPatch : BytecodePatch(
             """,
         )
 
-        val newVideoMethod = VideoIdFingerprint.result!!
-        val newVideoIndex = newVideoMethod.patternScanResult!!.endIndex + offset
-        newVideoMethod.mutableMethod.addInstructions(
-            newVideoIndex, """
-                const/4 v6, 0x1 
-                invoke-static {v6}, Lapp/revanced/integrations/utils/ReVancedUtils;->setNewVideo(Z)V
-            """
-        )
-
         userQualityMethod.mutableMethod.addInstruction(
             0,
             "invoke-static {p3}, Lapp/revanced/integrations/patches/VideoQualityPatch;->userChangedQuality(I)V"