KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-12-08 20:48:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fallback for channels without togglechat settings
This commit is contained in:
Kasper Rynning-Tønnesen
2018-09-27 13:02:08 +02:00
committed by GitHub
parent 34616c2d53 6996472854
commit fe727c075f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/handlers/chat.js
View File

@@ -90,7 +90,7 @@ function chat(msg, guid, offline, socket) {
msg.pass = crypto.createHash('sha256').update(Functions.decrypt_string(msg.pass)).digest("base64"); msg.pass = crypto.createHash('sha256').update(Functions.decrypt_string(msg.pass)).digest("base64");
} }
db.collection(coll + "_settings").find(function(err, conf){ db.collection(coll + "_settings").find(function(err, conf){
if(conf.length > 0 && !conf[0].toggleChat) { if(conf.length > 0 && (conf[0].hasOwnProperty("toggleChat") && !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"}); socket.emit('chat', {from: "System", msg: ": Chat for this channel has been disabled.", icon: "https://zoff.me/assets/images/favicon-32x32.png"});
return; return;
} else if(conf.length > 0 && (conf[0].userpass == undefined || conf[0].userpass == "" || (msg.hasOwnProperty('pass') && conf[0].userpass == msg.pass))) { } else if(conf.length > 0 && (conf[0].userpass == undefined || conf[0].userpass == "" || (msg.hasOwnProperty('pass') && conf[0].userpass == msg.pass))) {
@@ -233,7 +233,7 @@ function checkIfChatEnabled(channel, socket, callback) {
if(channel == "" || channel == undefined) callback(); if(channel == "" || channel == undefined) callback();
else { else {
db.collection(channel + "_settings").find(function(err, docs){ db.collection(channel + "_settings").find(function(err, docs){
if(docs.length > 0 && !docs[0].toggleChat) { if(docs.length > 0 && (docs[0].hasOwnProperty("toggleChat") && !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"}); socket.emit('chat', {from: "System", msg: ": Chat for this channel has been disabled.", icon: "https://zoff.me/assets/images/favicon-32x32.png"});
} else { } else {
callback(); callback();