Merge branch 'dev-0.1.7' into 'master'

0.1.7

See merge request goscrobble/goscrobble-api!11

.gitlab-ci.yml

@@ -2,7 +2,7 @@ stages:
  - build
 
 variables:
-  VERSION: 0.1.6
+  VERSION: 0.1.7
 
 build-go:
   image: golang:1.17

docs/changelog.md

@@ -1,3 +1,6 @@
+# 0.1.7
+- Fix navidrome logging 2x scrobbles if second player is paused
+
 # 0.1.6
 - Allow UUID of 0 in artists/{uuid}/top to return site-wide stats
 - Set images as failed if cannot find in spotify to prevent oversearching

internal/goscrobble/ingress_navidrome.go

@@ -139,7 +139,7 @@ func validateNavidromeConnection(url string, username string, hash string, salt
 // ParseNavidromeInput - Transform API data
 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... (:
-	lastPlayedTitle := getUserLastPlayed(userUUID)
+	lastPlayedTitle := getUserLastPlayed(userUUID + fmt.Sprintf("%s", data.PlayerName))
 	if lastPlayedTitle == data.Title+":"+data.Album {
 		// If it matches last played song, skip it
 		return nil

internal/goscrobble/server.go

@@ -825,7 +825,7 @@ func getServerInfo(w http.ResponseWriter, r *http.Request) {
 	}
 
 	info := ServerInfo{
-		Version:             "0.1.6",
+		Version:             "0.1.7",
 		RegistrationEnabled: registrationEnabled,
 	}