KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fallback for channels without togglechat settings

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-09-27 13:01:33 +02:00
parent 5878f57b64
commit 6996472854
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");
}
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"});
return;
} 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();
else {
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"});
} else {
callback();