mirror of
https://github.com/navidrome/navidrome.git
synced 2025-04-03 20:47:35 +03:00
fa85e2a781
* [bugfix] player: use userId, other fixes This PR primarily resolves #1928 by switching the foreign key of `player` from `user.user_name` to `user.id`. There are also a few other fixes/changes: - For some bizarre reason, `ip_address` is never returned from `read`/`get`. Change the field to `ip`, which works. Somehow - Update `players_test.go` mock to also check for user agent, replicating the actual code - Update `player_repository.go` `isPermitted` to check user id. I don't know how this worked before... - tests! - a few places referred to `typ`, when it is really `userAgent`. Change the field names * baseRequest -> selectPlayer * remove comment * update migration, make all of persistence foreign key enabled * maybe don't forget to save the file first
30 lines
1 KiB
Go
30 lines
1 KiB
Go
package model
|
|
|
|
import (
|
|
"time"
|
|
)
|
|
|
|
type Player struct {
|
|
Username string `structs:"-" json:"userName"`
|
|
|
|
ID string `structs:"id" json:"id"`
|
|
Name string `structs:"name" json:"name"`
|
|
UserAgent string `structs:"user_agent" json:"userAgent"`
|
|
UserId string `structs:"user_id" json:"userId"`
|
|
Client string `structs:"client" json:"client"`
|
|
IP string `structs:"ip" json:"ip"`
|
|
LastSeen time.Time `structs:"last_seen" json:"lastSeen"`
|
|
TranscodingId string `structs:"transcoding_id" json:"transcodingId"`
|
|
MaxBitRate int `structs:"max_bit_rate" json:"maxBitRate"`
|
|
ReportRealPath bool `structs:"report_real_path" json:"reportRealPath"`
|
|
ScrobbleEnabled bool `structs:"scrobble_enabled" json:"scrobbleEnabled"`
|
|
}
|
|
|
|
type Players []Player
|
|
|
|
type PlayerRepository interface {
|
|
Get(id string) (*Player, error)
|
|
FindMatch(userId, client, userAgent string) (*Player, error)
|
|
Put(p *Player) error
|
|
// TODO: Add CountAll method. Useful at least for metrics.
|
|
}
|