bvandeusen/minstrel
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 40 Wiki Activity

fix(server): repair recursive withUser, gofmt 2 files (golangci-lint)

Browse Source
This commit is contained in:
Bryan Van Deusen
2026-05-08 12:05:35 -04:00
parent 6a444334ea
commit b5a138bb27
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/api/likes.go
-1
View File
@@ -302,4 +302,3 @@ func uuidsToStrings(ids []pgtype.UUID) []string {
} }
return out return out
} }
internal/api/requests_test.go
+1 -1
View File
@@ -29,7 +29,7 @@ func newRequestsRouter(h *handlers) chi.Router {
// withUser injects a user into the request context the same way RequireUser does. // withUser injects a user into the request context the same way RequireUser does.
func withUser(req *http.Request, user dbq.User) *http.Request { func withUser(req *http.Request, user dbq.User) *http.Request {
return withUser(req, user) return req.WithContext(context.WithValue(req.Context(), userCtxKeyForTest(), user))
} }
// doCreateRequest fires POST /api/requests with the given JSON body as the given user. // doCreateRequest fires POST /api/requests with the given JSON body as the given user.
internal/coverart/provider_theaudiodb.go
+3 -4
View File
@@ -112,7 +112,7 @@ func (p *theAudioDBProvider) FetchAlbumCover(ctx context.Context, ref AlbumRef)
if len(resp.Album) == 0 || resp.Album[0].StrAlbumThumb == nil || *resp.Album[0].StrAlbumThumb == "" { if len(resp.Album) == 0 || resp.Album[0].StrAlbumThumb == nil || *resp.Album[0].StrAlbumThumb == "" {
return nil, ErrNotFound return nil, ErrNotFound
} }
return p.client.getImage(ctx,*resp.Album[0].StrAlbumThumb) return p.client.getImage(ctx, *resp.Album[0].StrAlbumThumb)
} }
// FetchArtistArt hits /artist-mb.php?i=<mbid>, parses strArtistThumb + // FetchArtistArt hits /artist-mb.php?i=<mbid>, parses strArtistThumb +
@@ -160,7 +160,7 @@ func (p *theAudioDBProvider) FetchArtistArt(ctx context.Context, ref ArtistRef)
} }
if thumbURL != "" { if thumbURL != "" {
thumb, err = p.client.getImage(ctx,thumbURL) thumb, err = p.client.getImage(ctx, thumbURL)
if err != nil && !errors.Is(err, ErrTransient) && !errors.Is(err, ErrNotFound) { if err != nil && !errors.Is(err, ErrTransient) && !errors.Is(err, ErrNotFound) {
return nil, nil, err return nil, nil, err
} }
@@ -170,7 +170,7 @@ func (p *theAudioDBProvider) FetchArtistArt(ctx context.Context, ref ArtistRef)
} }
} }
if fanartURL != "" { if fanartURL != "" {
fanart, err = p.client.getImage(ctx,fanartURL) fanart, err = p.client.getImage(ctx, fanartURL)
if err != nil && !errors.Is(err, ErrTransient) && !errors.Is(err, ErrNotFound) { if err != nil && !errors.Is(err, ErrTransient) && !errors.Is(err, ErrNotFound) {
return thumb, nil, err return thumb, nil, err
} }
@@ -204,4 +204,3 @@ func (p *theAudioDBProvider) TestConnection(ctx context.Context) error {
} }
return p.client.getJSON(ctx, p.jsonURL("album-mb.php?i="+theAudioDBTestSampleMBID), &resp) return p.client.getJSON(ctx, p.jsonURL("album-mb.php?i="+theAudioDBTestSampleMBID), &resp)
} }