From f4ddd201f2148cf4043a5a87276d7e251cb3623a Mon Sep 17 00:00:00 2001
From: Deluan <deluan@navidrome.org>
Date: Wed, 23 Jun 2021 09:19:58 -0400
Subject: [PATCH] Send the time the track started playing when scrobbling

---
 ui/src/audioplayer/Player.js | 10 ++++++----
 ui/src/subsonic/index.js     | 12 ++++++++++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ui/src/audioplayer/Player.js b/ui/src/audioplayer/Player.js
index 957cfbecd..a10040f66 100644
--- a/ui/src/audioplayer/Player.js
+++ b/ui/src/audioplayer/Player.js
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react'
+import React, { useCallback, useMemo, useState } from 'react'
 import ReactGA from 'react-ga'
 import { useDispatch, useSelector } from 'react-redux'
 import { Link } from 'react-router-dom'
@@ -121,6 +121,7 @@ const Player = () => {
   // Match the medium breakpoint defined in the material-ui theme
   // See https://material-ui.com/customization/breakpoints/#breakpoints
   const isDesktop = useMediaQuery('(min-width:810px)')
+  const [startTime, setStartTime] = useState(null)
 
   const nextSong = useCallback(() => {
     const idx = queue.queue.findIndex(
@@ -249,10 +250,10 @@ const Player = () => {
       const item = queue.queue.find((item) => item.trackId === info.trackId)
       if (item && !item.scrobbled) {
         dispatch(scrobble(info.trackId, true))
-        subsonic.scrobble(info.trackId, true)
+        subsonic.scrobble(info.trackId, true, startTime)
       }
     },
-    [dispatch, queue.queue]
+    [dispatch, queue.queue, startTime]
   )
 
   const onAudioVolumeChange = useCallback(
@@ -264,10 +265,11 @@ const Player = () => {
   const onAudioPlay = useCallback(
     (info) => {
       dispatch(currentPlaying(info))
+      setStartTime(Date.now())
       if (info.duration) {
         document.title = `${info.name} - ${info.singer} - Navidrome`
         dispatch(scrobble(info.trackId, false))
-        subsonic.scrobble(info.trackId, false)
+        subsonic.nowPlaying(info.trackId)
         if (config.gaTrackingId) {
           ReactGA.event({
             category: 'Player',
diff --git a/ui/src/subsonic/index.js b/ui/src/subsonic/index.js
index b08bcf398..e8562f55d 100644
--- a/ui/src/subsonic/index.js
+++ b/ui/src/subsonic/index.js
@@ -22,8 +22,15 @@ const url = (command, id, options) => {
   return `/rest/${command}?${params.toString()}`
 }
 
-const scrobble = (id, submit) =>
-  httpClient(url('scrobble', id, { submission: submit }))
+const scrobble = (id, submission = false, time) =>
+  httpClient(
+    url('scrobble', id, {
+      ...(submission && time && { time }),
+      submission,
+    })
+  )
+
+const nowPlaying = (id) => scrobble(id, false)
 
 const star = (id) => httpClient(url('star', id))
 
@@ -52,6 +59,7 @@ const streamUrl = (id) => {
 export default {
   url,
   scrobble,
+  nowPlaying,
   download,
   star,
   unstar,