From 0118fe0c63e4682d1a6898185f7a0c3b135aecba Mon Sep 17 00:00:00 2001
From: wvffle <funkwhale@wvffle.net>
Date: Fri, 28 Oct 2022 13:24:25 +0000
Subject: [PATCH] Resolve TODOs

---
 front/src/components/Queue.vue                | 23 ++++++++++++++-----
 front/src/components/audio/Player.vue         | 23 ++++++++++++++-----
 .../favorites/TrackFavoriteIcon.vue           |  3 ++-
 .../playlists/TrackPlaylistIcon.vue           |  5 ++--
 front/src/composables/audio/queue.ts          | 10 +++++---
 front/src/composables/audio/tracks.ts         |  6 +----
 front/src/composables/audio/usePlayOptions.ts |  4 ++--
 front/src/store/moderation.ts                 |  2 +-
 8 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/front/src/components/Queue.vue b/front/src/components/Queue.vue
index 7472d4f7a..6b6032ae0 100644
--- a/front/src/components/Queue.vue
+++ b/front/src/components/Queue.vue
@@ -13,8 +13,8 @@ import { useQueue } from '~/composables/audio/queue'
 
 import time from '~/utils/time'
 
-// import TrackFavoriteIcon from '~/components/favorites/TrackFavoriteIcon.vue'
-// import TrackPlaylistIcon from '~/components/playlists/TrackPlaylistIcon.vue'
+import TrackFavoriteIcon from '~/components/favorites/TrackFavoriteIcon.vue'
+import TrackPlaylistIcon from '~/components/playlists/TrackPlaylistIcon.vue'
 import PlayerControls from '~/components/audio/PlayerControls.vue'
 import VirtualList from '~/components/vui/list/VirtualList.vue'
 import QueueItem from '~/components/QueueItem.vue'
@@ -131,6 +131,18 @@ const reorderTracks = async (from: number, to: number) => {
     scrollToCurrent()
   }
 }
+
+const hideArtist = () => {
+  if (currentTrack.value.artistId !== -1) {
+    return store.dispatch('moderation/hide', {
+      type: 'artist',
+      target: {
+        id: currentTrack.value.artistId,
+        name: currentTrack.value.artistName
+      }
+    })
+  }
+}
 </script>
 
 <template>
