From f48149d0c94ad6f7d000fa88f7bba88a58f80744 Mon Sep 17 00:00:00 2001
From: Shiny Nematoda <snematoda@noreply.codeberg.org>
Date: Sun, 2 Oct 2022 16:49:55 +0000
Subject: [PATCH] Hotfixes

---
 README.md                     |  2 +-
 src/App.vue                   |  2 +-
 src/components/Charts.vue     | 17 ++++++++++++++++-
 src/components/NowPlaying.vue |  2 --
 src/components/Search.vue     |  1 +
 src/components/SongItem.vue   | 10 ++++------
 src/stores/results.js         |  8 ++++++--
 7 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 4e923e2..a0632ce 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Hyperpipe
 
-![Logo](https://codeberg.org/Hyperpipe/Hyperpipe/raw/branch/main/public/android-chrome-192x192.png)
+![Logo](https://codeberg.org/Hyperpipe/Hyperpipe/raw/branch/main/public/android-chrome-512x512.png)
 
 A Privacy Respecting Frontend for YouTube Music inspired and built with the help of [Piped][piped] and YouTube's InnerTube API.
 
diff --git a/src/App.vue b/src/App.vue
index 67b53f9..c6e801c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -185,7 +185,7 @@ onMounted(() => {
     </KeepAlive>
 
     <KeepAlive>
-      <Charts v-if="nav.state.page == 'charts'" />
+      <Charts v-if="nav.state.page == 'charts'" @play-urls="playList" />
     </KeepAlive>
 
     <NewPlaylist
diff --git a/src/components/Charts.vue b/src/components/Charts.vue
index d8aa8a3..40a9862 100644
--- a/src/components/Charts.vue
+++ b/src/components/Charts.vue
@@ -9,6 +9,8 @@ import { getJsonHyp } from '@/scripts/fetch.js';
 import { useResults, useArtist } from '@/stores/results.js';
 import { useI18n } from '@/stores/misc.js';
 
+defineEmits(['play-urls']);
+
 const { getArtist } = useArtist(),
   results = useResults(),
   { t } = useI18n();
@@ -73,7 +75,20 @@ onMounted(() => {
         :title="i.title"
         :author="i.subtitle"
         :channel="'/channel/' + i.subId"
-        :art="i.thumbnails[0].url" />
+        :art="i.thumbnails[0].url"
+        @open-song="
+          $emit('play-urls', [
+            {
+              url: '/watch?v=' + i.id,
+              title: i.title,
+              thumbnails: [
+                {
+                  url: i.thumbnails[1]?.url || i.thumbnails[0]?.url,
+                },
+              ],
+            },
+          ])
+        " />
     </div>
   </template>
 </template>
diff --git a/src/components/NowPlaying.vue b/src/components/NowPlaying.vue
index d2456ed..d7a2436 100644
--- a/src/components/NowPlaying.vue
+++ b/src/components/NowPlaying.vue
@@ -22,8 +22,6 @@ defineEmits(['get-artist']);
 <style scoped>
 h1 {
   font-weight: 500;
-  font-size: 2.6rem;
-  top: -10px;
 }
 
 h3 {
diff --git a/src/components/Search.vue b/src/components/Search.vue
index 7e203a0..3a029f7 100644
--- a/src/components/Search.vue
+++ b/src/components/Search.vue
@@ -196,6 +196,7 @@ onUpdated(() => {
       <template v-for="(song, index) in results.items.songs.items">
         <SongItem
           :index="index"
+          :playlistId="song.playlistId"
           :author="song.uploaderName || song.subtitle"
           :title="song.title || song.name"
           :channel="song.uploaderUrl || '/channel/' + song.subId"
diff --git a/src/components/SongItem.vue b/src/components/SongItem.vue
index 78be273..4877bb7 100644
--- a/src/components/SongItem.vue
+++ b/src/components/SongItem.vue
@@ -11,8 +11,7 @@ import { useData, usePlayer } from '@/stores/player.js';
 const rand = useRand(),
   data = useData(),
   player = usePlayer(),
-  artist = useArtist(),
-  { playlistId } = useResults();
+  artist = useArtist();
 
 const props = defineProps({
     index: Number,
@@ -21,6 +20,7 @@ const props = defineProps({
     channel: String,
     play: String,
     art: String,
+    playlistId: String,
   }),
   emit = defineEmits(['open-song', 'remove']),
   show = ref(false);
@@ -58,7 +58,7 @@ const openSong = el => {
         },
         body: JSON.stringify({
           index: props.index,
-          playlistId,
+          playlistId: props.playlistId,
         }),
       }).then(json => {
         console.log(json);
@@ -120,12 +120,10 @@ onMounted(() => {
         <div v-if="show" class="popup ign">
           <!-- TODO: Check if user is admin -->
           <span
-            v-if="useStore().auth && playlistId"
+            v-if="playlistId"
             class="bi bi-dash-lg clickable ign"
             @click="Remove"></span>
-
           <span class="bi bi-plus-lg clickable ign" @click="addSong"></span>
-
           <span class="bi bi-share clickable ign" @click="Share"></span>
         </div>
       </Transition>
diff --git a/src/stores/results.js b/src/stores/results.js
index 39c6d28..4584370 100644
--- a/src/stores/results.js
+++ b/src/stores/results.js
@@ -51,8 +51,12 @@ export const useResults = defineStore('results', () => {
       /[\da-fA-F]{8}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{12}/.test(
         hash,
       )
-    )
-      console.log('Piped playlists!!'); //json.relatedStreams = json.relatedStreams.map(i => ({ ...i, ...{auth: true}))
+    ) {
+      json.relatedStreams = json.relatedStreams.map(i => {
+        i.playlistId = hash;
+        return i;
+      });
+    }
 
     setItem('songs', {
       items: json.relatedStreams,