ReVanced/revanced-patches-ex
1
0
Fork 0
mirror of https://github.com/inotia00/revanced-patches.git synced 2025-06-12 21:27:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(YouTube Music - Disable music video in album): Redirects even from playlists other than Album https://github.com/inotia00/ReVanced_Extended/issues/2835

Browse Source
This commit is contained in:
inotia00
2025-03-15 14:36:10 +09:00
parent 842bde5a8a
commit 7a209bf28c
3 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/shared/src/main/java/app/revanced/extension/music/patches/misc/AlbumMusicVideoPatch.java
View File

@ -159,7 +159,7 @@ public class AlbumMusicVideoPatch {
VideoUtils.openInYouTubeMusic(songId);
}, 1000);
VideoUtils.runOnMainThreadDelayed(() -> isVideoLaunched.compareAndSet(true, false), 1500);
VideoUtils.runOnMainThreadDelayed(() -> isVideoLaunched.compareAndSet(true, false), 2500);
} catch (Exception ex) {
Logger.printException(() -> "openMusic failure", ex);
}

41
extensions/shared/src/main/java/app/revanced/extension/music/patches/misc/requests/PlaylistRequest.kt
View File

@ -5,6 +5,7 @@ import androidx.annotation.GuardedBy
import app.revanced.extension.shared.patches.client.YouTubeAppClient
import app.revanced.extension.shared.patches.spoof.requests.PlayerRoutes
import app.revanced.extension.shared.requests.Requester
import app.revanced.extension.shared.settings.AppLanguage
import app.revanced.extension.shared.utils.Logger
import app.revanced.extension.shared.utils.Utils
import org.json.JSONException
@ -139,11 +140,24 @@ class PlaylistRequest private constructor(
PlayerRoutes.GET_PLAYLIST_PAGE,
clientType
)
/**
* For some reason, the tracks in Top Songs have the playlistId of the album:
* [ReVanced_Extended#2835](https://github.com/inotia00/ReVanced_Extended/issues/2835)
*
* We can work around this issue by checking the playlist title in the response.
* Tracks played from an album have a playlist title that starts with 'Album',
* Tracks played from Top Songs have a playlist title that starts with 'Song'.
*
* By default, the playlist title follows the app language,
* So we can work around this by setting the language to English when sending the request.
*/
val requestBody =
PlayerRoutes.createApplicationRequestBody(
clientType = clientType,
videoId = videoId,
playlistId = playlistId
playlistId = playlistId,
setLocale = true,
language = AppLanguage.EN.language,
)
connection.setFixedLengthStreamingMode(requestBody.size)
@ -183,18 +197,23 @@ class PlaylistRequest private constructor(
.getJSONObject("playlist")
.getJSONObject("playlist")
val currentStreamJsonObject = playlistJsonObject
?.getJSONArray("contents")
?.get(playlistIndex)
val playlistTitle = playlistJsonObject
?.getString("title") + ""
if (currentStreamJsonObject is JSONObject) {
val watchEndpointJsonObject: JSONObject? =
currentStreamJsonObject
.getJSONObject("playlistPanelVideoRenderer")
.getJSONObject("navigationEndpoint")
.getJSONObject("watchEndpoint")
if (playlistTitle.startsWith("Album")) {
val currentStreamJsonObject = playlistJsonObject
?.getJSONArray("contents")
?.get(playlistIndex)
return watchEndpointJsonObject?.getString("videoId") + ""
if (currentStreamJsonObject is JSONObject) {
val watchEndpointJsonObject: JSONObject? =
currentStreamJsonObject
.getJSONObject("playlistPanelVideoRenderer")
.getJSONObject("navigationEndpoint")
.getJSONObject("watchEndpoint")
return watchEndpointJsonObject?.getString("videoId") + ""
}
}
}
} catch (e: JSONException) {

3
extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/PlayerRoutes.kt
View File

@ -88,6 +88,7 @@ object PlayerRoutes {
botGuardPoToken: String = "",
visitorId: String = "",
setLocale: Boolean = false,
language: String = BaseSettings.SPOOF_STREAMING_DATA_LANGUAGE.get().language,
): ByteArray {
val innerTubeBody = JSONObject()
@ -108,7 +109,7 @@ object PlayerRoutes {
client.put(
"hl",
if (setLocale) {
BaseSettings.SPOOF_STREAMING_DATA_LANGUAGE.get().language
language
} else {
LOCALE_LANGUAGE
}