Merge branch 'dev' into revanced-extended

.github/workflows/discord_ping_on_release.yml

@@ -10,13 +10,33 @@ jobs:
     steps:
       - uses: sarisia/actions-status-discord@v1
         if: always()
+        id: webhook # set id to reference output payload later
         with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK_URL }}
-          username: ReVanced Extended
-          color: 0xff5252
+          ack_no_webhook: true # suppress warning
           nodetail: true
           notimestamp: true
+
+          username: ReVanced Extended
           content: "<@&1271197877724643461>"
           title: "Patches `${{ github.event.release.tag_name }}` has been released!"
           description: |
-            Click [here](${{ github.event.release.html_url }}) to read the changelog and release notes.
+            Click [here](${{ github.event.release.html_url }}) to read the changelog and release notes.
+
+      - run: npm install axios
+      - uses: actions/github-script@v7
+        env:
+          WEBHOOK_PAYLOAD: ${{ steps.webhook.outputs.payload }}
+          WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
+        with:
+          script: |
+            const axios = require("axios")
+
+            const { WEBHOOK_PAYLOAD, WEBHOOK_URL } = process.env
+
+            const payload = JSON.parse(WEBHOOK_PAYLOAD)
+
+            // remove the color field to make it transparent
+            delete payload.embeds[0].color
+
+            // send to Discord 
+            axios.post(WEBHOOK_URL, payload)

README.md

