Skip to content

Liquid Glass and Apple Music touches for the Spotify iOS app. A GPL-3.0 fork of spoti.pw 0.21.1.

C

fix: Spotify's own lyrics count again for a track whose picked source did not answer

My-Name-Is-Jeff0fe467340272
diff --git a/tweak/Sources/Shared/Lyrics/KaraokeSource.x b/tweak/Sources/Shared/Lyrics/KaraokeSource.x
index e9be2320..5c7a7217 100644
--- a/tweak/Sources/Shared/Lyrics/KaraokeSource.x
+++ b/tweak/Sources/Shared/Lyrics/KaraokeSource.x
@@ -281,9 +281,11 @@ static BOOL requestFromSpotify(NSString *trackID) {
[sg_asking removeObject:trackID];
[sg_losses removeObjectForKey:trackID];
// Asked after the chain found plain text only: Spotify's replace it only when they are timed,
- // and never a source picked for the track from the player's ⋯.
+ // and never a source picked for the track from the player's ⋯ that answered.
NSArray<SGKaraokeLine *> *kept = sg_lyrics[trackID];
- if (lines && !SGLyricsChosenSource(trackID) && !(kept && SGKaraokeLinesTiming(kept) <= SGKaraokeLinesTiming(lines))) {
+ id answer = SGLyricsKeptAnswer(trackID);
+ BOOL picked = [answer isKindOfClass:SGLyricsResult.class] && [(SGLyricsResult *)answer picked];
+ if (lines && !picked && !(kept && SGKaraokeLinesTiming(kept) <= SGKaraokeLinesTiming(lines))) {
keep(trackID, lines);
SGLyricsSetCredit(trackID, @"Spotify");
return;