Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(YouTube Music - Spoof video streams): Use IOS_MUSIC client #4115

Closed
wants to merge 2 commits into from
+31 −5
Closed

fix(YouTube Music - Spoof video streams): Use IOS_MUSIC client #4115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbccff0
fix(YouTube Music - Spoof video streams): Use `IOS_MUSIC` client to f…
oSumAtrIX Dec 14, 2024
939667e
Merge remote-tracking branch 'upstream/dev' into fix/music-spoof
LisoUseInAIKyrios Dec 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/ClientType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,18 @@ public enum ClientType {
: "19.47.7",
false,
true
),
IOS_MUSIC(26,
LisoUseInAIKyrios marked this conversation as resolved.
Show resolved Hide resolved
"IOS_MUSIC",
"iPhone16,2",
"17.5.1.21F90",
"com.google.ios.youtubemusic/7.08.2 (iPhone16,2; U; CPU iOS 17_5_1 like Mac OS X;)",
null,
"7.08.2",
true,
false
);

private static boolean forceAVC() {
return BaseSettings.SPOOF_VIDEO_STREAMS_IOS_FORCE_AVC.get();
}

/**
* YouTube
Expand Down Expand Up @@ -111,4 +118,8 @@ private static boolean forceAVC() {
this.canLogin = canLogin;
this.useLanguageCode = useLanguageCode;
}

private static boolean forceAVC() {
return BaseSettings.SPOOF_VIDEO_STREAMS_IOS_FORCE_AVC.get();
}
}
11 changes: 9 additions & 2 deletions ...red/library/src/main/java/app/revanced/extension/shared/spoof/SpoofVideoStreamsPatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ public class SpoofVideoStreamsPatch {
private static final String UNREACHABLE_HOST_URI_STRING = "https://127.0.0.0";
private static final Uri UNREACHABLE_HOST_URI = Uri.parse(UNREACHABLE_HOST_URI_STRING);

/**
* Injection point. Used by YT Music.
*/
public static void setClientTypeToIosMusic() {
Logger.printDebug(() -> "Setting stream spoofing to: " + ClientType.IOS_MUSIC);
BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.save(ClientType.IOS_MUSIC);
}

/**
* Injection point.
* Blocks /get_watch requests by returning an unreachable URI.
Expand Down Expand Up @@ -168,8 +176,7 @@ public static byte[] removeVideoPlaybackPostBody(Uri uri, int method, byte[] pos
public static final class SpoofiOSAvailability implements Setting.Availability {
@Override
public boolean isAvailable() {
return BaseSettings.SPOOF_VIDEO_STREAMS.get()
&& BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.IOS;
return BaseSettings.SPOOF_VIDEO_STREAMS.get() && BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.IOS;
}
}
}
8 changes: 8 additions & 0 deletions patches/src/main/kotlin/app/revanced/patches/music/misc/spoof/SpoofVideoStreamsPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
package app.revanced.patches.music.misc.spoof

import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
import app.revanced.patches.music.misc.gms.musicActivityOnCreateFingerprint
import app.revanced.patches.shared.misc.spoof.EXTENSION_CLASS_DESCRIPTOR
import app.revanced.patches.shared.misc.spoof.spoofVideoStreamsPatch

val spoofVideoStreamsPatch = spoofVideoStreamsPatch({
compatibleWith("com.google.android.apps.youtube.music")
}, {
musicActivityOnCreateFingerprint.method.addInstruction(
0,
"invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->setClientTypeToIosMusic()V",
)
})
Loading