@@ -80,46 +80,46 @@ See the [documentation](https://github.com/inotia00/revanced-documentation#readm
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `Amoled` | Applies a pure black theme to some components. | 6.20.51 ~ 7.25.52 |
-| `Bitrate default value` | Sets the audio quality to 'Always High' when you first install the app. | 6.20.51 ~ 7.25.52 |
-| `Bypass image region restrictions` | Adds an option to use a different host for static images, so that images blocked in some countries can be received. | 6.20.51 ~ 7.25.52 |
-| `Certificate spoof` | Enables YouTube Music to work with Android Auto by spoofing the YouTube Music certificate. | 6.20.51 ~ 7.25.52 |
-| `Change share sheet` | Add option to change from in-app share sheet to system share sheet. | 6.20.51 ~ 7.25.52 |
-| `Change start page` | Adds an option to set which page the app opens in instead of the homepage. | 6.20.51 ~ 7.25.52 |
-| `Custom branding icon for YouTube Music` | Changes the YouTube Music app icon to the icon specified in patch options. | 6.20.51 ~ 7.25.52 |
-| `Custom branding name for YouTube Music` | Renames the YouTube Music app to the name specified in patch options. | 6.20.51 ~ 7.25.52 |
-| `Custom header for YouTube Music` | Applies a custom header in the top left corner within the app. | 6.20.51 ~ 7.25.52 |
-| `Disable Cairo splash animation` | Adds an option to disable Cairo splash animation. | 7.06.54 ~ 7.25.52 |
-| `Disable DRC audio` | Adds an option to disable DRC (Dynamic Range Compression) audio. | 6.20.51 ~ 7.25.52 |
-| `Disable auto captions` | Adds an option to disable captions from being automatically enabled. | 6.20.51 ~ 7.25.52 |
-| `Disable dislike redirection` | Adds an option to disable redirection to the next track when clicking the Dislike button. | 6.20.51 ~ 7.25.52 |
-| `Enable OPUS codec` | Adds an options to enable the OPUS audio codec if the player response includes. | 6.20.51 ~ 7.25.52 |
-| `Enable debug logging` | Adds an option to enable debug logging. | 6.20.51 ~ 7.25.52 |
-| `Enable landscape mode` | Adds an option to enable landscape mode when rotating the screen on phones. | 6.20.51 ~ 7.25.52 |
-| `Flyout menu components` | Adds options to hide or change flyout menu components. | 6.20.51 ~ 7.25.52 |
-| `GmsCore support` | Allows patched Google apps to run without root and under a different package name by using GmsCore instead of Google Play Services. | 6.20.51 ~ 7.25.52 |
-| `Hide account components` | Adds options to hide components related to the account menu. | 6.20.51 ~ 7.25.52 |
-| `Hide action bar components` | Adds options to hide action bar components and replace the offline download button with an external download button. | 6.20.51 ~ 7.25.52 |
-| `Hide ads` | Adds options to hide ads. | 6.20.51 ~ 7.25.52 |
-| `Hide layout components` | Adds options to hide general layout components. | 6.20.51 ~ 7.25.52 |
-| `Hide overlay filter` | Removes, at compile time, the dark overlay that appears when player flyout menus are open. | 6.20.51 ~ 7.25.52 |
-| `Hide player overlay filter` | Removes, at compile time, the dark overlay that appears when single-tapping in the player. | 6.20.51 ~ 7.25.52 |
-| `Navigation bar components` | Adds options to hide or change components related to the navigation bar. | 6.20.51 ~ 7.25.52 |
-| `Player components` | Adds options to hide or change components related to the player. | 6.20.51 ~ 7.25.52 |
-| `Remove background playback restrictions` | Removes restrictions on background playback, including for kids videos. | 6.20.51 ~ 7.25.52 |
-| `Remove viewer discretion dialog` | Adds an option to remove the dialog that appears when opening a video that has been age-restricted by accepting it automatically. This does not bypass the age restriction. | 6.20.51 ~ 7.25.52 |
-| `Restore old style library shelf` | Adds an option to return the Library tab to the old style. | 6.20.51 ~ 7.25.52 |
-| `Return YouTube Dislike` | Adds an option to show the dislike count of songs using the Return YouTube Dislike API. | 6.20.51 ~ 7.25.52 |
-| `Return YouTube Username` | Adds an option to replace YouTube handles with usernames in comments using YouTube Data API v3. | 6.20.51 ~ 7.25.52 |
-| `Sanitize sharing links` | Adds an option to remove tracking query parameters from URLs when sharing links. | 6.20.51 ~ 7.25.52 |
-| `Settings for YouTube Music` | Applies mandatory patches to implement ReVanced Extended settings into the application. | 6.20.51 ~ 7.25.52 |
-| `SponsorBlock` | Adds options to enable and configure SponsorBlock, which can skip undesired video segments, such as non-music sections. | 6.20.51 ~ 7.25.52 |
+| `Amoled` | Applies a pure black theme to some components. | 6.20.51 ~ 7.25.53 |
+| `Bitrate default value` | Sets the audio quality to 'Always High' when you first install the app. | 6.20.51 ~ 7.25.53 |
+| `Bypass image region restrictions` | Adds an option to use a different host for static images, so that images blocked in some countries can be received. | 6.20.51 ~ 7.25.53 |
+| `Certificate spoof` | Enables YouTube Music to work with Android Auto by spoofing the YouTube Music certificate. | 6.20.51 ~ 7.25.53 |
+| `Change share sheet` | Add option to change from in-app share sheet to system share sheet. | 6.20.51 ~ 7.25.53 |
+| `Change start page` | Adds an option to set which page the app opens in instead of the homepage. | 6.20.51 ~ 7.25.53 |
+| `Custom branding icon for YouTube Music` | Changes the YouTube Music app icon to the icon specified in patch options. | 6.20.51 ~ 7.25.53 |
+| `Custom branding name for YouTube Music` | Renames the YouTube Music app to the name specified in patch options. | 6.20.51 ~ 7.25.53 |
+| `Custom header for YouTube Music` | Applies a custom header in the top left corner within the app. | 6.20.51 ~ 7.25.53 |
+| `Disable Cairo splash animation` | Adds an option to disable Cairo splash animation. | 7.06.54 ~ 7.25.53 |
+| `Disable DRC audio` | Adds an option to disable DRC (Dynamic Range Compression) audio. | 6.20.51 ~ 7.25.53 |
+| `Disable auto captions` | Adds an option to disable captions from being automatically enabled. | 6.20.51 ~ 7.25.53 |
+| `Disable dislike redirection` | Adds an option to disable redirection to the next track when clicking the Dislike button. | 6.20.51 ~ 7.25.53 |
+| `Enable OPUS codec` | Adds an options to enable the OPUS audio codec if the player response includes. | 6.20.51 ~ 7.25.53 |
+| `Enable debug logging` | Adds an option to enable debug logging. | 6.20.51 ~ 7.25.53 |
+| `Enable landscape mode` | Adds an option to enable landscape mode when rotating the screen on phones. | 6.20.51 ~ 7.25.53 |
+| `Flyout menu components` | Adds options to hide or change flyout menu components. | 6.20.51 ~ 7.25.53 |
+| `GmsCore support` | Allows patched Google apps to run without root and under a different package name by using GmsCore instead of Google Play Services. | 6.20.51 ~ 7.25.53 |
+| `Hide account components` | Adds options to hide components related to the account menu. | 6.20.51 ~ 7.25.53 |
+| `Hide action bar components` | Adds options to hide action bar components and replace the offline download button with an external download button. | 6.20.51 ~ 7.25.53 |
+| `Hide ads` | Adds options to hide ads. | 6.20.51 ~ 7.25.53 |
+| `Hide layout components` | Adds options to hide general layout components. | 6.20.51 ~ 7.25.53 |
+| `Hide overlay filter` | Removes, at compile time, the dark overlay that appears when player flyout menus are open. | 6.20.51 ~ 7.25.53 |
+| `Hide player overlay filter` | Removes, at compile time, the dark overlay that appears when single-tapping in the player. | 6.20.51 ~ 7.25.53 |
+| `Navigation bar components` | Adds options to hide or change components related to the navigation bar. | 6.20.51 ~ 7.25.53 |
+| `Player components` | Adds options to hide or change components related to the player. | 6.20.51 ~ 7.25.53 |
+| `Remove background playback restrictions` | Removes restrictions on background playback, including for kids videos. | 6.20.51 ~ 7.25.53 |
+| `Remove viewer discretion dialog` | Adds an option to remove the dialog that appears when opening a video that has been age-restricted by accepting it automatically. This does not bypass the age restriction. | 6.20.51 ~ 7.25.53 |
+| `Restore old style library shelf` | Adds an option to return the Library tab to the old style. | 6.20.51 ~ 7.25.53 |
+| `Return YouTube Dislike` | Adds an option to show the dislike count of songs using the Return YouTube Dislike API. | 6.20.51 ~ 7.25.53 |
+| `Return YouTube Username` | Adds an option to replace YouTube handles with usernames in comments using YouTube Data API v3. | 6.20.51 ~ 7.25.53 |
+| `Sanitize sharing links` | Adds an option to remove tracking query parameters from URLs when sharing links. | 6.20.51 ~ 7.25.53 |
+| `Settings for YouTube Music` | Applies mandatory patches to implement ReVanced Extended settings into the application. | 6.20.51 ~ 7.25.53 |
+| `SponsorBlock` | Adds options to enable and configure SponsorBlock, which can skip undesired video segments, such as non-music sections. | 6.20.51 ~ 7.25.53 |
 | `Spoof app version` | Adds options to spoof the YouTube Music client version. This can remove the radio mode restriction in Canadian regions or disable real-time lyrics. | 6.20.51 ~ 7.16.53 |
-| `Spoof client` | Adds options to spoof the client to allow playback. | 6.20.51 ~ 7.25.52 |
-| `Spoof streaming data` | Adds options to spoof the streaming data to allow playback. | 6.20.51 ~ 7.25.52 |
-| `Translations for YouTube Music` | Add translations or remove string resources. | 6.20.51 ~ 7.25.52 |
-| `Video playback` | Adds options to customize settings related to video playback, such as default video quality and playback speed. | 6.20.51 ~ 7.25.52 |
-| `Visual preferences icons for YouTube Music` | Adds icons to specific preferences in the settings. | 6.20.51 ~ 7.25.52 |
+| `Spoof client` | Adds options to spoof the client to allow playback. | 6.20.51 ~ 7.16.53 |
+| `Spoof streaming data` | Adds options to spoof the streaming data to allow playback. | 6.20.51 ~ 7.25.53 |
+| `Translations for YouTube Music` | Add translations or remove string resources. | 6.20.51 ~ 7.25.53 |
+| `Video playback` | Adds options to customize settings related to video playback, such as default video quality and playback speed. | 6.20.51 ~ 7.25.53 |
+| `Visual preferences icons for YouTube Music` | Adds icons to specific preferences in the settings. | 6.20.51 ~ 7.25.53 |
 </details>
 
 ### [📦 `com.reddit.frontpage`](https://play.google.com/store/apps/details?id=com.reddit.frontpage)
@@ -180,7 +180,7 @@ Example:
         "6.42.55",
         "6.51.53",
         "7.16.53",
-        "7.25.52"
+        "7.25.53"
       ]
     },
     "options": []

