From d4eee69077a9728f9e16bc1577a9d53b4d3f20ff Mon Sep 17 00:00:00 2001
From: Shiny Nematoda <snematoda@noreply.codeberg.org>
Date: Sat, 12 Aug 2023 07:58:58 +0000
Subject: [PATCH] added MPRE* support + a few strings from #139 + minor cleanup

---
 src/App.vue                                     |  9 +++++----
 src/assets/base.css                             |  3 ++-
 src/assets/version.json                         |  2 +-
 src/components/Artist.vue                       |  5 +----
 src/components/Genres.vue                       |  4 ++--
 src/components/Info.vue                         |  2 +-
 src/components/{NewPlaylist.vue => Library.vue} |  7 +++++--
 src/components/Player.vue                       |  4 +---
 src/components/Search.vue                       | 12 ++++--------
 src/locales/en.json                             |  3 ++-
 src/stores/results.js                           |  8 ++++++--
 11 files changed, 30 insertions(+), 29 deletions(-)
 rename src/components/{NewPlaylist.vue => Library.vue} (98%)

diff --git a/src/App.vue b/src/App.vue
index 09d92b6..033a061 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,9 +23,7 @@ import Artist from '@/components/Artist.vue';
 /* Async Components */
 const Genres = defineAsyncComponent(() => import('@/components/Genres.vue')),
   Charts = defineAsyncComponent(() => import('@/components/Charts.vue')),
-  NewPlaylist = defineAsyncComponent(() =>
-    import('@/components/NewPlaylist.vue'),
-  ),
+  Library = defineAsyncComponent(() => import('@/components/Library.vue')),
   Prefs = defineAsyncComponent(() => import('@/components/Prefs.vue'));
 
 /* Composables */
