Fixed issues with private rooms.

app/client/scripts/events.js

@@ -1709,34 +1709,6 @@ Template.privateRoom.events({
             }
         }
     },
-    "click #lock": function () {
-        console.log("Lock");
-        console.log(Session.get("privateRoomName"));
-        Meteor.call("lockPrivateRoom", Session.get("privateRoomName"), function(err) {
-            if (err) {
-                console.log(err);
-                var $toastContent = $('<span><strong>Room not locked.</strong> ' + err.reason + '</span>');
-                Materialize.toast($toastContent, 2000);
-            } else {
-                var $toastContent = $('<span><strong>Room unlocked.</strong></span>');
-                Materialize.toast($toastContent, 2000);
-            }
-        });
-    },
-    "click #unlock": function () {
-        console.log("Unlock");
-        console.log(Session.get("privateRoomName"));
-        Meteor.call("unlockPrivateRoom", Session.get("privateRoomName"), function(err) {
-            if (err) {
-                console.log(err);
-                var $toastContent = $('<span><strong>Room not unlocked.</strong> ' + err.reason + '</span>');
-                Materialize.toast($toastContent, 2000);
-            } else {
-                var $toastContent = $('<span><strong>Room unlocked.</strong></span>');
-                Materialize.toast($toastContent, 2000);
-            }
-        });
-    },
     "click #submit": function () {
         if(Meteor.userId()){
             sendMessageGlobal();

app/client/templates/privateRoom.html

@@ -76,7 +76,7 @@
             {{#if currentUser}}
                 <a id="submit" class="waves-effect waves-light btn">Send</a>
             {{else}}
-                <a id="submit" class="waves-effect waves-light btn disabled" disabked>Send</a>
+                <a id="submit" class="waves-effect waves-light btn disabled" disabled>Send</a>
             {{/if}}
         </div>
     </div>
@@ -156,13 +156,6 @@
             <li><a id="play"><i class="material-icons">play_arrow</i></a></li>
         {{/if}}
         <li><a id="skip"><i class="material-icons">skip_next</i></a></li>
-        {{#if isModerator}}
-        {{#if private}}
-            <li><a id="unlock"><i class="material-icons">lock_outline</i></a></li>
-        {{else}}
-            <li><a id="lock"><i class="material-icons">lock_open</i></a></li>
-        {{/if}}
-        {{/if}}
         <li><a id="edit_room" href="#edit_room_modal"><i class="material-icons">mode_edit</i></a></li>
     </ul>
 

app/server/server.js

@@ -511,22 +511,16 @@ function PrivateStation(name) {
     };
     this.name = name;
 
-    /*this.private = private;
+    var privacy = PrivateRooms.findOne({name: name}).privacy;
+    this.privacy = privacy;
 
-    this.unlock = function () {
-        if (self.private) {
-            self.private = false;
-            PrivateRooms.update({name: name}, {$set: {"private": false}});
+    this.setPrivacy = function (privacy) {
+        if (self.privacy !== privacy) {
+            self.privacy = privacy;
+            return PrivateRooms.update({name: name}, {$set: {"privacy": privacy}});
         }
     };
 
-    this.lock = function () {
-        if (!self.private) {
-            self.private = true;
-            PrivateRooms.update({name: name}, {$set: {"private": true}});
-        }
-    };*/
-
     this.setPlaylist = function (plName) {
         if (PrivatePlaylists.findOne({name: plName, owner: _room.owner}) !== undefined) {
             PrivateRooms.update({name: name}, {$set: {"playlist": plName}});
@@ -1055,24 +1049,6 @@ Meteor.methods({
             throw new Meteor.Error(403, "Invalid permissions.");
         }
     },
-    lockPrivateRoom: function (name) {
-        if ((isAdmin() || isPrivateRoomOwner(name)) && !isBanned()) {
-            getPrivateStation(name, function (station) {
-                station.lock();
-            });
-        } else {
-            throw new Meteor.Error(403, "Invalid permissions.");
-        }
-    },
-    unlockPrivateRoom: function (name) {
-        if ((isAdmin() || isPrivateRoomOwner(name)) && !isBanned()) {
-            getPrivateStation(name, function (station) {
-                station.unlock();
-            });
-        } else {
-            throw new Meteor.Error(403, "Invalid permissions.");
-        }
-    },
     banUser: function (username, period, reason) {
         if (isAdmin() && !isBanned()) {
             var user = Meteor.user();