moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #478 from Xaekai/shadowmute 

Fix shadowmuted users usage of greentext and slash commands
This commit is contained in:
Calvin Montgomery 2015-05-19 13:02:17 -04:00
parent 88be0e1e92 7f269784b1
commit a38e4ef409
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/channel/chat.js
View File

@ -268,6 +268,25 @@ ChatModule.prototype.processChatMsg = function (user, data) {
return; return;
} }
if (data.msg.indexOf(">") === 0) {
msgobj.meta.addClass = "greentext";
}
if (data.msg.indexOf("/") === 0) {
var space = data.msg.indexOf(" ");
var cmd;
if (space < 0) {
cmd = data.msg.substring(1);
} else {
cmd = data.msg.substring(1, space);
}
if (cmd in this.commandHandlers) {
this.commandHandlers[cmd](user, data.msg, data.meta);
return;
}
}
if (user.is(Flags.U_SMUTED)) { if (user.is(Flags.U_SMUTED)) {
this.shadowMutedUsers().forEach(function (u) { this.shadowMutedUsers().forEach(function (u) {
u.socket.emit("chatMsg", msgobj); u.socket.emit("chatMsg", msgobj);
@ -284,27 +303,7 @@ ChatModule.prototype.processChatMsg = function (user, data) {
}); });
return; return;
} }
this.sendMessage(msgobj);
if (data.msg.indexOf("/") === 0) {
var space = data.msg.indexOf(" ");
var cmd;
if (space < 0) {
cmd = data.msg.substring(1);
} else {
cmd = data.msg.substring(1, space);
}
if (cmd in this.commandHandlers) {
this.commandHandlers[cmd](user, data.msg, data.meta);
} else {
this.sendMessage(msgobj);
}
} else {
if (data.msg.indexOf(">") === 0) {
msgobj.meta.addClass = "greentext";
}
this.sendMessage(msgobj);
}
}; };
ChatModule.prototype.formatMessage = function (username, data) { ChatModule.prototype.formatMessage = function (username, data) {