@@ -205,8 +217,7 @@ const reorderTracks = async (from: number, to: number) => {
             </p>
           </div>
           <div class="additional-controls desktop-and-below">
-            <!-- TODO (wvffle): Update props -->
-            <!-- <track-favorite-icon
+            <track-favorite-icon
               v-if="$store.state.auth.authenticated"
               :track="currentTrack"
             />
@@ -219,10 +230,10 @@ const reorderTracks = async (from: number, to: number) => {
               :class="['ui', 'really', 'basic', 'circular', 'icon', 'button']"
               :aria-label="labels.addArtistContentFilter"
               :title="labels.addArtistContentFilter"
-              @click="$store.dispatch('moderation/hide', {type: 'artist', target: currentTrack.artist})"
+              @click="hideArtist"
             >
               <i :class="['eye slash outline', 'basic', 'icon']" />
-            </button> -->
+            </button>
           </div>
           <div class="progress-wrapper">
             <div
diff --git a/front/src/components/audio/Player.vue b/front/src/components/audio/Player.vue
index db9036010..af33a6e36 100644
--- a/front/src/components/audio/Player.vue
+++ b/front/src/components/audio/Player.vue
@@ -10,8 +10,8 @@ import { useStore } from '~/store'
 import onKeyboardShortcut from '~/composables/onKeyboardShortcut'
 import time from '~/utils/time'
 
-// import TrackFavoriteIcon from '~/components/favorites/TrackFavoriteIcon.vue'
-// import TrackPlaylistIcon from '~/components/playlists/TrackPlaylistIcon.vue'
+import TrackFavoriteIcon from '~/components/favorites/TrackFavoriteIcon.vue'
+import TrackPlaylistIcon from '~/components/playlists/TrackPlaylistIcon.vue'
 import VolumeControl from './VolumeControl.vue'
 import PlayerControls from './PlayerControls.vue'
 
@@ -107,6 +107,18 @@ const loopingTitle = computed(() => {
       ? $pgettext('Sidebar/Player/Icon.Tooltip', 'Looping on a single track. Click to switch to whole queue looping.')
       : $pgettext('Sidebar/Player/Icon.Tooltip', 'Looping on whole queue. Click to disable looping.')
 })
+
+const hideArtist = () => {
+  if (currentTrack.value.artistId !== -1) {
+    return store.dispatch('moderation/hide', {
+      type: 'artist',
+      target: {
+        id: currentTrack.value.artistId,
+        name: currentTrack.value.artistName
+      }
+    })
+  }
+}
 </script>
 
 <template>
@@ -216,8 +228,7 @@ const loopingTitle = computed(() => {
           v-if="$store.state.auth.authenticated"
           class="controls desktop-and-up fluid align-right"
         >
-          <!-- TODO (wvffle): Uncomment -->
-          <!-- <track-favorite-icon
+          <track-favorite-icon
             class="control white"
             :track="currentTrack"
           />
@@ -229,10 +240,10 @@ const loopingTitle = computed(() => {
             :class="['ui', 'really', 'basic', 'circular', 'icon', 'button', 'control']"
             :aria-label="labels.addArtistContentFilter"
             :title="labels.addArtistContentFilter"
-            @click="$store.dispatch('moderation/hide', {type: 'artist', target: currentTrack.artist})"
+            @click="hideArtist"
           >
             <i :class="['eye slash outline', 'basic', 'icon']" />
-          </button> -->
+          </button>
         </div>
         <player-controls class="controls queue-not-focused" />
         <div class="controls progress-controls queue-not-focused tablet-and-up small align-left">
diff --git a/front/src/components/favorites/TrackFavoriteIcon.vue b/front/src/components/favorites/TrackFavoriteIcon.vue
index edf09372c..3811c10af 100644
--- a/front/src/components/favorites/TrackFavoriteIcon.vue
+++ b/front/src/components/favorites/TrackFavoriteIcon.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import type { QueueTrack } from '~/composables/audio/queue'
 import type { Track } from '~/types'
 
 import { useGettext } from 'vue3-gettext'
@@ -6,7 +7,7 @@ import { useStore } from '~/store'
 import { computed } from 'vue'
 
 interface Props {
-  track?: Track
+  track?: QueueTrack | Track
   button?: boolean
   border?: boolean
 }
diff --git a/front/src/components/playlists/TrackPlaylistIcon.vue b/front/src/components/playlists/TrackPlaylistIcon.vue
index 8ef8b7e2e..8872fa3fc 100644
--- a/front/src/components/playlists/TrackPlaylistIcon.vue
+++ b/front/src/components/playlists/TrackPlaylistIcon.vue
@@ -1,17 +1,18 @@
 <script setup lang="ts">
+import type { QueueTrack } from '~/composables/audio/queue'
 import type { Track } from '~/types'
 
 import { useGettext } from 'vue3-gettext'
 import { computed } from 'vue'
 
 interface Props {
-  track?: Track | null
+  track?: Track | QueueTrack
   button?: boolean
   border?: boolean
 }
 
 withDefaults(defineProps<Props>(), {
-  track: null,
+  track: undefined,
   button: false,
   border: false
 })
diff --git a/front/src/composables/audio/queue.ts b/front/src/composables/audio/queue.ts
index f7f1e44d8..5f38fdcfd 100644
--- a/front/src/composables/audio/queue.ts
+++ b/front/src/composables/audio/queue.ts
@@ -9,8 +9,10 @@ import { useClamp } from '@vueuse/math'
 import { looping, LoopingMode, isPlaying, usePlayer } from '~/composables/audio/player'
 import { useStore } from '~/store'
 
+import { useTracks } from '~/composables/audio/tracks'
+import { gettext } from '~/init/locale'
+
 import axios from 'axios'
-import { useTracks } from './tracks'
 
 // import useWebWorker from '~/composables/useWebWorker'
 
@@ -94,6 +96,8 @@ export const useQueue = createGlobalState(() => {
   const { currentSound } = useTracks()
 
   const createQueueTrack = async (track: Track): Promise<QueueTrack> => {
+    const { $pgettext } = gettext
+
     if (track.uploads.length === 0) {
       // we don't have any information for this track, we need to fetch it
       const { uploads } = await axios.get(`tracks/${track.id}/`)
@@ -106,9 +110,9 @@ export const useQueue = createGlobalState(() => {
       id: track.id,
       title: track.title,
       // TODO (wvffle): i18n
-      artistName: track.artist?.name ?? 'Unknown artist',
+      artistName: track.artist?.name ?? $pgettext('*/*/*', 'Unknown artist'),
       // TODO (wvffle): i18n
-      albumTitle: track.album?.title ?? 'Unknown album',
+      albumTitle: track.album?.title ?? $pgettext('*/*/*', 'Unknown album'),
       artistId: track.artist?.id ?? -1,
       albumId: track.album?.id ?? -1,
       coverUrl: (track.cover?.urls ?? track.album?.cover?.urls ?? track.artist?.cover?.urls)?.original
diff --git a/front/src/composables/audio/tracks.ts b/front/src/composables/audio/tracks.ts
index cd0831831..e631302b1 100644
--- a/front/src/composables/audio/tracks.ts
+++ b/front/src/composables/audio/tracks.ts
@@ -71,6 +71,7 @@ export const useTracks = createGlobalState(() => {
       return sound
     }
 
+    console.log('NO TRACK IN CACHE, CREATING')
     const soundPromise = createSoundPromise()
     soundPromises.set(track.id, soundPromise)
     return soundPromise
@@ -83,11 +84,6 @@ export const useTracks = createGlobalState(() => {
     console.log('LOADING TRACK', index)
 
     const track = queue.value[index]
-    if (!soundPromises.has(track.id) && !soundCache.has(track.id)) {
-      // TODO (wvffle): Resolve race condition - is it still here after adding soundPromises?
-      console.log('NO TRACK IN CACHE, CREATING')
-    }
-
     const sound = await createSound(track)
     console.log('CONNECTING NODE')
 
diff --git a/front/src/composables/audio/usePlayOptions.ts b/front/src/composables/audio/usePlayOptions.ts
index f1981c058..7632f8521 100644
--- a/front/src/composables/audio/usePlayOptions.ts
+++ b/front/src/composables/audio/usePlayOptions.ts
@@ -3,11 +3,11 @@ import type { ContentFilter } from '~/store/moderation'
 
 import { useCurrentElement } from '@vueuse/core'
 import { computed, markRaw, ref } from 'vue'
-import { useGettext } from 'vue3-gettext'
 import { useStore } from '~/store'
 
 import { usePlayer } from '~/composables/audio/player'
 import { useQueue } from '~/composables/audio/queue'
+import { gettext } from '~/init/locale'
 
 import jQuery from 'jquery'
 import axios from 'axios'
@@ -49,7 +49,7 @@ export default (props: PlayOptionsProps) => {
   const filterableArtist = computed(() => props.track?.artist ?? props.album?.artist ?? props.artist)
   const filterArtist = async () => store.dispatch('moderation/hide', { type: 'artist', target: filterableArtist.value })
 
-  const { $npgettext } = useGettext()
+  const { $npgettext } = gettext
   const addMessage = (tracks: Track[]) => {
     if (!tracks.length) {
       return
diff --git a/front/src/store/moderation.ts b/front/src/store/moderation.ts
index 6cd35a217..92392ea01 100644
--- a/front/src/store/moderation.ts
+++ b/front/src/store/moderation.ts
@@ -117,7 +117,7 @@ const store: Module<State, RootState> = {
     }
   },
   actions: {
-    hide ({ commit }, payload) {
+    hide ({ commit }, payload: State['filterModalTarget']) {
       commit('filterModalTarget', payload)
       commit('showFilterModal', true)
     },