heimoshuiyu/gonic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(subsonic): only return one bookmark entry per row in getBookmarks

Browse Source 
fixes #310

https://gitlab.com/ultrasonic/ultrasonic/-/issues/1113
This commit is contained in:
sentriz
2023-04-21 22:44:50 +01:00
parent d83fe560d3
commit efe72fc447
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/ctrlsubsonic/handlers_bookmark.go
View File

@@ -31,17 +31,17 @@ func (c *Controller) ServeGetBookmarks(r *http.Request) *spec.Response {
Type: specid.IDT(bookmark.EntryIDType), Type: specid.IDT(bookmark.EntryIDType),
Value: bookmark.EntryID, Value: bookmark.EntryID,
} }
entries := []*spec.BookmarkEntry{{ entry := spec.BookmarkEntry{
ID: specid, ID: specid,
Type: bookmark.EntryIDType, Type: bookmark.EntryIDType,
}} }
sub.Bookmarks.List = append(sub.Bookmarks.List, &spec.Bookmark{ sub.Bookmarks.List = append(sub.Bookmarks.List, &spec.Bookmark{
Username: user.Name, Username: user.Name,
Position: bookmark.Position, Position: bookmark.Position,
Comment: bookmark.Comment, Comment: bookmark.Comment,
Created: bookmark.CreatedAt, Created: bookmark.CreatedAt,
Changed: bookmark.UpdatedAt, Changed: bookmark.UpdatedAt,
Entries: entries, Entry: entry,
}) })
} }
return sub return sub

12
server/ctrlsubsonic/spec/spec.go
View File

@@ -370,12 +370,12 @@ type Bookmarks struct {
} }
type Bookmark struct { type Bookmark struct {
Entries []*BookmarkEntry `xml:"entry,omitempty" json:"entry,omitempty"` Entry BookmarkEntry `xml:"entry,omitempty" json:"entry,omitempty"`
Username string `xml:"username,attr" json:"username"` Username string `xml:"username,attr" json:"username"`
Position int `xml:"position,attr" json:"position"` Position int `xml:"position,attr" json:"position"`
Comment string `xml:"comment,attr" json:"comment"` Comment string `xml:"comment,attr" json:"comment"`
Created time.Time `xml:"created,attr" json:"created"` Created time.Time `xml:"created,attr" json:"created"`
Changed time.Time `xml:"changed,attr" json:"changed"` Changed time.Time `xml:"changed,attr" json:"changed"`
} }
type BookmarkEntry struct { type BookmarkEntry struct {