@@ -77,6 +75,9 @@ function parseUrl() {
       genreid.value = loc[2];
       nav.state.page = 'explore';
       break;
+    case 'browse':
+      if (loc[2].startsWith('MPRE')) results.getAlbum('?list=' + loc[2]);
+      break;
     case 'charts':
       nav.state.page = 'charts';
       break;
@@ -171,7 +172,7 @@ onMounted(() => {
       <Charts v-if="nav.state.page == 'charts'" @play-urls="playList" />
     </KeepAlive>
 
-    <NewPlaylist
+    <Library
       v-if="nav.state.page == 'library'"
       @play-urls="playList"
       @open-playlist="results.getAlbum" />
diff --git a/src/assets/base.css b/src/assets/base.css
index b564d76..7c386ca 100644
--- a/src/assets/base.css
+++ b/src/assets/base.css
@@ -347,7 +347,8 @@ img {
   box-shadow: 0 0 0.5rem var(--color-border);
 }
 
-.grid, .grid-3 {
+.grid,
+.grid-3 {
   --col: 1;
   grid-template-columns: repeat(var(--col), 1fr);
 }
diff --git a/src/assets/version.json b/src/assets/version.json
index fdb81b2..423790c 100644
--- a/src/assets/version.json
+++ b/src/assets/version.json
@@ -1,3 +1,3 @@
 {
-  "date": "2023-07-30"
+  "date": "2023-08-12"
 }
diff --git a/src/components/Artist.vue b/src/components/Artist.vue
index 8405f7e..b735df7 100644
--- a/src/components/Artist.vue
+++ b/src/components/Artist.vue
@@ -40,10 +40,7 @@ function Sub() {
         {{ artist.state.description }}
       </p>
       <div class="us-playwrap">
-        <Btn
-          @click="
-            results.getAlbum('/playlist?list=' + artist.state.playlistId)
-          " />
+        <Btn @click="results.getAlbum('?list=' + artist.state.playlistId)" />
         <span
           class="us-box subs"
           :data-active="isSub"
diff --git a/src/components/Genres.vue b/src/components/Genres.vue
index 991de37..e4cc46b 100644
--- a/src/components/Genres.vue
+++ b/src/components/Genres.vue
@@ -66,7 +66,7 @@ onMounted(get);
           :author="i.subtitle"
           :art="i.thumbnails[0].url"
           @open-album="
-            getAlbum('/playlist?list=' + i.id);
+            getAlbum('?list=' + i.id);
             nav.state.page = 'home';
           " />
       </div>
@@ -82,7 +82,7 @@ onMounted(get);
           :author="i.subtitle"
           :art="i.thumbnails[0].url"
           @open-album="
-            getAlbum('/playlist?list=' + i.id);
+            getAlbum('?list=' + i.id);
             nav.state.page = 'home';
           " />
       </div>
diff --git a/src/components/Info.vue b/src/components/Info.vue
index 9a75090..d351b50 100644
--- a/src/components/Info.vue
+++ b/src/components/Info.vue
@@ -3,7 +3,7 @@ import { useI18n } from '@/stores/misc.js';
 
 import TextModal from './TextModal.vue';
 
-defineProps(['text']);
+defineProps({ text: String });
 
 const { t } = useI18n(),
   parse = d => new DOMParser().parseFromString(d, 'text/html').body.innerText;
diff --git a/src/components/NewPlaylist.vue b/src/components/Library.vue
similarity index 98%
rename from src/components/NewPlaylist.vue
rename to src/components/Library.vue
index b8149aa..470c1b3 100644
--- a/src/components/NewPlaylist.vue
+++ b/src/components/Library.vue
@@ -436,7 +436,10 @@ onMounted(async () => {
     <h2 v-if="list.length > 0">{{ t('playlist.local') }}</h2>
 
     <div class="grid-3">
-      <AlbumItem name="Offline" :grad="useRand()" @open-album="OpenOffline()" />
+      <AlbumItem
+        :name="t('title.offline')"
+        :grad="useRand()"
+        @open-album="OpenOffline()" />
       <AlbumItem
         v-for="i in list"
         :key="i.name"
@@ -456,7 +459,7 @@ onMounted(async () => {
         :name="i.name.replace('Playlist - ', '')"
         :author="t('title.songs') + ' • ' + i.videos"
         :art="pathname(i.thumbnail) != '/' ? i.thumbnail : undefined"
-        @open-album="$emit('open-playlist', '/playlist?list=' + i.id)" />
+        @open-album="$emit('open-playlist', '?list=' + i.id)" />
     </div>
     <form v-else class="login" @submit.prevent>
       <input
diff --git a/src/components/Player.vue b/src/components/Player.vue
index f191189..0f5bf72 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -21,9 +21,7 @@ function audioCanPlay() {
     player.state.status = 'play';
   });
 
-  if (location.pathname != '/playlist') {
-    useRoute(data.state.url);
-  }
+  if (location.pathname != '/playlist') useRoute(data.state.url);
 
   document.title = `Playing: ${data.state.title} by ${data.state.artist}`;
 }
diff --git a/src/components/Search.vue b/src/components/Search.vue
index 6ad49bd..0ff6c02 100644
--- a/src/components/Search.vue
+++ b/src/components/Search.vue
@@ -341,9 +341,7 @@ onDeactivated(() => {
     </div>
     <a
       v-if="artist.state.playlistId"
-      @click.prevent="
-        results.getAlbum('/playlist?list=' + artist.state.playlistId)
-      "
+      @click.prevent="results.getAlbum('?list=' + artist.state.playlistId)"
       class="more"
       :href="'/playlist?list=' + artist.state.playlistId"
       >{{ t('info.see_all') }}</a
@@ -361,9 +359,7 @@ onDeactivated(() => {
         :author="album.uploaderName || album.subtitle"
         :name="album.name || album.title"
         :art="album.thumbnail || album.thumbnails[0].url"
-        @open-album="
-          results.getAlbum(album.url || '/playlist?list=' + album.id)
-        " />
+        @open-album="results.getAlbum(album.url || '?list=' + album.id)" />
     </div>
     <a
       v-if="results.items.albums.more?.params"
@@ -399,7 +395,7 @@ onDeactivated(() => {
         :author="single.subtitle"
         :name="single.title"
         :art="single.thumbnails[0].url"
-        @open-album="results.getAlbum('/playlist?list=' + single.id)" />
+        @open-album="results.getAlbum('?list=' + single.id)" />
     </div>
     <a
       v-if="results.items.singles.more?.params"
@@ -429,7 +425,7 @@ onDeactivated(() => {
           ? results.items.artists.items
           : results.items.recommendedArtists.items"
         :key="a.id || a.url"
-        :author="a.subtitle"
+        :author="a.subtitle.replace('subscribers', t('artist.subscribers'))"
         :name="a.name || a.title"
         :art="a.thumbnail || a.thumbnails[0].url"
         @open-album="
diff --git a/src/locales/en.json b/src/locales/en.json
index 76f6e2b..d1ed1e0 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -15,7 +15,8 @@
     "local": "Local",
     "remote": "Remote",
     "search": "Search",
-    "feeds": "Feeds"
+    "feeds": "Feeds",
+    "offline": "Offline"
   },
   "action": {
     "back": "Back",
diff --git a/src/stores/results.js b/src/stores/results.js
index 6a550ac..69c1abe 100644
--- a/src/stores/results.js
+++ b/src/stores/results.js
@@ -40,7 +40,11 @@ export const useResults = defineStore('results', () => {
   async function getAlbum(e) {
     const hash = new URLSearchParams(e.substring(e.indexOf('?'))).get('list'),
       isAuth = useVerifyAuth(hash),
-      path = '/playlists/' + hash,
+      path =
+        '/playlists/' +
+        (hash.startsWith('MPRE')
+          ? (await getJsonHyp('/album/' + hash))?.id
+          : hash),
       json = isAuth ? await getJsonAuth(path) : await getJsonPiped(path);
 
     resetItems();
@@ -58,7 +62,7 @@ export const useResults = defineStore('results', () => {
       title: json.name,
     });
 
-    useRoute(e);
+    useRoute('/playlist?list=' + hash);
     useNav().state.page = 'home';
     document.body.scrollIntoView();