extensions/shared/src/main/java/app/revanced/extension/music/patches/actionbar/ActionBarPatch.java

@@ -8,6 +8,7 @@
 import androidx.annotation.NonNull;
 
 import app.revanced.extension.music.settings.Settings;
+import app.revanced.extension.music.utils.VideoUtils;
 
 @SuppressWarnings("unused")
 public class ActionBarPatch {
@@ -39,6 +40,15 @@ public static void hideLikeDislikeButton(View view) {
         );
     }
 
+    public static void inAppDownloadButtonOnClick(View view) {
+        if (!Settings.EXTERNAL_DOWNLOADER_ACTION_BUTTON.get()) {
+            return;
+        }
+
+        if (buttonType.equals(ActionButton.DOWNLOAD.name))
+            view.setOnClickListener(imageView -> VideoUtils.launchExternalDownloader());
+    }
+
     public static void setButtonType(@NonNull Object obj) {
         final String buttonType = obj.toString();
 

extensions/shared/src/main/java/app/revanced/extension/music/patches/misc/SpoofClientPatch.java

@@ -2,11 +2,11 @@
 
 import app.revanced.extension.music.patches.misc.client.AppClient.ClientType;
 import app.revanced.extension.music.settings.Settings;
-import app.revanced.extension.shared.patches.BlockRequestPatch;
 
 @SuppressWarnings("unused")
-public class SpoofClientPatch extends BlockRequestPatch {
+public class SpoofClientPatch {
     private static final ClientType CLIENT_TYPE = Settings.SPOOF_CLIENT_TYPE.get();
+    public static final boolean SPOOF_CLIENT = Settings.SPOOF_CLIENT.get();
 
     /**
      * Injection point.

extensions/shared/src/main/java/app/revanced/extension/music/patches/misc/client/AppClient.java

@@ -2,49 +2,78 @@
 
 import android.os.Build;
 
-import app.revanced.extension.music.settings.Settings;
-
 public class AppClient {
-    private static final String CLIENT_VERSION_ANDROID_MUSIC = Settings.SPOOF_CLIENT_LEGACY.get()
-            ? "4.27.53"     // Audio codec is MP4A.
-            : "5.29.53";    // Audio codec is OPUS.
+
+    // Audio codec is MP4A.
+    private static final String CLIENT_VERSION_ANDROID_MUSIC_4_27 = "4.27.53";
+
+    // Audio codec is OPUS.
+    private static final String CLIENT_VERSION_ANDROID_MUSIC_5_29 = "5.29.53";
+
+    private static final String PACKAGE_NAME_ANDROID_MUSIC = "com.google.android.apps.youtube.music";
+    private static final String DEVICE_MODEL_ANDROID_MUSIC = Build.MODEL;
     private static final String OS_VERSION_ANDROID_MUSIC = Build.VERSION.RELEASE;
-    private static final String USER_AGENT_ANDROID_MUSIC = "com.google.android.apps.youtube.music/" +
-            CLIENT_VERSION_ANDROID_MUSIC +
-            " (Linux; U; Android " +
-            OS_VERSION_ANDROID_MUSIC +
-            "; GB) gzip";
-
-    private static final String CLIENT_VERSION_IOS_MUSIC = Settings.SPOOF_CLIENT_LEGACY.get()
-            ? "4.27"        // Audio codec is MP4A.
-            : "7.31.2";     // Audio codec is OPUS.
+
+    // Audio codec is MP4A.
+    private static final String CLIENT_VERSION_IOS_MUSIC_6_21 = "6.21";
+
+    // Audio codec is OPUS.
+    private static final String CLIENT_VERSION_IOS_MUSIC_7_04 = "7.04";
+
+    private static final String PACKAGE_NAME_IOS_MUSIC = "com.google.ios.youtubemusic";
     private static final String DEVICE_MODEL_IOS_MUSIC = "iPhone14,3";
     private static final String OS_VERSION_IOS_MUSIC = "15.7.1.19H117";
     private static final String USER_AGENT_VERSION_IOS_MUSIC = "15_7_1";
-    private static final String USER_AGENT_IOS_MUSIC = "com.google.ios.youtubemusic/" +
-            CLIENT_VERSION_IOS_MUSIC +
-            "(" +
-            DEVICE_MODEL_IOS_MUSIC +
-            "; U; CPU iOS " +
-            USER_AGENT_VERSION_IOS_MUSIC +
-            " like Mac OS X)";
 
     private AppClient() {
     }
 
+    private static String androidUserAgent(String clientVersion) {
+        return PACKAGE_NAME_ANDROID_MUSIC +
+                "/" +
+                clientVersion +
+                " (Linux; U; Android " +
+                OS_VERSION_ANDROID_MUSIC +
+                "; GB) gzip";
+    }
+
+    private static String iOSUserAgent(String clientVersion) {
+        return PACKAGE_NAME_IOS_MUSIC +
+                "/" +
+                clientVersion +
+                "(" +
+                DEVICE_MODEL_IOS_MUSIC +
+                "; U; CPU iOS " +
+                USER_AGENT_VERSION_IOS_MUSIC +
+                " like Mac OS X)";
+    }
+
     public enum ClientType {
-        ANDROID_MUSIC(21,
-                Build.MODEL,
+        ANDROID_MUSIC_4_27(21,
+                DEVICE_MODEL_ANDROID_MUSIC,
+                OS_VERSION_ANDROID_MUSIC,
+                androidUserAgent(CLIENT_VERSION_ANDROID_MUSIC_4_27),
+                CLIENT_VERSION_ANDROID_MUSIC_4_27
+        ),
+        ANDROID_MUSIC_5_29(21,
+                DEVICE_MODEL_ANDROID_MUSIC,
                 OS_VERSION_ANDROID_MUSIC,
-                USER_AGENT_ANDROID_MUSIC,
-                CLIENT_VERSION_ANDROID_MUSIC
+                androidUserAgent(CLIENT_VERSION_ANDROID_MUSIC_5_29),
+                CLIENT_VERSION_ANDROID_MUSIC_5_29
+        ),
+        IOS_MUSIC_6_21(
+                26,
+                DEVICE_MODEL_IOS_MUSIC,
+                OS_VERSION_IOS_MUSIC,
+                iOSUserAgent(CLIENT_VERSION_IOS_MUSIC_6_21),
+                CLIENT_VERSION_IOS_MUSIC_6_21
         ),
-        IOS_MUSIC(
+        IOS_MUSIC_7_04(
                 26,
                 DEVICE_MODEL_IOS_MUSIC,
                 OS_VERSION_IOS_MUSIC,
-                USER_AGENT_IOS_MUSIC,
-                CLIENT_VERSION_IOS_MUSIC
+                iOSUserAgent(CLIENT_VERSION_IOS_MUSIC_7_04),
+                CLIENT_VERSION_IOS_MUSIC_7_04
         );
 
         /**

extensions/shared/src/main/java/app/revanced/extension/music/settings/Settings.java

@@ -180,8 +180,8 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting DISABLE_DRC_AUDIO = new BooleanSetting("revanced_disable_drc_audio", FALSE, true);
     public static final BooleanSetting ENABLE_OPUS_CODEC = new BooleanSetting("revanced_enable_opus_codec", FALSE, true);
     public static final BooleanSetting SETTINGS_IMPORT_EXPORT = new BooleanSetting("revanced_extended_settings_import_export", FALSE, false);
-    public static final BooleanSetting SPOOF_CLIENT_LEGACY = new BooleanSetting("revanced_spoof_client_legacy", FALSE, true);
-    public static final EnumSetting<ClientType> SPOOF_CLIENT_TYPE = new EnumSetting<>("revanced_spoof_client_type", ClientType.ANDROID_MUSIC, true);
+    public static final BooleanSetting SPOOF_CLIENT = new BooleanSetting("revanced_spoof_client", FALSE, true);
+    public static final EnumSetting<ClientType> SPOOF_CLIENT_TYPE = new EnumSetting<>("revanced_spoof_client_type", ClientType.IOS_MUSIC_6_21, true);
 
 
     // PreferenceScreen: Return YouTube Dislike