mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-04 21:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Do not use lastFM api key and secret to determine if LastFM.Enabled should be set.

Browse source
This commit is contained in:
Caio Cotts 2024-06-10 14:55:07 -04:00
parent e535f7eb78
commit 1b77830eb4
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/serve_index.go
View file

@ -61,7 +61,7 @@ func serveIndex(ds model.DataStore, fs fs.FS, shareInfo *model.Share) http.Handl
"enableSharing": conf.Server.EnableSharing, "enableSharing": conf.Server.EnableSharing,
"defaultDownloadableShare": conf.Server.DefaultDownloadableShare, "defaultDownloadableShare": conf.Server.DefaultDownloadableShare,
"devSidebarPlaylists": conf.Server.DevSidebarPlaylists, "devSidebarPlaylists": conf.Server.DevSidebarPlaylists,
"lastFMEnabled": conf.Server.LastFM.Enabled && conf.Server.LastFM.ApiKey != "" && conf.Server.LastFM.Secret != "", "lastFMEnabled": conf.Server.LastFM.Enabled,
"devShowArtistPage": conf.Server.DevShowArtistPage, "devShowArtistPage": conf.Server.DevShowArtistPage,
"listenBrainzEnabled": conf.Server.ListenBrainz.Enabled, "listenBrainzEnabled": conf.Server.ListenBrainz.Enabled,
"enableExternalServices": conf.Server.EnableExternalServices, "enableExternalServices": conf.Server.EnableExternalServices,

2
server/serve_index_test.go
View file

@ -283,8 +283,6 @@ var _ = Describe("serveIndex", func() {
It("sets the lastFMEnabled", func() { It("sets the lastFMEnabled", func() {
conf.Server.LastFM.Enabled = true conf.Server.LastFM.Enabled = true
conf.Server.LastFM.ApiKey = "123"
conf.Server.LastFM.Secret = "456"
r := httptest.NewRequest("GET", "/index.html", nil) r := httptest.NewRequest("GET", "/index.html", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()

4
ui/src/personal/Personal.js
View file

@ -27,7 +27,9 @@ const Personal = () => {
<SelectDefaultView /> <SelectDefaultView />
{config.enableReplayGain && <ReplayGainToggle />} {config.enableReplayGain && <ReplayGainToggle />}
<NotificationsToggle /> <NotificationsToggle />
{config.lastFMEnabled && <LastfmScrobbleToggle />} {config.lastFMEnabled && localStorage.getItem('lastfm-apikey') && (
<LastfmScrobbleToggle />
)}
{config.listenBrainzEnabled && <ListenBrainzScrobbleToggle />} {config.listenBrainzEnabled && <ListenBrainzScrobbleToggle />}
</SimpleForm> </SimpleForm>
</Card> </Card>