Merge pull request #416 from zoff-music/feature/disable-chat

Added settings for disabling chat in a channel

server/handlers/chat.js

@@ -58,19 +58,6 @@ function getAndSendLogs(channel, all, socket, pass, query) {
     });
 }
 
-function checkIfUserIsBanned(channel, socket, guid, callback) {
-    var connection_id = Functions.hash_pass(socket.handshake.headers["user-agent"] + socket.handshake.address + socket.handshake.headers["accept-language"]);
-    db.collection(channel + "_banned_chat").find({connection_id: connection_id}, function(err, docs) {
-        if(docs.length == 0) callback();
-        else {
-            db.collection("user_names").update({guid, guid}, {$addToSet:{channels: channel}}, function(){
-                socket.emit('chat', {from: "System", msg: ": You can't chat in this channel, you are banned. The reason is: " + docs[0].reason, icon: "https://zoff.me/assets/images/favicon-32x32.png"});
-                return;
-            });
-        }
-    })
-}
-
 function chat(msg, guid, offline, socket) {
     if(typeof(msg) !== 'object' || !msg.hasOwnProperty('data') ||
     !msg.hasOwnProperty('channel') || typeof(msg.data) != "string" || typeof(msg.channel) != "string") {
@@ -103,7 +90,10 @@ function chat(msg, guid, offline, socket) {
                 msg.pass = crypto.createHash('sha256').update(Functions.decrypt_string(msg.pass)).digest("base64");
             }
             db.collection(coll + "_settings").find(function(err, conf){
-                if(conf.length > 0 && (conf[0].userpass == undefined || conf[0].userpass == "" || (msg.hasOwnProperty('pass') && conf[0].userpass == msg.pass))) {
+                if(conf.length > 0 && !conf[0].toggleChat) {
+                    socket.emit('chat', {from: "System", msg: ": Chat for this channel has been disabled.", icon: "https://zoff.me/assets/images/favicon-32x32.png"});
+                    return;
+                } else if(conf.length > 0 && (conf[0].userpass == undefined || conf[0].userpass == "" || (msg.hasOwnProperty('pass') && conf[0].userpass == msg.pass))) {
                     var data = msg.data;
 
                     Functions.check_inlist(coll, guid, socket, offline, function() {
@@ -239,9 +229,35 @@ function all_chat(msg, guid, offline, socket) {
     }, "place 2");
 }
 
+function checkIfChatEnabled(channel, socket, callback) {
+    if(channel == "" || channel == undefined) callback();
+    else {
+        db.collection(channel + "_settings").find(function(err, docs){
+            if(docs.length > 0 && !docs[0].toggleChat) {
+                socket.emit('chat', {from: "System", msg: ": Chat for this channel has been disabled.", icon: "https://zoff.me/assets/images/favicon-32x32.png"});
+            } else {
+                callback();
+            }
+        });
+    }
+}
+
+function checkIfUserIsBanned(channel, socket, guid, callback, callback_error) {
+    var connection_id = Functions.hash_pass(socket.handshake.headers["user-agent"] + socket.handshake.address + socket.handshake.headers["accept-language"]);
+    db.collection(channel + "_banned_chat").find({connection_id: connection_id}, function(err, docs) {
+        if(docs.length == 0) callback();
+        else {
+            db.collection("user_names").findAndModify({query: {guid, guid}, update: {$addToSet:{channels: channel}}}, function(e, d){
+                socket.emit('chat', {from: "System", msg: ": You can't chat in this channel, you are banned. The reason is: " + docs[0].reason, icon: "https://zoff.me/assets/images/favicon-32x32.png"});
+                if(typeof(callback_error) == "function") callback_error();
+                else return;
+            });
+        }
+    })
+}
+
 function namechange(data, guid, socket, tried, callback) {
-    /*if(!data.hasOwnProperty("channel") ||
-    typeof(data.channel) != "string") return;*/
+    checkIfChatEnabled(data.channel, socket, function() {
         checkIfUserIsBanned(data.channel, socket, guid, function() {
             var pw = "";
             var new_password;
@@ -355,11 +371,13 @@ function namechange(data, guid, socket, tried, callback) {
                     }
                 });
             });
+        }, callback);
     });
 }
 
 function removename(guid, coll, socket) {
     //coll = coll.replace(/ /g,'');
+    checkIfChatEnabled(coll, socket, function() {
         db.collection("user_names").find({"guid": guid}, function(err, docs) {
             if(docs.length == 1) {
                 var old_name = docs[0].name;
@@ -372,6 +390,7 @@ function removename(guid, coll, socket) {
                 });
             }
         });
+    });
 }
 
 function generate_name(guid, announce_payload, second, round, channel) {

server/handlers/functions.js

@@ -317,10 +317,11 @@ function setChromecastHost(id, other_id, list, callback) {
 
 function setSessionUserPass(id, userpass, list, callback) {
     try {
-        if(id == "empty" || id == undefined) {
+        if(id == "empty" || id == undefined || userpass == undefined) {
             callback();
             return;
         }
+
         connected_db.collection(id).update({_id: list}, {$set: {userpass: userpass}}, {upsert: true}, function(e, d){
             callback();
             return;

server/handlers/list_change.js

@@ -56,6 +56,7 @@ function addFromOtherList(arr, guid, offline, socket) {
                     } else {
                         otheruser = crypto.createHash('sha256').update(Functions.decrypt_string(otheruser)).digest("base64");
                     }
+                    
                     db.collection(channel).find({now_playing: true}, function(e, np) {
 
                         var project_object = {

server/handlers/list_settings.js

@@ -179,8 +179,8 @@ function conf_function(params, coll, guid, offline, socket) {
             var adminpass = params.adminpass;
             var skipping = params.skipping;
             var shuffling = params.shuffling;
-            var userpass = Functions.decrypt_string(params.userpass);
 
+            var userpass = Functions.decrypt_string(params.userpass);
 
             if((!params.userpass_changed && frontpage) || (params.userpass_changed && userpass == "")) {
                 userpass = "";
@@ -218,6 +218,9 @@ function conf_function(params, coll, guid, offline, socket) {
                         adminpass:hash,
                         desc: description,
                     };
+                    if(params.hasOwnProperty("toggleChat") && docs[0].adminpass != "" && docs[0].adminpass != undefined && docs[0].adminpass == hash) {
+                        obj.toggleChat = params.toggleChat;
+                    }
                     if(params.userpass_changed) {
                         obj["userpass"] = userpass;
                     } else if (frontpage) {
@@ -226,7 +229,7 @@ function conf_function(params, coll, guid, offline, socket) {
                     db.collection(coll + "_settings").update({ id: "config" }, {
                         $set:obj
                     }, function(err, docs){
-                        Functions.setSessionUserPass(Functions.getSession(socket), crypto.createHash('sha256').update(Functions.decrypt_string(params.userpass)).digest('base64'), coll, function() {
+                        Functions.setSessionUserPass(Functions.getSession(socket), obj["userpass"], coll, function() {
                             db.collection(coll + "_settings").find(function(err, docs){
                                 if(docs[0].adminpass !== "") docs[0].adminpass = true;
                                 if(docs[0].hasOwnProperty("userpass") && docs[0].userpass != "") docs[0].userpass = true;

server/public/assets/js/admin.js

@@ -22,7 +22,7 @@ var Admin = {
         }
         Helper.removeClass(".delete-context-menu", "context-menu-disabled");
         names     = ["vote","addsongs","longsongs","frontpage", "allvideos",
-        "removeplay", "skip", "shuffle", "userpass"];
+        "removeplay", "skip", "shuffle", "userpass", "toggleChat"];
         //Crypt.set_pass(chan.toLowerCase(), Crypt.tmp_pass);
 
         for (var i = 0; i < names.length; i++) {
@@ -42,6 +42,7 @@ var Admin = {
         document.getElementById("password").value = "";
         document.getElementById("password").setAttribute("placeholder", "Change admin password");
         Helper.removeClass(".user-password-li", "hide");
+        Helper.removeClass(".chat-toggle-li", "hide");
         Helper.removeClass(".delete-all", "hide");
         if(document.getElementsByClassName("password_protected")[0].checked) {
             Helper.removeClass(".change_user_pass", "hide");
@@ -105,7 +106,7 @@ var Admin = {
         w_p       = true;
         adminpass = "";
         names     = ["vote","addsongs","longsongs","frontpage", "allvideos",
-        "removeplay", "skip", "shuffle"];
+        "removeplay", "skip", "shuffle", "toggleChat"];
         document.getElementById("password").value = "";
         Helper.css("#thumbnail_form", "display", "none");
         Helper.css("#description_form", "display", "none");
@@ -123,6 +124,7 @@ var Admin = {
 
 
         Helper.addClass(".user-password-li", "hide");
+        Helper.addClass(".chat-toggle-li", "hide");
         Helper.addClass(".delete-all", "hide");
 
         if(document.getElementsByClassName("password_protected")[0].checked) {
@@ -146,9 +148,9 @@ var Admin = {
         music     = conf_array.allvideos;
         longsongs = conf_array.longsongs;
         names     = ["vote","addsongs","longsongs","frontpage", "allvideos",
-        "removeplay", "skip", "shuffle", "userpass"];
-
-
+        "removeplay", "skip", "shuffle", "userpass", "toggleChat"];
+        if(!conf.hasOwnProperty("toggleChat")) conf.toggleChat = true;
+        toggleChat = conf.toggleChat;
         hasadmin = conf_array.adminpass != "";
         var show_disabled = true;
         if(hasadmin && Admin.logged_in || !hasadmin) {
@@ -197,6 +199,8 @@ var Admin = {
         removeplay = form.removeplay.checked;
         skipping   = form.skip.checked;
         shuffling  = form.shuffle.checked;
+        toggleChat = form.toggleChat.checked;
+
         var pass_send = userpass_changed && !form.userpass.checked ? "" : userpass;
         configs = {
             channel: chan.toLowerCase(),
@@ -209,6 +213,7 @@ var Admin = {
             adminpass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass),
             skipping: skipping,
             shuffling: shuffling,
+            toggleChat: toggleChat,
             userpass: Crypt.crypt_pass(pass_send),
             userpass_changed: userpass_changed
         };

server/public/assets/js/chat.js

@@ -143,7 +143,7 @@ var Chat = {
     },
 
     channelchat: function(data, time_sent, disable_blink) {
-        if(data.msg.substring(0,1) == ":" && !chat_active && !disable_blink) {
+        if(data.msg.substring(0,1) == ":" && !chat_active && !disable_blink && data.from.toLowerCase() != "system") {
             document.querySelector("#favicon").setAttribute("href", "/assets/images/highlogo.png");
             unseen = true;
             chat_unseen = true;

server/public/assets/js/listeners.js

@@ -49,6 +49,7 @@ var frontpage = 1;
 var adminpass = "";
 var showDiscovery = false;
 var player_ready = false;
+var toggleChat = true;
 var viewers = 1;
 var temp_user_pass = "";
 var zoff_api_token = "DwpnKVkaMH2HdcpJT2YPy783SY33byF5/32rbs0+xdU=";

server/public/partials/channel/panel.handlebars

@@ -3,148 +3,7 @@
     <i class="material-icons auto-margin">close</i>
 </div>
 <ul class="collapsible collapsible-accordion settings-collapsible">
-    <li class="no-padding">
-        <div class="col s9 collapsible-header bold waves-effect admin-settings">
-            Channel Settings
-            <i class="material-icons">tune</i>
-        </div>
-        <div class="collapsible-body">
-            <ul>
-                <form action="#" id="adminForm" onsubmit="return false;">
-
-                    <li class="white-bg">
-                        <div class="input-field field-settings">
-                            <i id="admin-lock" class="material-icons">lock</i>
-                            <input placeholder="Enter admin password" id="password" type="password" class="validate" />
-                        </div>
-                    </li>
-                    <li>
-                        <span class="switch-text">
-                            Add songs
-                        </span>
-                        <div class="switch">
-                            <label>
-                                <span class="left-span">Anyone</span>
-                                <input name="addsongs" type="checkbox" class="conf" /><span class="lever"></span>
-                                <span class="right-span">Admin</span>
-                            </label>
-                        </div>
-                    </li>
-
-                    <li>
-                        <span class="switch-text">
-                            Vote
-                        </span>
-                        <div class="switch">
-                            <label>
-                                <span class="left-span">Anyone</span>
-                                <input name="vote" type="checkbox" class="conf" /><span class="lever"></span>
-                                <span class="right-span">Admin</span>
-                            </label>
-                        </div>
-                    </li>
-
-                    <li>
-                        <span class="switch-text">
-                            Shuffle
-                        </span>
-                        <div class="switch">
-                            <label>
-                                <span class="left-span">Anyone</span>
-                                <input name="shuffle" type="checkbox" class="conf" /><span class="lever"></span>
-                                <span class="right-span">Admin</span>
-                            </label>
-                        </div>
-                    </li>
-
-                    <li>
-                        <span class="switch-text">
-                            Skip
-                        </span>
-                        <div class="switch">
-                            <label>
-                                <span class="left-span">Anyone</span>
-                                <input name="skip" type="checkbox" class="conf" /><span class="lever"></span>
-                                <span class="right-span">Admin</span>
-                            </label>
-                        </div>
-                    </li>
-
-                    <li>
-                        <span class="switch-text">
-                            Song length
-                        </span>
-                        <div class="switch">
-                            <label>
-                                <span class="left-span">Any</span>
-                                <input name="longsongs" type="checkbox" class="conf" /><span class="lever"></span>
-                                <span class="right-span">Short</span>
-                            </label>
-                        </div>
-                    </li>
-
-                    <li>
-                        <span class="switch-text">
-                            Type
-                        </span>
-                        <div class="switch">
-                            <label>
-                                <span class="left-span">Any</span>
-                                <input name="allvideos" type="checkbox" class="conf" /><span class="lever"></span>
-                                <span class="right-span">Song</span>
-                            </label>
-                        </div>
-                    </li>
-
-
-                    <li>
-                        <span class="switch-text">
-                            Frontpage
-                        </span>
-                        <div class="switch">
-                            <label>
-                                <span class="left-span">Hide</span>
-                                <input name="frontpage" type="checkbox" class="conf" /><span class="lever"></span>
-                                <span class="right-span">Display</span>
-                            </label>
-                        </div>
-                    </li>
-
-                    <li>
-                        <span class="switch-text">
-                            After play
-                        </span>
-                        <div class="switch">
-                            <label>
-                                <span class="left-span">Keep</span>
-                                <input name="removeplay" type="checkbox" class="conf" /><span class="lever"></span>
-                                <span class="right-span">Remove</span>
-                            </label>
-                        </div>
-                    </li>
-                    <li class="user-password-li hide">
-                        <span class="switch-text">
-                            Channel password
-                        </span>
-                        <div class="switch">
-                            <label>
-                                <span class="left-span">No</span>
-                                <input name="userpass" type="checkbox" class="conf password_protected" /><span class="lever"></span>
-                                <span class="right-span">Yes</span>
-                            </label>
-                        </div>
-                    </li>
-                </form>
-
-                <li class="change_user_pass hide">
-                    <a href="#!" class="change_user_pass_btn btn waves-effect blue">Change password</a>
-                </li>
-                <li class="delete-all hide">
-                    <a href="#" class="delete-all-songs btn red">Delete all songs</a>
-                </li>
-            </ul>
-        </div>
-    </li>
+    {{> channel/settings}}
     <li class="no-padding">
         <div class="collapsible-header bold waves-effect">Channel Info
             <i class="material-icons">info_outline</i>

server/public/partials/channel/settings.handlebars

@@ -0,0 +1,151 @@
+<li class="no-padding">
+    <div class="col s9 collapsible-header bold waves-effect admin-settings">
+        Channel Settings
+        <i class="material-icons">tune</i>
+    </div>
+    <div class="collapsible-body">
+        <ul>
+            <form action="#" id="adminForm" onsubmit="return false;">
+
+                <li class="white-bg">
+                    <div class="input-field field-settings">
+                        <i id="admin-lock" class="material-icons">lock</i>
+                        <input placeholder="Enter admin password" id="password" type="password" class="validate" />
+                    </div>
+                </li>
+                <li>
+                    <span class="switch-text">
+                        Add songs
+                    </span>
+                    <div class="switch">
+                        <label>
+                            <span class="left-span">Anyone</span>
+                            <input name="addsongs" type="checkbox" class="conf" /><span class="lever"></span>
+                            <span class="right-span">Admin</span>
+                        </label>
+                    </div>
+                </li>
+
+                <li>
+                    <span class="switch-text">
+                        Vote
+                    </span>
+                    <div class="switch">
+                        <label>
+                            <span class="left-span">Anyone</span>
+                            <input name="vote" type="checkbox" class="conf" /><span class="lever"></span>
+                            <span class="right-span">Admin</span>
+                        </label>
+                    </div>
+                </li>
+
+                <li>
+                    <span class="switch-text">
+                        Shuffle
+                    </span>
+                    <div class="switch">
+                        <label>
+                            <span class="left-span">Anyone</span>
+                            <input name="shuffle" type="checkbox" class="conf" /><span class="lever"></span>
+                            <span class="right-span">Admin</span>
+                        </label>
+                    </div>
+                </li>
+
+                <li>
+                    <span class="switch-text">
+                        Skip
+                    </span>
+                    <div class="switch">
+                        <label>
+                            <span class="left-span">Anyone</span>
+                            <input name="skip" type="checkbox" class="conf" /><span class="lever"></span>
+                            <span class="right-span">Admin</span>
+                        </label>
+                    </div>
+                </li>
+
+                <li>
+                    <span class="switch-text">
+                        Song length
+                    </span>
+                    <div class="switch">
+                        <label>
+                            <span class="left-span">Any</span>
+                            <input name="longsongs" type="checkbox" class="conf" /><span class="lever"></span>
+                            <span class="right-span">Short</span>
+                        </label>
+                    </div>
+                </li>
+
+                <li>
+                    <span class="switch-text">
+                        Type
+                    </span>
+                    <div class="switch">
+                        <label>
+                            <span class="left-span">Any</span>
+                            <input name="allvideos" type="checkbox" class="conf" /><span class="lever"></span>
+                            <span class="right-span">Song</span>
+                        </label>
+                    </div>
+                </li>
+                <li>
+                    <span class="switch-text">
+                        Frontpage
+                    </span>
+                    <div class="switch">
+                        <label>
+                            <span class="left-span">Hide</span>
+                            <input name="frontpage" type="checkbox" class="conf" /><span class="lever"></span>
+                            <span class="right-span">Display</span>
+                        </label>
+                    </div>
+                </li>
+                <li>
+                    <span class="switch-text">
+                        After play
+                    </span>
+                    <div class="switch">
+                        <label>
+                            <span class="left-span">Keep</span>
+                            <input name="removeplay" type="checkbox" class="conf" /><span class="lever"></span>
+                            <span class="right-span">Remove</span>
+                        </label>
+                    </div>
+                </li>
+                <li class="chat-toggle-li hide">
+                    <span class="switch-text">
+                        Chat
+                    </span>
+                    <div class="switch">
+                        <label>
+                            <span class="left-span">Disabled</span>
+                            <input name="toggleChat" type="checkbox" class="conf" /><span class="lever"></span>
+                            <span class="right-span">Enabled</span>
+                        </label>
+                    </div>
+                </li>
+                <li class="user-password-li hide">
+                    <span class="switch-text">
+                        Channel password
+                    </span>
+                    <div class="switch">
+                        <label>
+                            <span class="left-span">No</span>
+                            <input name="userpass" type="checkbox" class="conf password_protected" /><span class="lever"></span>
+                            <span class="right-span">Yes</span>
+                        </label>
+                    </div>
+                </li>
+            </form>
+
+            <li class="change_user_pass hide">
+                <a href="#!" class="change_user_pass_btn btn waves-effect blue">Change password</a>
+            </li>
+            <li class="delete-all hide">
+                <a href="#" class="delete-all-songs btn red">Delete all songs</a>
+            </li>
+        </ul>
+    </div>
+</li>