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.

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

Integrate Apple Music playback into ListenBrainz #2509

Merged
merged 45 commits into from
Apr 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
ed43342
apple music player initial
vardansaini Jun 26, 2023
d7e302d
Merge branch 'master' into apple-player
vardansaini Jul 2, 2023
3a6dc07
Preview playing stopped for apple music
vardansaini Jul 3, 2023
1baa9af
code review changes are addressed
vardansaini Jul 3, 2023
0cdca81
stopping preview again
vardansaini Jul 3, 2023
9cda13f
Merge branch 'master' into apple-player
vardansaini Jul 4, 2023
1bbd86c
automatic developer token
vardansaini Jul 6, 2023
74613ff
merging master
vardansaini Jul 6, 2023
9562ce3
added applemusicplayer file
vardansaini Jul 6, 2023
f87a8b0
Merge remote-tracking branch 'origin' into apple-player
vardansaini Jul 10, 2023
75ddd7b
store music user token in db
vardansaini Jul 10, 2023
7a4450c
minor fix
vardansaini Jul 10, 2023
1771df6
Merge branch 'master' into apple-player
amCap1712 Jul 21, 2023
b419201
improve workflow for apple music
vardansaini Jul 24, 2023
1ea74cf
Merge branch 'master' into apple-player
vardansaini Jul 24, 2023
ee0de32
Merge branch 'master' into apple-player
amCap1712 Aug 14, 2023
f63ba13
Fix snapshot
amCap1712 Aug 14, 2023
245337d
Merge branch 'master' into apple-player
MonkeyDo Mar 25, 2024
fcdebb1
Re-add AppleMusic service button
MonkeyDo Mar 25, 2024
fc69c80
Refactor Apple Music oauth mechanism
MonkeyDo Mar 25, 2024
e442d19
Fix extraneous prop
MonkeyDo Mar 25, 2024
1b96fc9
Remove old dependency
MonkeyDo Mar 25, 2024
4cf7b07
Reimplement custom AppleMusic auth methods
MonkeyDo Mar 26, 2024
09945ea
Reimplement authentication in AppleMusicPlayer
MonkeyDo Mar 26, 2024
7f8b3de
Reimplement apple music account linking
MonkeyDo Mar 26, 2024
d488bc8
Catch some error cases
MonkeyDo Mar 26, 2024
be0f9f3
Apple: Get fresh developer token
MonkeyDo Mar 27, 2024
a5f5199
Fix code issues
MonkeyDo Mar 27, 2024
7eddfb3
AppleMusic: Better error handling, types
MonkeyDo Mar 28, 2024
1abbb1d
AppleMusic: Fix token generator import
MonkeyDo Mar 28, 2024
f886cce
Merge branch 'master' into apple-player
MonkeyDo Mar 28, 2024
70387e7
Remove cryptography dependency
MonkeyDo Mar 28, 2024
376c337
tests: Update apple music test key
MonkeyDo Apr 1, 2024
bd5cf32
Merge branch 'master' into pr/2509
MonkeyDo Apr 11, 2024
464f47f
Add AppleMusic to BrainzPlayer settings page
MonkeyDo Apr 12, 2024
94b24b5
Fix current permissions for Apple Music
MonkeyDo Apr 12, 2024
8fd3836
Typo
MonkeyDo Apr 12, 2024
0fc4261
Fix BrainzPlayer disabled warning
MonkeyDo Apr 12, 2024
0f7a51c
Pep8 le pew
MonkeyDo Apr 12, 2024
afb944d
Merge branch 'master' into apple-player
MonkeyDo Apr 12, 2024
f703002
Apply suggestions from code review
MonkeyDo Apr 15, 2024
8a942d2
Remove unused APPLE_MUSIC_REDIRECT_URI env variable
MonkeyDo Apr 15, 2024
6f7f013
Remove bitrate configuration option
MonkeyDo Apr 17, 2024
0e71ed8
Return after finding track
MonkeyDo Apr 17, 2024
17fe18d
Merge branch 'master' into apple-player
MonkeyDo Apr 18, 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
1 change: 0 additions & 1 deletion consul_config.py.ctmpl
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ SPOTIFY_CACHE_CLIENT_SECRET = '''{{template "KEY" "spotify_cache/client_secret"}
APPLE_MUSIC_TEAM_ID = '''{{template "KEY" "apple/team_id"}}'''
APPLE_MUSIC_KID = '''{{template "KEY" "apple/kid"}}'''
APPLE_MUSIC_KEY = '''{{template "KEY" "apple/key"}}'''
APPLE_MUSIC_CALLBACK_URL = '''{{template "KEY" "apple/redirect_uri"}}'''

# CRITIQUEBRAINZ
CRITIQUEBRAINZ_CLIENT_ID = '''{{template "KEY" "critiquebrainz/client_id"}}'''
Expand Down
Loading
Loading