From f3ffed42c11663a7b7c8de587519455e89938065 Mon Sep 17 00:00:00 2001
From: inotia00 <108592928+inotia00@users.noreply.github.com>
Date: Thu, 9 Nov 2023 17:16:49 +0900
Subject: [PATCH] feat(YouTube): add `Enable music search` patch

---
 .../general/musicsearch/MusicSearchPatch.kt   | 67 +++++++++++++++++++
 .../VoiceSearchConfigFingerprint.kt           |  9 +++
 .../youtube/settings/host/values/strings.xml  |  3 +
 .../youtube/settings/xml/revanced_prefs.xml   | 16 +++--
 4 files changed, 89 insertions(+), 6 deletions(-)
 create mode 100644 src/main/kotlin/app/revanced/patches/youtube/general/musicsearch/MusicSearchPatch.kt
 create mode 100644 src/main/kotlin/app/revanced/patches/youtube/general/musicsearch/fingerprints/VoiceSearchConfigFingerprint.kt

diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/musicsearch/MusicSearchPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/musicsearch/MusicSearchPatch.kt
new file mode 100644
index 000000000..72318487b
--- /dev/null
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/musicsearch/MusicSearchPatch.kt
@@ -0,0 +1,67 @@
+package app.revanced.patches.youtube.general.musicsearch
+
+import app.revanced.extensions.exception
+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.youtube.general.musicsearch.fingerprints.VoiceSearchConfigFingerprint
+import app.revanced.patches.youtube.utils.settings.SettingsPatch
+import app.revanced.util.integrations.Constants.GENERAL
+
+@Patch(
+    name = "Enable music search",
+    description = "Enables music search in the voice search screen.",
+    dependencies = [SettingsPatch::class],
+    compatiblePackages = [
+        CompatiblePackage(
+            "com.google.android.youtube",
+            [
+                "18.30.37",
+                "18.31.40",
+                "18.32.39",
+                "18.33.40",
+                "18.34.38",
+                "18.35.36",
+                "18.36.39",
+                "18.37.36",
+                "18.38.44",
+                "18.39.41",
+                "18.40.34"
+            ]
+        )
+    ],
+    use = false
+)
+@Suppress("unused")
+object MusicSearchPatch : BytecodePatch(
+    setOf(VoiceSearchConfigFingerprint)
+) {
+    override fun execute(context: BytecodeContext) {
+
+        VoiceSearchConfigFingerprint.result?.let {
+            it.mutableMethod.apply {
+                addInstructions(
+                    0, """
+                        invoke-static { }, $GENERAL->enableMusicSearch()Z
+                        move-result v0
+                        return v0
+                    """
+                )
+            }
+        } ?: throw VoiceSearchConfigFingerprint.exception
+
+        /**
+         * Add settings
+         */
+        SettingsPatch.addPreference(
+            arrayOf(
+                "PREFERENCE: GENERAL_SETTINGS",
+                "SETTINGS: ENABLE_MUSIC_SEARCH"
+            )
+        )
+
+        SettingsPatch.updatePatchStatus("Enable music search")
+    }
+}
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/musicsearch/fingerprints/VoiceSearchConfigFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/general/musicsearch/fingerprints/VoiceSearchConfigFingerprint.kt
new file mode 100644
index 000000000..f483b73ff
--- /dev/null
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/musicsearch/fingerprints/VoiceSearchConfigFingerprint.kt
@@ -0,0 +1,9 @@
+package app.revanced.patches.youtube.general.musicsearch.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.util.bytecode.isWide32LiteralExists
+
+object VoiceSearchConfigFingerprint : MethodFingerprint(
+    returnType = "Z",
+    customFingerprint = { methodDef, _ -> methodDef.isWide32LiteralExists(45417109) }
+)
\ No newline at end of file
diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml
index 8e676e856..482342f54 100644
--- a/src/main/resources/youtube/settings/host/values/strings.xml
+++ b/src/main/resources/youtube/settings/host/values/strings.xml
@@ -120,6 +120,9 @@
     <string name="revanced_enable_language_switch_summary_off">Language switch is disabled.</string>
     <string name="revanced_enable_language_switch_summary_on">Language switch is enabled.</string>
     <string name="revanced_enable_language_switch_title">Enable language switch</string>
+    <string name="revanced_enable_music_search_summary_off">Music search is disabled.</string>
+    <string name="revanced_enable_music_search_summary_on">Music search is enabled.</string>
+    <string name="revanced_enable_music_search_title">Enable music search</string>
     <string name="revanced_enable_new_splash_animation_summary_off">New splash animation is disabled.</string>
     <string name="revanced_enable_new_splash_animation_summary_on">New splash animation is enabled.</string>
     <string name="revanced_enable_new_splash_animation_title">Enable new splash animation</string>
diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index 8cda48ca6..3414ad825 100644
--- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -165,6 +165,9 @@
         <!-- SETTINGS: ENABLE_GRADIENT_LOADING_SCREEN
         <SwitchPreference android:title="@string/revanced_enable_gradient_loading_screen_title" android:key="revanced_enable_gradient_loading_screen" android:defaultValue="false" android:summaryOn="@string/revanced_enable_gradient_loading_screen_summary_on" android:summaryOff="@string/revanced_enable_gradient_loading_screen_summary_off" />SETTINGS: ENABLE_GRADIENT_LOADING_SCREEN -->
 
