Advanced Listening Parties Testing

SaturnMusic · Aug 1, 2024 · d1081aa · d1081aa
1 parent 289ca67
commit d1081aa
Show file tree

Hide file tree

Showing 25 changed files with 962 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -8,6 +8,7 @@
 https://fund.saturn.kim/
 
 # Featuring:
+- [Listening Parties (Clubs)](https://clubs.saturn.kim)
 - FLAC & MP3 320 support
 - BYO Last.fm Integration (Safer solution!)
 - Discord Listen Together & RPC

diff --git a/app/client/package.json b/app/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "client",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

diff --git a/app/client/src/App.vue b/app/client/src/App.vue
@@ -144,6 +144,14 @@
           <v-list-item-title>{{$t('About')}}</v-list-item-title>
         </v-list-item>
 
+        <!-- Rooms -->
+        <v-list-item link to='/rooms' v-if='isUp()'>
+          <v-list-item-icon>
+            <v-icon>mdi-earth</v-icon>
+          </v-list-item-icon>
+          <v-list-item-title>Clubs</v-list-item-title>
+        </v-list-item>
+
       </v-list>
     </v-navigation-drawer>
 
@@ -227,6 +235,7 @@
 
         <!-- Controls -->
         <v-col class='text-center' cols='12' sm='auto'>
+          <div v-if='$rooms.allowControls()'>
             <v-btn icon large @click.stop='$root.skip(-1)'>
                 <v-icon>mdi-skip-previous</v-icon>
             </v-btn>
@@ -237,6 +246,7 @@
             <v-btn icon large @click.stop='$root.skipNext'>
                 <v-icon>mdi-skip-next</v-icon>
             </v-btn>
+          </div>
         </v-col>
 
 
@@ -346,6 +356,7 @@
 
 <script>
 import FullscreenPlayer from '@/views/FullscreenPlayer.vue';
+import axios from 'axios';
 
 export default {
   name: 'App',
@@ -375,6 +386,15 @@ export default {
       if (this.showPlayer) this.showPlayer = false;
       this.volume = this.$root.volume;
     },
+    async isUp() { // do not show button if site is down because consistency
+      await axios.get('https://clubs.saturn.kim/a')
+      .catch(function (error) {
+        if (error.response) {
+          if (error.response.status == 404) { return true; } // index doesnt exist so this actually makes sense
+          else { return false; }
+        }
+      });
+    },
     //Navigation
     previous() {
       if (window.history.length == 3) return;
@@ -440,6 +460,7 @@ export default {
       }
     },
     seek(val) {
+      if (!this.$rooms.allowControls()) return;
       this.$root.seek(Math.round((val / 100) * this.$root.duration()));
     },
     async exitApp() {

diff --git a/app/client/src/components/AlbumContext.vue b/app/client/src/components/AlbumContext.vue
@@ -1,7 +1,7 @@
 <template>
 <v-list dense>
     <!-- Play album -->
-    <v-list-item dense @click='$emit("play")'>
+    <v-list-item dense @click='$emit("play")' v-if='!$rooms.room'>
         <v-list-item-icon>
             <v-icon>mdi-play</v-icon>
         </v-list-item-icon>
@@ -10,7 +10,7 @@
         </v-list-item-content>
     </v-list-item>
     <!-- Add to queue -->
-    <v-list-item dense @click='$emit("addQueue")'>
+    <v-list-item dense @click='$emit("addQueue")' v-if='!$rooms.room'>
         <v-list-item-icon>
             <v-icon>mdi-playlist-plus</v-icon>
         </v-list-item-icon>

diff --git a/app/client/src/components/AlbumTile.vue b/app/client/src/components/AlbumTile.vue
@@ -120,6 +120,9 @@ export default {
             });
         },
         async play() {
+            //Rooms
+            if (!this.$rooms.allowControls()) return;
+
             let album = this.album;
             //Load album from API if tracks are missing
             if (album.tracks.length == 0) {
@@ -139,6 +142,9 @@ export default {
         },
         //Add to queue
         async addQueue() {
+            //Rooms
+            if (!this.$rooms.allowControls()) return;
+
             let album = this.album;
             //Load album from API if tracks are missing
             if (album.tracks.length == 0) {

diff --git a/app/client/src/components/LibraryHistory.vue b/app/client/src/components/LibraryHistory.vue
@@ -55,6 +55,9 @@ export default {
         },
         //Load as queue and play
         play(index) {
+            //Rooms
+            if (this.$rooms.room) return;
+
             this.$root.queue.source = {
                 text: this.$t('History'),
                 source: 'history',

diff --git a/app/client/src/components/LibraryTracks.vue b/app/client/src/components/LibraryTracks.vue
@@ -107,6 +107,9 @@ export default {
         },
         //Play track
         async play(id) {
+            //Rooms
+            if (this.$rooms.room) return;
+
             this.$root.queue.source = {
                 text: 'Loved tracks',
                 source: 'playlist',

diff --git a/app/client/src/components/Lyrics.vue b/app/client/src/components/Lyrics.vue
@@ -104,6 +104,9 @@ export default {
         },
         //Seek to lyric in song
         seekTo(i) {
+            //Rooms
+            if (!this.$rooms.allowControls()) return;
+
             this.$root.seek(this.lyrics.lyrics[i].offset);
         }
     },

diff --git a/app/client/src/components/PlaylistTile.vue b/app/client/src/components/PlaylistTile.vue
@@ -27,7 +27,7 @@
                 </template>
                 <v-list dense>
                     <!-- Play -->
-                    <v-list-item dense @click='play'>
+                    <v-list-item dense @click='play' v-if='!$rooms.room'>
                         <v-list-item-icon>
                             <v-icon>mdi-play</v-icon>
                         </v-list-item-icon>
@@ -134,6 +134,8 @@ export default {
     },
     methods: {
         async play() {
+            if (this.$rooms.room) return;
+
             let playlist = this.playlist;
             //Load if no tracks
             if (!playlist || playlist.tracks.length == 0)

diff --git a/app/client/src/components/SmartTrackList.vue b/app/client/src/components/SmartTrackList.vue
@@ -27,6 +27,10 @@ export default {
     methods: {
         //Load stt as source
         async play() {
+            //Rooms
+            if (this.$rooms.room) return;
+
+
             this.loading = true;
             
             //Load data

diff --git a/app/client/src/components/TrackTile.vue b/app/client/src/components/TrackTile.vue
@@ -44,7 +44,7 @@
             </template>
             <v-list dense>
                 <!-- Play Next -->
-                <v-list-item dense @click='playNext'>
+                <v-list-item dense @click='playNext' v-if='$rooms.allowControls()'>
                     <v-list-item-icon>
                         <v-icon>mdi-playlist-plus</v-icon>
                     </v-list-item-icon>
@@ -53,14 +53,23 @@
                     </v-list-item-content>
                 </v-list-item>
                 <!-- Add to end of queue -->
-                <v-list-item dense @click='addQueue'>
+                <v-list-item dense @click='addQueue' v-if='$rooms.allowControls()'>
                     <v-list-item-icon>
                         <v-icon>mdi-playlist-plus</v-icon>
                     </v-list-item-icon>
                     <v-list-item-content>
                         <v-list-item-title>{{$t("Add to queue")}}</v-list-item-title>
                     </v-list-item-content>
                 </v-list-item>
+                <!-- Request song (Rooms) -->
+                <v-list-item dense @click='$rooms.request(track)' v-if='$rooms.room && !$rooms.allowControls()'>
+                    <v-list-item-icon>
+                        <v-icon>mdi-playlist-plus</v-icon>
+                    </v-list-item-icon>
+                    <v-list-item-content>
+                        <v-list-item-title>Request song in room</v-list-item-title>
+                    </v-list-item-content>
+                </v-list-item>
                 <!-- Add to library -->
                 <v-list-item dense @click='addLibrary' v-if='!isLibrary'>
                     <v-list-item-icon>
@@ -107,7 +116,7 @@
                     </v-list-item-content>
                 </v-list-item>
                 <!-- Play track mix -->
-                <v-list-item dense @click='trackMix'>
+                <v-list-item dense @click='trackMix' v-if='!$rooms.room'>
                     <v-list-item-icon>
                         <v-icon>mdi-playlist-music</v-icon>
                     </v-list-item-icon>
@@ -199,9 +208,19 @@ export default {
     methods: {
         //Add track next to queue
         playNext() {
+            //Rooms
+            if (this.$rooms.allowControls()) {
+                this.$rooms.addQueue(this.track, true);
+                return;
+            }
             this.$root.addTrackIndex(this.track, this.$root.queue.index+1);
         },
         addQueue() {
+            //Rooms
+            if (this.$rooms.allowControls()) {
+                this.$rooms.addQueue(this.track);
+                return;
+            }
             this.$root.queue.data.push(this.track);
         },
         addLibrary() {