MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix trackListened not being sent when tab is not focused

This commit is contained in:
Kasper Seweryn 2022-09-17 13:08:41 +00:00 committed by Ciarán Ainsworth
parent de815301e4
commit b04b2ece50
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/changelog.d/1997.bugfix Normal file
View File

@ -0,0 +1 @@
Fixes track listenings not being sent when tab is not focused

32
front/src/composables/audio/useSound.ts
View File

@ -25,7 +25,7 @@ const soundCache = useSoundCache()
const currentTrack = computed(() => store.getters['queue/currentTrack']) const currentTrack = computed(() => store.getters['queue/currentTrack'])
const looping = computed(() => store.state.player.looping) const looping = computed(() => store.state.player.looping)
const currentSound = ref() const currentSound = ref<Sound>()
const soundId = ref() const soundId = ref()
const soundProgress = createEventHook<{ node: HTMLAudioElement, time: number, duration: number }>() const soundProgress = createEventHook<{ node: HTMLAudioElement, time: number, duration: number }>()
@ -72,10 +72,18 @@ const loadSound = (track: Track): Sound => {
onend () { onend () {
const onlyTrack = store.state.queue.tracks.length === 1 const onlyTrack = store.state.queue.tracks.length === 1
// NOTE: We need to send trackListened when we've finished track playback and we are not focused on the tab
const { isListeningSubmitted } = usePlayer()
if (!isListeningSubmitted.value) {
store.dispatch('player/trackListened', currentTrack.value)
isListeningSubmitted.value = true
}
if (looping.value === 1 || (onlyTrack && looping.value === 2)) { if (looping.value === 1 || (onlyTrack && looping.value === 2)) {
currentSound.value.seek(0) currentSound.value?.seek(0)
store.dispatch('player/updateProgress', 0) store.dispatch('player/updateProgress', 0)
soundId.value = currentSound.value.play(soundId.value) soundId.value = currentSound.value?.play()
} else { } else {
store.dispatch('player/trackEnded', currentTrack.value) store.dispatch('player/trackEnded', currentTrack.value)
} }
@ -83,22 +91,10 @@ const loadSound = (track: Track): Sound => {
onunlock () { onunlock () {
if (store.state.player.playing && currentSound.value) { if (store.state.player.playing && currentSound.value) {
soundId.value = currentSound.value.play(soundId.value) soundId.value = currentSound.value.play()
} }
}, },
onload () {
const node = (howl as any)._sounds[0]._node as HTMLAudioElement
node.addEventListener('progress', () => {
if (howl !== currentSound.value) {
return
}
currentSound.value._triggerSoundProgress()
})
},
onplay () { onplay () {
const [otherId] = (this as any)._getSoundIds() const [otherId] = (this as any)._getSoundIds()
const [currentId] = (currentSound.value?.howl as any)?._getSoundIds() ?? [] const [currentId] = (currentSound.value?.howl as any)?._getSoundIds() ?? []
@ -107,8 +103,8 @@ const loadSound = (track: Track): Sound => {
return (this as any).stop() return (this as any).stop()
} }
const time = currentSound.value.seek() const time = currentSound.value?.seek() ?? 0
const duration = currentSound.value.duration() const duration = currentSound.value?.duration() ?? 0
if (time <= duration / 2) { if (time <= duration / 2) {
const { isListeningSubmitted } = usePlayer() const { isListeningSubmitted } = usePlayer()
isListeningSubmitted.value = false isListeningSubmitted.value = false