Fix error comparisons

core/agents/lastfm/auth_router.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	_ "embed"
+	"errors"
 	"net/http"
 	"time"
 
@@ -67,7 +68,7 @@ func (s *Router) getLinkStatus(w http.ResponseWriter, r *http.Request) {
 	resp := map[string]interface{}{}
 	u, _ := request.UserFrom(r.Context())
 	key, err := s.sessionKeys.Get(r.Context(), u.ID)
-	if err != nil && err != model.ErrNotFound {
+	if err != nil && !errors.Is(err, model.ErrNotFound) {
 		resp["error"] = err
 		resp["status"] = false
 		_ = rest.RespondWithJSON(w, http.StatusInternalServerError, resp)

core/agents/listenbrainz/auth_router.go

@@ -3,6 +3,7 @@ package listenbrainz
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"net/http"
 
 	"github.com/deluan/rest"
@@ -62,7 +63,7 @@ func (s *Router) getLinkStatus(w http.ResponseWriter, r *http.Request) {
 	resp := map[string]interface{}{}
 	u, _ := request.UserFrom(r.Context())
 	key, err := s.sessionKeys.Get(r.Context(), u.ID)
-	if err != nil && err != model.ErrNotFound {
+	if err != nil && !errors.Is(err, model.ErrNotFound) {
 		resp["error"] = err
 		resp["status"] = false
 		_ = rest.RespondWithJSON(w, http.StatusInternalServerError, resp)

core/agents/spotify/spotify.go

@@ -2,6 +2,7 @@ package spotify
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/http"
 	"sort"
@@ -46,7 +47,7 @@ func (s *spotifyAgent) AgentName() string {
 func (s *spotifyAgent) GetImages(ctx context.Context, id, name, mbid string) ([]agents.ArtistImage, error) {
 	a, err := s.searchArtist(ctx, name)
 	if err != nil {
-		if err == model.ErrNotFound {
+		if errors.Is(err, model.ErrNotFound) {
 			log.Warn(ctx, "Artist not found in Spotify", "artist", name)
 		} else {
 			log.Error(ctx, "Error calling Spotify", "artist", name, err)

core/artwork.go

@@ -57,7 +57,7 @@ func (ci *imageInfo) Key() string {
 
 func (a *artwork) Get(ctx context.Context, id string, size int) (io.ReadCloser, error) {
 	path, lastUpdate, err := a.getImagePath(ctx, id)
-	if err != nil && err != model.ErrNotFound {
+	if err != nil && !errors.Is(err, model.ErrNotFound) {
 		return nil, err
 	}
 
@@ -106,7 +106,7 @@ func (a *artwork) getImagePath(ctx context.Context, id string) (path string, las
 	mf, err = a.ds.MediaFile(ctx).Get(id)
 
 	// If it is not, may be an albumId
-	if err == model.ErrNotFound {
+	if errors.Is(err, model.ErrNotFound) {
 		return a.getImagePath(ctx, "al-"+id)
 	}
 	if err != nil {

core/playlists.go

@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/url"
@@ -146,7 +147,7 @@ func (s *playlists) updatePlaylist(ctx context.Context, newPls *model.Playlist)
 	owner, _ := request.UserFrom(ctx)
 
 	pls, err := s.ds.Playlist(ctx).FindByPath(newPls.Path)
-	if err != nil && err != model.ErrNotFound {
+	if err != nil && !errors.Is(err, model.ErrNotFound) {
 		return err
 	}
 	if err == nil && !pls.Sync {

core/scrobbler/buffered_scrobbler.go

@@ -2,6 +2,7 @@ package scrobbler
 
 import (
 	"context"
+	"errors"
 	"time"
 
 	"github.com/navidrome/navidrome/log"
@@ -92,16 +93,14 @@ func (b *bufferedScrobbler) processUserQueue(ctx context.Context, userId string)
 			MediaFile: entry.MediaFile,
 			TimeStamp: entry.PlayTime,
 		})
+		if errors.Is(err, ErrRetryLater) {
+			log.Warn(ctx, "Could not send scrobble. Will be retried", "userId", entry.UserID,
+				"track", entry.Title, "artist", entry.Artist, "scrobbler", b.service, err)
+			return false
+		}
 		if err != nil {
-			switch err {
-			case ErrRetryLater:
-				log.Warn(ctx, "Could not send scrobble. Will be retried", "userId", entry.UserID,
-					"track", entry.Title, "artist", entry.Artist, "scrobbler", b.service, err)
-				return false
-			default:
-				log.Error(ctx, "Error sending scrobble to service. Discarding", "scrobbler", b.service,
-					"userId", entry.UserID, "artist", entry.Artist, "track", entry.Title, err)
-			}
+			log.Error(ctx, "Error sending scrobble to service. Discarding", "scrobbler", b.service,
+				"userId", entry.UserID, "artist", entry.Artist, "track", entry.Title, err)
 		}
 		err = buffer.Dequeue(entry)
 		if err != nil {