mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-06 22:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Send the time the track started playing when scrobbling

Browse source
This commit is contained in:
Deluan 2021-06-23 09:19:58 -04:00 • committed by Deluan Quintão
parent 056f0b944f
commit f4ddd201f2
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ui/src/audioplayer/Player.js
View file

@ -1,4 +1,4 @@
import React, { useCallback, useMemo } from 'react' import React, { useCallback, useMemo, useState } from 'react'
import ReactGA from 'react-ga' import ReactGA from 'react-ga'
import { useDispatch, useSelector } from 'react-redux' import { useDispatch, useSelector } from 'react-redux'
import { Link } from 'react-router-dom' import { Link } from 'react-router-dom'
@ -121,6 +121,7 @@ const Player = () => {
// Match the medium breakpoint defined in the material-ui theme // Match the medium breakpoint defined in the material-ui theme
// See https://material-ui.com/customization/breakpoints/#breakpoints // See https://material-ui.com/customization/breakpoints/#breakpoints
const isDesktop = useMediaQuery('(min-width:810px)') const isDesktop = useMediaQuery('(min-width:810px)')
const [startTime, setStartTime] = useState(null)
const nextSong = useCallback(() => { const nextSong = useCallback(() => {
const idx = queue.queue.findIndex( const idx = queue.queue.findIndex(
@ -249,10 +250,10 @@ const Player = () => {
const item = queue.queue.find((item) => item.trackId === info.trackId) const item = queue.queue.find((item) => item.trackId === info.trackId)
if (item && !item.scrobbled) { if (item && !item.scrobbled) {
dispatch(scrobble(info.trackId, true)) 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( const onAudioVolumeChange = useCallback(
@ -264,10 +265,11 @@ const Player = () => {
const onAudioPlay = useCallback( const onAudioPlay = useCallback(
(info) => { (info) => {
dispatch(currentPlaying(info)) dispatch(currentPlaying(info))
setStartTime(Date.now())
if (info.duration) { if (info.duration) {
document.title = `${info.name} - ${info.singer} - Navidrome` document.title = `${info.name} - ${info.singer} - Navidrome`
dispatch(scrobble(info.trackId, false)) dispatch(scrobble(info.trackId, false))
subsonic.scrobble(info.trackId, false) subsonic.nowPlaying(info.trackId)
if (config.gaTrackingId) { if (config.gaTrackingId) {
ReactGA.event({ ReactGA.event({
category: 'Player', category: 'Player',

12
ui/src/subsonic/index.js
View file

@ -22,8 +22,15 @@ const url = (command, id, options) => {
return `/rest/${command}?${params.toString()}` return `/rest/${command}?${params.toString()}`
} }
const scrobble = (id, submit) => const scrobble = (id, submission = false, time) =>
httpClient(url('scrobble', id, { submission: submit })) httpClient(
url('scrobble', id, {
...(submission && time && { time }),
submission,
})
)
const nowPlaying = (id) => scrobble(id, false)
const star = (id) => httpClient(url('star', id)) const star = (id) => httpClient(url('star', id))
@ -52,6 +59,7 @@ const streamUrl = (id) => {
export default { export default {
url, url,
scrobble, scrobble,
nowPlaying,
download, download,
star, star,
unstar, unstar,