From d8d3f52e7f5a55b09956c3f1ee5091cfcfbfabbf Mon Sep 17 00:00:00 2001 From: inotia00 <108592928+inotia00@users.noreply.github.com> Date: Sun, 26 May 2024 16:26:41 +0900 Subject: [PATCH] feat(YouTube/Video Information): remove `playlist id` --- .../utils/fix/parameter/SpoofPlayerParameterPatch.kt | 2 +- .../youtube/video/information/VideoInformationPatch.kt | 2 +- .../video/playerresponse/PlayerResponseMethodHookPatch.kt | 7 ++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/SpoofPlayerParameterPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/SpoofPlayerParameterPatch.kt index f7adf4a5b..5e21e10e0 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/SpoofPlayerParameterPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/SpoofPlayerParameterPatch.kt @@ -54,7 +54,7 @@ object SpoofPlayerParameterPatch : BaseBytecodePatch( // Hook the player parameters. PlayerResponseMethodHookPatch += PlayerResponseMethodHookPatch.Hook.PlayerParameter( - "$INTEGRATIONS_CLASS_DESCRIPTOR->spoofParameter(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;" + "$INTEGRATIONS_CLASS_DESCRIPTOR->spoofParameter(Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;" ) // Force the seekbar time and chapters to always show up. diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/information/VideoInformationPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/information/VideoInformationPatch.kt index ce1fe7f70..410e7ec07 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/video/information/VideoInformationPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/video/information/VideoInformationPatch.kt @@ -268,7 +268,7 @@ object VideoInformationPatch : BytecodePatch( // Call before any other video id hooks, // so they can use VideoInformation and check if the video id is for a Short. PlayerResponseMethodHookPatch += PlayerResponseMethodHookPatch.Hook.PlayerParameterBeforeVideoId( - "$INTEGRATIONS_CLASS_DESCRIPTOR->newPlayerResponseParameter(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;") + "$INTEGRATIONS_CLASS_DESCRIPTOR->newPlayerResponseParameter(Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;") /** * Hook current playback speed diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/PlayerResponseMethodHookPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/PlayerResponseMethodHookPatch.kt index e8678f727..11cb0686d 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/PlayerResponseMethodHookPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/PlayerResponseMethodHookPatch.kt @@ -17,7 +17,6 @@ object PlayerResponseMethodHookPatch : // Parameter numbers of the patched method. private var PARAMETER_VIDEO_ID = 1 private var PARAMETER_PLAYER_PARAMETER = 3 - private var PARAMETER_PLAYLIST_ID = 4 private var PARAMETER_IS_SHORT_AND_OPENING_OR_PLAYING = 11 private var freeRegister = 0 @@ -33,7 +32,6 @@ object PlayerResponseMethodHookPatch : shouldApplyNewMethod = freeRegister > 2 if (shouldApplyNewMethod) { PARAMETER_IS_SHORT_AND_OPENING_OR_PLAYING = freeRegister - PARAMETER_PLAYLIST_ID = freeRegister - 1 PARAMETER_PLAYER_PARAMETER = freeRegister - 2 PARAMETER_VIDEO_ID = freeRegister - 3 } @@ -57,12 +55,12 @@ object PlayerResponseMethodHookPatch : val instruction = if (shouldApplyNewMethod) """ - invoke-static {v$PARAMETER_VIDEO_ID, v$PARAMETER_PLAYER_PARAMETER, v$PARAMETER_PLAYLIST_ID, v$PARAMETER_IS_SHORT_AND_OPENING_OR_PLAYING}, $hook + invoke-static {v$PARAMETER_VIDEO_ID, v$PARAMETER_PLAYER_PARAMETER, v$PARAMETER_IS_SHORT_AND_OPENING_OR_PLAYING}, $hook move-result-object p3 """ else """ - invoke-static {p$PARAMETER_VIDEO_ID, p$PARAMETER_PLAYER_PARAMETER, p$PARAMETER_PLAYLIST_ID, p$PARAMETER_IS_SHORT_AND_OPENING_OR_PLAYING}, $hook + invoke-static {p$PARAMETER_VIDEO_ID, p$PARAMETER_PLAYER_PARAMETER, p$PARAMETER_IS_SHORT_AND_OPENING_OR_PLAYING}, $hook move-result-object p$PARAMETER_PLAYER_PARAMETER """ @@ -87,7 +85,6 @@ object PlayerResponseMethodHookPatch : 0, """ move-object v$PARAMETER_VIDEO_ID, p1 move-object v$PARAMETER_PLAYER_PARAMETER, p3 - move-object v$PARAMETER_PLAYLIST_ID, p4 move/from16 v$PARAMETER_IS_SHORT_AND_OPENING_OR_PLAYING, p11 """ )