From 7eca32e0066a63aecf623ece4354d4854e2cdcb3 Mon Sep 17 00:00:00 2001
From: wvffle <funkwhale@wvffle.net>
Date: Mon, 8 Aug 2022 14:54:41 +0000
Subject: [PATCH] Couple fixes

---
 front/src/components/audio/Player.vue              |  6 +-----
 front/src/components/library/EditCard.vue          | 14 +++++++++++---
 front/src/composables/moderation/useEditConfigs.ts |  2 +-
 front/src/store/player.ts                          |  5 +++--
 front/src/types.ts                                 |  2 +-
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/front/src/components/audio/Player.vue b/front/src/components/audio/Player.vue
index 3c3123dc0..f62bb9c44 100644
--- a/front/src/components/audio/Player.vue
+++ b/front/src/components/audio/Player.vue
@@ -86,10 +86,6 @@ const labels = computed(() => ({
   addArtistContentFilter: $pgettext('Sidebar/Player/Icon.Tooltip/Verb', 'Hide content from this artist…')
 }))
 
-const setCurrentTime = (time: number) => {
-  currentTime.value = time
-}
-
 const switchTab = () => {
   store.commit('ui/queueFocused', store.state.ui.queueFocused === 'player' ? 'queue' : 'player')
 }
@@ -295,7 +291,7 @@ const { width: screenWidth } = useWindowSize()
             <template v-if="!isLoadingAudio">
               <span
                 class="start"
-                @click.stop.prevent="setCurrentTime(0)"
+                @click.stop.prevent="currentTime = 0"
               >
                 {{ currentTimeFormatted }}
               </span>
diff --git a/front/src/components/library/EditCard.vue b/front/src/components/library/EditCard.vue
index 3c5b318d9..8cc85a89f 100644
--- a/front/src/components/library/EditCard.vue
+++ b/front/src/components/library/EditCard.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import type { ConfigField } from '~/composables/moderation/useEditConfigs'
 import type { Review, ReviewState, ReviewStatePayload } from '~/types'
 import type { Change } from 'diff'
 
@@ -93,14 +94,21 @@ const updatedFields = computed(() => {
       newRepr: getValueRepr(payload[id]) ?? '',
       old: undefined,
       oldRepr: '',
-      diff: [] as Change[]
+      diff: []
+    } as {
+      id: string
+      config: ConfigField
+      old?: ReviewStatePayload
+      new: ReviewStatePayload
+      oldRepr: string
+      newRepr: string
+      diff: Change[]
     }
 
     if (state?.[id]) {
       const oldState = state[id]
-      console.log(oldState)
       result.old = oldState
-      result.oldRepr = getValueRepr(typeof oldState === 'string' ? oldState : oldState?.value) ?? ''
+      result.oldRepr = getValueRepr(('value' in oldState && oldState.value) ?? oldState) ?? ''
 
       // we compute the diffs between the old and new values
       result.diff = diffWordsWithSpace(result.oldRepr, result.newRepr)
diff --git a/front/src/composables/moderation/useEditConfigs.ts b/front/src/composables/moderation/useEditConfigs.ts
index 7b7353300..1d9236bea 100644
--- a/front/src/composables/moderation/useEditConfigs.ts
+++ b/front/src/composables/moderation/useEditConfigs.ts
@@ -2,7 +2,7 @@ import type { Album, Artist, Content, Track } from '~/types'
 
 import { gettext } from '~/init/locale'
 
-interface ConfigField {
+export interface ConfigField {
   id: string
   label: string
   type: 'content' | 'attachment' | 'tags' | 'text' | 'license'
diff --git a/front/src/store/player.ts b/front/src/store/player.ts
index ed3f83499..db7f68f7c 100644
--- a/front/src/store/player.ts
+++ b/front/src/store/player.ts
@@ -126,6 +126,7 @@ const store: Module<State, RootState> = {
     async resumePlayback ({ commit, state, dispatch }) {
       commit('playing', true)
       if (state.errored && state.errorCount < state.maxConsecutiveErrors) {
+        // TODO (wvffle): Cancel whenever we skip track
         await new Promise(resolve => setTimeout(resolve, 3000))
         if (state.playing) {
           return dispatch('queue/next', null, { root: true })
@@ -177,8 +178,8 @@ const store: Module<State, RootState> = {
         }, 3000)
       }
     },
-    updateProgress ({ commit }, t) {
-      commit('currentTime', t)
+    updateProgress ({ commit }, time: number) {
+      commit('currentTime', time)
     },
     mute ({ commit, state }) {
       commit('tempVolume', state.volume)
diff --git a/front/src/types.ts b/front/src/types.ts
index 18d6fb4bf..47ae66d4c 100644
--- a/front/src/types.ts
+++ b/front/src/types.ts
@@ -400,7 +400,7 @@ export interface ReportTarget {
   type: EntityObjectType
 }
 
-export type ReviewStatePayload = Partial<Artist> | Partial<Album> | Partial<Track>
+export type ReviewStatePayload = { value: unknown } | Partial<Artist> | Partial<Album> | Partial<Track>
 export interface ReviewState {
   [id: string]: ReviewStatePayload
 }