+        <!-- SETTINGS: ENABLE_MUSIC_SEARCH
+        <SwitchPreference android:title="@string/revanced_enable_music_search_title" android:key="revanced_enable_music_search" android:defaultValue="true" android:summaryOn="@string/revanced_enable_music_search_summary_on" android:summaryOff="@string/revanced_enable_music_search_summary_off" />SETTINGS: ENABLE_MUSIC_SEARCH -->
+
         <!-- SETTINGS: ENABLE_TABLET_MINI_PLAYER
         <SwitchPreference android:title="@string/revanced_enable_tablet_mini_player_title" android:key="revanced_enable_tablet_mini_player" android:defaultValue="false" android:summaryOn="@string/revanced_enable_tablet_mini_player_summary_on" android:summaryOff="@string/revanced_enable_tablet_mini_player_summary_off" />SETTINGS: ENABLE_TABLET_MINI_PLAYER -->
 
@@ -359,6 +362,7 @@
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_general" />
             <Preference android:title="Disable auto captions" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="Enable gradient loading screen" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
+            <Preference android:title="Enable music search" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="Enable tablet mini player" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="Enable wide search bar" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="Hide account menu" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
@@ -580,25 +584,25 @@
     <PreferenceScreen android:title="@string/revanced_seekbar" android:key="seekbar">
         <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_seekbar" />PREFERENCE: SEEKBAR_SETTINGS -->
 
-    <!-- SETTINGS: APPEND_TIME_STAMP_INFORMATION
+        <!-- SETTINGS: APPEND_TIME_STAMP_INFORMATION
         <SwitchPreference android:title="@string/revanced_append_time_stamp_information_title" android:key="revanced_append_time_stamp_information" android:defaultValue="true" android:summaryOn="@string/revanced_append_time_stamp_information_summary_on" android:summaryOff="@string/revanced_append_time_stamp_information_summary_off" />
         <SwitchPreference android:title="@string/revanced_append_time_stamp_information_type_title" android:key="revanced_append_time_stamp_information_type" android:defaultValue="true" android:summaryOn="@string/revanced_append_time_stamp_information_type_summary_on" android:summaryOff="@string/revanced_append_time_stamp_information_type_summary_off" android:dependency="revanced_append_time_stamp_information" />SETTINGS: APPEND_TIME_STAMP_INFORMATION -->
 
-    <!-- SETTINGS: CUSTOM_SEEKBAR_COLOR
+        <!-- SETTINGS: CUSTOM_SEEKBAR_COLOR
         <SwitchPreference android:title="@string/revanced_enable_custom_seekbar_color_title" android:key="revanced_enable_custom_seekbar_color" android:defaultValue="true" android:summaryOn="@string/revanced_enable_custom_seekbar_color_summary_on" android:summaryOff="@string/revanced_enable_custom_seekbar_color_summary_off" />
         <app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_custom_seekbar_color_value_title" android:key="revanced_custom_seekbar_color_value" android:summary="@string/revanced_custom_seekbar_color_value_summary" android:defaultValue="#ff0000" android:hint="#ff0000" android:inputType="text" />SETTINGS: CUSTOM_SEEKBAR_COLOR -->
 
-    <!-- SETTINGS: ENABLE_NEW_THUMBNAIL_PREVIEW
+        <!-- SETTINGS: ENABLE_NEW_THUMBNAIL_PREVIEW
         <SwitchPreference android:title="@string/revanced_enable_new_thumbnail_preview_title" android:key="revanced_enable_new_thumbnail_preview" android:defaultValue="false" android:summaryOn="@string/revanced_enable_new_thumbnail_preview_summary_on" android:summaryOff="@string/revanced_enable_new_thumbnail_preview_summary_off" />SETTINGS: ENABLE_NEW_THUMBNAIL_PREVIEW -->
 
-    <!-- SETTINGS: ENABLE_SEEKBAR_TAPPING
+        <!-- SETTINGS: ENABLE_SEEKBAR_TAPPING
         <SwitchPreference android:title="@string/revanced_enable_seekbar_tapping_title" android:key="revanced_enable_seekbar_tapping" android:defaultValue="true" android:summaryOn="@string/revanced_enable_seekbar_tapping_summary_on" android:summaryOff="@string/revanced_enable_seekbar_tapping_summary_off" />SETTINGS: ENABLE_SEEKBAR_TAPPING -->
 
-    <!-- SETTINGS: HIDE_SEEKBAR
+        <!-- SETTINGS: HIDE_SEEKBAR
         <SwitchPreference android:title="@string/revanced_hide_seekbar_title" android:key="revanced_hide_seekbar" android:defaultValue="false" android:summaryOn="@string/revanced_hide_seekbar_summary_on" android:summaryOff="@string/revanced_hide_seekbar_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_seekbar_thumbnail_title" android:key="revanced_hide_seekbar_thumbnail" android:defaultValue="false" android:summaryOn="@string/revanced_hide_seekbar_thumbnail_summary_on" android:summaryOff="@string/revanced_hide_seekbar_thumbnail_summary_off" />SETTINGS: HIDE_SEEKBAR -->
 
-    <!-- SETTINGS: HIDE_TIME_STAMP
+        <!-- SETTINGS: HIDE_TIME_STAMP
         <SwitchPreference android:title="@string/revanced_hide_time_stamp_title" android:key="revanced_hide_time_stamp" android:defaultValue="false" android:summaryOn="@string/revanced_hide_time_stamp_summary_on" android:summaryOff="@string/revanced_hide_time_stamp_summary_off" />SETTINGS: HIDE_TIME_STAMP -->
 
     <!-- PREFERENCE: SEEKBAR_SETTINGS