2026-01-03 06:15:22 +00:00
32 changed files with 160 additions and 920 deletions
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@ -217,7 +217,7 @@ jobs:
            CROSS_TAGLIB_VERSION=${{ env.CROSS_TAGLIB_VERSION }}

      - name: Upload Binaries
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: navidrome-${{ env.PLATFORM }}
          path: ./output
@ -248,7 +248,7 @@ jobs:
          touch "/tmp/digests/${digest#sha256:}"          

      - name: Upload digest
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        if: env.IS_LINUX == 'true' && env.IS_DOCKER_PUSH_CONFIGURED == 'true' && env.IS_ARMV5 == 'false'
        with:
          name: digests-${{ env.PLATFORM }}
@ -270,7 +270,7 @@ jobs:
      - uses: actions/checkout@v6

      - name: Download digests
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          path: /tmp/digests
          pattern: digests-*
@ -304,7 +304,7 @@ jobs:
      - uses: actions/checkout@v6

      - name: Download digests
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          path: /tmp/digests
          pattern: digests-*
@ -356,7 +356,7 @@ jobs:
    steps:
      - uses: actions/checkout@v6

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          path: ./binaries
          pattern: navidrome-windows*
@ -375,7 +375,7 @@ jobs:
          du -h binaries/msi/*.msi

      - name: Upload MSI files
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: navidrome-windows-installers
          path: binaries/msi/*.msi
@ -393,7 +393,7 @@ jobs:
          fetch-depth: 0
          fetch-tags: true

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          path: ./binaries
          pattern: navidrome-*
@ -419,7 +419,7 @@ jobs:
          rm ./dist/*.tar.gz ./dist/*.zip

      - name: Upload all-packages artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: packages
          path: dist/navidrome_0*
@ -442,13 +442,13 @@ jobs:
        item: ${{ fromJson(needs.release.outputs.package_list) }}
    steps:
      - name: Download all-packages artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: packages
          path: ./dist

      - name: Upload all-packages artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: navidrome_linux_${{ matrix.item }}
          path: dist/navidrome_0*_linux_${{ matrix.item }}
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@ -12,7 +12,7 @@ jobs:
      pull-requests: write
    runs-on: ubuntu-latest
    steps:
-      - uses: dessant/lock-threads@v6
+      - uses: dessant/lock-threads@v5
        with:
          process-only: 'issues, prs'
          issue-inactive-days: 120
--- a/.github/workflows/update-translations.yml
+++ b/.github/workflows/update-translations.yml
@ -24,7 +24,7 @@ jobs:
          git status --porcelain
          git diff
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v8
+        uses: peter-evans/create-pull-request@v7
        with:
          token: ${{ secrets.PAT }}
          author: "navidrome-bot <navidrome-bot@navidrome.org>"
--- a/10
+++ b/10
@ -2,10 +2,10 @@ FROM --platform=$BUILDPLATFORM ghcr.io/crazy-max/osxcross:14.5-debian AS osxcros

 ########################################################################################################################
 ### Build xx (original image: tonistiigi/xx)
-FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/alpine:3.20 AS xx-build
+FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/alpine:3.19 AS xx-build

-# v1.9.0
-ENV XX_VERSION=a5592eab7a57895e8d385394ff12241bc65ecd50
+# v1.5.0
+ENV XX_VERSION=b4e4c451c778822e6742bfc9d9a91d7c7d885c8a

 RUN apk add -U --no-cache git
 RUN git clone https://github.com/tonistiigi/xx && \
@ -26,7 +26,7 @@ COPY --from=xx-build /out/ /usr/bin/

 ########################################################################################################################
 ### Get TagLib
-FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/alpine:3.20 AS taglib-build
+FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/alpine:3.19 AS taglib-build
 ARG TARGETPLATFORM
 ARG CROSS_TAGLIB_VERSION=2.1.1-1
 ENV CROSS_TAGLIB_RELEASES_URL=https://github.com/navidrome/cross-taglib/releases/download/v${CROSS_TAGLIB_VERSION}/
@ -122,7 +122,7 @@ COPY --from=build /out /

 ########################################################################################################################
 ### Build Final Image
-FROM public.ecr.aws/docker/library/alpine:3.20 AS final
+FROM public.ecr.aws/docker/library/alpine:3.19 AS final
 LABEL maintainer="deluan@navidrome.org"
 LABEL org.opencontainers.image.source="https://github.com/navidrome/navidrome"

--- a/2
+++ b/2
@ -16,7 +16,7 @@ DOCKER_TAG ?= deluan/navidrome:develop

 # Taglib version to use in cross-compilation, from https://github.com/navidrome/cross-taglib
 CROSS_TAGLIB_VERSION ?= 2.1.1-1
-GOLANGCI_LINT_VERSION ?= v2.7.2
+GOLANGCI_LINT_VERSION ?= v2.6.2

 UI_SRC_FILES := $(shell find ui -type f -not -path "ui/build/*" -not -path "ui/node_modules/*")

--- a/cmd/scan.go
+++ b/cmd/scan.go
@ -1,12 +1,9 @@
 package cmd

 import (
-	"bufio"
 	"context"
 	"encoding/gob"
-	"fmt"
 	"os"
-	"strings"

 	"github.com/navidrome/navidrome/core"
 	"github.com/navidrome/navidrome/db"
@ -22,14 +19,12 @@ var (
 	fullScan   bool
 	subprocess bool
 	targets    []string
-	targetFile string
 )

 func init() {
 	scanCmd.Flags().BoolVarP(&fullScan, "full", "f", false, "check all subfolders, ignoring timestamps")
 	scanCmd.Flags().BoolVarP(&subprocess, "subprocess", "", false, "run as subprocess (internal use)")
 	scanCmd.Flags().StringArrayVarP(&targets, "target", "t", []string{}, "list of libraryID:folderPath pairs, can be repeated (e.g., \"-t 1:Music/Rock -t 1:Music/Jazz -t 2:Classical\")")
-	scanCmd.Flags().StringVar(&targetFile, "target-file", "", "path to file containing targets (one libraryID:folderPath per line)")
 	rootCmd.AddCommand(scanCmd)
 }

@ -76,17 +71,10 @@ func runScanner(ctx context.Context) {
 	ds := persistence.New(sqlDB)
 	pls := core.NewPlaylists(ds)

-	// Parse targets from command line or file
+	// Parse targets if provided
 	var scanTargets []model.ScanTarget
-	var err error
-
-	if targetFile != "" {
-		scanTargets, err = readTargetsFromFile(targetFile)
-		if err != nil {
-			log.Fatal(ctx, "Failed to read targets from file", err)
-		}
-		log.Info(ctx, "Scanning specific folders from file", "numTargets", len(scanTargets))
-	} else if len(targets) > 0 {
+	if len(targets) > 0 {
+		var err error
 		scanTargets, err = model.ParseTargets(targets)
 		if err != nil {
 			log.Fatal(ctx, "Failed to parse targets", err)
@ -106,31 +94,3 @@ func runScanner(ctx context.Context) {
 		trackScanInteractively(ctx, progress)
 	}
 }
-
-// readTargetsFromFile reads scan targets from a file, one per line.
-// Each line should be in the format "libraryID:folderPath".
-// Empty lines and lines starting with # are ignored.
-func readTargetsFromFile(filePath string) ([]model.ScanTarget, error) {
-	file, err := os.Open(filePath)
-	if err != nil {
-		return nil, fmt.Errorf("failed to open target file: %w", err)
-	}
-	defer file.Close()
-
-	var targetStrings []string
-	scanner := bufio.NewScanner(file)
-	for scanner.Scan() {
-		line := strings.TrimSpace(scanner.Text())
-		// Skip empty lines and comments
-		if line == "" {
-			continue
-		}
-		targetStrings = append(targetStrings, line)
-	}
-
-	if err := scanner.Err(); err != nil {
-		return nil, fmt.Errorf("failed to read target file: %w", err)
-	}
-
-	return model.ParseTargets(targetStrings)
-}
--- a/cmd/scan_test.go
+++ b/cmd/scan_test.go
@ -1,89 +0,0 @@
-package cmd
-
-import (
-	"os"
-	"path/filepath"
-
-	"github.com/navidrome/navidrome/model"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("readTargetsFromFile", func() {
-	var tempDir string
-
-	BeforeEach(func() {
-		var err error
-		tempDir, err = os.MkdirTemp("", "navidrome-test-")
-		Expect(err).ToNot(HaveOccurred())
-	})
-
-	AfterEach(func() {
-		os.RemoveAll(tempDir)
-	})
-
-	It("reads valid targets from file", func() {
-		filePath := filepath.Join(tempDir, "targets.txt")
-		content := "1:Music/Rock\n2:Music/Jazz\n3:Classical\n"
-		err := os.WriteFile(filePath, []byte(content), 0600)
-		Expect(err).ToNot(HaveOccurred())
-
-		targets, err := readTargetsFromFile(filePath)
-		Expect(err).ToNot(HaveOccurred())
-		Expect(targets).To(HaveLen(3))
-		Expect(targets[0]).To(Equal(model.ScanTarget{LibraryID: 1, FolderPath: "Music/Rock"}))
-		Expect(targets[1]).To(Equal(model.ScanTarget{LibraryID: 2, FolderPath: "Music/Jazz"}))
-		Expect(targets[2]).To(Equal(model.ScanTarget{LibraryID: 3, FolderPath: "Classical"}))
-	})
-
-	It("skips empty lines", func() {
-		filePath := filepath.Join(tempDir, "targets.txt")
-		content := "1:Music/Rock\n\n2:Music/Jazz\n\n"
-		err := os.WriteFile(filePath, []byte(content), 0600)
-		Expect(err).ToNot(HaveOccurred())
-
-		targets, err := readTargetsFromFile(filePath)
-		Expect(err).ToNot(HaveOccurred())
-		Expect(targets).To(HaveLen(2))
-	})
-
-	It("trims whitespace", func() {
-		filePath := filepath.Join(tempDir, "targets.txt")
-		content := "  1:Music/Rock  \n\t2:Music/Jazz\t\n"
-		err := os.WriteFile(filePath, []byte(content), 0600)
-		Expect(err).ToNot(HaveOccurred())
-
-		targets, err := readTargetsFromFile(filePath)
-		Expect(err).ToNot(HaveOccurred())
-		Expect(targets).To(HaveLen(2))
-		Expect(targets[0].FolderPath).To(Equal("Music/Rock"))
-		Expect(targets[1].FolderPath).To(Equal("Music/Jazz"))
-	})
-
-	It("returns error for non-existent file", func() {
-		_, err := readTargetsFromFile("/nonexistent/file.txt")
-		Expect(err).To(HaveOccurred())
-		Expect(err.Error()).To(ContainSubstring("failed to open target file"))
-	})
-
-	It("returns error for invalid target format", func() {
-		filePath := filepath.Join(tempDir, "targets.txt")
-		content := "invalid-format\n"
-		err := os.WriteFile(filePath, []byte(content), 0600)
-		Expect(err).ToNot(HaveOccurred())
-
-		_, err = readTargetsFromFile(filePath)
-		Expect(err).To(HaveOccurred())
-	})
-
-	It("handles mixed valid and empty lines", func() {
-		filePath := filepath.Join(tempDir, "targets.txt")
-		content := "\n1:Music/Rock\n\n\n2:Music/Jazz\n\n"
-		err := os.WriteFile(filePath, []byte(content), 0600)
-		Expect(err).ToNot(HaveOccurred())
-
-		targets, err := readTargetsFromFile(filePath)
-		Expect(err).ToNot(HaveOccurred())
-		Expect(targets).To(HaveLen(2))
-	})
-})
--- a/conf/configuration.go
+++ b/conf/configuration.go
@ -90,7 +90,7 @@ type configOptions struct {
 	ExtAuth                         extAuthOptions
 	Plugins                         pluginsOptions
 	PluginConfig                    map[string]map[string]string
-	HTTPHeaders                     httpHeaderOptions   `json:",omitzero"`
+	HTTPSecurityHeaders             secureOptions       `json:",omitzero"`
 	Prometheus                      prometheusOptions   `json:",omitzero"`
 	Scanner                         scannerOptions      `json:",omitzero"`
 	Jukebox                         jukeboxOptions      `json:",omitzero"`
@ -188,8 +188,8 @@ type listenBrainzOptions struct {
 	BaseURL string
 }

-type httpHeaderOptions struct {
-	FrameOptions string
+type secureOptions struct {
+	CustomFrameOptionsValue string
 }

 type prometheusOptions struct {
@ -257,7 +257,6 @@ func Load(noConfigDump bool) {
 	// Map deprecated options to their new names for backwards compatibility
 	mapDeprecatedOption("ReverseProxyWhitelist", "ExtAuth.TrustedSources")
 	mapDeprecatedOption("ReverseProxyUserHeader", "ExtAuth.UserHeader")
-	mapDeprecatedOption("HTTPSecurityHeaders.CustomFrameOptionsValue", "HTTPHeaders.FrameOptions")

 	err := viper.Unmarshal(&Server)
 	if err != nil {
@ -345,8 +344,6 @@ func Load(noConfigDump bool) {
 	// Log configuration source
 	if Server.ConfigFile != "" {
 		log.Info("Loaded configuration", "file", Server.ConfigFile)
-	} else if hasNDEnvVars() {
-		log.Info("No configuration file found. Loaded configuration only from environment variables")
 	} else {
 		log.Warn("No configuration file found. Using default values. To specify a config file, use the --configfile flag or set the ND_CONFIGFILE environment variable.")
 	}
@ -368,12 +365,10 @@ func Load(noConfigDump bool) {
 		log.Warn(fmt.Sprintf("Extractor '%s' is not implemented, using 'taglib'", Server.Scanner.Extractor))
 		Server.Scanner.Extractor = consts.DefaultScannerExtractor
 	}
-	logDeprecatedOptions("Scanner.GenreSeparators", "")
-	logDeprecatedOptions("Scanner.GroupAlbumReleases", "")
-	logDeprecatedOptions("DevEnableBufferedScrobble", "") // Deprecated: Buffered scrobbling is now always enabled and this option is ignored
-	logDeprecatedOptions("ReverseProxyWhitelist", "ExtAuth.TrustedSources")
-	logDeprecatedOptions("ReverseProxyUserHeader", "ExtAuth.UserHeader")
-	logDeprecatedOptions("HTTPSecurityHeaders.CustomFrameOptionsValue", "HTTPHeaders.FrameOptions")
+	logDeprecatedOptions("Scanner.GenreSeparators")
+	logDeprecatedOptions("Scanner.GroupAlbumReleases")
+	logDeprecatedOptions("DevEnableBufferedScrobble") // Deprecated: Buffered scrobbling is now always enabled and this option is ignored
+	logDeprecatedOptions("ReverseProxyWhitelist", "ReverseProxyUserHeader")

 	// Call init hooks
 	for _, hook := range hooks {
@ -381,21 +376,15 @@ func Load(noConfigDump bool) {
 	}
 }

-func logDeprecatedOptions(oldName, newName string) {
-	envVar := "ND_" + strings.ToUpper(strings.ReplaceAll(oldName, ".", "_"))
-	newEnvVar := "ND_" + strings.ToUpper(strings.ReplaceAll(newName, ".", "_"))
-	logWarning := func(oldName, newName string) {
-		if newName != "" {
-			log.Warn(fmt.Sprintf("Option '%s' is deprecated and will be ignored in a future release. Please use the new '%s'", oldName, newName))
-		} else {
-			log.Warn(fmt.Sprintf("Option '%s' is deprecated and will be ignored in a future release", oldName))
+func logDeprecatedOptions(options ...string) {
+	for _, option := range options {
+		envVar := "ND_" + strings.ToUpper(strings.ReplaceAll(option, ".", "_"))
+		if os.Getenv(envVar) != "" {
+			log.Warn(fmt.Sprintf("Option '%s' is deprecated and will be ignored in a future release", envVar))
+		}
+		if viper.InConfig(option) {
+			log.Warn(fmt.Sprintf("Option '%s' is deprecated and will be ignored in a future release", option))
 		}
-	}
-	if os.Getenv(envVar) != "" {
-		logWarning(envVar, newEnvVar)
-	}
-	if viper.InConfig(oldName) {
-		logWarning(oldName, newName)
 	}
 }

@ -513,16 +502,6 @@ func AddHook(hook func()) {
 	hooks = append(hooks, hook)
 }

-// hasNDEnvVars checks if any ND_ prefixed environment variables are set (excluding ND_CONFIGFILE)
-func hasNDEnvVars() bool {
-	for _, env := range os.Environ() {
-		if strings.HasPrefix(env, "ND_") && !strings.HasPrefix(env, "ND_CONFIGFILE=") {
-			return true
-		}
-	}
-	return false
-}
-
 func setViperDefaults() {
 	viper.SetDefault("musicfolder", filepath.Join(".", "music"))
 	viper.SetDefault("cachefolder", "")
@ -607,7 +586,7 @@ func setViperDefaults() {
 	viper.SetDefault("subsonic.appendsubtitle", true)
 	viper.SetDefault("subsonic.artistparticipations", false)
 	viper.SetDefault("subsonic.defaultreportrealpath", false)
-	viper.SetDefault("subsonic.legacyclients", "DSub,SubMusic")
+	viper.SetDefault("subsonic.legacyclients", "DSub")
 	viper.SetDefault("agents", "lastfm,spotify,deezer")
 	viper.SetDefault("lastfm.enabled", true)
 	viper.SetDefault("lastfm.language", "en")
@ -621,7 +600,7 @@ func setViperDefaults() {
 	viper.SetDefault("listenbrainz.enabled", true)
 	viper.SetDefault("listenbrainz.baseurl", "https://api.listenbrainz.org/1/")
 	viper.SetDefault("enablescrobblehistory", true)
-	viper.SetDefault("httpheaders.frameoptions", "DENY")
+	viper.SetDefault("httpsecurityheaders.customframeoptionsvalue", "DENY")
 	viper.SetDefault("backup.path", "")
 	viper.SetDefault("backup.schedule", "")
 	viper.SetDefault("backup.count", 0)
--- a/core/agents/deezer/client.go
+++ b/core/agents/deezer/client.go
@ -43,7 +43,6 @@ func newClient(hc httpDoer, language string) *client {
 func (c *client) searchArtists(ctx context.Context, name string, limit int) ([]Artist, error) {
 	params := url.Values{}
 	params.Add("q", name)
-	params.Add("order", "RANKING")
 	params.Add("limit", strconv.Itoa(limit))
 	req, err := http.NewRequestWithContext(ctx, "GET", apiBaseURL+"/search/artist", nil)
 	if err != nil {
--- a/core/agents/deezer/deezer.go
+++ b/core/agents/deezer/deezer.go
@ -3,7 +3,6 @@ package deezer
 import (
 	"context"
 	"errors"
-	"fmt"
 	"net/http"
 	"strings"

@ -83,20 +82,10 @@ func (s *deezerAgent) searchArtist(ctx context.Context, name string) (*Artist, e
 		return nil, err
 	}

-	log.Trace(ctx, "Artists found", "count", len(artists), "searched_name", name)
-	for i := range artists {
-		log.Trace(ctx, fmt.Sprintf("Artists found #%d", i), "name", artists[i].Name, "id", artists[i].ID, "link", artists[i].Link)
-		if i > 2 {
-			break
-		}
-	}
-
 	// If the first one has the same name, that's the one
 	if !strings.EqualFold(artists[0].Name, name) {
-		log.Trace(ctx, "Top artist do not match", "searched_name", name, "found_name", artists[0].Name)
 		return nil, agents.ErrNotFound
 	}
-	log.Trace(ctx, "Found artist", "name", artists[0].Name, "id", artists[0].ID, "link", artists[0].Link)
 	return &artists[0], err
 }

--- a/core/scrobbler/play_tracker.go
+++ b/core/scrobbler/play_tracker.go
@ -32,7 +32,6 @@ type Submission struct {
 }

 type nowPlayingEntry struct {
-	ctx      context.Context
 	userId   string
 	track    *model.MediaFile
 	position int
@ -221,17 +220,15 @@ func (p *playTracker) NowPlaying(ctx context.Context, playerId string, playerNam
 	}
 	player, _ := request.PlayerFrom(ctx)
 	if player.ScrobbleEnabled {
-		p.enqueueNowPlaying(ctx, playerId, user.ID, mf, position)
+		p.enqueueNowPlaying(playerId, user.ID, mf, position)
 	}
 	return nil
 }

-func (p *playTracker) enqueueNowPlaying(ctx context.Context, playerId string, userId string, track *model.MediaFile, position int) {
+func (p *playTracker) enqueueNowPlaying(playerId string, userId string, track *model.MediaFile, position int) {
 	p.npMu.Lock()
 	defer p.npMu.Unlock()
-	ctx = context.WithoutCancel(ctx) // Prevent cancellation from affecting background processing
 	p.npQueue[playerId] = nowPlayingEntry{
-		ctx:      ctx,
 		userId:   userId,
 		track:    track,
 		position: position,
@ -270,7 +267,7 @@ func (p *playTracker) nowPlayingWorker() {

 		// Process entries without holding lock
 		for _, entry := range entries {
-			p.dispatchNowPlaying(entry.ctx, entry.userId, entry.track, entry.position)
+			p.dispatchNowPlaying(context.Background(), entry.userId, entry.track, entry.position)
 		}
 	}
 }
--- a/core/scrobbler/play_tracker_test.go
+++ b/core/scrobbler/play_tracker_test.go
@ -170,17 +170,6 @@ var _ = Describe("PlayTracker", func() {
 			Expect(err).ToNot(HaveOccurred())
 			Expect(eventBroker.getEvents()).To(BeEmpty())
 		})
-
-		It("passes user to scrobbler via context (fix for issue #4787)", func() {
-			ctx = request.WithUser(ctx, model.User{ID: "u-1", UserName: "testuser"})
-			ctx = request.WithPlayer(ctx, model.Player{ScrobbleEnabled: true})
-
-			err := tracker.NowPlaying(ctx, "player-1", "player-one", "123", 0)
-			Expect(err).ToNot(HaveOccurred())
-			Eventually(func() bool { return fake.GetNowPlayingCalled() }).Should(BeTrue())
-			// Verify the username was passed through async dispatch via context
-			Eventually(func() string { return fake.GetUsername() }).Should(Equal("testuser"))
-		})
 	})

 	Describe("GetNowPlaying", func() {
@ -439,7 +428,6 @@ type fakeScrobbler struct {
 	nowPlayingCalled atomic.Bool
 	ScrobbleCalled   atomic.Bool
 	userID           atomic.Pointer[string]
-	username         atomic.Pointer[string]
 	track            atomic.Pointer[model.MediaFile]
 	position         atomic.Int32
 	LastScrobble     atomic.Pointer[Scrobble]
@ -465,13 +453,6 @@ func (f *fakeScrobbler) GetPosition() int {
 	return int(f.position.Load())
 }

-func (f *fakeScrobbler) GetUsername() string {
-	if p := f.username.Load(); p != nil {
-		return *p
-	}
-	return ""
-}
-
 func (f *fakeScrobbler) IsAuthorized(ctx context.Context, userId string) bool {
 	return f.Error == nil && f.Authorized
 }
@ -482,16 +463,6 @@ func (f *fakeScrobbler) NowPlaying(ctx context.Context, userId string, track *mo
 		return f.Error
 	}
 	f.userID.Store(&userId)
-	// Capture username from context (this is what plugin scrobblers do)
-	username, _ := request.UsernameFrom(ctx)
-	if username == "" {
-		if u, ok := request.UserFrom(ctx); ok {
-			username = u.UserName
-		}
-	}
-	if username != "" {
-		f.username.Store(&username)
-	}
 	f.track.Store(track)
 	f.position.Store(int32(position))
 	return nil
--- a/go.mod
+++ b/go.mod
@ -39,13 +39,13 @@ require (
 	github.com/knqyf263/go-plugin v0.9.0
 	github.com/kr/pretty v0.3.1
 	github.com/lestrrat-go/jwx/v2 v2.1.6
-	github.com/maruel/natural v1.3.0
+	github.com/maruel/natural v1.2.1
 	github.com/matoous/go-nanoid/v2 v2.1.0
 	github.com/mattn/go-sqlite3 v1.14.32
 	github.com/microcosm-cc/bluemonday v1.0.27
 	github.com/mileusna/useragent v1.3.5
-	github.com/onsi/ginkgo/v2 v2.27.3
-	github.com/onsi/gomega v1.38.3
+	github.com/onsi/ginkgo/v2 v2.27.2
+	github.com/onsi/gomega v1.38.2
 	github.com/pelletier/go-toml/v2 v2.2.4
 	github.com/pocketbase/dbx v1.11.0
 	github.com/pressly/goose/v3 v3.26.0
@ -54,21 +54,22 @@ require (
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
 	github.com/sirupsen/logrus v1.9.3
-	github.com/spf13/cobra v1.10.2
+	github.com/spf13/cobra v1.10.1
 	github.com/spf13/viper v1.21.0
 	github.com/stretchr/testify v1.11.1
-	github.com/tetratelabs/wazero v1.11.0
+	github.com/tetratelabs/wazero v1.10.1
 	github.com/unrolled/secure v1.17.0
 	github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342
 	go.uber.org/goleak v1.3.0
-	golang.org/x/image v0.34.0
-	golang.org/x/net v0.48.0
-	golang.org/x/sync v0.19.0
-	golang.org/x/sys v0.39.0
-	golang.org/x/term v0.38.0
-	golang.org/x/text v0.32.0
+	golang.org/x/exp v0.0.0-20251113190631-e25ba8c21ef6
+	golang.org/x/image v0.33.0
+	golang.org/x/net v0.47.0
+	golang.org/x/sync v0.18.0
+	golang.org/x/sys v0.38.0
+	golang.org/x/term v0.37.0
+	golang.org/x/text v0.31.0
 	golang.org/x/time v0.14.0
-	google.golang.org/protobuf v1.36.11
+	google.golang.org/protobuf v1.36.10
 	gopkg.in/yaml.v3 v3.0.1
 )

@ -90,7 +91,7 @@ require (
 	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/goccy/go-yaml v1.18.0 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/pprof v0.0.0-20251213031049-b05bdaca462f // indirect
+	github.com/google/pprof v0.0.0-20251114195745-4902fdda35c8 // indirect
 	github.com/google/subcommands v1.2.0 // indirect
 	github.com/gorilla/css v1.0.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
@ -128,11 +129,10 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/crypto v0.46.0 // indirect
-	golang.org/x/exp v0.0.0-20251209150349-8475f28825e9 // indirect
-	golang.org/x/mod v0.31.0 // indirect
-	golang.org/x/telemetry v0.0.0-20251203150158-8fff8a5912fc // indirect
-	golang.org/x/tools v0.40.0 // indirect
+	golang.org/x/crypto v0.45.0 // indirect
+	golang.org/x/mod v0.30.0 // indirect
+	golang.org/x/telemetry v0.0.0-20251111182119-bc8e575c7b54 // indirect
+	golang.org/x/tools v0.39.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -99,8 +99,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/go-pipeline v0.0.0-20230411140531-6cbedfc1d3fc h1:hd+uUVsB1vdxohPneMrhGH2YfQuH5hRIK9u4/XCeUtw=
 github.com/google/go-pipeline v0.0.0-20230411140531-6cbedfc1d3fc/go.mod h1:SL66SJVysrh7YbDCP9tH30b8a9o/N2HeiQNUm85EKhc=
-github.com/google/pprof v0.0.0-20251213031049-b05bdaca462f h1:HU1RgM6NALf/KW9HEY6zry3ADbDKcmpQ+hJedoNGQYQ=
-github.com/google/pprof v0.0.0-20251213031049-b05bdaca462f/go.mod h1:67FPmZWbr+KDT/VlpWtw6sO9XSjpJmLuHpoLmWiTGgY=
+github.com/google/pprof v0.0.0-20251114195745-4902fdda35c8 h1:3DsUAV+VNEQa2CUVLxCY3f87278uWfIDhJnbdvDjvmE=
+github.com/google/pprof v0.0.0-20251114195745-4902fdda35c8/go.mod h1:I6V7YzU0XDpsHqbsyrghnFZLO1gwK6NPTNvmetQIk9U=
 github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE=
 github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@ -162,8 +162,8 @@ github.com/lestrrat-go/jwx/v2 v2.1.6 h1:hxM1gfDILk/l5ylers6BX/Eq1m/pnxe9NBwW6lVf
 github.com/lestrrat-go/jwx/v2 v2.1.6/go.mod h1:Y722kU5r/8mV7fYDifjug0r8FK8mZdw0K0GpJw/l8pU=
 github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU=
 github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
-github.com/maruel/natural v1.3.0 h1:VsmCsBmEyrR46RomtgHs5hbKADGRVtliHTyCOLFBpsg=
-github.com/maruel/natural v1.3.0/go.mod h1:v+Rfd79xlw1AgVBjbO0BEQmptqb5HvL/k9GRHB7ZKEg=
+github.com/maruel/natural v1.2.1 h1:G/y4pwtTA07lbQsMefvsmEO0VN0NfqpxprxXDM4R/4o=
+github.com/maruel/natural v1.2.1/go.mod h1:v+Rfd79xlw1AgVBjbO0BEQmptqb5HvL/k9GRHB7ZKEg=
 github.com/matoous/go-nanoid/v2 v2.1.0 h1:P64+dmq21hhWdtvZfEAofnvJULaRR1Yib0+PnU669bE=
 github.com/matoous/go-nanoid/v2 v2.1.0/go.mod h1:KlbGNQ+FhrUNIHUxZdL63t7tl4LaPkZNpUULS8H4uVM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
@ -186,10 +186,10 @@ github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdh
 github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 github.com/ogier/pflag v0.0.1 h1:RW6JSWSu/RkSatfcLtogGfFgpim5p7ARQ10ECk5O750=
 github.com/ogier/pflag v0.0.1/go.mod h1:zkFki7tvTa0tafRvTBIZTvzYyAu6kQhPZFnshFFPE+g=
-github.com/onsi/ginkgo/v2 v2.27.3 h1:ICsZJ8JoYafeXFFlFAG75a7CxMsJHwgKwtO+82SE9L8=
-github.com/onsi/ginkgo/v2 v2.27.3/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo=
-github.com/onsi/gomega v1.38.3 h1:eTX+W6dobAYfFeGC2PV6RwXRu/MyT+cQguijutvkpSM=
-github.com/onsi/gomega v1.38.3/go.mod h1:ZCU1pkQcXDO5Sl9/VVEGlDyp+zm0m1cmeG5TOzLgdh4=
+github.com/onsi/ginkgo/v2 v2.27.2 h1:LzwLj0b89qtIy6SSASkzlNvX6WktqurSHwkk2ipF/Ns=
+github.com/onsi/ginkgo/v2 v2.27.2/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo=
+github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A=
+github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k=
 github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
 github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
@ -244,8 +244,8 @@ github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
 github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
 github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=
 github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
-github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
-github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
+github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
+github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
 github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
 github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
@ -265,8 +265,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
-github.com/tetratelabs/wazero v1.11.0 h1:+gKemEuKCTevU4d7ZTzlsvgd1uaToIDtlQlmNbwqYhA=
-github.com/tetratelabs/wazero v1.11.0/go.mod h1:eV28rsN8Q+xwjogd7f4/Pp4xFxO7uOGbLcD/LzB1wiU=
+github.com/tetratelabs/wazero v1.10.1 h1:2DugeJf6VVk58KTPszlNfeeN8AhhpwcZqkJj2wwFuH8=
+github.com/tetratelabs/wazero v1.10.1/go.mod h1:DRm5twOQ5Gr1AoEdSi0CLjDQF1J9ZAuyqFIjl1KKfQU=
 github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
 github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
@ -298,20 +298,20 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
-golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
-golang.org/x/exp v0.0.0-20251209150349-8475f28825e9 h1:MDfG8Cvcqlt9XXrmEiD4epKn7VJHZO84hejP9Jmp0MM=
-golang.org/x/exp v0.0.0-20251209150349-8475f28825e9/go.mod h1:EPRbTFwzwjXj9NpYyyrvenVh9Y+GFeEvMNh7Xuz7xgU=
+golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
+golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
+golang.org/x/exp v0.0.0-20251113190631-e25ba8c21ef6 h1:zfMcR1Cs4KNuomFFgGefv5N0czO2XZpUbxGUy8i8ug0=
+golang.org/x/exp v0.0.0-20251113190631-e25ba8c21ef6/go.mod h1:46edojNIoXTNOhySWIWdix628clX9ODXwPsQuG6hsK0=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.34.0 h1:33gCkyw9hmwbZJeZkct8XyR11yH889EQt/QH4VmXMn8=
-golang.org/x/image v0.34.0/go.mod h1:2RNFBZRB+vnwwFil8GkMdRvrJOFd1AzdZI6vOY+eJVU=
+golang.org/x/image v0.33.0 h1:LXRZRnv1+zGd5XBUVRFmYEphyyKJjQjCRiOuAP3sZfQ=
+golang.org/x/image v0.33.0/go.mod h1:DD3OsTYT9chzuzTQt+zMcOlBHgfoKQb1gry8p76Y1sc=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI=
-golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=
+golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
+golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@ -323,8 +323,8 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
-golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
-golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
+golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
+golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@ -332,8 +332,8 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
-golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
+golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@ -350,11 +350,11 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
-golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
+golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
-golang.org/x/telemetry v0.0.0-20251203150158-8fff8a5912fc h1:bH6xUXay0AIFMElXG2rQ4uiE+7ncwtiOdPfYK1NK2XA=
-golang.org/x/telemetry v0.0.0-20251203150158-8fff8a5912fc/go.mod h1:hKdjCMrbv9skySur+Nek8Hd0uJ0GuxJIoIX2payrIdQ=
+golang.org/x/telemetry v0.0.0-20251111182119-bc8e575c7b54 h1:E2/AqCUMZGgd73TQkxUMcMla25GB9i/5HOdLr+uH7Vo=
+golang.org/x/telemetry v0.0.0-20251111182119-bc8e575c7b54/go.mod h1:hKdjCMrbv9skySur+Nek8Hd0uJ0GuxJIoIX2payrIdQ=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@ -363,8 +363,8 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
-golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
-golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
+golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
+golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@ -375,8 +375,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
-golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
+golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
 golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
 golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@ -386,12 +386,12 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
-golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
-golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
+golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
+golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
-google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
+google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
--- a/persistence/album_repository_test.go
+++ b/persistence/album_repository_test.go
@ -512,70 +512,6 @@ var _ = Describe("AlbumRepository", func() {
 			// Clean up the test album created for this test
 			_, _ = albumRepo.executeSQL(squirrel.Delete("album").Where(squirrel.Eq{"id": album.ID}))
 		})
-
-		It("removes stale role associations when artist role changes", func() {
-			// Regression test for issue #4242: Composers displayed in albumartist list
-			// This happens when an artist's role changes (e.g., was both albumartist and composer,
-			// now only composer) and the old role association isn't properly removed.
-
-			// Create an artist that will have changing roles
-			artist := &model.Artist{
-				ID:              "role-change-artist-1",
-				Name:            "Role Change Artist",
-				OrderArtistName: "role change artist",
-			}
-			err := createArtistWithLibrary(artistRepo, artist, 1)
-			Expect(err).ToNot(HaveOccurred())
-
-			// Create album with artist as both albumartist and composer
-			album := &model.Album{
-				LibraryID:     1,
-				ID:            "test-album-role-change",
-				Name:          "Test Album Role Change",
-				AlbumArtistID: "role-change-artist-1",
-				AlbumArtist:   "Role Change Artist",
-				Participants: model.Participants{
-					model.RoleAlbumArtist: {
-						{Artist: model.Artist{ID: "role-change-artist-1", Name: "Role Change Artist"}},
-					},
-					model.RoleComposer: {
-						{Artist: model.Artist{ID: "role-change-artist-1", Name: "Role Change Artist"}},
-					},
-				},
-			}
-
-			err = albumRepo.Put(album)
-			Expect(err).ToNot(HaveOccurred())
-
-			// Verify initial state: artist has both albumartist and composer roles
-			expected := []albumArtistRecord{
-				{ArtistID: "role-change-artist-1", Role: "albumartist", SubRole: ""},
-				{ArtistID: "role-change-artist-1", Role: "composer", SubRole: ""},
-			}
-			verifyAlbumArtists(album.ID, expected)
-
-			// Now update album so artist is ONLY a composer (remove albumartist role)
-			album.Participants = model.Participants{
-				model.RoleComposer: {
-					{Artist: model.Artist{ID: "role-change-artist-1", Name: "Role Change Artist"}},
-				},
-			}
-
-			err = albumRepo.Put(album)
-			Expect(err).ToNot(HaveOccurred())
-
-			// Verify that the albumartist role was removed - only composer should remain
-			// This is the key test: before the fix, the albumartist role would remain
-			// causing composers to appear in the albumartist filter
-			expectedAfter := []albumArtistRecord{
-				{ArtistID: "role-change-artist-1", Role: "composer", SubRole: ""},
-			}
-			verifyAlbumArtists(album.ID, expectedAfter)
-
-			// Clean up
-			_, _ = artistRepo.executeSQL(squirrel.Delete("artist").Where(squirrel.Eq{"id": artist.ID}))
-			_, _ = albumRepo.executeSQL(squirrel.Delete("album").Where(squirrel.Eq{"id": album.ID}))
-		})
 	})
 })

--- a/persistence/folder_repository.go
+++ b/persistence/folder_repository.go
@ -95,82 +95,45 @@ func (r folderRepository) CountAll(opt ...model.QueryOptions) (int64, error) {
 }

 func (r folderRepository) GetFolderUpdateInfo(lib model.Library, targetPaths ...string) (map[string]model.FolderUpdateInfo, error) {
-	// If no specific paths, return all folders in the library
-	if len(targetPaths) == 0 {
-		return r.getFolderUpdateInfoAll(lib)
-	}
-
-	// Check if any path is root (return all folders)
-	for _, targetPath := range targetPaths {
-		if targetPath == "" || targetPath == "." {
-			return r.getFolderUpdateInfoAll(lib)
-		}
-	}
-
-	// Process paths in batches to avoid SQLite's expression tree depth limit (max 1000).
-	// Each path generates ~3 conditions, so batch size of 100 keeps us well under the limit.
-	const batchSize = 100
-	result := make(map[string]model.FolderUpdateInfo)
-
-	for batch := range slices.Chunk(targetPaths, batchSize) {
-		batchResult, err := r.getFolderUpdateInfoBatch(lib, batch)
-		if err != nil {
-			return nil, err
-		}
-		for id, info := range batchResult {
-			result[id] = info
-		}
-	}
-
-	return result, nil
-}
-
-// getFolderUpdateInfoAll returns update info for all non-missing folders in the library
-func (r folderRepository) getFolderUpdateInfoAll(lib model.Library) (map[string]model.FolderUpdateInfo, error) {
-	where := And{
-		Eq{"library_id": lib.ID},
-		Eq{"missing": false},
-	}
-	return r.queryFolderUpdateInfo(where)
-}
-
-// getFolderUpdateInfoBatch returns update info for a batch of target paths and their descendants
-func (r folderRepository) getFolderUpdateInfoBatch(lib model.Library, targetPaths []string) (map[string]model.FolderUpdateInfo, error) {
 	where := And{
 		Eq{"library_id": lib.ID},
 		Eq{"missing": false},
 	}

-	// Collect folder IDs for exact target folders and path conditions for descendants
-	folderIDs := make([]string, 0, len(targetPaths))
-	pathConditions := make(Or, 0, len(targetPaths)*2)
+	// If specific paths are requested, include those folders and all their descendants
+	if len(targetPaths) > 0 {
+		// Collect folder IDs for exact target folders and path conditions for descendants
+		folderIDs := make([]string, 0, len(targetPaths))
+		pathConditions := make(Or, 0, len(targetPaths)*2)

-	for _, targetPath := range targetPaths {
-		// Clean the path to normalize it. Paths stored in the folder table do not have leading/trailing slashes.
-		cleanPath := strings.TrimPrefix(targetPath, string(os.PathSeparator))
-		cleanPath = filepath.Clean(cleanPath)
+		for _, targetPath := range targetPaths {
+			if targetPath == "" || targetPath == "." {
+				// Root path - include everything in this library
+				pathConditions = Or{}
+				folderIDs = nil
+				break
+			}
+			// Clean the path to normalize it. Paths stored in the folder table do not have leading/trailing slashes.
+			cleanPath := strings.TrimPrefix(targetPath, string(os.PathSeparator))
+			cleanPath = filepath.Clean(cleanPath)

-		// Include the target folder itself by ID
-		folderIDs = append(folderIDs, model.FolderID(lib, cleanPath))
+			// Include the target folder itself by ID
+			folderIDs = append(folderIDs, model.FolderID(lib, cleanPath))

-		// Include all descendants: folders whose path field equals or starts with the target path
-		// Note: Folder.Path is the directory path, so children have path = targetPath
-		pathConditions = append(pathConditions, Eq{"path": cleanPath})
-		pathConditions = append(pathConditions, Like{"path": cleanPath + "/%"})
+			// Include all descendants: folders whose path field equals or starts with the target path
+			// Note: Folder.Path is the directory path, so children have path = targetPath
+			pathConditions = append(pathConditions, Eq{"path": cleanPath})
+			pathConditions = append(pathConditions, Like{"path": cleanPath + "/%"})
+		}
+
+		// Combine conditions: exact folder IDs OR descendant path patterns
+		if len(folderIDs) > 0 {
+			where = append(where, Or{Eq{"id": folderIDs}, pathConditions})
+		} else if len(pathConditions) > 0 {
+			where = append(where, pathConditions)
+		}
 	}

-	// Combine conditions: exact folder IDs OR descendant path patterns
-	if len(folderIDs) > 0 {
-		where = append(where, Or{Eq{"id": folderIDs}, pathConditions})
-	} else if len(pathConditions) > 0 {
-		where = append(where, pathConditions)
-	}
-
-	return r.queryFolderUpdateInfo(where)
-}
-
-// queryFolderUpdateInfo executes the query and returns the result map
-func (r folderRepository) queryFolderUpdateInfo(where And) (map[string]model.FolderUpdateInfo, error) {
 	sq := r.newSelect().Columns("id", "updated_at", "hash").Where(where)
 	var res []struct {
 		ID        string
--- a/persistence/sql_participations.go
+++ b/persistence/sql_participations.go
@ -51,10 +51,8 @@ func unmarshalParticipants(data string) (model.Participants, error) {
 }

 func (r sqlRepository) updateParticipants(itemID string, participants model.Participants) error {
-	// Delete all existing participant entries for this item.
-	// This ensures stale role associations are removed when an artist's role changes
-	// (e.g., an artist was both albumartist and composer, but is now only composer).
-	sqd := Delete(r.tableName + "_artists").Where(Eq{r.tableName + "_id": itemID})
+	ids := participants.AllIDs()
+	sqd := Delete(r.tableName + "_artists").Where(And{Eq{r.tableName + "_id": itemID}, NotEq{"artist_id": ids}})
 	_, err := r.executeSQL(sqd)
 	if err != nil {
 		return err
--- a/resources/i18n/eu.json
+++ b/resources/i18n/eu.json
@ -302,8 +302,6 @@
      },
      "actions": {
        "scan": "Arakatu liburutegia",
-        "quickScan": "Araketa bizkorra",
-        "fullScan": "Araketa sakona",
        "manageUsers": "Kudeatu erabiltzaileen sarbidea",
        "viewDetails": "Ikusi xehetasunak"
      },
@ -312,9 +310,6 @@
        "updated": "Liburutegia ondo eguneratu da",
        "deleted": "Liburutegia ondo ezabatu da",
        "scanStarted": "Liburutegiaren araketa hasi da",
-        "quickScanStarted": "Araketa bizkorra hasi da",
-        "fullScanStarted": "Araketa sakona hasi da",
-        "scanError": "Errorea araketa abiaraztean. Aztertu erregistroak",
        "scanCompleted": "Liburutegiaren araketa amaitu da"
      },
      "validation": {
@ -464,7 +459,7 @@
      "bad_item": "Elementu okerra",
      "item_doesnt_exist": "Elementua ez dago",
      "http_error": "Errorea zerbitzariarekin komunikatzerakoan",
-      "data_provider_error": "Errorea datuen hornitzailean. Aztertu kontsola xehetasun gehiagorako.",
+      "data_provider_error": "Errorea datuen hornitzailean. Berrikusi kontsola xehetasun gehiagorako.",
      "i18n_error": "Ezin izan dira zehaztutako hizkuntzaren itzulpenak kargatu",
      "canceled": "Ekintza bertan behera utzi da",
      "logged_out": "Saioa amaitu da, konektatu berriro.",
@ -605,9 +600,8 @@
  "activity": {
    "title": "Ekintzak",
    "totalScanned": "Arakatutako karpeta guztiak",
-    "quickScan": "Arakatze bizkorra",
+    "quickScan": "Arakatze azkarra",
    "fullScan": "Arakatze sakona",
-    "selectiveScan": "Arakatze selektiboa",
    "serverUptime": "Zerbitzariak piztuta daraman denbora",
    "serverDown": "LINEAZ KANPO",
    "scanType": "Mota",
--- a/scanner/external.go
+++ b/scanner/external.go
@ -14,12 +14,6 @@ import (
 	"github.com/navidrome/navidrome/model"
 )

-const (
-	// argLengthThreshold is the threshold for switching from command-line args to file-based target passing.
-	// Set conservatively at 24KB to support Windows (~32KB limit) with margin for env vars.
-	argLengthThreshold = 24 * 1024
-)
-
 // scannerExternal is a scanner that runs an external process to do the scanning. It is used to avoid
 // memory leaks or retention in the main process, as the scanner can consume a lot of memory. The
 // external process will be spawned with the same executable as the current process, and will run
@ -51,14 +45,10 @@ func (s *scannerExternal) scan(ctx context.Context, fullScan bool, targets []mod

 	// Add targets if provided
 	if len(targets) > 0 {
-		targetArgs, cleanup, err := targetArguments(ctx, targets, argLengthThreshold)
-		if err != nil {
-			progress <- &ProgressInfo{Error: err.Error()}
-			return
+		for _, target := range targets {
+			args = append(args, "-t", target.String())
 		}
-		defer cleanup()
-		log.Debug(ctx, "Spawning external scanner process with target file", "fullScan", fullScan, "path", exe, "numTargets", len(targets))
-		args = append(args, targetArgs...)
+		log.Debug(ctx, "Spawning external scanner process with targets", "fullScan", fullScan, "path", exe, "targets", targets)
 	} else {
 		log.Debug(ctx, "Spawning external scanner process", "fullScan", fullScan, "path", exe)
 	}
@ -108,62 +98,4 @@ func (s *scannerExternal) wait(cmd *exec.Cmd, out *io.PipeWriter) {
 	_ = out.Close()
 }

-// targetArguments builds command-line arguments for the given scan targets.
-// If the estimated argument length exceeds a threshold, it writes the targets to a temp file
-// and returns the --target-file argument instead.
-// Returns the arguments, a cleanup function to remove any temp file created, and an error if any.
-func targetArguments(ctx context.Context, targets []model.ScanTarget, lengthThreshold int) ([]string, func(), error) {
-	var args []string
-
-	// Estimate argument length to decide whether to use file-based approach
-	argLength := estimateArgLength(targets)
-
-	if argLength > lengthThreshold {
-		// Write targets to temp file and pass via --target-file
-		targetFile, err := writeTargetsToFile(targets)
-		if err != nil {
-			return nil, nil, fmt.Errorf("failed to write targets to file: %w", err)
-		}
-		args = append(args, "--target-file", targetFile)
-		return args, func() {
-			os.Remove(targetFile) // Clean up temp file
-		}, nil
-	}
-
-	// Use command-line arguments for small target lists
-	for _, target := range targets {
-		args = append(args, "-t", target.String())
-	}
-	return args, func() {}, nil
-}
-
-// estimateArgLength estimates the total length of command-line arguments for the given targets.
-func estimateArgLength(targets []model.ScanTarget) int {
-	length := 0
-	for _, target := range targets {
-		// Each target adds: "-t " + target string + space
-		length += 3 + len(target.String()) + 1
-	}
-	return length
-}
-
-// writeTargetsToFile writes the targets to a temporary file, one per line.
-// Returns the path to the temp file, which the caller should clean up.
-func writeTargetsToFile(targets []model.ScanTarget) (string, error) {
-	tmpFile, err := os.CreateTemp("", "navidrome-scan-targets-*.txt")
-	if err != nil {
-		return "", fmt.Errorf("failed to create temp file: %w", err)
-	}
-	defer tmpFile.Close()
-
-	for _, target := range targets {
-		if _, err := fmt.Fprintln(tmpFile, target.String()); err != nil {
-			os.Remove(tmpFile.Name())
-			return "", fmt.Errorf("failed to write to temp file: %w", err)
-		}
-	}
-
-	return tmpFile.Name(), nil
-}
-
 var _ scanner = (*scannerExternal)(nil)
--- a/scanner/external_test.go
+++ b/scanner/external_test.go
@ -1,160 +0,0 @@
-package scanner
-
-import (
-	"context"
-	"os"
-	"strings"
-
-	"github.com/navidrome/navidrome/model"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("targetArguments", func() {
-	var ctx context.Context
-
-	BeforeEach(func() {
-		ctx = GinkgoT().Context()
-	})
-
-	Context("with small target list", func() {
-		It("returns command-line arguments for single target", func() {
-			targets := []model.ScanTarget{
-				{LibraryID: 1, FolderPath: "Music/Rock"},
-			}
-
-			args, cleanup, err := targetArguments(ctx, targets, argLengthThreshold)
-			Expect(err).ToNot(HaveOccurred())
-			defer cleanup()
-			Expect(args).To(Equal([]string{"-t", "1:Music/Rock"}))
-		})
-
-		It("returns command-line arguments for multiple targets", func() {
-			targets := []model.ScanTarget{
-				{LibraryID: 1, FolderPath: "Music/Rock"},
-				{LibraryID: 2, FolderPath: "Music/Jazz"},
-				{LibraryID: 3, FolderPath: "Classical"},
-			}
-
-			args, cleanup, err := targetArguments(ctx, targets, argLengthThreshold)
-			Expect(err).ToNot(HaveOccurred())
-			defer cleanup()
-			Expect(args).To(Equal([]string{
-				"-t", "1:Music/Rock",
-				"-t", "2:Music/Jazz",
-				"-t", "3:Classical",
-			}))
-		})
-
-		It("handles targets with special characters", func() {
-			targets := []model.ScanTarget{
-				{LibraryID: 1, FolderPath: "Music/Rock & Roll"},
-				{LibraryID: 2, FolderPath: "Music/Jazz (Modern)"},
-			}
-
-			args, cleanup, err := targetArguments(ctx, targets, argLengthThreshold)
-			Expect(err).ToNot(HaveOccurred())
-			defer cleanup()
-			Expect(args).To(Equal([]string{
-				"-t", "1:Music/Rock & Roll",
-				"-t", "2:Music/Jazz (Modern)",
-			}))
-		})
-	})
-
-	Context("with large target list exceeding threshold", func() {
-		It("returns --target-file argument when exceeding threshold", func() {
-			// Create enough targets to exceed the threshold
-			var targets []model.ScanTarget
-			for i := 1; i <= 600; i++ {
-				targets = append(targets, model.ScanTarget{
-					LibraryID:  1,
-					FolderPath: "Music/VeryLongFolderPathToSimulateRealScenario/SubFolder",
-				})
-			}
-
-			args, cleanup, err := targetArguments(ctx, targets, argLengthThreshold)
-			Expect(err).ToNot(HaveOccurred())
-			defer cleanup()
-			Expect(args).To(HaveLen(2))
-			Expect(args[0]).To(Equal("--target-file"))
-
-			// Verify the file exists and has correct format
-			filePath := args[1]
-			Expect(filePath).To(ContainSubstring("navidrome-scan-targets-"))
-			Expect(filePath).To(HaveSuffix(".txt"))
-
-			// Verify file actually exists
-			_, err = os.Stat(filePath)
-			Expect(err).ToNot(HaveOccurred())
-		})
-
-		It("creates temp file with correct format", func() {
-			// Use custom threshold to easily exceed it
-			targets := []model.ScanTarget{
-				{LibraryID: 1, FolderPath: "Music/Rock"},
-				{LibraryID: 2, FolderPath: "Music/Jazz"},
-				{LibraryID: 3, FolderPath: "Classical"},
-			}
-
-			// Set threshold very low to force file usage
-			args, cleanup, err := targetArguments(ctx, targets, 10)
-			Expect(err).ToNot(HaveOccurred())
-			defer cleanup()
-			Expect(args[0]).To(Equal("--target-file"))
-
-			// Verify file exists with correct format
-			filePath := args[1]
-			Expect(filePath).To(ContainSubstring("navidrome-scan-targets-"))
-			Expect(filePath).To(HaveSuffix(".txt"))
-
-			// Verify file content
-			content, err := os.ReadFile(filePath)
-			Expect(err).ToNot(HaveOccurred())
-			lines := strings.Split(strings.TrimSpace(string(content)), "\n")
-			Expect(lines).To(HaveLen(3))
-			Expect(lines[0]).To(Equal("1:Music/Rock"))
-			Expect(lines[1]).To(Equal("2:Music/Jazz"))
-			Expect(lines[2]).To(Equal("3:Classical"))
-		})
-	})
-
-	Context("edge cases", func() {
-		It("handles empty target list", func() {
-			var targets []model.ScanTarget
-
-			args, cleanup, err := targetArguments(ctx, targets, argLengthThreshold)
-			Expect(err).ToNot(HaveOccurred())
-			defer cleanup()
-			Expect(args).To(BeEmpty())
-		})
-
-		It("uses command-line args when exactly at threshold", func() {
-			// Create targets that are exactly at threshold
-			targets := []model.ScanTarget{
-				{LibraryID: 1, FolderPath: "Music"},
-			}
-
-			// Estimate length should be 11 bytes
-			estimatedLength := estimateArgLength(targets)
-
-			args, cleanup, err := targetArguments(ctx, targets, estimatedLength)
-			Expect(err).ToNot(HaveOccurred())
-			defer cleanup()
-			Expect(args).To(Equal([]string{"-t", "1:Music"}))
-		})
-
-		It("uses file when one byte over threshold", func() {
-			targets := []model.ScanTarget{
-				{LibraryID: 1, FolderPath: "Music"},
-			}
-
-			// Set threshold just below the estimated length
-			estimatedLength := estimateArgLength(targets)
-			args, cleanup, err := targetArguments(ctx, targets, estimatedLength-1)
-			Expect(err).ToNot(HaveOccurred())
-			defer cleanup()
-			Expect(args[0]).To(Equal("--target-file"))
-		})
-	})
-})
--- a/scanner/phase_1_folders.go
+++ b/scanner/phase_1_folders.go
@ -76,12 +76,6 @@ func newScanJob(ctx context.Context, ds model.DataStore, cw artwork.CacheWarmer,
 		log.Error(ctx, "Error getting fs for library", "library", lib.Name, "path", lib.Path, err)
 		return nil, fmt.Errorf("getting fs for library: %w", err)
 	}
-
-	// Ensure FullScanInProgress reflects the current scan request.
-	// This is important when resuming an interrupted quick scan as a full scan:
-	// the DB may have FullScanInProgress=false, but we need it true for isOutdated() to work correctly.
-	lib.FullScanInProgress = lib.FullScanInProgress || fullScan
-
 	return &scanJob{
 		lib:           lib,
 		fs:            fsys,
--- a/scanner/scanner_test.go
+++ b/scanner/scanner_test.go
@ -675,155 +675,6 @@ var _ = Describe("Scanner", Ordered, func() {
 		})
 	})

-	Describe("Interrupted scan resumption", func() {
-		var fsys storagetest.FakeFS
-		var help func(...map[string]any) *fstest.MapFile
-
-		BeforeEach(func() {
-			help = template(_t{"albumartist": "The Beatles", "album": "Help!", "year": 1965})
-			fsys = createFS(fstest.MapFS{
-				"The Beatles/Help!/01 - Help!.mp3":            help(track(1, "Help!")),
-				"The Beatles/Help!/02 - The Night Before.mp3": help(track(2, "The Night Before")),
-			})
-		})
-
-		simulateInterruptedScan := func(fullScan bool) {
-			// Call ScanBegin to properly set LastScanStartedAt and FullScanInProgress
-			// This simulates what would happen if a scan was interrupted (ScanBegin called but ScanEnd not)
-			Expect(ds.Library(ctx).ScanBegin(lib.ID, fullScan)).To(Succeed())
-
-			// Verify the update was persisted
-			reloaded, err := ds.Library(ctx).Get(lib.ID)
-			Expect(err).ToNot(HaveOccurred())
-			Expect(reloaded.LastScanStartedAt).ToNot(BeZero())
-			Expect(reloaded.FullScanInProgress).To(Equal(fullScan))
-		}
-
-		Context("when a quick scan is interrupted and resumed with a full scan request", func() {
-			BeforeEach(func() {
-				// First, complete a full scan to populate the database
-				Expect(runScanner(ctx, true)).To(Succeed())
-
-				// Verify files were imported
-				mfs, err := ds.MediaFile(ctx).GetAll()
-				Expect(err).ToNot(HaveOccurred())
-				Expect(mfs).To(HaveLen(2))
-
-				// Now simulate an interrupted quick scan
-				// (LastScanStartedAt is set, FullScanInProgress is false)
-				simulateInterruptedScan(false)
-			})
-
-			It("should rescan all folders when resumed as full scan", func() {
-				// Update a tag without changing the folder hash by preserving the original modtime.
-				// In a quick scan, this wouldn't be detected because the folder hash hasn't changed.
-				// But in a full scan, all files should be re-read regardless of hash.
-				origModTime := fsys.MapFS["The Beatles/Help!/01 - Help!.mp3"].ModTime
-				fsys.UpdateTags("The Beatles/Help!/01 - Help!.mp3", _t{"comment": "updated comment"}, origModTime)
-
-				// Resume with a full scan - this should process all folders
-				// even though folder hashes haven't changed
-				Expect(runScanner(ctx, true)).To(Succeed())
-
-				// Verify the comment was updated (which means the folder was processed and file re-imported)
-				mfs, err := ds.MediaFile(ctx).GetAll(model.QueryOptions{
-					Filters: squirrel.Eq{"title": "Help!"},
-				})
-				Expect(err).ToNot(HaveOccurred())
-				Expect(mfs).To(HaveLen(1))
-				Expect(mfs[0].Comment).To(Equal("updated comment"))
-			})
-		})
-
-		Context("when a full scan is interrupted and resumed with a quick scan request", func() {
-			BeforeEach(func() {
-				// First, complete a full scan to populate the database
-				Expect(runScanner(ctx, true)).To(Succeed())
-
-				// Verify files were imported
-				mfs, err := ds.MediaFile(ctx).GetAll()
-				Expect(err).ToNot(HaveOccurred())
-				Expect(mfs).To(HaveLen(2))
-
-				// Now simulate an interrupted full scan
-				// (LastScanStartedAt is set, FullScanInProgress is true)
-				simulateInterruptedScan(true)
-			})
-
-			It("should continue as full scan even when quick scan is requested", func() {
-				// Update a tag without changing the folder hash by preserving the original modtime.
-				origModTime := fsys.MapFS["The Beatles/Help!/01 - Help!.mp3"].ModTime
-				fsys.UpdateTags("The Beatles/Help!/01 - Help!.mp3", _t{"comment": "full scan comment"}, origModTime)
-
-				// Request a quick scan - but because a full scan was in progress,
-				// it should continue as a full scan
-				Expect(runScanner(ctx, false)).To(Succeed())
-
-				// Verify the comment was updated (folder was processed despite unchanged hash)
-				mfs, err := ds.MediaFile(ctx).GetAll(model.QueryOptions{
-					Filters: squirrel.Eq{"title": "Help!"},
-				})
-				Expect(err).ToNot(HaveOccurred())
-				Expect(mfs).To(HaveLen(1))
-				Expect(mfs[0].Comment).To(Equal("full scan comment"))
-			})
-		})
-
-		Context("when no scan was in progress", func() {
-			BeforeEach(func() {
-				// First, complete a full scan to populate the database
-				Expect(runScanner(ctx, true)).To(Succeed())
-
-				// Verify files were imported
-				mfs, err := ds.MediaFile(ctx).GetAll()
-				Expect(err).ToNot(HaveOccurred())
-				Expect(mfs).To(HaveLen(2))
-
-				// Library should have LastScanStartedAt cleared after successful scan
-				updatedLib, err := ds.Library(ctx).Get(lib.ID)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(updatedLib.LastScanStartedAt).To(BeZero())
-				Expect(updatedLib.FullScanInProgress).To(BeFalse())
-			})
-
-			It("should respect the full scan flag for new scans", func() {
-				// Update a tag without changing the folder hash by preserving the original modtime.
-				origModTime := fsys.MapFS["The Beatles/Help!/01 - Help!.mp3"].ModTime
-				fsys.UpdateTags("The Beatles/Help!/01 - Help!.mp3", _t{"comment": "new full scan"}, origModTime)
-
-				// Start a new full scan
-				Expect(runScanner(ctx, true)).To(Succeed())
-
-				// Verify the comment was updated
-				mfs, err := ds.MediaFile(ctx).GetAll(model.QueryOptions{
-					Filters: squirrel.Eq{"title": "Help!"},
-				})
-				Expect(err).ToNot(HaveOccurred())
-				Expect(mfs).To(HaveLen(1))
-				Expect(mfs[0].Comment).To(Equal("new full scan"))
-			})
-
-			It("should not rescan unchanged folders during quick scan", func() {
-				// Update a tag without changing the folder hash by preserving the original modtime.
-				// This simulates editing tags in a file (e.g., with a tag editor) without modifying its timestamp.
-				// In a quick scan, this should NOT be detected because the folder hash remains unchanged.
-				origModTime := fsys.MapFS["The Beatles/Help!/01 - Help!.mp3"].ModTime
-				fsys.UpdateTags("The Beatles/Help!/01 - Help!.mp3", _t{"comment": "should not appear"}, origModTime)
-
-				// Do a quick scan - unchanged folders should be skipped
-				Expect(runScanner(ctx, false)).To(Succeed())
-
-				// Verify the comment was NOT updated (folder was skipped)
-				mfs, err := ds.MediaFile(ctx).GetAll(model.QueryOptions{
-					Filters: squirrel.Eq{"title": "Help!"},
-				})
-				Expect(err).ToNot(HaveOccurred())
-				Expect(mfs).To(HaveLen(1))
-				Expect(mfs[0].Comment).To(BeEmpty())
-			})
-		})
-	})
-
 	Describe("RefreshStats", func() {
 		var refreshStatsCalls []bool
 		var fsys storagetest.FakeFS
--- a/server/middlewares.go
+++ b/server/middlewares.go
@ -107,7 +107,7 @@ func secureMiddleware() func(http.Handler) http.Handler {
 		FrameDeny:               true,
 		ReferrerPolicy:          "same-origin",
 		PermissionsPolicy:       "autoplay=(), camera=(), microphone=(), usb=()",
-		CustomFrameOptionsValue: conf.Server.HTTPHeaders.FrameOptions,
+		CustomFrameOptionsValue: conf.Server.HTTPSecurityHeaders.CustomFrameOptionsValue,
 		//ContentSecurityPolicy: "script-src 'self' 'unsafe-inline'",
 	})
 	return sec.Handler
--- a/server/subsonic/api.go
+++ b/server/subsonic/api.go
@ -118,7 +118,11 @@ func (api *Router) routes() http.Handler {
 			hr(r, "getAlbumList2", api.GetAlbumList2)
 			h(r, "getStarred", api.GetStarred)
 			h(r, "getStarred2", api.GetStarred2)
-			h(r, "getNowPlaying", api.GetNowPlaying)
+			if conf.Server.EnableNowPlaying {
+				h(r, "getNowPlaying", api.GetNowPlaying)
+			} else {
+				h501(r, "getNowPlaying")
+			}
 			h(r, "getRandomSongs", api.GetRandomSongs)
 			h(r, "getSongsByGenre", api.GetSongsByGenre)
 		})
--- a/server/subsonic/users.go
+++ b/server/subsonic/users.go
@ -2,13 +2,11 @@ package subsonic

 import (
 	"net/http"
-	"strings"

 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/model/request"
 	"github.com/navidrome/navidrome/server/subsonic/responses"
-	"github.com/navidrome/navidrome/utils/req"
 	"github.com/navidrome/navidrome/utils/slice"
 )

@ -37,13 +35,7 @@ func (api *Router) GetUser(r *http.Request) (*responses.Subsonic, error) {
 	if !ok {
 		return nil, newError(responses.ErrorGeneric, "Internal error")
 	}
-	username, err := req.Params(r).String("username")
-	if err != nil {
-		return nil, err
-	}
-	if !strings.EqualFold(username, loggedUser.UserName) {
-		return nil, newError(responses.ErrorAuthorizationFail)
-	}
+
 	response := newResponse()
 	user := buildUserResponse(loggedUser)
 	response.User = &user
--- a/server/subsonic/users_test.go
+++ b/server/subsonic/users_test.go
@ -1,7 +1,7 @@
 package subsonic

 import (
-	"errors"
+	"context"
 	"net/http/httptest"

 	"github.com/navidrome/navidrome/conf"
@ -43,8 +43,8 @@ var _ = Describe("Users", func() {
 			}

 			// Create request with user in context
-			req := httptest.NewRequest("GET", "/rest/getUser?username=testuser", nil)
-			ctx := request.WithUser(GinkgoT().Context(), testUser)
+			req := httptest.NewRequest("GET", "/rest/getUser", nil)
+			ctx := request.WithUser(context.Background(), testUser)
 			req = req.WithContext(ctx)

 			userResponse, err1 := router.GetUser(req)
@ -116,60 +116,4 @@ var _ = Describe("Users", func() {
 			Expect(response.Folder).To(ContainElements(int32(1), int32(2), int32(5)))
 		})
 	})
-
-	Describe("GetUser authorization", func() {
-		It("should allow user to request their own information", func() {
-			req := httptest.NewRequest("GET", "/rest/getUser?username=testuser", nil)
-			ctx := request.WithUser(GinkgoT().Context(), testUser)
-			req = req.WithContext(ctx)
-
-			response, err := router.GetUser(req)
-
-			Expect(err).ToNot(HaveOccurred())
-			Expect(response).ToNot(BeNil())
-			Expect(response.User).ToNot(BeNil())
-			Expect(response.User.Username).To(Equal("testuser"))
-		})
-
-		It("should deny user from requesting another user's information", func() {
-			req := httptest.NewRequest("GET", "/rest/getUser?username=anotheruser", nil)
-			ctx := request.WithUser(GinkgoT().Context(), testUser)
-			req = req.WithContext(ctx)
-
-			response, err := router.GetUser(req)
-
-			Expect(err).To(HaveOccurred())
-			Expect(response).To(BeNil())
-
-			var subErr subError
-			ok := errors.As(err, &subErr)
-			Expect(ok).To(BeTrue())
-			Expect(subErr.code).To(Equal(responses.ErrorAuthorizationFail))
-		})
-
-		It("should return error when username parameter is missing", func() {
-			req := httptest.NewRequest("GET", "/rest/getUser", nil)
-			ctx := request.WithUser(GinkgoT().Context(), testUser)
-			req = req.WithContext(ctx)
-
-			response, err := router.GetUser(req)
-
-			Expect(err).To(MatchError("missing parameter: 'username'"))
-			Expect(response).To(BeNil())
-		})
-
-		It("should return error when user context is missing", func() {
-			req := httptest.NewRequest("GET", "/rest/getUser?username=testuser", nil)
-
-			response, err := router.GetUser(req)
-
-			Expect(err).To(HaveOccurred())
-			Expect(response).To(BeNil())
-
-			var subErr subError
-			ok := errors.As(err, &subErr)
-			Expect(ok).To(BeTrue())
-			Expect(subErr.code).To(Equal(responses.ErrorGeneric))
-		})
-	})
 })
--- a/ui/src/missing/MissingListActions.jsx
+++ b/ui/src/missing/MissingListActions.jsx
@ -1,15 +1,12 @@
 import React from 'react'
-import { TopToolbar, ExportButton, useListContext } from 'react-admin'
+import { TopToolbar, ExportButton } from 'react-admin'
 import DeleteMissingFilesButton from './DeleteMissingFilesButton.jsx'

-const MissingListActions = (props) => {
-  const { total } = useListContext()
-  return (
-    <TopToolbar {...props}>
-      <ExportButton maxResults={total} />
-      <DeleteMissingFilesButton deleteAll />
-    </TopToolbar>
-  )
-}
+const MissingListActions = (props) => (
+  <TopToolbar {...props}>
+    <ExportButton />
+    <DeleteMissingFilesButton deleteAll />
+  </TopToolbar>
+)

 export default MissingListActions
--- a/ui/src/themes/amusic.css.js
+++ b/ui/src/themes/amusic.css.js
@ -1,10 +1,4 @@
 const stylesheet = `
-.react-jinke-music-player-main .music-player-panel svg {
-    color: #eee
-}
-.react-jinke-music-player-main .music-player-panel button:disabled svg {
-    opacity: 0.3
-}
 .react-jinke-music-player-main svg:active, .react-jinke-music-player-main svg:hover {
    color: #D60017
 }
@ -33,6 +27,7 @@ const stylesheet = `
 .react-jinke-music-player-main .audio-item.playing .player-singer {
    color: #ff4e6b !important
 }
+.react-jinke-music-player-main .lyric-btn,
 .react-jinke-music-player-main .lyric-btn-active svg{
    color: #ff4e6b !important
 }
--- a/ui/src/themes/amusic.js
+++ b/ui/src/themes/amusic.js
@ -194,12 +194,7 @@ export default {
    },
    RaDeleteWithConfirmButton: {
      deleteButton: {
-        color: '#fff',
-      },
-    },
-    RaBulkDeleteWithUndoButton: {
-      deleteButton: {
-        color: '#fff',
+        color: 'unset',
      },
    },
    RaPaginationActions: {
--- a/utils/number/number.go
+++ b/utils/number/number.go
@ -2,15 +2,11 @@ package number

 import (
 	"strconv"
+
+	"golang.org/x/exp/constraints"
 )

-// Integer is a constraint that permits any integer type.
-type Integer interface {
-	~int | ~int8 | ~int16 | ~int32 | ~int64 |
-		~uint | ~uint8 | ~uint16 | ~uint32 | ~uint64 | ~uintptr
-}
-
-func ParseInt[T Integer](s string) T {
+func ParseInt[T constraints.Integer](s string) T {
 	r, _ := strconv.ParseInt(s, 10, 64)
 	return T(r)
 }
--- a/utils/random/number.go
+++ b/utils/random/number.go
@ -5,12 +5,12 @@ import (
 	"encoding/binary"
 	"math/big"

-	"github.com/navidrome/navidrome/utils/number"
+	"golang.org/x/exp/constraints"
 )

 // Int64N returns a random int64 between 0 and max.
 // This is a reimplementation of math/rand/v2.Int64N using a cryptographically secure random number generator.
-func Int64N[T number.Integer](max T) int64 {
+func Int64N[T constraints.Integer](max T) int64 {
 	rnd, _ := rand.Int(rand.Reader, big.NewInt(int64(max)))
 	return rnd.Int64()
 }
--- a/utils/slice/slice.go
+++ b/utils/slice/slice.go
@ -6,8 +6,9 @@ import (
 	"cmp"
 	"io"
 	"iter"
-	"maps"
 	"slices"
+
+	"golang.org/x/exp/maps"
 )

 func Map[T any, R any](t []T, mapFunc func(T) R) []R {
@ -48,9 +49,11 @@ func CompactByFrequency[T comparable](list []T) []T {
 		counters[item]++
 	}

-	return slices.SortedFunc(maps.Keys(counters), func(i, j T) int {
+	sorted := maps.Keys(counters)
+	slices.SortFunc(sorted, func(i, j T) int {
 		return cmp.Compare(counters[j], counters[i])
 	})
+	return sorted
 }

 func MostFrequent[T comparable](list []T) T {