mirror of
https://github.com/navidrome/navidrome.git
synced 2026-08-31 07:30:32 +00:00
82fde00ecc
* feat(scrobbler): add scrobble_filter column to user * feat(scrobbler): validate scrobble filter criteria on user save * refactor(persistence): make smart playlist join helpers package-level * feat(scrobbler): add MediaFileRepository.MatchesCriteria * feat(scrobbler): filter external scrobbles with per-user criteria * feat(ui): add scrobble filter field to user form * fix(scrobbler): default scrobble_filter to empty string for existing users * refactor(scrobbler): also gate playback reports on the scrobble filter Playback reports carry the same track metadata to plugin scrobblers, so a filtered track leaked through that third dispatch path. Skip the filter evaluation entirely when no scrobbler is active. * refactor(persistence): move criteria join building into criteria_sql.go The join set a criteria needs was decided in criteria_sql.go but built in smart_playlist_repository.go, so both callers had to pair the two by hand. * refactor(persistence): unexport smartPlaylistCriteria methods The type never leaves the package, so the exported names advertised an API that callers outside persistence could never reach. Also disambiguates where/orderBy from squirrel's SelectBuilder methods of the same name. * fix(ui): cap the scrobble filter field width fullWidth stretched it across the whole page next to 256px inputs. Bounded at 40em, with two rows and a resize handle so JSON rules stay readable. * refactor(ui): move scrobble filter input in UserEdit component * feat(ui): add pt-BR translations for the scrobble filter * fix(scrobbler): take the filter verdict before incPlay incPlay mutates play counts and dates a filter can test on, so evaluating at dispatch time let one play decide differently on either side of the increment: a track could be scrobbled despite matching, or lose only its stopped report and strand presence plugins. Reject limit/offset too, rather than silently ignoring part of a rule copied from a smart playlist. * fix(scrobbler): filter the report from an expired session The expiry callback runs with a stub user carrying no filter, so evaluating there always returned false and leaked the track to plugin scrobblers. That is the normal path for clients that never send stopped, such as legacy Subsonic now-playing. Carry the last verdict on the session instead. * refactor(scrobbler): skip the now-playing enqueue instead of threading the verdict Queuing an entry only to drop it at dispatch also cancelled a pending announcement for the previous, unfiltered track, since the queue is keyed by player and a new entry replaces the old one. * fix(scrobbler): evaluate the filter regardless of active scrobblers The verdict is stored on the session and dispatched at expiry, so skipping evaluation when no scrobbler was active let a plugin enabled mid-session receive a filtered track. The empty-filter guard above already gives servers without scrobbling the same free path, so the shortcut only ever applied to users who had a filter set.
65 lines
2.3 KiB
Go
65 lines
2.3 KiB
Go
package model
|
|
|
|
import (
|
|
"time"
|
|
)
|
|
|
|
type User struct {
|
|
ID string `structs:"id" json:"id"`
|
|
UserName string `structs:"user_name" json:"userName"`
|
|
Name string `structs:"name" json:"name"`
|
|
Email string `structs:"email" json:"email"`
|
|
IsAdmin bool `structs:"is_admin" json:"isAdmin"`
|
|
LastLoginAt *time.Time `structs:"last_login_at" json:"lastLoginAt"`
|
|
LastAccessAt *time.Time `structs:"last_access_at" json:"lastAccessAt"`
|
|
CreatedAt time.Time `structs:"created_at" json:"createdAt"`
|
|
UpdatedAt time.Time `structs:"updated_at" json:"updatedAt"`
|
|
// Smart-playlist criteria JSON; matching songs are not sent to external scrobblers
|
|
ScrobbleFilter string `structs:"scrobble_filter" json:"scrobbleFilter"`
|
|
|
|
// Library associations (many-to-many relationship)
|
|
Libraries Libraries `structs:"-" json:"libraries,omitempty"`
|
|
|
|
// This is only available on the backend, and it is never sent over the wire
|
|
Password string `structs:"-" json:"-"`
|
|
// This is used to set or change a password when calling Put. If it is empty, the password is not changed.
|
|
// It is received from the UI with the name "password"
|
|
NewPassword string `structs:"password,omitempty" json:"password,omitempty"` //nolint:gosec
|
|
// If changing the password, this is also required
|
|
CurrentPassword string `structs:"current_password,omitempty" json:"currentPassword,omitempty"`
|
|
}
|
|
|
|
func (u User) HasLibraryAccess(libraryID int) bool {
|
|
if u.IsAdmin {
|
|
return true // Admin users have access to all libraries
|
|
}
|
|
for _, lib := range u.Libraries {
|
|
if lib.ID == libraryID {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
type Users []User
|
|
|
|
type UserRepository interface {
|
|
ResourceRepository
|
|
CountAll(...QueryOptions) (int64, error)
|
|
Delete(id string) error
|
|
Get(id string) (*User, error)
|
|
GetAll(options ...QueryOptions) (Users, error)
|
|
Put(*User) error
|
|
UpdateLastLoginAt(id string) error
|
|
UpdateLastAccessAt(id string) error
|
|
FindFirstAdmin() (*User, error)
|
|
// FindByUsername must be case-insensitive
|
|
FindByUsername(username string) (*User, error)
|
|
// FindByUsernameWithPassword is the same as above, but also returns the decrypted password
|
|
FindByUsernameWithPassword(username string) (*User, error)
|
|
|
|
// Library association methods
|
|
GetUserLibraries(userID string) (Libraries, error)
|
|
SetUserLibraries(userID string, libraryIDs []int) error
|
|
}
|