2
0
Эх сурвалжийг харах

Fixed some issues with tooltips and songs not playing after turning off partyMode.

KrisVos130 9 жил өмнө
parent
commit
9e49587cc8

+ 16 - 0
app/client/scripts/helpers.js

@@ -749,6 +749,22 @@ Template.communityStation.helpers({
             return false;
         }
     },
+    playingHidden: function() {
+        var room = CommunityStations.findOne({name: Session.get("CommunityStationName")});
+        if (room !== undefined) {
+            return (room.state === "playing") ? "hidden" : "";
+        } else {
+            return "";
+        }
+    },
+    pausedHidden: function() {
+        var room = CommunityStations.findOne({name: Session.get("CommunityStationName")});
+        if (room !== undefined) {
+            return (room.state === "paused") ? "hidden" : "";
+        } else {
+            return "";
+        }
+    },
     currentSong: function(){
         return Session.get("currentSong");
     },

+ 2 - 11
app/client/templates/communityStation.html

@@ -7,17 +7,8 @@
                            class="brand-logo">Musare</a></li>
                     <!--li><a id="vote-skip" class="tooltipped" data-position="bottom" data-delay="50" data-tooltip="Vote to skip this song"><i class="material-icons left">skip_next</i>{{votes}}</a></li-->
                     {{#if isCommunityStationOwner name}}
-                        {{#if playing}}
-                            <li style="margin-left: 144px;"><a id="pause" data-position="bottom" data-delay="50"
-                                                               data-tooltip="Pause this room"
-                                                               data-activates="chat-slide-out" class="tooltipped"><i
-                                    class="material-icons">pause</i></a></li>
-                        {{else}}
-                            <li style="margin-left: 144px;"><a id="play" data-position="bottom" data-delay="50"
-                                                               data-tooltip="Play this room"
-                                                               data-activates="chat-slide-out" class="tooltipped"><i
-                                    class="material-icons">play_arrow</i></a></li>
-                        {{/if}}
+                        <li style="margin-left: 144px;" class={{pausedHidden}}><a id="pause" data-position="bottom" data-delay="50" data-tooltip="Pause this room" data-activates="chat-slide-out" class="tooltipped"><i class="material-icons">pause</i></a></li>
+                        <li style="margin-left: 144px;" class={{playingHidden}}><a id="play" data-position="bottom" data-delay="50" data-tooltip="Play this room" data-activates="chat-slide-out" class="tooltipped"><i class="material-icons">play_arrow</i></a></li>
                         <li><a id="skip" data-position="bottom" data-delay="50" data-tooltip="Skip this song"
                                data-activates="chat-slide-out" class="tooltipped"><i
                                 class="material-icons">skip_next</i></a></li>

+ 8 - 0
app/server/server.js

@@ -508,6 +508,8 @@ function CommunityStation(name) {
                 currentSong++;
             } else currentSong = 0;
             currentId = songs[currentSong];
+            console.log(currentSong, currentId);
+            console.log(songs);
             CommunityStations.update({name: name}, {$set: {timePaused: 0}});
             this.songTimer();
             CommunityStations.update({name: name}, {
@@ -674,6 +676,7 @@ function CommunityStation(name) {
                 currentSong: {}
             }
         });
+        this.skipSong();
     };
 
     this.setQueueLocked = function(queueLocked) {
@@ -839,6 +842,11 @@ function getSongDataYT(id) {
         var dur = res.data.items[0].contentDetails.duration;
         dur = dur.replace("PT", "");
         var durInSec = 0;
+        dur = dur.replace(/([\d]*)H/, function(v, v2) {
+            v2 = Number(v2);
+            durInSec = (v2 * 60 * 60)
+            return "";
+        });
         dur = dur.replace(/([\d]*)M/, function(v, v2) {
             v2 = Number(v2);
             durInSec = (v2 * 60)