chore(release): 4.3.0-dev.8 [skip ci]

# [4.3.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v4.3.0-dev.7...v4.3.0-dev.8) (2024-02-28)

### Bug Fixes

* Remove extra space from patch description ([#2780](https://github.com/ReVanced/revanced-patches/issues/2780)) ([a6f5dd9](a6f5dd933f))

.editorconfig

@@ -0,0 +1,3 @@
+[*.{kt,kts}]
+ktlint_code_style = intellij_idea
+ktlint_standard_no-wildcard-imports = disabled

.github/workflows/build_pull_request.yml

@@ -0,0 +1,25 @@
+name: Build pull request
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - dev
+
+jobs:
+  release:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Cache Gradle
+        uses: burrunan/gradle-cache-action@v1
+
+      - name: Build
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew build --no-daemon

.github/workflows/release.yml

@@ -6,10 +6,6 @@ on:
     branches:
       - main
       - dev
-  pull_request:
-    branches:
-      - main
-      - dev
 
 jobs:
   release:
@@ -41,6 +37,13 @@ jobs:
       - name: Install dependencies
         run: npm install
 
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          fingerprint: ${{ env.GPG_FINGERPRINT }}
+
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}

.releaserc

@@ -33,7 +33,7 @@
       {
         "assets": [
           {
-            "path": "build/libs/*.jar"
+            "path": "build/libs/revanced-patches*"
           },
           {
             "path": "patches.json"

CHANGELOG.md

@@ -1,3 +1,80 @@
+# [4.3.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v4.3.0-dev.7...v4.3.0-dev.8) (2024-02-28)
+
+
+### Bug Fixes
+
+* Remove extra space from patch description ([#2780](https://github.com/ReVanced/revanced-patches/issues/2780)) ([96a3f35](https://github.com/ReVanced/revanced-patches/commit/96a3f359266ff8d16ae9ee3c6ce2f16ce67a3b93))
+
+# [4.3.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v4.3.0-dev.6...v4.3.0-dev.7) (2024-02-26)
+
+
+### Features
+
+* **OpeningHours:** Add `Fix crash` patch ([#2697](https://github.com/ReVanced/revanced-patches/issues/2697)) ([0d011b8](https://github.com/ReVanced/revanced-patches/commit/0d011b876ecf05031a7daa54ab7e6d3506728a47))
+
+# [4.3.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v4.3.0-dev.5...v4.3.0-dev.6) (2024-02-25)
+
+
+### Features
+
+* **VSCO - Unlock pro:** Constrain to last working version ([6dd4a7c](https://github.com/ReVanced/revanced-patches/commit/6dd4a7c29e48c3bc517bbdd7ed160624c36c2333))
+
+# [4.3.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v4.3.0-dev.4...v4.3.0-dev.5) (2024-02-25)
+
+
+### Features
+
+* Remove unnecessary description from patch ([1a89dd9](https://github.com/ReVanced/revanced-patches/commit/1a89dd9f8cd0c614055a9da97338839b77a25ed1))
+* **Twitter - Unlock downloads:** Unlock GIF downloads ([d0f91c8](https://github.com/ReVanced/revanced-patches/commit/d0f91c8550592723e1252e1af2971b508591dd59))
+
+# [4.3.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v4.3.0-dev.3...v4.3.0-dev.4) (2024-02-22)
+
+
+### Bug Fixes
+
+* Compile DEX without debugging information ([f5df957](https://github.com/ReVanced/revanced-patches/commit/f5df9578669f71a67411bc93a25a7e8da43610d0))
+* Use deprecated members to ensure backwards compatibility ([083bd40](https://github.com/ReVanced/revanced-patches/commit/083bd4009231b9612394b4496ca1d329947d6577))
+
+
+### Features
+
+* **X:** Add `Open links as query` patch ([#2730](https://github.com/ReVanced/revanced-patches/issues/2730)) ([ba75a51](https://github.com/ReVanced/revanced-patches/commit/ba75a51b71dbb9157db230b3e97a90361019fe30))
+
+# [4.3.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v4.3.0-dev.2...v4.3.0-dev.3) (2024-02-20)
+
+
+### Features
+
+* **YouTube - Change header:** Improve patch option description ([3b8bc08](https://github.com/ReVanced/revanced-patches/commit/3b8bc08d4ed3a3a0f96d2f476e5059840b9f9d9b))
+* **YouTube - Custom branding:** Improve patch option description ([e27f56c](https://github.com/ReVanced/revanced-patches/commit/e27f56c8a34d41167b290f47280276c1c6003876))
+
+# [4.3.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.3.0-dev.1...v4.3.0-dev.2) (2024-02-09)
+
+
+### Features
+
+* **Sync for Reddit:** Add `Fix /s/ links` patch ([f15ef3f](https://github.com/ReVanced/revanced-patches/commit/f15ef3f63460254236185f8e22c9395db4db9465))
+
+# [4.3.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.2.0...v4.3.0-dev.1) (2024-02-09)
+
+
+### Features
+
+* **YouTube - Change start page:** Add more start pages ([cc1d9b7](https://github.com/ReVanced/revanced-patches/commit/cc1d9b743633c619fb6acc428e884c1c9b53e10b))
+
+# [4.2.0](https://github.com/ReVanced/revanced-patches/compare/v4.1.0...v4.2.0) (2024-02-08)
+
+
+### Bug Fixes
+
+* **Infinity for Reddit - Unlock subscription:** Do not crash by patching billing client ([7d76e2e](https://github.com/ReVanced/revanced-patches/commit/7d76e2e43c69b2b75f40a15a9147d041c77cbcd9))
+
+
+### Features
+
+* **X:** Add `Hide view count` patch ([bf064ec](https://github.com/ReVanced/revanced-patches/commit/bf064ecc1d5de8b592d14d34acfa1a4314c374ba))
+* **X:** Add `Unlock downloads` patch ([2c20844](https://github.com/ReVanced/revanced-patches/commit/2c20844eaae698f185a9d321e2c70bde4b485cee))
+
 # [4.2.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.1.1-dev.1...v4.2.0-dev.1) (2024-02-08)
 
 

CONTRIBUTING.md

@@ -64,15 +64,15 @@ This document describes how to contribute to ReVanced Patches.
 
 ## 📖 Resources to help you get started
 
-* The [documentation](https://github.com/ReVanced/revanced-patches/tree/docs/docs) provides the fundamentals of patches 
+* The [documentation](https://github.com/ReVanced/revanced-patcher/tree/docs/docs) contains the fundamentals
-and everything necessary to create your own patch from scratch
+of ReVanced Patcher and how to use ReVanced Patcher to create patches
 * [Our backlog](https://github.com/orgs/ReVanced/projects/12) is where we keep track of what we're working on
 * [Issues](https://github.com/ReVanced/revanced-patches/issues) are where we keep track of bugs and feature requests
 
 ## 🙏 Submitting a feature request
 
 Features can be requested by opening an issue using the
-[Feature request issue template](https://github.com/ReVanced/revanced-patches/issues/new?assignees=&labels=Feature+request&projects=&template=feature-request.yml&title=feat%3A+).
+[Feature request issue template](https://github.com/ReVanced/revanced-patches/issues/new?assignees=&labels=Feature+request&projects=&template=feature_request.yml&title=feat%3A+).
 
 > **Note**
 > Requests can be accepted or rejected at the discretion of maintainers of ReVanced Patches.
@@ -81,7 +81,7 @@ Features can be requested by opening an issue using the
 ## 🐞 Submitting a bug report
 
 If you encounter a bug while using ReVanced Patches, open an issue using the
-[Bug report issue template](https://github.com/ReVanced/revanced-patches/issues/new?assignees=&labels=Bug+report&projects=&template=bug-report.yml&title=bug%3A+).
+[Bug report issue template](https://github.com/ReVanced/revanced-patches/issues/new?assignees=&labels=Bug+report&projects=&template=bug_report.yml&title=bug%3A+).
 
 ## 🧑‍⚖️ Guidelines for requesting or contributing patches
 

README.md

@@ -67,7 +67,7 @@ This repository contains a collection of ReVanced Patches.
 
 ## ❓ About
 
-Patches are small modifications to Android apps that allow you to change the behaviour of or add new features, 
+Patches are small modifications to Android apps that allow you to change the behavior of or add new features,
 block ads, customize the appearance, and much more.
 
 ## 💪 Features
@@ -81,7 +81,7 @@ Some of the features the patches provide are:
   export activities, etc.
 * ✨ **And much more!**
 
-For a full list of all available patches, visit [revanced.app/patches](https://revanced.app/patches).
+For a complete list of all available patches, visit [revanced.app/patches](https://revanced.app/patches).
 
 ## 🚀 How to get started
 
@@ -93,17 +93,13 @@ You can use [ReVanced CLI](https://github.com/ReVanced/revanced-cli) or [ReVance
 
 Thank you for considering contributing to ReVanced Patches. You can find the contribution guidelines [here](CONTRIBUTING.md).
 
-### 📃 Documentation
-
-The documentation provides the fundamentals of patches and everything necessary to create your own patch from scratch.
-You can find it [here](https://github.com/ReVanced/revanced-patches/tree/docs/docs).
-
 ### 🛠️ Building
 
-In order to build ReVanced Patches, you can follow the [ReVanced documentation](https://github.com/ReVanced/revanced-documentation).
+To build ReVanced Patches, you can follow the [ReVanced documentation](https://github.com/ReVanced/revanced-documentation).
 
 ## 📜 Licence
 
-ReVanced Patches is licensed under the GPLv3 licence. Please see the [licence file](LICENSE) for more information.
+ReVanced Patches is licensed under the GPLv3 license. Please see the [license file](LICENSE) for more information.
 [tl;dr](https://www.tldrlegal.com/license/gnu-general-public-license-v3-gpl-3) you may copy, distribute and modify ReVanced Patches as long as you track changes/dates in source files.
-Any modifications to ReVanced Patches must also be made available under the GPL along with build & install instructions.
+Any modifications to ReVanced Patches must also be made available under the GPL,
+along with build & install instructions.

api/revanced-patches.api

@@ -1,3 +1,7 @@
+public final class app/revanced/generator/MainKt {
+	public static synthetic fun main ([Ljava/lang/String;)V
+}
+
 public final class app/revanced/patches/all/activity/exportall/ExportAllActivitiesPatch : app/revanced/patcher/patch/ResourcePatch {
 	public static final field INSTANCE Lapp/revanced/patches/all/activity/exportall/ExportAllActivitiesPatch;
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
@@ -406,6 +410,12 @@ public final class app/revanced/patches/nyx/misc/pro/UnlockProPatch : app/revanc
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/openinghours/misc/fix/crash/FixCrashPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/openinghours/misc/fix/crash/FixCrashPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/photomath/detection/deviceid/SpoofDeviceIdPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/photomath/detection/deviceid/SpoofDeviceIdPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -550,6 +560,12 @@ public final class app/revanced/patches/reddit/customclients/syncforreddit/detec
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/reddit/customclients/syncforreddit/fix/slink/FixSLinksPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/syncforreddit/fix/slink/FixSLinksPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/reddit/layout/disablescreenshotpopup/DisableScreenshotPopupPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/reddit/layout/disablescreenshotpopup/DisableScreenshotPopupPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -1104,6 +1120,12 @@ public final class app/revanced/patches/twitter/misc/hook/patch/recommendation/H
 	public static final field INSTANCE Lapp/revanced/patches/twitter/misc/hook/patch/recommendation/HideRecommendedUsersPatch;
 }
 
+public final class app/revanced/patches/twitter/misc/links/OpenLinksWithAppChooserPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/twitter/misc/links/OpenLinksWithAppChooserPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/vsco/misc/pro/UnlockProPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/vsco/misc/pro/UnlockProPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V

build.gradle.kts

@@ -1,9 +1,10 @@
 import org.gradle.kotlin.dsl.support.listFilesOrdered
 
 plugins {
-    kotlin("jvm") version "1.9.22"
+    alias(libs.plugins.kotlin)
     alias(libs.plugins.binary.compatibility.validator)
     `maven-publish`
+    signing
 }
 
 group = "app.revanced"
@@ -12,7 +13,14 @@ repositories {
     mavenCentral()
     mavenLocal()
     google()
-    maven { url = uri("https://jitpack.io") }
+    maven {
+        // A repository must be speficied for some reason. "registry" is a dummy.
+        url = uri("https://maven.pkg.github.com/revanced/registry")
+        credentials {
+            username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR")
+            password = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN")
+        }
+    }
 }
 
 dependencies {
@@ -22,16 +30,14 @@ dependencies {
     implementation(libs.guava)
     // Used in JsonGenerator.
     implementation(libs.gson)
-
-    // A dependency to the Android library unfortunately fails the build, which is why this is required.
-    compileOnly(project("dummy"))
 }
 
 kotlin {
     jvmToolchain(11)
 }
 
-tasks.withType(Jar::class) {
+tasks {
+    withType(Jar::class) {
         exclude("app/revanced/meta")
 
         manifest {
@@ -47,9 +53,9 @@ tasks.withType(Jar::class) {
         }
     }
 
-tasks {
+    register("buildDexJar") {
-    register<DefaultTask>("generateBundle") {
+        description = "Build and add a DEX to the JAR file"
-        description = "Generate DEX files and add them in the JAR file"
+        group = "build"
 
         dependsOn(build)
 
@@ -57,39 +63,50 @@ tasks {
             val d8 = File(System.getenv("ANDROID_HOME")).resolve("build-tools")
                 .listFilesOrdered().last().resolve("d8").absolutePath
 
-            val artifacts = configurations.archives.get().allArtifacts.files.files.first().absolutePath
+            val patchesJar = configurations.archives.get().allArtifacts.files.files.first().absolutePath
             val workingDirectory = layout.buildDirectory.dir("libs").get().asFile
 
             exec {
                 workingDir = workingDirectory
-                commandLine = listOf(d8, artifacts)
+                commandLine = listOf(d8, "--release", patchesJar)
             }
 
             exec {
                 workingDir = workingDirectory
-                commandLine = listOf("zip", "-u", artifacts, "classes.dex")
+                commandLine = listOf("zip", "-u", patchesJar, "classes.dex")
             }
         }
     }
 
-    register<JavaExec>("generateMeta") {
+    register<JavaExec>("generatePatchesFiles") {
-        description = "Generate metadata for this bundle"
+        description = "Generate patches files"
 
         dependsOn(build)
 
         classpath = sourceSets["main"].runtimeClasspath
-        mainClass.set("app.revanced.meta.IPatchesFileGenerator")
+        mainClass.set("app.revanced.generator.MainKt")
     }
 
-    // Required to run tasks because Gradle semantic-release plugin runs the publish task.
+    // Needed by gradle-semantic-release-plugin.
     // Tracking: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
-    named("publish") {
+    publish {
-        dependsOn("generateBundle")
+        dependsOn("buildDexJar")
-        dependsOn("generateMeta")
+        dependsOn("generatePatchesFiles")
     }
 }
 
 publishing {
+    repositories {
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/revanced/revanced-patches")
+            credentials {
+                username = System.getenv("GITHUB_ACTOR")
+                password = System.getenv("GITHUB_TOKEN")
+            }
+        }
+    }
+
     publications {
         create<MavenPublication>("revanced-patches-publication") {
             from(components["java"])
@@ -121,3 +138,9 @@ publishing {
         }
     }
 }
+
+signing {
+    useGpgCmd()
+
+    sign(publishing.publications["revanced-patches-publication"])
+}

dummy/build.gradle.kts

@@ -1,9 +0,0 @@
-plugins {
-    id("java")
-}
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
-    }
-}

dummy/src/main/java/android/os/Environment.java

@@ -1,9 +0,0 @@
-package android.os;
-
-import java.io.File;
-
-public final class Environment {
-    public static File getExternalStorageDirectory() {
-        throw new UnsupportedOperationException("Stub");
-    }
-}

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 4.2.0-dev.1
+version = 4.3.0-dev.8

gradle/libs.versions.toml

@@ -1,9 +1,10 @@
 [versions]
-revanced-patcher = "19.2.0"
+revanced-patcher = "19.3.1"
-smali = "3.0.3"
+smali = "3.0.4"
 guava = "33.0.0-jre"
 gson = "2.10.1"
-binary-compatibility-validator = "0.13.2"
+binary-compatibility-validator = "0.14.0"
+kotlin = "1.9.22"
 
 [libraries]
 revanced-patcher = { module = "app.revanced:revanced-patcher", version.ref = "revanced-patcher" }
@@ -13,3 +14,4 @@ gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 
 [plugins]
 binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator" }
+kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,8 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
-networkTimeout=10000
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dist

package-lock.json

@@ -9,7 +9,7 @@
         "@semantic-release/changelog": "^6.0.3",
         "@semantic-release/git": "^10.0.1",
         "gradle-semantic-release-plugin": "^1.9.1",
-        "semantic-release": "^23.0.0"
+        "semantic-release": "^23.0.2"
       }
     },
     "node_modules/@babel/code-frame": {
@@ -326,9 +326,9 @@
       }
     },
     "node_modules/@octokit/request": {
-      "version": "8.1.6",
+      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.1.6.tgz",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.2.0.tgz",
-      "integrity": "sha512-YhPaGml3ncZC1NfXpP3WZ7iliL1ap6tLkAp6MvbK2fTTPytzVUyUesBBogcdMm86uRYO5rHaM1xIWxigWZ17MQ==",
+      "integrity": "sha512-exPif6x5uwLqv1N1irkLG1zZNJkOtj8bZxuVHd71U5Ftuxf2wGNvAJyNBcPbPC+EBzwYEbBDdSFb8EPcjpYxPQ==",
       "dev": true,
       "dependencies": {
         "@octokit/endpoint": "^9.0.0",
@@ -564,6 +564,26 @@
         "node": ">= 16"
       }
     },
+    "node_modules/@saithodev/semantic-release-backmerge/node_modules/marked-terminal": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-6.2.0.tgz",
+      "integrity": "sha512-ubWhwcBFHnXsjYNsu+Wndpg0zhY4CahSpPlA70PlO0rR9r2sZpkyU+rkCsOWH+KMEkx847UpALON+HWgxowFtw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^6.2.0",
+        "cardinal": "^2.1.1",
+        "chalk": "^5.3.0",
+        "cli-table3": "^0.6.3",
+        "node-emoji": "^2.1.3",
+        "supports-hyperlinks": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      },
+      "peerDependencies": {
+        "marked": ">=1 <12"
+      }
+    },
     "node_modules/@saithodev/semantic-release-backmerge/node_modules/mimic-fn": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
@@ -1195,9 +1215,9 @@
       }
     },
     "node_modules/@sindresorhus/merge-streams": {
-      "version": "1.0.0",
+      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.2.0.tgz",
-      "integrity": "sha512-rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw==",
+      "integrity": "sha512-UTce8mUwUW0RikMb/eseJ7ys0BRkZVFB86orHzrfW12ZmFtym5zua8joZ4L7okH2dDFHkcFjqnZ5GocWBXOFtA==",
       "dev": true,
       "engines": {
         "node": ">=18"
@@ -1282,6 +1302,12 @@
       "integrity": "sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==",
       "dev": true
     },
+    "node_modules/any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
+      "dev": true
+    },
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -1376,6 +1402,81 @@
         "node": ">=6"
       }
     },
+    "node_modules/cli-highlight": {
+      "version": "2.1.11",
+      "resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz",
+      "integrity": "sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "highlight.js": "^10.7.1",
+        "mz": "^2.4.0",
+        "parse5": "^5.1.1",
+        "parse5-htmlparser2-tree-adapter": "^6.0.0",
+        "yargs": "^16.0.0"
+      },
+      "bin": {
+        "highlight": "bin/highlight"
+      },
+      "engines": {
+        "node": ">=8.0.0",
+        "npm": ">=5.0.0"
+      }
+    },
+    "node_modules/cli-highlight/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/cli-highlight/node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/cli-highlight/node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cli-highlight/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/cli-table3": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz",
@@ -1818,9 +1919,9 @@
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.1",
+      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -1888,9 +1989,9 @@
       }
     },
     "node_modules/fastq": {
-      "version": "1.16.0",
+      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-      "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==",
+      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
       "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"
@@ -2052,12 +2153,12 @@
       }
     },
     "node_modules/globby": {
-      "version": "14.0.0",
+      "version": "14.0.1",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.1.tgz",
-      "integrity": "sha512-/1WM/LNHRAOH9lZta77uGbq0dAEQM+XjNesWwhlERDVenqothRbnzTrL3/LrIoEPPjeUHC3vrS6TwoyxeHs7MQ==",
+      "integrity": "sha512-jOMLD2Z7MAhyG8aJpNOpmziMOP4rPLcc95oQPKXBazW82z+CEgPFBQvEpRUa1KeIMUJo4Wsm+q6uzO/Q/4BksQ==",
       "dev": true,
       "dependencies": {
-        "@sindresorhus/merge-streams": "^1.0.0",
+        "@sindresorhus/merge-streams": "^2.1.0",
         "fast-glob": "^3.3.2",
         "ignore": "^5.2.4",
         "path-type": "^5.0.0",
@@ -2142,9 +2243,9 @@
       }
     },
     "node_modules/hasown": {
-      "version": "2.0.0",
+      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==",
       "dev": true,
       "dependencies": {
         "function-bind": "^1.1.2"
@@ -2153,6 +2254,15 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/highlight.js": {
+      "version": "10.7.3",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
+      "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/hook-std": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/hook-std/-/hook-std-3.0.0.tgz",
@@ -2178,9 +2288,9 @@
       }
     },
     "node_modules/http-proxy-agent": {
-      "version": "7.0.0",
+      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.1.tgz",
-      "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
+      "integrity": "sha512-My1KCEPs6A0hb4qCVzYp8iEvA8j8YqcvXLZZH8C9OFuTYpYjHE7N2dtG3mRl1HMD4+VGXpF3XcDVcxGBT7yDZQ==",
       "dev": true,
       "dependencies": {
         "agent-base": "^7.1.0",
@@ -2191,9 +2301,9 @@
       }
     },
     "node_modules/https-proxy-agent": {
-      "version": "7.0.2",
+      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.3.tgz",
-      "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
+      "integrity": "sha512-kCnwztfX0KZJSLOBrcL0emLeFako55NWMovvyPP2AjsghNk9RB1yjSI+jVumPHYZsNXegNoqupSW9IY3afSH8w==",
       "dev": true,
       "dependencies": {
         "agent-base": "^7.0.2",
@@ -2213,9 +2323,9 @@
       }
     },
     "node_modules/ignore": {
-      "version": "5.3.0",
+      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
-      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
+      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -2629,9 +2739,9 @@
       }
     },
     "node_modules/marked": {
-      "version": "11.1.1",
+      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-11.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-12.0.0.tgz",
-      "integrity": "sha512-EgxRjgK9axsQuUa/oKMx5DEY8oXpKJfk61rT5iY3aRlgU6QJtUcxU5OAymdhCvWvhYcd9FKmO5eQoX8m9VGJXg==",
+      "integrity": "sha512-Vkwtq9rLqXryZnWaQc86+FHLC6tr/fycMfYAhiOIXkrNmeGAyhSxjqu0Rs1i0bBqw5u0S7+lV9fdH2ZSVaoa0w==",
       "dev": true,
       "bin": {
         "marked": "bin/marked.js"
@@ -2641,14 +2751,14 @@
       }
     },
     "node_modules/marked-terminal": {
-      "version": "6.2.0",
+      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-6.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-7.0.0.tgz",
-      "integrity": "sha512-ubWhwcBFHnXsjYNsu+Wndpg0zhY4CahSpPlA70PlO0rR9r2sZpkyU+rkCsOWH+KMEkx847UpALON+HWgxowFtw==",
+      "integrity": "sha512-sNEx8nn9Ktcm6pL0TnRz8tnXq/mSS0Q1FRSwJOAqw4lAB4l49UeDf85Gm1n9RPFm5qurCPjwi1StAQT2XExhZw==",
       "dev": true,
       "dependencies": {
         "ansi-escapes": "^6.2.0",
-        "cardinal": "^2.1.1",
         "chalk": "^5.3.0",
+        "cli-highlight": "^2.1.11",
         "cli-table3": "^0.6.3",
         "node-emoji": "^2.1.3",
         "supports-hyperlinks": "^3.0.0"
@@ -2657,7 +2767,7 @@
         "node": ">=16.0.0"
       },
       "peerDependencies": {
-        "marked": ">=1 <12"
+        "marked": ">=1 <13"
       }
     },
     "node_modules/meow": {
@@ -2739,6 +2849,17 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
+    "node_modules/mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dev": true,
+      "dependencies": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
     "node_modules/neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
@@ -5551,6 +5672,15 @@
       "inBundle": true,
       "license": "ISC"
     },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -5695,6 +5825,27 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/parse5": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
+      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
+      "dev": true
+    },
+    "node_modules/parse5-htmlparser2-tree-adapter": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
+      "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
+      "dev": true,
+      "dependencies": {
+        "parse5": "^6.0.1"
+      }
+    },
+    "node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
+    },
     "node_modules/parsimmon": {
       "version": "1.18.1",
       "resolved": "https://registry.npmjs.org/parsimmon/-/parsimmon-1.18.1.tgz",
@@ -5860,9 +6011,9 @@
       }
     },
     "node_modules/read-pkg-up/node_modules/type-fest": {
-      "version": "4.10.1",
+      "version": "4.10.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.10.1.tgz",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.10.2.tgz",
-      "integrity": "sha512-7ZnJYTp6uc04uYRISWtiX3DSKB/fxNQT0B5o1OUeCqiQiwF+JC9+rJiZIDrPrNCLLuTqyQmh4VdQqh/ZOkv9MQ==",
+      "integrity": "sha512-anpAG63wSpdEbLwOqH8L84urkL6PiVIov3EMmgIhhThevh9aiMQov+6Btx0wldNcvm4wV+e2/Rt1QdDwKHFbHw==",
       "dev": true,
       "engines": {
         "node": ">=16"
@@ -5889,9 +6040,9 @@
       }
     },
     "node_modules/read-pkg/node_modules/type-fest": {
-      "version": "4.10.1",
+      "version": "4.10.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.10.1.tgz",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.10.2.tgz",
-      "integrity": "sha512-7ZnJYTp6uc04uYRISWtiX3DSKB/fxNQT0B5o1OUeCqiQiwF+JC9+rJiZIDrPrNCLLuTqyQmh4VdQqh/ZOkv9MQ==",
+      "integrity": "sha512-anpAG63wSpdEbLwOqH8L84urkL6PiVIov3EMmgIhhThevh9aiMQov+6Btx0wldNcvm4wV+e2/Rt1QdDwKHFbHw==",
       "dev": true,
       "engines": {
         "node": ">=16"
@@ -5994,9 +6145,9 @@
       "dev": true
     },
     "node_modules/semantic-release": {
-      "version": "23.0.0",
+      "version": "23.0.2",
-      "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-23.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-23.0.2.tgz",
-      "integrity": "sha512-Jz7jEWO2igTtske112gC4PPE2whCMVrsgxUPG3/SZI7VE357suIUZFlJd1Yu0g2I6RPc2HxNEfUg7KhmDTjwqg==",
+      "integrity": "sha512-OnVYJ6Xgzwe1x8MKswba7RU9+5djS1MWRTrTn5qsq3xZYpslroZkV9Pt0dA2YcIuieeuSZWJhn+yUWoBUHO5Fw==",
       "dev": true,
       "dependencies": {
         "@semantic-release/commit-analyzer": "^11.0.0",
@@ -6017,8 +6168,8 @@
         "hosted-git-info": "^7.0.0",
         "import-from-esm": "^1.3.1",
         "lodash-es": "^4.17.21",
-        "marked": "^11.0.0",
+        "marked": "^12.0.0",
-        "marked-terminal": "^6.0.0",
+        "marked-terminal": "^7.0.0",
         "micromatch": "^4.0.2",
         "p-each-series": "^3.0.0",
         "p-reduce": "^3.0.0",
@@ -6247,9 +6398,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.5.4",
+      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -6481,9 +6632,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.16",
+      "version": "3.0.17",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",
-      "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==",
+      "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==",
       "dev": true
     },
     "node_modules/split2": {
@@ -6655,6 +6806,27 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "dev": true,
+      "dependencies": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "node_modules/thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+      "dev": true,
+      "dependencies": {
+        "thenify": ">= 3.1.0 < 4"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",

package.json

@@ -4,6 +4,6 @@
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "gradle-semantic-release-plugin": "^1.9.1",
-    "semantic-release": "^23.0.0"
+    "semantic-release": "^23.0.2"
   }
 }

settings.gradle.kts

@@ -1,5 +1,3 @@
-include("dummy")
-
 rootProject.name = "revanced-patches"
 
 buildCache {

src/main/kotlin/app/revanced/generator/JsonPatchesFileGenerator.kt

@@ -1,11 +1,11 @@
-package app.revanced.meta
+package app.revanced.generator
 
 import app.revanced.patcher.PatchSet
 import app.revanced.patcher.patch.Patch
 import com.google.gson.GsonBuilder
 import java.io.File
 
-internal class JsonPatchesFileGenerator : IPatchesFileGenerator {
+internal class JsonPatchesFileGenerator : PatchesFileGenerator {
     override fun generate(patches: PatchSet) = patches.map {
         JsonPatch(
             it.name!!,
@@ -20,9 +20,9 @@ internal class JsonPatchesFileGenerator : IPatchesFileGenerator {
                     option.values,
                     option.title,
                     option.description,
-                    option.required
+                    option.required,
                 )
-            }
+            },
         )
     }.let {
         File("patches.json").writeText(GsonBuilder().serializeNulls().create().toJson(it))
@@ -35,7 +35,7 @@ internal class JsonPatchesFileGenerator : IPatchesFileGenerator {
         val compatiblePackages: Set<Patch.CompatiblePackage>? = null,
         val use: Boolean = true,
         val requiresIntegrations: Boolean = false,
-        val options: List<Option>
+        val options: List<Option>,
     ) {
         class Option(
             val key: String,

src/main/kotlin/app/revanced/generator/Main.kt

@@ -0,0 +1,12 @@
+package app.revanced.generator
+
+import app.revanced.patcher.PatchBundleLoader
+import java.io.File
+
+internal fun main() = PatchBundleLoader.Jar(
+    File("build/libs/").listFiles { it -> it.name.endsWith(".jar") }!!.first(),
+).also { loader ->
+    if (loader.isEmpty()) throw IllegalStateException("No patches found")
+}.let { bundle ->
+    arrayOf(JsonPatchesFileGenerator()).forEach { generator -> generator.generate(bundle) }
+}

src/main/kotlin/app/revanced/generator/PatchesFileGenerator.kt

@@ -0,0 +1,7 @@
+package app.revanced.generator
+
+import app.revanced.patcher.PatchSet
+
+internal interface PatchesFileGenerator {
+    fun generate(patches: PatchSet)
+}

src/main/kotlin/app/revanced/meta/IPatchesFileGenerator.kt

@@ -1,20 +0,0 @@
-package app.revanced.meta
-
-import app.revanced.patcher.PatchBundleLoader
-import app.revanced.patcher.PatchSet
-import java.io.File
-
-internal interface IPatchesFileGenerator {
-    fun generate(patches: PatchSet)
-
-    private companion object {
-        @JvmStatic
-        fun main(args: Array<String>) = PatchBundleLoader.Jar(
-            File("build/libs/").listFiles { it -> it.name.endsWith(".jar") }!!.first()
-        ).also { loader ->
-            if (loader.isEmpty()) throw IllegalStateException("No patches found")
-        }.let { bundle ->
-            arrayOf(JsonPatchesFileGenerator()).forEach { generator -> generator.generate(bundle) }
-        }
-    }
-}

src/main/kotlin/app/revanced/patches/all/activity/exportall/ExportAllActivitiesPatch.kt

@@ -7,14 +7,16 @@ import app.revanced.patcher.patch.annotation.Patch
 @Patch(
     name = "Export all activities",
     description = "Makes all app activities exportable.",
-    use = false
+    use = false,
 )
 @Suppress("unused")
 object ExportAllActivitiesPatch : ResourcePatch() {
     private const val EXPORTED_FLAG = "android:exported"
+
     override fun execute(context: ResourceContext) {
         context.xmlEditor["AndroidManifest.xml"].use { editor ->
             val document = editor.file
+
             val activities = document.getElementsByTagName("activity")
 
             for (i in 0..activities.length) {
@@ -22,12 +24,14 @@ object ExportAllActivitiesPatch : ResourcePatch() {
                     val exportedAttribute = attributes.getNamedItem(EXPORTED_FLAG)
 
                     if (exportedAttribute != null) {
-                        if (exportedAttribute.nodeValue != "true")
+                        if (exportedAttribute.nodeValue != "true") {
                             exportedAttribute.nodeValue = "true"
                         }
+                    }
                     // Reason why the attribute is added in the case it does not exist:
                     // https://github.com/revanced/revanced-patches/pull/1751/files#r1141481604
-                    else document.createAttribute(EXPORTED_FLAG)
+                    else {
+                        document.createAttribute(EXPORTED_FLAG)
                             .apply { value = "true" }
                             .let(attributes::setNamedItem)
                     }
@@ -35,3 +39,4 @@ object ExportAllActivitiesPatch : ResourcePatch() {
             }
         }
     }
+}

src/main/kotlin/app/revanced/patches/all/interaction/gestures/PredictiveBackGesturePatch.kt

@@ -7,7 +7,7 @@ import app.revanced.patcher.patch.annotation.Patch
 @Patch(
     name = "Predictive back gesture",
     description = "Enables the predictive back gesture introduced on Android 13.",
-    use = false
+    use = false,
 )
 @Suppress("unused")
 object PredictiveBackGesturePatch : ResourcePatch() {

src/main/kotlin/app/revanced/patches/all/misc/debugging/EnableAndroidDebuggingPatch.kt

@@ -8,14 +8,16 @@ import org.w3c.dom.Element
 @Patch(
     name = "Enable Android debugging",
     description = "Enables Android debugging capabilities. This can slow down the app.",
-    use = false
+    use = false,
 )
 @Suppress("unused")
 object EnableAndroidDebuggingPatch : ResourcePatch() {
     override fun execute(context: ResourceContext) {
-        context.xmlEditor["AndroidManifest.xml"].use { dom ->
+        context.xmlEditor["AndroidManifest.xml"].use { editor ->
-            val applicationNode = dom
+            val document = editor.file
-                .file
+
+            val applicationNode =
+                document
                     .getElementsByTagName("application")
                     .item(0) as Element
 

src/main/kotlin/app/revanced/patches/all/misc/network/OverrideCertificatePinningPatch.kt

@@ -11,16 +11,17 @@ import java.io.File
     name = "Override certificate pinning",
     description = "Overrides certificate pinning, allowing to inspect traffic via a proxy.",
     dependencies = [EnableAndroidDebuggingPatch::class],
-    use = false
+    use = false,
 )
 @Suppress("unused")
 object OverrideCertificatePinningPatch : ResourcePatch() {
     override fun execute(context: ResourceContext) {
-        val resXmlDirectory = context["res/xml"]
+        val resXmlDirectory = context.get("res/xml")
 
         // Add android:networkSecurityConfig="@xml/network_security_config" and the "networkSecurityConfig" attribute if it does not exist.
         context.xmlEditor["AndroidManifest.xml"].use { editor ->
             val document = editor.file
+
             val applicationNode = document.getElementsByTagName("application").item(0) as Element
 
             if (!applicationNode.hasAttribute("networkSecurityConfig")) {
@@ -54,7 +55,7 @@ object OverrideCertificatePinningPatch : ResourcePatch() {
                             </trust-anchors>
                         </debug-overrides>
                     </network-security-config>
-                    """
+                    """,
                 )
             } else {
                 // If the file already exists.
@@ -63,12 +64,11 @@ object OverrideCertificatePinningPatch : ResourcePatch() {
                         writeText(
                             text.replace(
                                 "<trust-anchors>",
-                                "<trust-anchors>\n<certificates src=\"user\" overridePins=\"true\" />\n<certificates src=\"system\" />"
+                                "<trust-anchors>\n<certificates src=\"user\" overridePins=\"true\" />\n<certificates src=\"system\" />",
-                            )
+                            ),
                         )
                     }
                 }
-
             }
         }
     }

src/main/kotlin/app/revanced/patches/all/misc/packagename/ChangePackageNamePatch.kt

@@ -11,17 +11,18 @@ import java.io.Closeable
 @Patch(
     name = "Change package name",
     description = "Appends \".revanced\" to the package name by default. Changing the package name of the app can lead to unexpected issues.",
-    use = false
+    use = false,
 )
 @Suppress("unused")
 object ChangePackageNamePatch : ResourcePatch(), Closeable {
-    private val packageNameOption = stringPatchOption(
+    private val packageNameOption =
+        stringPatchOption(
             key = "packageName",
             default = "Default",
             values = mapOf("Default" to "Default"),
             title = "Package name",
             description = "The name of the package to rename the app to.",
-        required = true
+            required = true,
         ) {
             it == "Default" || it!!.matches(Regex("^[a-z]\\w*(\\.[a-z]\\w*)+\$"))
         }
@@ -43,20 +44,27 @@ object ChangePackageNamePatch : ResourcePatch(), Closeable {
     fun setOrGetFallbackPackageName(fallbackPackageName: String): String {
         val packageName = packageNameOption.value!!
 
-        return if (packageName == packageNameOption.default)
+        return if (packageName == packageNameOption.default) {
             fallbackPackageName.also { packageNameOption.value = it }
-        else
+        } else {
             packageName
         }
+    }
+
+    override fun close() =
+        context.xmlEditor["AndroidManifest.xml"].use { editor ->
+            val document = editor.file
 
-    override fun close() = context.xmlEditor["AndroidManifest.xml"].use { editor ->
             val replacementPackageName = packageNameOption.value
 
-        val manifest = editor.file.getElementsByTagName("manifest").item(0) as Element
+            val manifest = document.getElementsByTagName("manifest").item(0) as Element
             manifest.setAttribute(
                 "package",
-            if (replacementPackageName != packageNameOption.default) replacementPackageName
+                if (replacementPackageName != packageNameOption.default) {
-            else "${manifest.getAttribute("package")}.revanced"
+                    replacementPackageName
+                } else {
+                    "${manifest.getAttribute("package")}.revanced"
+                },
             )
         }
 }

src/main/kotlin/app/revanced/patches/all/misc/resources/AddResourcesPatch.kt

@@ -19,6 +19,7 @@ import java.util.*
  * An identifier of an app. For example, `youtube`.
  */
 private typealias AppId = String
+
 /**
  * An identifier of a patch. For example, `ad.general.HideAdsPatch`.
  */
@@ -28,10 +29,12 @@ private typealias PatchId = String
  * A set of resources of a patch.
  */
 private typealias PatchResources = MutableSet<BaseResource>
+
 /**
  * A map of resources belonging to a patch.
  */
 private typealias AppResources = MutableMap<PatchId, PatchResources>
+
 /**
  * A map of resources belonging to an app.
  */
@@ -67,7 +70,8 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
     override fun execute(context: ResourceContext) {
         this.context = context
 
-        resources = buildMap {
+        resources =
+            buildMap {
                 /**
                  * Puts resources under `/resources/addresources/<value>/<resourceKind>.xml` into the map.
                  *
@@ -82,14 +86,16 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
                 ) {
                     inputStreamFromBundledResource(
                         "addresources",
-                    "$value/$resourceKind.xml"
+                        "$value/$resourceKind.xml",
                     )?.let { stream ->
                         // Add the resources associated with the given value to the map,
                         // instead of overwriting it.
                         // This covers the example case such as adding strings and arrays of the same value.
                         getOrPut(value, ::mutableMapOf).apply {
-                        context.xmlEditor[stream].use {
+                            context.xmlEditor[stream].use { editor ->
-                            it.file.getElementsByTagName("app").asSequence().forEach { app ->
+                                val document = editor.file
+
+                                document.getElementsByTagName("app").asSequence().forEach { app ->
                                     val appId = app.attributes.getNamedItem("id").textContent
 
                                     getOrPut(appId, ::mutableMapOf).apply {
@@ -136,8 +142,10 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
      *
      * @return True if the resource was added, false if it already existed.
      */
-    operator fun invoke(value: Value, resource: BaseResource) =
+    operator fun invoke(
-        getOrPut(value, ::mutableSetOf).add(resource)
+        value: Value,
+        resource: BaseResource,
+    ) = getOrPut(value, ::mutableSetOf).add(resource)
 
     /**
      * Adds a list of [BaseResource]s to the map using [MutableMap.getOrPut].
@@ -147,8 +155,10 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
      *
      * @return True if the resources were added, false if they already existed.
      */
-    operator fun invoke(value: Value, resources: Iterable<BaseResource>) =
+    operator fun invoke(
-        getOrPut(value, ::mutableSetOf).addAll(resources)
+        value: Value,
+        resources: Iterable<BaseResource>,
+    ) = getOrPut(value, ::mutableSetOf).addAll(resources)
 
     /**
      * Adds a [StringResource].
@@ -177,10 +187,9 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
      */
     operator fun invoke(
         name: String,
-        items: List<String>
+        items: List<String>,
     ) = invoke("values", ArrayResource(name, items))
 
-
     /**
      * Puts all resources of any [Value] staged in [resources] for the given [PatchClass] to [AddResourcesPatch].
      *
@@ -209,7 +218,7 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
 
                 appId to patchId
             }
-        }
+        },
     ): Boolean {
         val (appId, patchId) = patch.parseIds()
 
@@ -232,28 +241,32 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
     override fun close() {
         operator fun MutableMap<String, Pair<DomFileEditor, Node>>.invoke(
             value: Value,
-            resource: BaseResource
+            resource: BaseResource,
         ) {
             // TODO: Fix open-closed principle violation by modifying BaseResource#serialize so that it accepts
-            //  a Value and the map of editors. It will then get or put the editor suitable for its resource type
+            //  a Value and the map of documents. It will then get or put the document suitable for its resource type
             //  to serialize itself to it.
-            val resourceFileName = when (resource) {
+            val resourceFileName =
+                when (resource) {
                     is StringResource -> "strings"
                     is ArrayResource -> "arrays"
                     else -> throw NotImplementedError("Unsupported resource type")
                 }
 
             getOrPut(resourceFileName) {
-                val targetFile = context["res/$value/$resourceFileName.xml"].also {
+                val targetFile =
+                    context.get("res/$value/$resourceFileName.xml").also {
                         it.parentFile?.mkdirs()
                         it.createNewFile()
                     }
 
                 context.xmlEditor[targetFile.path].let { editor ->
+                    val document = editor.file
+
                     // Save the target node here as well
-                    // in order to avoid having to call editor.getNode("resources")
+                    // in order to avoid having to call document.getNode("resources")
-                    // every time addUsingEditors is called but also save the editor so that it can be closed later.
+                    // but also save the document so that it can be closed later.
-                    editor to editor.getNode("resources")
+                    editor to document.getNode("resources")
                 }
             }.let { (_, targetNode) ->
                 targetNode.addResource(resource) { invoke(value, it) }
@@ -261,17 +274,17 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
         }
 
         forEach { (value, resources) ->
-            // A map of editors associated by their kind (e.g. strings, arrays).
+            // A map of document associated by their kind (e.g. strings, arrays).
-            // Each editor is accompanied by the target node to which resources are added.
+            // Each document is accompanied by the target node to which resources are added.
-            // A map is used because Map#getOrPut allows opening a new editor for the duration of a resource value.
+            // A map is used because Map#getOrPut allows opening a new document for the duration of a resource value.
             // This is done to prevent having to open the files for every resource that is added.
             // Instead, it is cached once and reused for resources of the same value.
-            // This map is later accessed to close all editors for the current resource value.
+            // This map is later accessed to close all documents for the current resource value.
-            val resourceFileEditors = mutableMapOf<String, Pair<DomFileEditor, Node>>()
+            val documents = mutableMapOf<String, Pair<DomFileEditor, Node>>()
 
-            resources.forEach { resource -> resourceFileEditors(value, resource) }
+            resources.forEach { resource -> documents(value, resource) }
 
-            resourceFileEditors.values.forEach { (editor, _) -> editor.close() }
+            documents.values.forEach { (document, _) -> document.close() }
         }
     }
 }

src/main/kotlin/app/revanced/patches/all/misc/transformation/BaseTransformInstructionsPatch.kt

@@ -9,12 +9,12 @@ import com.android.tools.smali.dexlib2.iface.Method
 import com.android.tools.smali.dexlib2.iface.instruction.Instruction
 
 @Suppress("MemberVisibilityCanBePrivate")
-abstract class BaseTransformInstructionsPatch<T> : BytecodePatch() {
+abstract class BaseTransformInstructionsPatch<T> : BytecodePatch(emptySet()) {
     abstract fun filterMap(
         classDef: ClassDef,
         method: Method,
         instruction: Instruction,
-        instructionIndex: Int
+        instructionIndex: Int,
     ): T?
 
     abstract fun transform(mutableMethod: MutableMethod, entry: T)

src/main/kotlin/app/revanced/patches/all/screencapture/removerestriction/RemoveCaptureRestrictionResourcePatch.kt

@@ -8,11 +8,12 @@ import org.w3c.dom.Element
 @Patch(description = "Sets allowAudioPlaybackCapture in manifest to true.")
 internal object RemoveCaptureRestrictionResourcePatch : ResourcePatch() {
     override fun execute(context: ResourceContext) {
-        // create an xml editor instance
+        context.xmlEditor["AndroidManifest.xml"].use { editor ->
-        context.xmlEditor["AndroidManifest.xml"].use { dom ->
+            val document = editor.file
+
             // get the application node
-            val applicationNode = dom
+            val applicationNode =
-                .file
+                document
                     .getElementsByTagName("application")
                     .item(0) as Element
 

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/ExclusiveAudioFingerprint.kt

@@ -1,51 +0,0 @@
-package app.revanced.patches.music.audio.exclusiveaudio.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-internal object ExclusiveAudioFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf("L", "Z"),
-    listOf(
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQ,
-        Opcode.CONST_4,
-        Opcode.GOTO,
-        Opcode.NOP,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.IF_EQZ,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.GOTO,
-        Opcode.RETURN_VOID
-    )
-)

src/main/kotlin/app/revanced/patches/music/misc/gms/fingerprints/ServiceCheckFingerprint.kt

@@ -1,14 +1,12 @@
 package app.revanced.patches.music.misc.gms.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
-
 internal object ServiceCheckFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PUBLIC or AccessFlags.STATIC,
     listOf("L", "I"),
-    strings = listOf("Google Play Services not available")
+    strings = listOf("Google Play Services not available"),
 )

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

@@ -6,8 +6,5 @@ import app.revanced.patches.shared.misc.integrations.BaseIntegrationsPatch
 
 @Patch(requiresIntegrations = true)
 object IntegrationsPatch : BaseIntegrationsPatch(
-    "Lapp/revanced/integrations/utils/ReVancedUtils;",
+    setOf(ApplicationInitFingerprint),
-    setOf(
-        ApplicationInitFingerprint,
-    ),
 )

src/main/kotlin/app/revanced/patches/netguard/broadcasts/removerestriction/RemoveBroadcastsRestrictionPatch.kt

@@ -6,19 +6,20 @@ import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import org.w3c.dom.Element
 
-
 @Patch(
     name = "Remove broadcasts restriction",
     description = "Enables starting/stopping NetGuard via broadcasts.",
     compatiblePackages = [CompatiblePackage("eu.faircode.netguard")],
-    use = false
+    use = false,
 )
 @Suppress("unused")
 object RemoveBroadcastsRestrictionPatch : ResourcePatch() {
     override fun execute(context: ResourceContext) {
-        context.xmlEditor["AndroidManifest.xml"].use { dom ->
+        context.xmlEditor["AndroidManifest.xml"].use { editor ->
-            val applicationNode = dom
+            val document = editor.file
-                .file
+
+            val applicationNode =
+                document
                     .getElementsByTagName("application")
                     .item(0) as Element
 

src/main/kotlin/app/revanced/patches/openinghours/misc/fix/crash/FixCrashPatch.kt

@@ -0,0 +1,115 @@
+package app.revanced.patches.openinghours.misc.fix.crash
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.getInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.extensions.newLabel
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.openinghours.misc.fix.crash.fingerprints.SetPlaceFingerprint
+import app.revanced.util.exception
+import app.revanced.util.getReference
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction21t
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.Instruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+
+@Patch(
+    name = "Fix crash",
+    compatiblePackages = [CompatiblePackage("de.simon.openinghours", ["1.0"])],
+)
+@Suppress("unused")
+object FixCrashPatch : BytecodePatch(
+    setOf(SetPlaceFingerprint),
+) {
+
+    override fun execute(context: BytecodeContext) {
+        SetPlaceFingerprint.result?.let {
+            val indexedInstructions = it.mutableMethod.getInstructions().withIndex().toList()
+
+            /**
+             * This function replaces all `checkNotNull` instructions in the integer interval
+             * from [startIndex] to [endIndex], both inclusive. In place of the `checkNotNull`
+             * instruction an if-null check is inserted. If the if-null check yields that
+             * the value is indeed null, we jump to a newly created label at `endIndex + 1`.
+             */
+            fun avoidNullPointerException(startIndex: Int, endIndex: Int) {
+                val continueLabel = it.mutableMethod.newLabel(endIndex + 1)
+
+                for (index in startIndex..endIndex) {
+                    val instruction = indexedInstructions[index].value
+
+                    if (!instruction.isCheckNotNullInstruction) {
+                        continue
+                    }
+
+                    val checkNotNullInstruction = instruction as FiveRegisterInstruction
+                    val originalRegister = checkNotNullInstruction.registerC
+
+                    it.mutableMethod.replaceInstruction(
+                        index,
+                        BuilderInstruction21t(
+                            Opcode.IF_EQZ,
+                            originalRegister,
+                            continueLabel,
+                        ),
+                    )
+                }
+            }
+
+            val getOpeningHoursIndex = getIndicesOfInvoke(
+                indexedInstructions,
+                "Lde/simon/openinghours/models/Place;",
+                "getOpeningHours",
+            )
+
+            val setWeekDayTextIndex = getIndexOfInvoke(
+                indexedInstructions,
+                "Lde/simon/openinghours/views/custom/PlaceCard;",
+                "setWeekDayText",
+            )
+
+            val startCalculateStatusIndex = getIndexOfInvoke(
+                indexedInstructions,
+                "Lde/simon/openinghours/views/custom/PlaceCard;",
+                "startCalculateStatus",
+            )
+
+            // Replace the Intrinsics;->checkNotNull instructions with a null check
+            // and jump to our newly created label if it returns true.
+            // This avoids the NullPointerExceptions.
+            avoidNullPointerException(getOpeningHoursIndex[1], startCalculateStatusIndex)
+            avoidNullPointerException(getOpeningHoursIndex[0], setWeekDayTextIndex)
+        } ?: throw SetPlaceFingerprint.exception
+    }
+
+    private fun isInvokeInstruction(instruction: Instruction, className: String, methodName: String): Boolean {
+        val methodRef = instruction.getReference<MethodReference>() ?: return false
+        return methodRef.definingClass == className && methodRef.name == methodName
+    }
+
+    private fun getIndicesOfInvoke(
+        instructions: List<IndexedValue<Instruction>>,
+        className: String,
+        methodName: String,
+    ): List<Int> = instructions.mapNotNull { (index, instruction) ->
+        if (isInvokeInstruction(instruction, className, methodName)) {
+            index
+        } else {
+            null
+        }
+    }
+
+    private fun getIndexOfInvoke(
+        instructions: List<IndexedValue<Instruction>>,
+        className: String,
+        methodName: String,
+    ): Int = instructions.first { (_, instruction) ->
+        isInvokeInstruction(instruction, className, methodName)
+    }.index
+
+    private val Instruction.isCheckNotNullInstruction
+        get() = isInvokeInstruction(this, "Lkotlin/jvm/internal/Intrinsics;", "checkNotNull")
+}

src/main/kotlin/app/revanced/patches/openinghours/misc/fix/crash/fingerprints/SetPlaceFingerprint.kt

@@ -0,0 +1,12 @@
+package app.revanced.patches.openinghours.misc.fix.crash.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object SetPlaceFingerprint : MethodFingerprint(
+    "V",
+    parameters = listOf("Lde/simon/openinghours/models/Place;"),
+    customFingerprint = { methodDef, _ ->
+        methodDef.definingClass == "Lde/simon/openinghours/views/custom/PlaceCard;" &&
+            methodDef.name == "setPlace"
+    },
+)

src/main/kotlin/app/revanced/patches/reddit/ad/banner/HideBannerPatch.kt

@@ -9,8 +9,10 @@ object HideBannerPatch : ResourcePatch() {
     private const val RESOURCE_FILE_PATH = "res/layout/merge_listheader_link_detail.xml"
 
     override fun execute(context: ResourceContext) {
-        context.xmlEditor[RESOURCE_FILE_PATH].use {
+        context.xmlEditor[RESOURCE_FILE_PATH].use { editor ->
-            it.file.getElementsByTagName("merge").item(0).childNodes.apply {
+            val document = editor.file
+
+            document.getElementsByTagName("merge").item(0).childNodes.apply {
                 val attributes = arrayOf("height", "width")
 
                 for (i in 1 until length) {
@@ -30,4 +32,3 @@ object HideBannerPatch : ResourcePatch() {
         }
     }
 }
-

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/fix/slink/FixSLinksPatch.kt

@@ -0,0 +1,32 @@
+package app.revanced.patches.reddit.customclients.syncforreddit.fix.slink
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.reddit.customclients.syncforreddit.fix.slink.fingerprints.LinkHelperOpenLinkFingerprint
+import app.revanced.util.exception
+
+@Patch(
+    name = "Fix /s/ links",
+    description = "Fixes the issue where /s/ links do not work.",
+    compatiblePackages = [
+        CompatiblePackage("com.laurencedawson.reddit_sync"),
+        CompatiblePackage("com.laurencedawson.reddit_sync.pro"),
+        CompatiblePackage("com.laurencedawson.reddit_sync.dev")
+    ],
+    requiresIntegrations = true
+)
+object FixSLinksPatch : BytecodePatch(
+    setOf(LinkHelperOpenLinkFingerprint)
+) {
+    override fun execute(context: BytecodeContext) =
+        LinkHelperOpenLinkFingerprint.result?.mutableMethod?.addInstructions(
+            1,
+            """
+                invoke-static { p3 }, Lapp/revanced/integrations/syncforreddit/FixSLinksPatch;->resolveSLink(Ljava/lang/String;)Ljava/lang/String;
+                move-result-object p3
+            """
+        ) ?: throw LinkHelperOpenLinkFingerprint.exception
+}

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/fix/slink/fingerprints/LinkHelperOpenLinkFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.reddit.customclients.syncforreddit.fix.slink.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object LinkHelperOpenLinkFingerprint: MethodFingerprint(
+    strings = listOf("Link title: ")
+)

src/main/kotlin/app/revanced/patches/shared/misc/gms/BaseGmsCoreSupportResourcePatch.kt

@@ -22,18 +22,20 @@ abstract class BaseGmsCoreSupportResourcePatch(
     private val fromPackageName: String,
     private val toPackageName: String,
     private val spoofedPackageSignature: String,
-    dependencies: Set<PatchClass> = setOf()
+    dependencies: Set<PatchClass> = setOf(),
 ) : ResourcePatch(dependencies = setOf(ChangePackageNamePatch::class, AddResourcesPatch::class) + dependencies) {
-    internal val gmsCoreVendorOption = stringPatchOption(
+    internal val gmsCoreVendorOption =
+        stringPatchOption(
             key = "gmsCoreVendor",
             default = "com.mgoogle",
-        values = mapOf(
+            values =
+            mapOf(
                 "Vanced" to "com.mgoogle",
-            "ReVanced" to "app.revanced"
+                "ReVanced" to "app.revanced",
             ),
             title = "GmsCore Vendor",
             description = "The group id of the GmsCore vendor.",
-        required = true
+            required = true,
         ) { it!!.matches(Regex("^[a-z]\\w*(\\.[a-z]\\w*)+\$")) }
 
     protected val gmsCoreVendor by gmsCoreVendorOption
@@ -49,15 +51,20 @@ abstract class BaseGmsCoreSupportResourcePatch(
      * Add metadata to manifest to support spoofing the package name and signature of GmsCore.
      */
     private fun ResourceContext.addSpoofingMetadata() {
-        fun Node.adoptChild(tagName: String, block: Element.() -> Unit) {
+        fun Node.adoptChild(
+            tagName: String,
+            block: Element.() -> Unit,
+        ) {
             val child = ownerDocument.createElement(tagName)
             child.block()
             appendChild(child)
         }
 
-        xmlEditor["AndroidManifest.xml"].use {
+        xmlEditor["AndroidManifest.xml"].use { editor ->
-            val applicationNode = it
+            val document = editor.file
-                .file
+
+            val applicationNode =
+                document
                     .getElementsByTagName("application")
                     .item(0)
 
@@ -87,27 +94,27 @@ abstract class BaseGmsCoreSupportResourcePatch(
     private fun ResourceContext.patchManifest() {
         val packageName = ChangePackageNamePatch.setOrGetFallbackPackageName(toPackageName)
 
-        val manifest = this["AndroidManifest.xml"].readText()
+        val manifest = this.get("AndroidManifest.xml").readText()
-        this["AndroidManifest.xml"].writeText(
+        this.get("AndroidManifest.xml").writeText(
             manifest.replace(
                 "package=\"$fromPackageName",
-                "package=\"$packageName"
+                "package=\"$packageName",
             ).replace(
                 "android:authorities=\"$fromPackageName",
-                "android:authorities=\"$packageName"
+                "android:authorities=\"$packageName",
             ).replace(
                 "$fromPackageName.permission.C2D_MESSAGE",
-                "$packageName.permission.C2D_MESSAGE"
+                "$packageName.permission.C2D_MESSAGE",
             ).replace(
                 "$fromPackageName.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION",
-                "$packageName.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"
+                "$packageName.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION",
             ).replace(
                 "com.google.android.c2dm",
-                "$gmsCoreVendor.android.c2dm"
+                "$gmsCoreVendor.android.c2dm",
             ).replace(
                 "</queries>",
-                "<package android:name=\"$gmsCoreVendor.android.gms\"/></queries>"
+                "<package android:name=\"$gmsCoreVendor.android.gms\"/></queries>",
-            )
+            ),
         )
     }
 }

src/main/kotlin/app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch.kt

@@ -11,23 +11,25 @@ import com.android.tools.smali.dexlib2.iface.ClassDef
 import com.android.tools.smali.dexlib2.iface.Method
 
 abstract class BaseIntegrationsPatch(
-    private val hooks: Set<IntegrationsFingerprint>
+    private val hooks: Set<IntegrationsFingerprint>,
 ) : BytecodePatch(hooks) {
 
     @Deprecated(
         "Use the constructor without the integrationsDescriptor parameter",
-        ReplaceWith("AbstractIntegrationsPatch(hooks)")
+        ReplaceWith("BaseIntegrationsPatch(hooks)"),
     )
     @Suppress("UNUSED_PARAMETER")
     constructor(
         integrationsDescriptor: String,
-        hooks: Set<IntegrationsFingerprint>
+        hooks: Set<IntegrationsFingerprint>,
     ) : this(hooks)
 
     override fun execute(context: BytecodeContext) {
-        if (context.findClass(INTEGRATIONS_CLASS_DESCRIPTOR) == null) throw PatchException(
+        if (context.findClass(INTEGRATIONS_CLASS_DESCRIPTOR) == null) {
-            "Integrations have not been merged yet. This patch can not succeed without merging the integrations."
+            throw PatchException(
+                "Integrations have not been merged yet. This patch can not succeed without merging the integrations.",
             )
+        }
 
         hooks.forEach { hook ->
             hook.invoke(INTEGRATIONS_CLASS_DESCRIPTOR)
@@ -47,14 +49,14 @@ abstract class BaseIntegrationsPatch(
         opcodes: Iterable<Opcode?>? = null,
         strings: Iterable<String>? = null,
         customFingerprint: ((methodDef: Method, classDef: ClassDef) -> Boolean)? = null,
-        private val contextRegisterResolver: (Method) -> Int = object : IRegisterResolver {}
+        private val contextRegisterResolver: (Method) -> Int = object : IRegisterResolver {},
     ) : MethodFingerprint(
         returnType,
         accessFlags,
         parameters,
         opcodes,
         strings,
-        customFingerprint
+        customFingerprint,
     ) {
         fun invoke(integrationsDescriptor: String) {
             result?.mutableMethod?.let { method ->
@@ -63,7 +65,7 @@ abstract class BaseIntegrationsPatch(
                 method.addInstruction(
                     0,
                     "sput-object v$contextRegister, " +
-                            "$integrationsDescriptor->context:Landroid/content/Context;"
+                        "$integrationsDescriptor->context:Landroid/content/Context;",
                 )
             } ?: throw PatchException("Could not find hook target fingerprint.")
         }

src/main/kotlin/app/revanced/patches/shared/misc/mapping/ResourceMappingPatch.kt

@@ -7,7 +7,6 @@ import java.util.*
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 
-
 object ResourceMappingPatch : ResourcePatch() {
     internal lateinit var resourceMappings: List<ResourceElement>
         private set
@@ -17,7 +16,7 @@ object ResourceMappingPatch : ResourcePatch() {
 
     override fun execute(context: ResourceContext) {
         // save the file in memory to concurrently read from
-        val resourceXmlFile = context["res/values/public.xml"].readBytes()
+        val resourceXmlFile = context.get("res/values/public.xml").readBytes()
 
         // create a synchronized list to store the resource mappings
         val mappings = Collections.synchronizedList(mutableListOf<ResourceElement>())
@@ -25,7 +24,9 @@ object ResourceMappingPatch : ResourcePatch() {
         for (threadIndex in 0 until THREAD_COUNT) {
             threadPoolExecutor.execute thread@{
                 context.xmlEditor[resourceXmlFile.inputStream()].use { editor ->
-                    val resources = editor.file.documentElement.childNodes
+                    val document = editor.file
+
+                    val resources = document.documentElement.childNodes
                     val resourcesLength = resources.length
                     val jobSize = resourcesLength / THREAD_COUNT
 

src/main/kotlin/app/revanced/patches/shared/misc/settings/BaseSettingsResourcePatch.kt

@@ -21,16 +21,18 @@ import java.io.Closeable
  */
 abstract class BaseSettingsResourcePatch(
     private val rootPreference: Pair<IntentPreference, String>? = null,
-    dependencies: Set<PatchClass> = emptySet()
+    dependencies: Set<PatchClass> = emptySet(),
 ) : ResourcePatch(
-    dependencies = setOf(AddResourcesPatch::class) + dependencies
+    dependencies = setOf(AddResourcesPatch::class) + dependencies,
-), MutableSet<BasePreference> by mutableSetOf(), Closeable {
+),
+    MutableSet<BasePreference> by mutableSetOf(),
+    Closeable {
     private lateinit var context: ResourceContext
 
     override fun execute(context: ResourceContext) {
         context.copyResources(
             "settings",
-            ResourceGroup("xml", "revanced_prefs.xml")
+            ResourceGroup("xml", "revanced_prefs.xml"),
         )
 
         this.context = context
@@ -49,14 +51,18 @@ abstract class BaseSettingsResourcePatch(
 
         // Add the root preference to an existing fragment if needed.
         rootPreference?.let { (intentPreference, fragment) ->
-            context.xmlEditor["res/xml/$fragment.xml"].use {
+            context.xmlEditor["res/xml/$fragment.xml"].use { editor ->
-                it.getNode("PreferenceScreen").addPreference(intentPreference)
+                val document = editor.file
+
+                document.getNode("PreferenceScreen").addPreference(intentPreference)
             }
         }
 
         // Add all preferences to the ReVanced fragment.
         context.xmlEditor["res/xml/revanced_prefs.xml"].use { editor ->
-            val revancedPreferenceScreenNode = editor.getNode("PreferenceScreen")
+            val document = editor.file
+
+            val revancedPreferenceScreenNode = document.getNode("PreferenceScreen")
             forEach { revancedPreferenceScreenNode.addPreference(it) }
         }
     }

src/main/kotlin/app/revanced/patches/spotify/layout/theme/CustomThemePatch.kt

@@ -10,7 +10,7 @@ import org.w3c.dom.Element
 @Patch(
     name = "Custom theme",
     description = "Applies a custom theme.",
-    compatiblePackages = [CompatiblePackage("com.spotify.music")]
+    compatiblePackages = [CompatiblePackage("com.spotify.music")],
 )
 @Suppress("unused")
 object CustomThemePatch : ResourcePatch() {
@@ -19,7 +19,7 @@ object CustomThemePatch : ResourcePatch() {
         default = "@android:color/black",
         title = "Primary background color",
         description = "The background color. Can be a hex color or a resource reference.",
-        required = true
+        required = true,
     )
 
     private var backgroundColorSecondary by stringPatchOption(
@@ -27,7 +27,7 @@ object CustomThemePatch : ResourcePatch() {
         default = "#ff282828",
         title = "Secondary background color",
         description = "The secondary background color. (e.g. search box, artist & podcast). Can be a hex color or a resource reference.",
-        required = true
+        required = true,
     )
 
     private var accentColor by stringPatchOption(
@@ -35,16 +35,17 @@ object CustomThemePatch : ResourcePatch() {
         default = "#ff1ed760",
         title = "Accent color",
         description = "The accent color ('Spotify green' by default). Can be a hex color or a resource reference.",
-        required = true
+        required = true,
     )
 
     private var accentColorPressed by stringPatchOption(
         key = "accentColorPressed",
         default = "#ff169c46",
         title = "Pressed dark theme accent color",
-        description = "The color when accented buttons are pressed, by default slightly darker than accent. "
+        description =
-                + "Can be a hex color or a resource reference.",
+        "The color when accented buttons are pressed, by default slightly darker than accent. " +
-        required = true
+            "Can be a hex color or a resource reference.",
+        required = true,
     )
 
     override fun execute(context: ResourceContext) {
@@ -54,15 +55,19 @@ object CustomThemePatch : ResourcePatch() {
         val accentColorPressed = accentColorPressed!!
 
         context.xmlEditor["res/values/colors.xml"].use { editor ->
-            val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
+            val document = editor.file
+
+            val resourcesNode = document.getElementsByTagName("resources").item(0) as Element
 
             for (i in 0 until resourcesNode.childNodes.length) {
                 val node = resourcesNode.childNodes.item(i) as? Element ?: continue
 
-                node.textContent = when (node.getAttribute("name")) {
+                node.textContent =
+                    when (node.getAttribute("name")) {
                         "dark_base_background_elevated_base", "design_dark_default_color_background",
                         "design_dark_default_color_surface", "gray_7", "gray_background", "gray_layer",
-                    "sthlm_blk" -> backgroundColor
+                        "sthlm_blk",
+                        -> backgroundColor
 
                         "gray_15" -> backgroundColorSecondary
 

src/main/kotlin/app/revanced/patches/tiktok/misc/spoof/sim/SpoofSimPatch.kt

@@ -23,19 +23,19 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
     dependencies = [IntegrationsPatch::class, SettingsPatch::class],
     compatiblePackages = [
         CompatiblePackage("com.ss.android.ugc.trill"),
-        CompatiblePackage("com.zhiliaoapp.musically")
+        CompatiblePackage("com.zhiliaoapp.musically"),
     ],
-    use = false
+    use = false,
 )
 @Suppress("unused")
-object SpoofSimPatch : BytecodePatch() {
+object SpoofSimPatch : BytecodePatch(emptySet()) {
     private val replacements = hashMapOf(
         "getSimCountryIso" to "getCountryIso",
         "getNetworkCountryIso" to "getCountryIso",
         "getSimOperator" to "getOperator",
         "getNetworkOperator" to "getOperator",
         "getSimOperatorName" to "getOperatorName",
-        "getNetworkOperatorName" to "getOperatorName"
+        "getNetworkOperatorName" to "getOperatorName",
     )
 
     override fun execute(context: BytecodeContext) {
@@ -85,7 +85,7 @@ object SpoofSimPatch : BytecodePatch() {
         with(SettingsStatusLoadFingerprint.result!!.mutableMethod) {
             addInstruction(
                 0,
-                "invoke-static {}, Lapp/revanced/integrations/tiktok/settings/SettingsStatus;->enableSimSpoof()V"
+                "invoke-static {}, Lapp/revanced/integrations/tiktok/settings/SettingsStatus;->enableSimSpoof()V",
             )
         }
     }
@@ -99,7 +99,7 @@ object SpoofSimPatch : BytecodePatch() {
             """
                 invoke-static {v$resultReg}, Lapp/revanced/integrations/tiktok/spoof/sim/SpoofSimPatch;->$replacement(Ljava/lang/String;)Ljava/lang/String;
                 move-result-object v$resultReg
-            """
+            """,
         )
     }
 }

src/main/kotlin/app/revanced/patches/tumblr/ads/DisableDashboardAds.kt

@@ -10,10 +10,10 @@ import app.revanced.patches.tumblr.timelinefilter.TimelineFilterPatch
     name = "Disable dashboard ads",
     description = "Disables ads in the dashboard.",
     compatiblePackages = [CompatiblePackage("com.tumblr")],
-    dependencies = [TimelineFilterPatch::class]
+    dependencies = [TimelineFilterPatch::class],
 )
 @Suppress("unused")
-object DisableDashboardAds : BytecodePatch() {
+object DisableDashboardAds : BytecodePatch(emptySet()) {
     override fun execute(context: BytecodeContext) {
         // The timeline object types are filtered by their name in the TimelineObjectType enum.
         // This is often different from the "object_type" returned in the api (noted in comments here)
@@ -29,7 +29,7 @@ object DisableDashboardAds : BytecodePatch() {
             "DISPLAY_IO_INTERSCROLLER_AD", // "display_io_interscroller"
             "DISPLAY_IO_HEADLINE_VIDEO_AD", // "display_io_headline_video"
             "FACEBOOK_BIDDAABLE", // "facebook_biddable_sdk_ad"
-            "GOOGLE_NATIVE" // "google_native_ad"
+            "GOOGLE_NATIVE", // "google_native_ad"
         ).forEach {
             TimelineFilterPatch.addObjectTypeFilter(it)
         }

src/main/kotlin/app/revanced/patches/tumblr/annoyances/inappupdate/DisableInAppUpdatePatch.kt

@@ -10,10 +10,10 @@ import app.revanced.patches.tumblr.featureflags.OverrideFeatureFlagsPatch
     name = "Disable in-app update",
     description = "Disables the in-app update check and update prompt.",
     dependencies = [OverrideFeatureFlagsPatch::class],
-    compatiblePackages = [CompatiblePackage("com.tumblr")]
+    compatiblePackages = [CompatiblePackage("com.tumblr")],
 )
 @Suppress("unused")
-object DisableInAppUpdatePatch : BytecodePatch() {
+object DisableInAppUpdatePatch : BytecodePatch(emptySet()) {
     override fun execute(context: BytecodeContext) {
         // Before checking for updates using Google Play core AppUpdateManager, the value of this feature flag is checked.
         // If this flag is false or the last update check was today and no update check is performed.

src/main/kotlin/app/revanced/patches/tumblr/live/DisableTumblrLivePatch.kt

@@ -11,10 +11,10 @@ import app.revanced.patches.tumblr.timelinefilter.TimelineFilterPatch
     name = "Disable Tumblr Live",
     description = "Disable the Tumblr Live tab button and dashboard carousel.",
     dependencies = [OverrideFeatureFlagsPatch::class, TimelineFilterPatch::class],
-    compatiblePackages = [CompatiblePackage("com.tumblr")]
+    compatiblePackages = [CompatiblePackage("com.tumblr")],
 )
 @Suppress("unused")
-object DisableTumblrLivePatch : BytecodePatch() {
+object DisableTumblrLivePatch : BytecodePatch(emptySet()) {
     override fun execute(context: BytecodeContext) {
         // Hide the LIVE_MARQUEE timeline element that appears in the feed
         // Called "live_marquee" in api response

src/main/kotlin/app/revanced/patches/twitter/interaction/downloads/UnlockDownloadsPatch.kt

@@ -2,27 +2,36 @@ package app.revanced.patches.twitter.interaction.downloads
 
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patcher.fingerprint.MethodFingerprintResult
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.util.smali.ExternalLabel
+import app.revanced.patches.twitter.interaction.downloads.fingerprints.BuildMediaOptionsSheetFingerprint
 import app.revanced.patches.twitter.interaction.downloads.fingerprints.ConstructMediaOptionsSheetFingerprint
 import app.revanced.patches.twitter.interaction.downloads.fingerprints.ShowDownloadVideoUpsellBottomSheetFingerprint
 import app.revanced.util.exception
+import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 
 @Patch(
     name = "Unlock downloads",
-    description = "Unlocks the ability to download any video.",
+    description = "Unlocks the ability to download any video. GIFs can be downloaded via the menu on long press.",
-    compatiblePackages = [CompatiblePackage("com.twitter.android")]
+    compatiblePackages = [CompatiblePackage("com.twitter.android")],
 )
 @Suppress("unused")
 object UnlockDownloadsPatch : BytecodePatch(
-    setOf(ConstructMediaOptionsSheetFingerprint, ShowDownloadVideoUpsellBottomSheetFingerprint)
+    setOf(
+        ConstructMediaOptionsSheetFingerprint,
+        ShowDownloadVideoUpsellBottomSheetFingerprint,
+        BuildMediaOptionsSheetFingerprint,
+    ),
 ) {
     override fun execute(context: BytecodeContext) {
         fun MethodFingerprint.patch(getRegisterAndIndex: MethodFingerprintResult.() -> Pair<Int, Int>) = result?.let {
@@ -46,5 +55,29 @@ object UnlockDownloadsPatch : BytecodePatch(
 
             showDownloadButtonIndex to register
         }
+
+        // Make GIFs downloadable.
+        BuildMediaOptionsSheetFingerprint.result?.let {
+            val scanResult = it.scanResult.patternScanResult!!
+            it.mutableMethod.apply {
+                val checkMediaTypeIndex = scanResult.startIndex
+                val checkMediaTypeInstruction = getInstruction<TwoRegisterInstruction>(checkMediaTypeIndex)
+
+                // Treat GIFs as videos.
+                addInstructionsWithLabels(
+                    checkMediaTypeIndex + 1,
+                    """
+                        const/4 v${checkMediaTypeInstruction.registerB}, 0x2 # GIF
+                        if-eq v${checkMediaTypeInstruction.registerA}, v${checkMediaTypeInstruction.registerB}, :video
+                    """,
+                    ExternalLabel("video", getInstruction(scanResult.endIndex)),
+                )
+
+                // Remove media.isDownloadable check.
+                removeInstruction(
+                    getInstructions().first { insn -> insn.opcode == Opcode.IGET_BOOLEAN }.location.index + 1,
+                )
+            }
+        } ?: throw BuildMediaOptionsSheetFingerprint.exception
     }
 }

src/main/kotlin/app/revanced/patches/twitter/interaction/downloads/fingerprints/BuildMediaOptionsSheetFingerprint.kt

@@ -0,0 +1,14 @@
+package app.revanced.patches.twitter.interaction.downloads.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object BuildMediaOptionsSheetFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.IF_EQ,
+        Opcode.SGET_OBJECT,
+        Opcode.GOTO_16,
+        Opcode.NEW_INSTANCE,
+    ),
+    strings = listOf("resources.getString(R.string.post_video)"),
+)

src/main/kotlin/app/revanced/patches/twitter/misc/dynamiccolor/DynamicColorPatch.kt

@@ -11,12 +11,12 @@ import java.nio.file.Files
 @Patch(
     name = "Dynamic color",
     description = "Replaces the default X (Formerly Twitter) Blue with the user's Material You palette.",
-    compatiblePackages = [CompatiblePackage("com.twitter.android")]
+    compatiblePackages = [CompatiblePackage("com.twitter.android")],
 )
 @Suppress("unused")
 object DynamicColorPatch : ResourcePatch() {
     override fun execute(context: ResourceContext) {
-        val resDirectory = context["res"]
+        val resDirectory = context.get("res")
         if (!resDirectory.isDirectory) throw PatchException("The res folder can not be found.")
 
         val valuesV31Directory = resDirectory.resolve("values-v31")
@@ -46,7 +46,7 @@ object DynamicColorPatch : ResourcePatch() {
                 "twitter_blue_opacity_30" to "@android:color/system_accent1_100",
                 "twitter_blue_opacity_50" to "@android:color/system_accent1_200",
                 "twitter_blue_opacity_58" to "@android:color/system_accent1_300",
-                "deep_transparent_twitter_blue" to "@android:color/system_accent1_200"
+                "deep_transparent_twitter_blue" to "@android:color/system_accent1_200",
             ).forEach { (k, v) ->
                 val colorElement = document.createElement("color")
 
@@ -66,7 +66,7 @@ object DynamicColorPatch : ResourcePatch() {
                 "twitter_blue_opacity_30" to "@android:color/system_accent1_50",
                 "twitter_blue_opacity_50" to "@android:color/system_accent1_100",
                 "twitter_blue_opacity_58" to "@android:color/system_accent1_200",
-                "deep_transparent_twitter_blue" to "@android:color/system_accent1_200"
+                "deep_transparent_twitter_blue" to "@android:color/system_accent1_200",
             ).forEach { (k, v) ->
                 val colorElement = document.createElement("color")
 

src/main/kotlin/app/revanced/patches/twitter/misc/hook/patch/BaseHookPatch.kt

@@ -4,7 +4,7 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patches.twitter.misc.hook.json.JsonHookPatch
 
-abstract class BaseHookPatch(private val hookClassDescriptor: String) : BytecodePatch() {
+abstract class BaseHookPatch(private val hookClassDescriptor: String) : BytecodePatch(emptySet()) {
     override fun execute(context: BytecodeContext) =
         JsonHookPatch.hooks.addHook(JsonHookPatch.Hook(context, hookClassDescriptor))
 }

src/main/kotlin/app/revanced/patches/twitter/misc/hook/patch/ads/HideAdsHookPatch.kt

@@ -7,9 +7,8 @@ import app.revanced.patches.twitter.misc.hook.patch.BaseHookPatch
 
 @Patch(
     name = "Hide ads",
-    description = "Hides ads.",
     dependencies = [JsonHookPatch::class],
-    compatiblePackages = [CompatiblePackage("com.twitter.android")]
+    compatiblePackages = [CompatiblePackage("com.twitter.android")],
 )
 @Suppress("unused")
 object HideAdsHookPatch : BaseHookPatch("Lapp/revanced/integrations/twitter/patches/hook/patch/ads/AdsHook;")

src/main/kotlin/app/revanced/patches/twitter/misc/links/OpenLinksWithAppChooserPatch.kt

@@ -0,0 +1,35 @@
+package app.revanced.patches.twitter.misc.links
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.twitter.misc.links.fingerprints.OpenLinkFingerprint
+import app.revanced.util.exception
+
+@Patch(
+    name = "Open links with app chooser",
+    description = "Instead of opening links directly, open them with an app chooser. " +
+        "As a result you can select a browser to open the link with.",
+    compatiblePackages = [CompatiblePackage("com.twitter.android")],
+    use = false,
+)
+@Suppress("unused")
+object OpenLinksWithAppChooserPatch : BytecodePatch(
+    setOf(OpenLinkFingerprint),
+) {
+    private const val METHOD_REFERENCE =
+        "Lapp/revanced/integrations/twitter/patches/links/OpenLinksWithAppChooserPatch;->" +
+            "openWithChooser(Landroid/content/Context;Landroid/content/Intent;)V"
+
+    override fun execute(context: BytecodeContext) {
+        OpenLinkFingerprint.result?.mutableMethod?.addInstructions(
+            0,
+            """
+                invoke-static { p0, p1 }, $METHOD_REFERENCE
+                return-void
+            """,
+        ) ?: throw OpenLinkFingerprint.exception
+    }
+}

src/main/kotlin/app/revanced/patches/twitter/misc/links/fingerprints/OpenLinkFingerprint.kt

@@ -0,0 +1,8 @@
+package app.revanced.patches.twitter.misc.links.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object OpenLinkFingerprint : MethodFingerprint(
+    returnType = "V",
+    parameters = listOf("Landroid/content/Context;", "Landroid/content/Intent;", "Landroid/os/Bundle;"),
+)

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

@@ -1,20 +1,20 @@
 package app.revanced.patches.vsco.misc.pro
 
-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.vsco.misc.pro.fingerprints.RevCatSubscriptionFingerprint
+import app.revanced.util.exception
 
 @Patch(
     name = "Unlock pro",
     description = "Unlocks pro features.",
-    compatiblePackages = [CompatiblePackage("com.vsco.cam")]
+    compatiblePackages = [CompatiblePackage("com.vsco.cam", ["345"])],
 )
 object UnlockProPatch : BytecodePatch(
-    setOf(RevCatSubscriptionFingerprint)
+    setOf(RevCatSubscriptionFingerprint),
 ) {
     override fun execute(context: BytecodeContext) {
         RevCatSubscriptionFingerprint.result?.mutableMethod?.apply {
@@ -23,7 +23,7 @@ object UnlockProPatch : BytecodePatch(
                 0,
                 """
                     const p1, 0x1
-                """
+                """,
             )
         } ?: throw RevCatSubscriptionFingerprint.exception
     }

src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt

@@ -1,7 +1,5 @@
 package app.revanced.patches.youtube.ad.general
 
-import app.revanced.util.findMutableMethodOf
-import app.revanced.util.injectHideViewCall
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
@@ -9,6 +7,8 @@ import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.shared.misc.fix.verticalscroll.VerticalScrollPatch
 import app.revanced.patches.youtube.ad.getpremium.HideGetPremiumPatch
 import app.revanced.patches.youtube.misc.fix.backtoexitgesture.FixBackToExitGesturePatch
+import app.revanced.util.findMutableMethodOf
+import app.revanced.util.injectHideViewCall
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction31i
 import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
@@ -20,11 +20,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
         HideGetPremiumPatch::class,
         HideAdsResourcePatch::class,
         VerticalScrollPatch::class,
-        FixBackToExitGesturePatch::class
+        FixBackToExitGesturePatch::class,
     ],
     compatiblePackages = [
         CompatiblePackage(
-            "com.google.android.youtube", [
+            "com.google.android.youtube",
+            [
                 "18.32.39",
                 "18.37.36",
                 "18.38.44",
@@ -37,30 +38,33 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
                 "19.02.39",
                 "19.03.35",
                 "19.03.36",
-                "19.04.37"
+                "19.04.37",
-            ]
+            ],
-        )
+        ),
-    ]
+    ],
 )
 @Suppress("unused")
-object HideAdsPatch : BytecodePatch() {
+object HideAdsPatch : BytecodePatch(emptySet()) {
     override fun execute(context: BytecodeContext) {
         context.classes.forEach { classDef ->
             classDef.methods.forEach { method ->
                 with(method.implementation) {
                     this?.instructions?.forEachIndexed { index, instruction ->
-                        if (instruction.opcode != Opcode.CONST)
+                        if (instruction.opcode != Opcode.CONST) {
                             return@forEachIndexed
+                        }
                         // Instruction to store the id adAttribution into a register
-                        if ((instruction as Instruction31i).wideLiteral != HideAdsResourcePatch.adAttributionId)
+                        if ((instruction as Instruction31i).wideLiteral != HideAdsResourcePatch.adAttributionId) {
                             return@forEachIndexed
+                        }
 
                         val insertIndex = index + 1
 
                         // Call to get the view with the id adAttribution
                         with(instructions.elementAt(insertIndex)) {
-                            if (opcode != Opcode.INVOKE_VIRTUAL)
+                            if (opcode != Opcode.INVOKE_VIRTUAL) {
                                 return@forEachIndexed
+                            }
 
                             // Hide the view
                             val viewRegister = (this as Instruction35c).registerC
@@ -71,7 +75,7 @@ object HideAdsPatch : BytecodePatch() {
                                     insertIndex,
                                     viewRegister,
                                     "Lapp/revanced/integrations/youtube/patches/components/AdsFilter;",
-                                    "hideAdAttributionView"
+                                    "hideAdAttributionView",
                                 )
                         }
                     }

src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt

@@ -13,28 +13,29 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
     dependencies = [
         CopyVideoUrlResourcePatch::class,
         PlayerControlsBytecodePatch::class,
-        VideoInformationPatch::class
+        VideoInformationPatch::class,
     ],
     compatiblePackages = [
         CompatiblePackage(
-            "com.google.android.youtube", [
+            "com.google.android.youtube",
+            [
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
                 "19.03.35",
                 "19.03.36",
-                "19.04.37"
+                "19.04.37",
-            ]
+            ],
-        )
+        ),
-    ]
+    ],
 )
 @Suppress("unused")
-object CopyVideoUrlBytecodePatch : BytecodePatch() {
+object CopyVideoUrlBytecodePatch : BytecodePatch(emptySet()) {
     private const val INTEGRATIONS_PLAYER_PACKAGE = "Lapp/revanced/integrations/youtube/videoplayer"
     private val BUTTONS_DESCRIPTORS = listOf(
         "$INTEGRATIONS_PLAYER_PACKAGE/CopyVideoUrlButton;",
-        "$INTEGRATIONS_PLAYER_PACKAGE/CopyVideoUrlTimestampButton;"
+        "$INTEGRATIONS_PLAYER_PACKAGE/CopyVideoUrlTimestampButton;",
     )
 
     override fun execute(context: BytecodeContext) {

src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/ExternalDownloadsBytecodePatch.kt

@@ -13,24 +13,25 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
     dependencies = [
         ExternalDownloadsResourcePatch::class,
         PlayerControlsBytecodePatch::class,
-        VideoInformationPatch::class
+        VideoInformationPatch::class,
     ],
     compatiblePackages = [
         CompatiblePackage(
-            "com.google.android.youtube", [
+            "com.google.android.youtube",
+            [
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
                 "19.03.35",
                 "19.03.36",
-                "19.04.37"
+                "19.04.37",
-            ]
+            ],
         ),
-    ]
+    ],
 )
 @Suppress("unused")
-object ExternalDownloadsBytecodePatch : BytecodePatch() {
+object ExternalDownloadsBytecodePatch : BytecodePatch(emptySet()) {
     private const val BUTTON_DESCRIPTOR = "Lapp/revanced/integrations/youtube/videoplayer/ExternalDownloadButton;"
 
     override fun execute(context: BytecodeContext) {
@@ -39,13 +40,15 @@ object ExternalDownloadsBytecodePatch : BytecodePatch() {
          */
 
         PlayerControlsBytecodePatch.initializeControl(
-            "$BUTTON_DESCRIPTOR->initializeButton(Landroid/view/View;)V")
+            "$BUTTON_DESCRIPTOR->initializeButton(Landroid/view/View;)V",
+        )
 
         /*
          add code to change the visibility of the control
          */
 
         PlayerControlsBytecodePatch.injectVisibilityCheckCall(
-            "$BUTTON_DESCRIPTOR->changeVisibility(Z)V")
+            "$BUTTON_DESCRIPTOR->changeVisibility(Z)V",
+        )
     }
 }

src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt

@@ -15,9 +15,9 @@ import java.nio.file.Files
     name = "Custom branding",
     description = "Applies a custom app name and icon. Defaults to \"YouTube ReVanced\" and the ReVanced logo.",
     compatiblePackages = [
-        CompatiblePackage("com.google.android.youtube")
+        CompatiblePackage("com.google.android.youtube"),
     ],
-    use = false
+    use = false,
 )
 @Suppress("unused")
 object CustomBrandingPatch : ResourcePatch() {
@@ -28,7 +28,7 @@ object CustomBrandingPatch : ResourcePatch() {
         "adaptiveproduct_youtube_background_color_108",
         "adaptiveproduct_youtube_foreground_color_108",
         "ic_launcher",
-        "ic_launcher_round"
+        "ic_launcher_round",
     ).map { "$it.png" }.toTypedArray()
 
     private val mipmapDirectories = arrayOf(
@@ -36,7 +36,7 @@ object CustomBrandingPatch : ResourcePatch() {
         "xxhdpi",
         "xhdpi",
         "hdpi",
-        "mdpi"
+        "mdpi",
     ).map { "mipmap-$it" }
 
     private var appName by stringPatchOption(
@@ -49,7 +49,7 @@ object CustomBrandingPatch : ResourcePatch() {
             "YouTube" to "YouTube",
         ),
         title = "App name",
-        description = "The name of the app."
+        description = "The name of the app.",
     )
 
     private var icon by stringPatchOption(
@@ -58,14 +58,16 @@ object CustomBrandingPatch : ResourcePatch() {
         values = mapOf("ReVanced Logo" to REVANCED_ICON),
         title = "App icon",
         description = """
-            The path to a folder containing the following folders:
+            The icon to apply to the app.
+            
+            If a path to a folder is provided, the folder must contain the following folders:
 
             ${mipmapDirectories.joinToString("\n") { "- $it" }}
 
-            Each of these folders has to have the following files:
+            Each of these folders must contain the following files:
 
             ${iconResourceFileNames.joinToString("\n") { "- $it" }}
-        """.trimIndentMultiline()
+        """.trimIndentMultiline(),
     )
 
     override fun execute(context: ResourceContext) {
@@ -73,12 +75,13 @@ object CustomBrandingPatch : ResourcePatch() {
             // Change the app icon.
             mipmapDirectories.map { directory ->
                 ResourceGroup(
-                    directory, *iconResourceFileNames
+                    directory,
+                    *iconResourceFileNames,
                 )
             }.let { resourceGroups ->
                 if (icon != REVANCED_ICON) {
                     val path = File(icon)
-                    val resourceDirectory = context["res"]
+                    val resourceDirectory = context.get("res")
 
                     resourceGroups.forEach { group ->
                         val fromDirectory = path.resolve(group.resourceDirectoryName)
@@ -87,23 +90,25 @@ object CustomBrandingPatch : ResourcePatch() {
                         group.resources.forEach { iconFileName ->
                             Files.write(
                                 toDirectory.resolve(iconFileName).toPath(),
-                                fromDirectory.resolve(iconFileName).readBytes()
+                                fromDirectory.resolve(iconFileName).readBytes(),
                             )
                         }
                     }
-                } else resourceGroups.forEach { context.copyResources("custom-branding", it) }
+                } else {
+                    resourceGroups.forEach { context.copyResources("custom-branding", it) }
+                }
             }
         }
 
         appName?.let { name ->
             // Change the app name.
-            val manifest = context["AndroidManifest.xml"]
+            val manifest = context.get("AndroidManifest.xml")
             manifest.writeText(
                 manifest.readText()
                     .replace(
                         "android:label=\"@string/application_name",
-                        "android:label=\"$name"
+                        "android:label=\"$name",
-                    )
+                    ),
             )
         }
     }

src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/ChangeHeaderPatch.kt

@@ -15,62 +15,69 @@ import java.io.File
     name = "Change header",
     description = "Applies a custom header in the top left corner within the app. Defaults to the ReVanced header.",
     compatiblePackages = [
-        CompatiblePackage("com.google.android.youtube")
+        CompatiblePackage("com.google.android.youtube"),
     ],
-    use = false
+    use = false,
 )
 @Suppress("unused")
 object ChangeHeaderPatch : ResourcePatch() {
-    private const val HEADER_NAME = "yt_wordmark_header"
+    private const val HEADER_FILE_NAME = "yt_wordmark_header"
-    private const val PREMIUM_HEADER_NAME = "yt_premium_wordmark_header"
+    private const val PREMIUM_HEADER_FILE_NAME = "yt_premium_wordmark_header"
-    private const val REVANCED_HEADER_NAME = "ReVanced"
-    private const val REVANCED_BORDERLESS_HEADER_NAME = "ReVanced (borderless logo)"
 
-    private val targetResourceDirectoryNames = arrayOf(
+    private const val HEADER_OPTION = "header*"
-        "xxxhdpi",
+    private const val PREMIUM_HEADER_OPTION = "premium*header"
-        "xxhdpi",
+    private const val REVANCED_HEADER_OPTION = "revanced*"
-        "xhdpi",
+    private const val REVANCED_BORDERLESS_HEADER_OPTION = "revanced*borderless"
-        "mdpi",
+
-        "hdpi",
+    private val targetResourceDirectoryNames = mapOf(
-    ).map { dpi ->
+        "xxxhdpi" to "512px x 192px",
-        "drawable-$dpi"
+        "xxhdpi" to "387px x 144px",
-    }
+        "xhdpi" to "258px x 96px",
+        "hdpi" to "194px x 72px",
+        "mdpi" to "129px x 48px",
+    ).map { (dpi, dim) ->
+        "drawable-$dpi" to dim
+    }.toMap()
 
     private val variants = arrayOf("light", "dark")
 
     private val header by stringPatchOption(
         key = "header",
-        default = REVANCED_BORDERLESS_HEADER_NAME,
+        default = REVANCED_BORDERLESS_HEADER_OPTION,
         values = mapOf(
-            "YouTube" to HEADER_NAME,
+            "YouTube" to HEADER_OPTION,
-            "YouTube Premium" to PREMIUM_HEADER_NAME,
+            "YouTube Premium" to PREMIUM_HEADER_OPTION,
-            "ReVanced" to REVANCED_HEADER_NAME,
+            "ReVanced" to REVANCED_HEADER_OPTION,
-            "ReVanced (borderless logo)" to REVANCED_BORDERLESS_HEADER_NAME,
+            "ReVanced (borderless logo)" to REVANCED_BORDERLESS_HEADER_OPTION,
         ),
         title = "Header",
         description = """
-            Either a header name or a path to a custom header folder to use in the top bar.
+            The header to apply to the app.
-            The path to a folder must contain one or more of the following folders matching the DPI of your device:
             
-            ${targetResourceDirectoryNames.joinToString("\n") { "- $it" }}
+            If a path to a folder is provided, the folder must contain one or more of the following folders, depending on the DPI of the device:
             
-            These folders must contain the following files:
+            ${targetResourceDirectoryNames.keys.joinToString("\n") { "- $it" }}
             
-            ${variants.joinToString("\n") { variant -> "- ${HEADER_NAME}_$variant.png" }}
+            Each of the folders must contain all of the following files:
+            
+            ${variants.joinToString("\n") { variant -> "- ${HEADER_FILE_NAME}_$variant.png" }}
+
+            The image dimensions must be as follows:
+            ${targetResourceDirectoryNames.map { (dpi, dim) -> "- $dpi: $dim" }.joinToString("\n")}
         """.trimIndentMultiline(),
         required = true,
     )
 
     override fun execute(context: ResourceContext) {
         // The directories to copy the header to.
-        val targetResourceDirectories = targetResourceDirectoryNames.mapNotNull {
+        val targetResourceDirectories = targetResourceDirectoryNames.keys.mapNotNull {
-            context["res"].resolve(it).takeIf(File::exists)
+            context.get("res").resolve(it).takeIf(File::exists)
         }
         // The files to replace in the target directories.
-        val targetResourceFiles = targetResourceDirectoryNames.map { directoryName ->
+        val targetResourceFiles = targetResourceDirectoryNames.keys.map { directoryName ->
             ResourceGroup(
                 directoryName,
-                *variants.map { variant -> "${HEADER_NAME}_$variant.png" }.toTypedArray()
+                *variants.map { variant -> "${HEADER_FILE_NAME}_$variant.png" }.toTypedArray(),
             )
         }
 
@@ -89,8 +96,8 @@ object ChangeHeaderPatch : ResourcePatch() {
         }
 
         // Functions to overwrite the header to the different variants.
-        val toPremium = { overwriteFromTo(PREMIUM_HEADER_NAME, HEADER_NAME) }
+        val toPremium = { overwriteFromTo(PREMIUM_HEADER_FILE_NAME, HEADER_FILE_NAME) }
-        val toHeader = { overwriteFromTo(HEADER_NAME, PREMIUM_HEADER_NAME) }
+        val toHeader = { overwriteFromTo(HEADER_FILE_NAME, PREMIUM_HEADER_FILE_NAME) }
         val toReVanced = {
             // Copy the ReVanced header to the resource directories.
             targetResourceFiles.forEach { context.copyResources("change-header/revanced", it) }
@@ -106,32 +113,38 @@ object ChangeHeaderPatch : ResourcePatch() {
             toHeader()
         }
         val toCustom = {
-            var copiedReplacementImages = false
+            val sourceFolders = File(header!!).listFiles { file -> file.isDirectory }
-            // For all the resource groups in the custom header folder, copy them to the resource directories.
+                ?: throw PatchException("The provided path is not a directory: $header")
-            File(header!!).listFiles { file -> file.isDirectory }?.forEach { folder ->
-                val targetDirectory = context["res"].resolve(folder.name)
-                // Skip if the target directory (DPI) doesn't exist.
-                if (!targetDirectory.exists()) return@forEach
 
-                folder.listFiles { file -> file.isFile }?.forEach {
+            var copiedFiles = false
-                    val targetResourceFile = targetDirectory.resolve(it.name)
 
-                    it.copyTo(targetResourceFile, true)
+            // For each source folder, copy the files to the target resource directories.
-                    copiedReplacementImages = true
+            sourceFolders.forEach { dpiSourceFolder ->
+                val targetDpiFolder = context.get("res").resolve(dpiSourceFolder.name)
+                if (!targetDpiFolder.exists()) return@forEach
+
+                val imgSourceFiles = dpiSourceFolder.listFiles { file -> file.isFile }!!
+                imgSourceFiles.forEach { imgSourceFile ->
+                    val imgTargetFile = targetDpiFolder.resolve(imgSourceFile.name)
+                    imgSourceFile.copyTo(imgTargetFile, true)
+
+                    copiedFiles = true
                 }
             }
 
-            if (!copiedReplacementImages) throw PatchException("Could not find any custom images resources in directory: $header")
+            if (!copiedFiles) {
+                throw PatchException("No header files were copied from the provided path: $header.")
+            }
 
             // Overwrite the premium with the custom header as well.
             toHeader()
         }
 
         when (header) {
-            HEADER_NAME -> toHeader
+            HEADER_OPTION -> toHeader
-            PREMIUM_HEADER_NAME -> toPremium
+            PREMIUM_HEADER_OPTION -> toPremium
-            REVANCED_HEADER_NAME -> toReVanced
+            REVANCED_HEADER_OPTION -> toReVanced
-            REVANCED_BORDERLESS_HEADER_NAME -> toReVancedBorderless
+            REVANCED_BORDERLESS_HEADER_OPTION -> toReVancedBorderless
             else -> toCustom
         }()
     }

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/cast/HideCastButtonPatch.kt

@@ -17,13 +17,13 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
     dependencies = [
         IntegrationsPatch::class,
         SettingsPatch::class,
-        AddResourcesPatch::class
+        AddResourcesPatch::class,
     ],
     compatiblePackages = [
-        CompatiblePackage("com.google.android.youtube")
+        CompatiblePackage("com.google.android.youtube"),
-    ]
+    ],
 )
-object HideCastButtonPatch : BytecodePatch() {
+object HideCastButtonPatch : BytecodePatch(emptySet()) {
     override fun execute(context: BytecodeContext) {
         AddResourcesPatch(this::class)
 
@@ -38,7 +38,7 @@ object HideCastButtonPatch : BytecodePatch() {
                 """
                     invoke-static {p1}, Lapp/revanced/integrations/youtube/patches/HideCastButtonPatch;->getCastButtonOverrideV2(I)I
                     move-result p1
-                """
+                """,
             )
         } ?: throw PatchException("setVisibility method not found.")
     }

src/main/kotlin/app/revanced/patches/youtube/layout/player/background/PlayerControlsBackgroundPatch.kt

@@ -12,7 +12,8 @@ import org.w3c.dom.Element
     description = "Removes the dark background surrounding the video player controls.",
     compatiblePackages = [
         CompatiblePackage(
-            "com.google.android.youtube", [
+            "com.google.android.youtube",
+            [
                 "18.32.39",
                 "18.37.36",
                 "18.38.44",
@@ -25,11 +26,11 @@ import org.w3c.dom.Element
                 "19.02.39",
                 "19.03.35",
                 "19.03.36",
-                "19.04.37"
+                "19.04.37",
-            ]
-        )
             ],
-    use = false
+        ),
+    ],
+    use = false,
 )
 @Suppress("unused")
 object PlayerControlsBackgroundPatch : ResourcePatch() {
@@ -37,7 +38,9 @@ object PlayerControlsBackgroundPatch : ResourcePatch() {
 
     override fun execute(context: ResourceContext) {
         context.xmlEditor[RESOURCE_FILE_PATH].use { editor ->
-            editor.file.doRecursively node@{ node ->
+            val document = editor.file
+
+            document.doRecursively node@{ node ->
                 if (node !is Element) return@node
 
                 node.getAttributeNode("android:color")?.let { attribute ->

src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/SeekbarColorResourcePatch.kt

@@ -30,15 +30,19 @@ internal object SeekbarColorResourcePatch : ResourcePatch(){
 
         // Edit the resume playback drawable and replace the progress bar with a custom drawable
         context.xmlEditor["res/drawable/resume_playback_progressbar_drawable.xml"].use { editor ->
-            val layerList = editor.file.getElementsByTagName("layer-list").item(0) as Element
+            val document = editor.file
+
+            val layerList = document.getElementsByTagName("layer-list").item(0) as Element
             val progressNode = layerList.getElementsByTagName("item").item(1) as Element
             if (!progressNode.getAttributeNode("android:id").value.endsWith("progress")) {
                 throw PatchException("Could not find progress bar")
             }
             val scaleNode = progressNode.getElementsByTagName("scale").item(0) as Element
             val shapeNode = scaleNode.getElementsByTagName("shape").item(0) as Element
-            val replacementNode = editor.file.createElement(
+            val replacementNode =
-                "app.revanced.integrations.youtube.patches.theme.ProgressBarDrawable")
+                document.createElement(
+                    "app.revanced.integrations.youtube.patches.theme.ProgressBarDrawable",
+                )
             scaleNode.replaceChild(replacementNode, shapeNode)
         }
     }

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockResourcePatch.kt

@@ -17,26 +17,25 @@ import app.revanced.util.inputStreamFromBundledResource
     dependencies = [
         SettingsPatch::class,
         ResourceMappingPatch::class,
-        AddResourcesPatch::class
+        AddResourcesPatch::class,
-    ]
+    ],
 )
 internal object SponsorBlockResourcePatch : ResourcePatch() {
-
     override fun execute(context: ResourceContext) {
         AddResourcesPatch(this::class)
 
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             IntentPreference(
                 "revanced_sb_settings",
-                intent = SettingsPatch.newIntent("revanced_sb_settings_intent")
+                intent = SettingsPatch.newIntent("revanced_sb_settings_intent"),
-            )
+            ),
         )
         arrayOf(
             ResourceGroup(
                 "layout",
                 "revanced_sb_inline_sponsor_overlay.xml",
                 "revanced_sb_new_segment.xml",
-                "revanced_sb_skip_sponsor_button.xml"
+                "revanced_sb_skip_sponsor_button.xml",
             ),
             ResourceGroup(
                 // required resource for back button, because when the base APK is used, this resource will not exist
@@ -46,37 +45,49 @@ internal object SponsorBlockResourcePatch : ResourcePatch() {
                 "revanced_sb_edit.xml",
                 "revanced_sb_logo.xml",
                 "revanced_sb_publish.xml",
-                "revanced_sb_voting.xml"
+                "revanced_sb_voting.xml",
             ),
             ResourceGroup(
                 // required resource for back button, because when the base APK is used, this resource will not exist
-                "drawable-xxxhdpi", "quantum_ic_skip_next_white_24.png"
+                "drawable-xxxhdpi",
-            )
+                "quantum_ic_skip_next_white_24.png",
+            ),
         ).forEach { resourceGroup ->
             context.copyResources("sponsorblock", resourceGroup)
         }
 
         // copy nodes from host resources to their real xml files
 
-        val hostingResourceStream = inputStreamFromBundledResource(
+        val hostingResourceStream =
+            inputStreamFromBundledResource(
                 "sponsorblock",
-            "host/layout/youtube_controls_layout.xml"
+                "host/layout/youtube_controls_layout.xml",
             )!!
 
         var modifiedControlsLayout = false
-        val targetXmlEditor = context.xmlEditor["res/layout/youtube_controls_layout.xml"]
+        val editor = context.xmlEditor["res/layout/youtube_controls_layout.xml"]
         "RelativeLayout".copyXmlNode(
             context.xmlEditor[hostingResourceStream],
-            targetXmlEditor
+            editor,
         ).also {
-            val children = targetXmlEditor.file.getElementsByTagName("RelativeLayout").item(0).childNodes
+            val document = editor.file
+
+            val children = document.getElementsByTagName("RelativeLayout").item(0).childNodes
 
             // Replace the startOf with the voting button view so that the button does not overlap
             for (i in 1 until children.length) {
                 val view = children.item(i)
 
                 // Replace the attribute for a specific node only
-                if (!(view.hasAttributes() && view.attributes.getNamedItem("android:id").nodeValue.endsWith("live_chat_overlay_button"))) continue
+                if (!(
+                        view.hasAttributes() &&
+                            view.attributes.getNamedItem(
+                                "android:id",
+                            ).nodeValue.endsWith("live_chat_overlay_button")
+                        )
+                ) {
+                    continue
+                }
 
                 // voting button id from the voting button view from the youtube_controls_layout.xml host file
                 val votingButtonId = "@+id/revanced_sb_voting_button"

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

@@ -20,8 +20,8 @@ import org.w3c.dom.Element
         SettingsPatch::class,
         ResourceMappingPatch::class,
         SeekbarPreferencesPatch::class,
-        AddResourcesPatch::class
+        AddResourcesPatch::class,
-    ]
+    ],
 )
 internal object ThemeResourcePatch : ResourcePatch() {
     private const val SPLASH_BACKGROUND_COLOR = "revanced_splash_background_color"
@@ -31,20 +31,23 @@ internal object ThemeResourcePatch : ResourcePatch() {
 
         SeekbarPreferencesPatch.addPreferences(
             SwitchPreference("revanced_seekbar_custom_color"),
-            TextPreference("revanced_seekbar_custom_color_value", inputType = InputType.TEXT_CAP_CHARACTERS)
+            TextPreference("revanced_seekbar_custom_color_value", inputType = InputType.TEXT_CAP_CHARACTERS),
         )
 
         // Edit theme colors via resources.
         context.xmlEditor["res/values/colors.xml"].use { editor ->
-            val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
+            val document = editor.file
+
+            val resourcesNode = document.getElementsByTagName("resources").item(0) as Element
 
             val children = resourcesNode.childNodes
             for (i in 0 until children.length) {
                 val node = children.item(i) as? Element ?: continue
 
-                node.textContent = when (node.getAttribute("name")) {
+                node.textContent =
+                    when (node.getAttribute("name")) {
                         "yt_black0", "yt_black1", "yt_black1_opacity95", "yt_black1_opacity98", "yt_black2", "yt_black3",
-                    "yt_black4", "yt_status_bar_background_dark", "material_grey_850"
+                        "yt_black4", "yt_status_bar_background_dark", "material_grey_850",
                         -> darkThemeBackgroundColor ?: continue
 
                         "yt_white1", "yt_white1_opacity95", "yt_white1_opacity98",
@@ -68,14 +71,17 @@ internal object ThemeResourcePatch : ResourcePatch() {
         // Edit splash screen files and change the background color,
         // if the background colors are set.
         if (darkThemeBackgroundColor != null && lightThemeBackgroundColor != null) {
-            val splashScreenResourceFiles = listOf(
+            val splashScreenResourceFiles =
+                listOf(
                     "res/drawable/quantum_launchscreen_youtube.xml",
-                "res/drawable-sw600dp/quantum_launchscreen_youtube.xml"
+                    "res/drawable-sw600dp/quantum_launchscreen_youtube.xml",
                 )
 
             splashScreenResourceFiles.forEach editSplashScreen@{ resourceFile ->
-                context.xmlEditor[resourceFile].use {
+                context.xmlEditor[resourceFile].use { editor ->
-                    val layerList = it.file.getElementsByTagName("layer-list").item(0) as Element
+                    val document = editor.file
+
+                    val layerList = document.getElementsByTagName("layer-list").item(0) as Element
 
                     val childNodes = layerList.childNodes
                     for (i in 0 until childNodes.length) {
@@ -89,24 +95,26 @@ internal object ThemeResourcePatch : ResourcePatch() {
                 }
             }
         }
-
     }
 
     private fun addColorResource(
         context: ResourceContext,
         resourceFile: String,
         colorName: String,
-        colorValue: String
+        colorValue: String,
     ) {
-        context.xmlEditor[resourceFile].use {
+        context.xmlEditor[resourceFile].use { editor ->
-            val resourcesNode = it.file.getElementsByTagName("resources").item(0) as Element
+            val document = editor.file
+
+            val resourcesNode = document.getElementsByTagName("resources").item(0) as Element
 
             resourcesNode.appendChild(
-                it.file.createElement("color").apply {
+                document.createElement("color").apply {
                     setAttribute("name", colorName)
                     setAttribute("category", "color")
                     textContent = colorValue
-                })
+                },
+            )
         }
     }
 }

src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/fingerprints/LithoFilterFingerprint.kt

@@ -5,9 +5,9 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
 internal object LithoFilterFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.CONSTRUCTOR,
+    accessFlags = AccessFlags.STATIC or AccessFlags.CONSTRUCTOR,
     returnType = "V",
     customFingerprint = { _, classDef ->
         classDef.type.endsWith("LithoFilterPatch;")
-    }
+    },
 )

src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch.kt

@@ -18,11 +18,11 @@ object BottomControlsResourcePatch : ResourcePatch(), Closeable {
     private var lastLeftOf = "fullscreen_button"
 
     private lateinit var resourceContext: ResourceContext
-    private lateinit var targetXmlEditor: DomFileEditor
+    private lateinit var targetDocumentEditor: DomFileEditor
 
     override fun execute(context: ResourceContext) {
         resourceContext = context
-        targetXmlEditor = context.xmlEditor[TARGET_RESOURCE]
+        targetDocumentEditor = context.xmlEditor[TARGET_RESOURCE]
 
         bottomUiContainerResourceId = ResourceMappingPatch.resourceMappings
             .single { it.type == "id" && it.name == "bottom_ui_container_stub" }.id
@@ -34,21 +34,21 @@ object BottomControlsResourcePatch : ResourcePatch(), Closeable {
      * @param resourceDirectoryName The name of the directory containing the hosting resource.
      */
     fun addControls(resourceDirectoryName: String) {
-        val sourceXmlEditor = resourceContext.xmlEditor[
+        val sourceDocumentEditor = resourceContext.xmlEditor[
             this::class.java.classLoader.getResourceAsStream(
-                "$resourceDirectoryName/host/layout/$TARGET_RESOURCE_NAME"
+                "$resourceDirectoryName/host/layout/$TARGET_RESOURCE_NAME",
-            )!!
+            )!!,
         ]
+        val sourceDocument = sourceDocumentEditor.file
+        val targetDocument = targetDocumentEditor.file
 
-        val targetElement = "android.support.constraint.ConstraintLayout"
+        val targetElementTag = "android.support.constraint.ConstraintLayout"
 
-        val hostElements = sourceXmlEditor.file.getElementsByTagName(targetElement).item(0).childNodes
+        val sourceElements = sourceDocument.getElementsByTagName(targetElementTag).item(0).childNodes
+        val targetElement = targetDocument.getElementsByTagName(targetElementTag).item(0)
 
-        val destinationResourceFile = targetXmlEditor.file
+        for (index in 1 until sourceElements.length) {
-        val destinationElement = destinationResourceFile.getElementsByTagName(targetElement).item(0)
+            val element = sourceElements.item(index).cloneNode(true)
-
-        for (index in 1 until hostElements.length) {
-            val element = hostElements.item(index).cloneNode(true)
 
             // If the element has no attributes there's no point to adding it to the destination.
             if (!element.hasAttributes()) continue
@@ -63,11 +63,11 @@ object BottomControlsResourcePatch : ResourcePatch(), Closeable {
             lastLeftOf = element.attributes.getNamedItem("android:id").nodeValue.substring(nameSpaceLength)
 
             // Add the element.
-            destinationResourceFile.adoptNode(element)
+            targetDocument.adoptNode(element)
-            destinationElement.appendChild(element)
+            targetElement.appendChild(element)
         }
-        sourceXmlEditor.close()
+        sourceDocumentEditor.close()
     }
 
-    override fun close() = targetXmlEditor.close()
+    override fun close() = targetDocumentEditor.close()
 }

src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsResourcePatch.kt

@@ -12,12 +12,13 @@ import org.w3c.dom.Element
 object SettingsResourcePatch : BaseSettingsResourcePatch(
     IntentPreference(
         "revanced_settings",
-        intent = SettingsPatch.newIntent("revanced_settings_intent")
+        intent = SettingsPatch.newIntent("revanced_settings_intent"),
     ) to "settings_fragment",
-    dependencies = setOf(
+    dependencies =
+    setOf(
         ResourceMappingPatch::class,
         AddResourcesPatch::class,
-    )
+    ),
 ) {
     // Used for a fingerprint from SettingsPatch.
     internal var appearanceStringId = -1L
@@ -28,12 +29,13 @@ object SettingsResourcePatch : BaseSettingsResourcePatch(
         AddResourcesPatch(this::class)
 
         // Used for a fingerprint from SettingsPatch.
-        appearanceStringId = ResourceMappingPatch.resourceMappings.find {
+        appearanceStringId =
+            ResourceMappingPatch.resourceMappings.find {
                 it.type == "string" && it.name == "app_theme_appearance_dark"
             }!!.id
 
         arrayOf(
-            ResourceGroup("layout", "revanced_settings_with_toolbar.xml")
+            ResourceGroup("layout", "revanced_settings_with_toolbar.xml"),
         ).forEach { resourceGroup ->
             context.copyResources("settings", resourceGroup)
         }
@@ -42,19 +44,21 @@ object SettingsResourcePatch : BaseSettingsResourcePatch(
         // Some devices freak out if undeclared data is passed to an intent,
         // and this change appears to fix the issue.
         context.xmlEditor["AndroidManifest.xml"].use { editor ->
+            val document = editor.file
+
             // A xml regular-expression would probably work better than this manual searching.
-            val manifestNodes = editor.file.getElementsByTagName("manifest").item(0).childNodes
+            val manifestNodes = document.getElementsByTagName("manifest").item(0).childNodes
             for (i in 0..manifestNodes.length) {
                 val node = manifestNodes.item(i)
                 if (node != null && node.nodeName == "application") {
                     val applicationNodes = node.childNodes
                     for (j in 0..applicationNodes.length) {
                         val applicationChild = applicationNodes.item(j)
-                        if (applicationChild is Element && applicationChild.nodeName == "activity"
+                        if (applicationChild is Element && applicationChild.nodeName == "activity" &&
-                            && applicationChild.getAttribute("android:name") == "com.google.android.libraries.social.licenses.LicenseActivity"
+                            applicationChild.getAttribute("android:name") == "com.google.android.libraries.social.licenses.LicenseActivity"
                         ) {
-                            val intentFilter = editor.file.createElement("intent-filter")
+                            val intentFilter = document.createElement("intent-filter")
-                            val mimeType = editor.file.createElement("data")
+                            val mimeType = document.createElement("data")
                             mimeType.setAttribute("android:mimeType", "text/plain")
                             intentFilter.appendChild(mimeType)
                             applicationChild.appendChild(intentFilter)

src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt

@@ -13,20 +13,21 @@ import app.revanced.patches.youtube.video.speed.remember.RememberPlaybackSpeedPa
     dependencies = [CustomPlaybackSpeedPatch::class, RememberPlaybackSpeedPatch::class],
     compatiblePackages = [
         CompatiblePackage(
-            "com.google.android.youtube", [
+            "com.google.android.youtube",
+            [
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
                 "19.03.35",
                 "19.03.36",
-                "19.04.37"
+                "19.04.37",
-            ]
+            ],
-        )
+        ),
-    ]
+    ],
 )
 @Suppress("unused")
-object PlaybackSpeedPatch : BytecodePatch() {
+object PlaybackSpeedPatch : BytecodePatch(emptySet()) {
     override fun execute(context: BytecodeContext) {
         // All patches this patch depends on succeed.
     }

src/main/kotlin/app/revanced/util/ResourceUtils.kt

@@ -2,7 +2,6 @@ package app.revanced.util
 
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.util.DomFileEditor
-import app.revanced.patches.all.misc.resources.AddResourcesPatch
 import app.revanced.util.resource.BaseResource
 import org.w3c.dom.Node
 import org.w3c.dom.NodeList
@@ -25,7 +24,8 @@ fun Node.childElementsSequence() = this.childNodes.asSequence().filter { it.node
 /**
  * Performs the given [action] on each child element.
  */
-fun Node.forEachChildElement(action: (Node) -> Unit) = childElementsSequence().forEach {
+fun Node.forEachChildElement(action: (Node) -> Unit) =
+    childElementsSequence().forEach {
         action(it)
     }
 
@@ -45,15 +45,19 @@ fun Node.doRecursively(action: (Node) -> Unit) {
  * @param sourceResourceDirectory The source resource directory name.
  * @param resources The resources to copy.
  */
-fun ResourceContext.copyResources(sourceResourceDirectory: String, vararg resources: ResourceGroup) {
+fun ResourceContext.copyResources(
-    val targetResourceDirectory = this["res"]
+    sourceResourceDirectory: String,
+    vararg resources: ResourceGroup,
+) {
+    val targetResourceDirectory = this.get("res")
 
     for (resourceGroup in resources) {
         resourceGroup.resources.forEach { resource ->
             val resourceFile = "${resourceGroup.resourceDirectoryName}/$resource"
             Files.copy(
                 inputStreamFromBundledResource(sourceResourceDirectory, resourceFile)!!,
-                targetResourceDirectory.resolve(resourceFile).toPath(), StandardCopyOption.REPLACE_EXISTING
+                targetResourceDirectory.resolve(resourceFile).toPath(),
+                StandardCopyOption.REPLACE_EXISTING,
             )
         }
     }
@@ -61,7 +65,7 @@ fun ResourceContext.copyResources(sourceResourceDirectory: String, vararg resour
 
 internal fun inputStreamFromBundledResource(
     sourceResourceDirectory: String,
-    resourceFile: String
+    resourceFile: String,
 ): InputStream? = classLoader.getResourceAsStream("$sourceResourceDirectory/$resourceFile")
 
 /**
@@ -80,20 +84,15 @@ class ResourceGroup(val resourceDirectoryName: String, vararg val resources: Str
 fun ResourceContext.iterateXmlNodeChildren(
     resource: String,
     targetTag: String,
-    callback: (node: Node) -> Unit
+    callback: (node: Node) -> Unit,
-) =
+) = xmlEditor[classLoader.getResourceAsStream(resource)!!].use { editor ->
-    xmlEditor[classLoader.getResourceAsStream(resource)!!].use {
+    val document = editor.file
-        val stringsNode = it.file.getElementsByTagName(targetTag).item(0).childNodes
+
+    val stringsNode = document.getElementsByTagName(targetTag).item(0).childNodes
     for (i in 1 until stringsNode.length - 1) callback(stringsNode.item(i))
 }
 
-
+// TODO: After the migration to the new patcher, remove the following code and replace it with the commented code below.
-/**
- * Copies the specified node of the source [DomFileEditor] to the target [DomFileEditor].
- * @param source the source [DomFileEditor].
- * @param target the target [DomFileEditor]-
- * @return AutoCloseable that closes the target [DomFileEditor]s.
- */
 fun String.copyXmlNode(source: DomFileEditor, target: DomFileEditor): AutoCloseable {
     val hostNodes = source.file.getElementsByTagName(this).item(0).childNodes
 
@@ -112,14 +111,56 @@ fun String.copyXmlNode(source: DomFileEditor, target: DomFileEditor): AutoClosea
     }
 }
 
+// /**
+//  * Copies the specified node of the source [Document] to the target [Document].
+//  * @param source the source [Document].
+//  * @param target the target [Document]-
+//  * @return AutoCloseable that closes the [Document]s.
+//  */
+// fun String.copyXmlNode(
+//     source: Document,
+//     target: Document,
+// ): AutoCloseable {
+//     val hostNodes = source.getElementsByTagName(this).item(0).childNodes
+//
+//     val destinationNode = target.getElementsByTagName(this).item(0)
+//
+//     for (index in 0 until hostNodes.length) {
+//         val node = hostNodes.item(index).cloneNode(true)
+//         target.adoptNode(node)
+//         destinationNode.appendChild(node)
+//     }
+//
+//     return AutoCloseable {
+//         source.close()
+//         target.close()
+//     }
+// }
+
+// @Deprecated(
+//     "Use copyXmlNode(Document, Document) instead.",
+//     ReplaceWith(
+//         "this.copyXmlNode(source.file as Document, target.file as Document)",
+//         "app.revanced.patcher.util.Document",
+//         "app.revanced.patcher.util.Document",
+//     ),
+// )
+// fun String.copyXmlNode(
+//     source: DomFileEditor,
+//     target: DomFileEditor,
+// ) = this.copyXmlNode(source.file as Document, target.file as Document)
+
 /**
  * Add a resource node child.
  *
  * @param resource The resource to add.
  * @param resourceCallback Called when a resource has been processed.
  */
-internal fun Node.addResource(resource: BaseResource, resourceCallback: (BaseResource) -> Unit = { }) {
+internal fun Node.addResource(
+    resource: BaseResource,
+    resourceCallback: (BaseResource) -> Unit = { },
+) {
     appendChild(resource.serialize(ownerDocument, resourceCallback))
 }
 
-internal fun DomFileEditor?.getNode(tagName: String) = this!!.file.getElementsByTagName(tagName).item(0)
+internal fun org.w3c.dom.Document.getNode(tagName: String) = this.getElementsByTagName(tagName).item(0)

src/main/resources/addresources/values/arrays.xml

@@ -20,12 +20,16 @@
         </patch>
         <patch id="layout.startpage.ChangeStartPagePatch">
             <string-array name="revanced_start_page_entries">
-                <item>@string/revanced_start_page_home_entry_0</item>
+                <item>@string/revanced_start_page_entry_0</item>
-                <item>@string/revanced_start_page_home_entry_1</item>
+                <item>@string/revanced_start_page_entry_1</item>
-                <item>@string/revanced_start_page_search_entry_2</item>
+                <item>@string/revanced_start_page_entry_2</item>
-                <item>@string/revanced_start_page_subscriptions_entry_3</item>
+                <item>@string/revanced_start_page_entry_3</item>
-                <item>@string/revanced_start_page_explore_entry_4</item>
+                <item>@string/revanced_start_page_entry_4</item>
-                <item>@string/revanced_start_page_shorts_entry_5</item>
+                <item>@string/revanced_start_page_entry_5</item>
+                <item>@string/revanced_start_page_entry_6</item>
+                <item>@string/revanced_start_page_entry_7</item>
+                <item>@string/revanced_start_page_entry_8</item>
+                <item>@string/revanced_start_page_entry_9</item>
             </string-array>
             <string-array name="revanced_start_page_entry_values">
                 <item/>
@@ -34,6 +38,11 @@
                 <item>open.subscriptions</item>
                 <item>open.explore</item>
                 <item>open.shorts</item>
+                <item>www.youtube.com/feed/library</item>
+                <!-- Liked videos -->
+                <item>www.youtube.com/playlist?list=LL</item>
+                <item>www.youtube.com/feed/history</item>
+                <item>www.youtube.com/feed/trending</item>
             </string-array>
         </patch>
         <patch id="layout.thumbnails.AlternativeThumbnailsPatch">

src/main/resources/addresources/values/strings.xml

@@ -792,12 +792,16 @@
         </patch>
         <patch id="layout.startpage.ChangeStartPagePatch">
             <string name="revanced_start_page_title">Set start page</string>
-            <string name="revanced_start_page_home_entry_0">Default</string>
+            <string name="revanced_start_page_entry_0">Default</string>
-            <string name="revanced_start_page_home_entry_1">Home</string>
+            <string name="revanced_start_page_entry_1">Home</string>
-            <string name="revanced_start_page_search_entry_2">Search</string>
+            <string name="revanced_start_page_entry_2">Search</string>
-            <string name="revanced_start_page_subscriptions_entry_3">Subscriptions</string>
+            <string name="revanced_start_page_entry_3">Subscriptions</string>
-            <string name="revanced_start_page_explore_entry_4">Explore</string>
+            <string name="revanced_start_page_entry_4">Explore</string>
-            <string name="revanced_start_page_shorts_entry_5">Shorts</string>
+            <string name="revanced_start_page_entry_5">Shorts</string>
+            <string name="revanced_start_page_entry_6">Library</string>
+            <string name="revanced_start_page_entry_7">Liked videos</string>
+            <string name="revanced_start_page_entry_8">History</string>
+            <string name="revanced_start_page_entry_9">Trending</string>
         </patch>
         <patch id="layout.startupshortsreset.DisableResumingShortsOnStartupPatch">
             <string name="revanced_disable_resuming_shorts_player_title">Disable resuming Shorts player</string>