finished chat view, fixed playlist view not updating bug

app/client/scripts/helpers.js

@@ -115,10 +115,13 @@ Template.home.helpers({
 
 Template.playlist.helpers({
     playlist_songs: function () {
-        var parts = location.href.split('/');
-        var id = parts.pop();
-        var type = id.toLowerCase();
-        var data = Songs.find({"genres": type}).fetch();
+        var songIDs = Playlists.find({"type": Session.get("type")}).fetch()[0].songs
+        var data = [];
+        songIDs.forEach(function(id){
+            var song = Songs.findOne({"mid": id});
+            data.push(song);
+        })
+        console.log(data);
         if (data !== undefined) {
             data.map(function (song) {
                 if (Session.get("currentSong") !== undefined && song.mid === Session.get("currentSong").mid) {
@@ -133,17 +136,17 @@ Template.playlist.helpers({
             return [];
         }
     },
-    currentSong: function(){
-        var parts = location.href.split('/');
-        var id = parts.pop();
-        var type = id.toLowerCase();
-        var data = Songs.find({"genres": type}).fetch();
+    nextSong: function(){
+        var song;
+        var data = Playlists.find({"type": Session.get("type")}).fetch()[0].songs
         for(var i = 0; i < data.length; i++){
-            if(data[i].mid === Session.get("currentSong").mid){
+            if(data[i] === Session.get("currentSong").mid){
                 if(i === data.length - 1){
-                    Session.set("nextSong", [data[0]]);
+                    song = Songs.findOne({"mid": data[0]});
+                    Session.set("nextSong", [song])
                 } else{
-                    Session.set("nextSong", [data[i+1]]);
+                    song = Songs.findOne({"mid": data[i+1]});
+                    Session.set("nextSong", [song]);
                 }
             }
         };

app/client/templates/playlist.html

@@ -4,7 +4,7 @@
         <label for="search-playlist">Search playlist by song/artist</label>
     </div>
     <ul id="up-next">
-        {{#each currentSong}}
+        {{#each nextSong}}
             <p style="margin: -20px 0 0 15px; font-weight: 300;">Up Next</p>
             <li class="pl-item" style="color: rgb(107, 197, 164) !important;">
                 <img src={{img}} style="width: 80px; float: left; margin: 0 10px 10px 0;">

app/client/templates/room.html

@@ -73,7 +73,7 @@
                         <span title="{{time}}" style="float: right; margin-top: 15px">{{rtime time}}</span>
                         <small class="rank-{{this.rawrank}}" style="margin-top: 15px">{{this.rank}}</small>
                         <a style="text-decoration: none; font-size: 0.9em; height: 0.9em; font-weight: 500" href="/u/{{this.username}}" target="_blank">{{this.username}}</a>
-                        <p style="clear: both; line-height: 1.2em; margin-left: 13px; margin-bottom: 30px; font-size: 1.2em; height: 0">{{this.message}}</p>
+                        <p style="clear: both; line-height: 1.2em; margin-left: 13px; margin-bottom: 0; font-size: 1.2em">{{this.message}}</p>
                     </li>
                 {{/emojione}}
             {{/each}}