idanoo/GoScrobble
1
0
Fork 0
mirror of https://github.com/idanoo/GoScrobble.git synced 2024-11-22 00:21:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-0.1.7' into 'master'

Browse Source 
0.1.7

See merge request goscrobble/goscrobble-api!13
This commit is contained in:
Daniel Mason 2022-01-15 06:33:13 +00:00
commit 2dea7418bd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/goscrobble/ingress_navidrome.go
View File

@ -139,7 +139,7 @@ func validateNavidromeConnection(url string, username string, hash string, salt
// ParseNavidromeInput - Transform API data // ParseNavidromeInput - Transform API data
func ParseNavidromeInput(userUUID string, data NavidromeNowPlaying, ip net.IP, tx *sql.Tx) error { func ParseNavidromeInput(userUUID string, data NavidromeNowPlaying, ip net.IP, tx *sql.Tx) error {
// Custom cache key - never log the same song twice in a row for now... (: // Custom cache key - never log the same song twice in a row for now... (:
lastPlayedTitle := getUserLastPlayed(userUUID + fmt.Sprintf("%s", data.PlayerName)) lastPlayedTitle := getUserLastPlayed(userUUID + fmt.Sprintf(":%d", data.PlayerID))
if lastPlayedTitle == data.Title+":"+data.Album { if lastPlayedTitle == data.Title+":"+data.Album {
// If it matches last played song, skip it // If it matches last played song, skip it
return nil return nil
@ -177,7 +177,7 @@ func ParseNavidromeInput(userUUID string, data NavidromeNowPlaying, ip net.IP, t
return errors.New("Failed to map track") return errors.New("Failed to map track")
} }
setUserLastPlayed(userUUID+fmt.Sprintf("%s", data.PlayerName), data.Title+":"+data.Album) setUserLastPlayed(userUUID+fmt.Sprintf(":%d", data.PlayerID), data.Title+":"+data.Album)
return nil return nil
} }