From e0bc3c61a2716acc99c22af50db327845eaf0330 Mon Sep 17 00:00:00 2001
From: Shiny Nematoda <snematoda@noreply.codeberg.org>
Date: Sun, 14 Aug 2022 06:17:40 +0000
Subject: [PATCH] Bug Fixes: - Fixed Navbar links (closes #8) - Fixed Lyrics
 not updating

---
 README.md                 | 16 ++++++++++++++--
 src/App.vue               | 23 +++++++++++++----------
 src/components/Genres.vue | 31 +++++++++++++++++++++----------
 src/components/Lyrics.vue | 28 +++++++++++++---------------
 src/components/NavBar.vue | 31 +++++++++++++++++++++++++------
 src/components/Search.vue | 10 +++++++---
 6 files changed, 93 insertions(+), 46 deletions(-)

diff --git a/README.md b/README.md
index 9a7e93c..620525c 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ![On Codeberg](https://codeberg.org/Hyperpipe/static/raw/branch/master/on-codeberg.svg)
 
-A Privacy Respecting Frontend for YouTube Music inspired and built with the help [Piped][piped] and YouTube's innertube API.
+A Privacy Respecting Frontend for YouTube Music inspired and built with the help [Piped][piped] and YouTube's InnerTube API.
 
 ![YouTube Music](https://img.shields.io/badge/youtube-music-red?style=for-the-badge&logo=youtube)
 ![Website](https://img.shields.io/website?down_color=red&down_message=offline&label=status&style=for-the-badge&up_color=cornflowerblue&up_message=online&url=https%3A%2F%2Fhyperpipe.surge.sh)
@@ -49,10 +49,18 @@ npm run build
 
 Please see [hyperpipe.codeberg.page](https://hyperpipe.codeberg.page)
 
+## Extensions
+
+- [Libredirect](https://codeberg.org/LibRedirect/libredirect) -> For Redirecting YouTube Music links to Hyperpipe.
+
 ## LICENSE
 
 ### AGPL-3.0-or-later
 
+Hyperpipe
+
+Copyright (C) 2022  Shiny Nematoda
+
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as
 published by the Free Software Foundation, either version 3 of the
@@ -63,7 +71,9 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Affero General Public License for more details.
 
-Please refer to [LICENSE][license].
+You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+Please refer to [LICENSE][license] for more details.
 
 ## Help
 
@@ -93,6 +103,8 @@ You can reach out to me personally on:
 
 - [Cider](https://github.com/ciderapp/Cider) -> Cross-platform Apple Music experience based on Electron and Vue.js
 
+- [Ossia](https://github.com/shie1/ossia) -> Ossia Music Player is a free, open source alternative to YouTube Music.
+
 [hypipe]: https://hyperpipe.surge.sh
 [piped]: https://piped.kavin.rocks
 [license]: https://codeberg.org/Hyperpipe/Hyperpipe/src/branch/main/LICENSE.md
diff --git a/src/App.vue b/src/App.vue
index fbfa6cf..20fd954 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -68,9 +68,17 @@ function parseUrl() {
       break;
     case 'explore':
       genreid.value = loc[2];
-      nav.state.page = 'genres';
+      nav.state.page = 'explore';
+      break;
+    case 'library':
+      nav.state.page = 'library';
+      break;
+    case 'prefs':
+      nav.state.page = 'prefs';
+      break;
     default:
       console.log(loc);
+      break;
   }
 }
 
@@ -336,7 +344,7 @@ onMounted(() => {
 </script>
 
 <template>
-  <NavBar />
+  <NavBar @explore="getExplore" />
 
   <template v-if="artist.state.title && nav.state.page == 'home'">
     <Artist @playall="getAlbum" />
@@ -365,17 +373,12 @@ onMounted(() => {
 
     <KeepAlive>
       <Genres
-        v-if="nav.state.page == 'genres'"
+        v-if="nav.state.page == 'explore'"
         :id="genreid"
-        @get-album="
-          e => {
-            getAlbum(e);
-            nav.state.page = 'home';
-          }
-        " />
+        @get-album="getAlbum" />
     </KeepAlive>
 
-    <NewPlaylist v-if="nav.state.page == 'playlist'" @play-urls="playList" />
+    <NewPlaylist v-if="nav.state.page == 'library'" @play-urls="playList" />
 
     <Prefs v-if="nav.state.page == 'prefs'" />
   </main>
diff --git a/src/components/Genres.vue b/src/components/Genres.vue
index 6705b88..d6fffd1 100644
--- a/src/components/Genres.vue
+++ b/src/components/Genres.vue
@@ -1,7 +1,7 @@
 <script setup>
-import { reactive, ref, onMounted } from 'vue';
+import { reactive, ref, onMounted, onUnmounted } from 'vue';
 
-import { getJson } from '../scripts/fetch.js';
+import { getJsonHyp } from '../scripts/fetch.js';
 import { useRandColor } from '../scripts/colors.js';
 import { useRoute } from '../scripts/util.js';
 
@@ -19,25 +19,28 @@ const data = reactive({
   btns = reactive({
     moods: [],
     genres: [],
-  });
+  }),
+  todo = ['title', 'community', 'spotlight', 'featured'];
 
 function get(id) {
-  if (props.id || id) {
-    getJson(
-      'https://hyperpipeapi.onrender.com/genres/' + (props.id || id),
-    ).then(res => {
+  if (props.id || typeof id == 'string') {
+    getJsonHyp('/genres/' + (props.id || id)).then(res => {
       console.log(res);
 
-      for (let i of ['title', 'community', 'spotlight', 'featured']) {
+      for (let i of todo) {
         data[i] = res[i];
       }
 
       useRoute('/explore/' + (props.id || id));
     });
   } else {
-    getJson('https://hyperpipeapi.onrender.com/genres').then(res => {
+    getJsonHyp('/genres').then(res => {
       console.log(res);
 
+      for (let i of todo) {
+        data[i] = undefined;
+      }
+
       for (let i of ['moods', 'genres']) {
         btns[i] = res[i];
       }
@@ -52,6 +55,8 @@ onMounted(get);
 
 <template>
   <template v-if="data.title">
+    <i class="bi bi-arrow-left back" @click="get"> Back</i>
+
     <h2 class="head">{{ data.title }}</h2>
 
     <template v-for="type in ['featured', 'spotlight', 'community']">
@@ -62,7 +67,10 @@ onMounted(get);
             :name="i.title"
             :author="i.subtitle"
             :art="'url(' + i.thumbnails[0].url + ')'"
-            @open-album="$emit('get-album', '/playlist?list=' + i.id)" />
+            @open-album="
+              $emit('get-album', '/playlist?list=' + i.id);
+              nav.state.page = 'home';
+            " />
         </template>
       </div>
     </template>
@@ -96,6 +104,9 @@ onMounted(get);
 </template>
 
 <style scoped>
+.back {
+  width: fit-content;
+}
 .btn-grid {
   display: grid;
   grid-template-columns: calc(100% / 3) calc(100% / 3) calc(100% / 3);
diff --git a/src/components/Lyrics.vue b/src/components/Lyrics.vue
index c6844b9..b485fd2 100644
--- a/src/components/Lyrics.vue
+++ b/src/components/Lyrics.vue
@@ -14,31 +14,29 @@ const data = useData(),
 function get() {
   status.value = false;
 
-  if (data.state.lyrics && data.state.urls === data.state.urls[0]?.url) {
-    getJsonHyp('/browse/' + data.state.lyrics).then(res => {
+  const set = id => {
+    getJsonHyp('/browse/' + id).then(res => {
       text.value = res.text;
       source.value = res.source;
       status.value = true;
     });
-  } else if (data.state.urls[0]?.url) {
-    getJsonHyp(
-      '/next/' + data.state.urls[0]?.url.replace('/watch?v=', ''),
-    ).then(next => {
-      if (next.lyricsId) {
-        getJsonHyp('/browse/' + next.lyricsId).then(res => {
-          text.value = res.text;
-          source.value = res.source;
-          status.value = true;
-        });
-      }
-    });
+  };
+
+  if (data.state.lyrics && data.state.urls === data.state.url) {
+    set(data.state.lyrics);
+  } else if (data.state.url) {
+    getJsonHyp('/next/' + data.state.url.replace('/watch?v=', '')).then(
+      next => {
+        if (next.lyricsId) set(next.lyricsId);
+      },
+    );
   }
 }
 
 get();
 
 watch(
-  () => data.state.urls[0]?.url,
+  () => data.state.url,
   () => {
     get();
   },
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index eaf1120..e42de2b 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -4,7 +4,26 @@ import SearchBar from '../components/SearchBar.vue';
 
 import { useNav } from '@/stores/misc.js';
 
+import { useRoute } from '@/scripts/util.js';
+
+const emit = defineEmits(['explore']);
+
 const nav = useNav();
+
+function home() {
+  useRoute('/');
+  nav.state.page = 'home';
+  emit('explore');
+}
+
+function set(page) {
+  nav.state.page = page;
+  if (page == 'home') {
+    useRoute('/');
+  } else {
+    useRoute(`/${page}/`);
+  }
+}
 </script>
 
 <template>
@@ -15,19 +34,19 @@ const nav = useNav();
       <span
         class="nav-ico bi bi-house"
         :data-active="nav.state.page == 'home'"
-        @click="nav.state.page = 'home'"></span>
+        @click="set('home')"></span>
       <span
         class="nav-ico bi bi-compass"
-        :data-active="nav.state.page == 'genres'"
-        @click="nav.state.page = 'genres'"></span>
+        :data-active="nav.state.page == 'explore'"
+        @click="set('explore')"></span>
       <span
         class="nav-ico bi bi-collection"
-        :data-active="nav.state.page == 'playlist'"
-        @click="nav.state.page = 'playlist'"></span>
+        :data-active="nav.state.page == 'library'"
+        @click="set('library')"></span>
       <span
         class="nav-ico bi bi-gear"
         :data-active="nav.state.page == 'prefs'"
-        @click="nav.state.page = 'prefs'"></span>
+        @click="set('prefs')"></span>
     </div>
 
     <div class="wrap">
diff --git a/src/components/Search.vue b/src/components/Search.vue
index 75a18ba..3c28158 100644
--- a/src/components/Search.vue
+++ b/src/components/Search.vue
@@ -30,11 +30,15 @@ const playAlbum = () => {
   },
   saveAlbum = () => {
     const urls = results.items?.songs?.items?.map(item => {
-        return { url: item.url, title: item.title };
-      }),
-      title = results.items?.songs?.title;
+      return { url: item.url, title: item.title };
+    });
+
+    let title = results.items?.songs?.title;
 
     if (title) {
+      if (title == 'Songs')
+        title += ' - ' + results.items.songs.items[0].uploaderName;
+
       useCreatePlaylist(title, urls, () => {
         alert('Saved!');
       });