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

Merge branch '3.0' of github.com:calzoneman/sync into 3.0

This commit is contained in:
Calvin Montgomery 2015-01-07 15:59:52 -05:00
parent c1ef0848cd 7dab3276a6
commit ef7ee067f2
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/channel/chat.js
View File

@ -482,7 +482,8 @@ ChatModule.prototype.handleCmdMute = function (user, msg, meta) {
return;
}
if (target.account.effectiveRank >= user.account.effectiveRank) {
if (target.account.effectiveRank >= user.account.effectiveRank
|| target.account.globalRank >= user.account.globalRank) {
user.socket.emit("errorMsg", {
msg: "/mute failed - " + target.getName() + " has equal or higher rank " +
"than you."
@ -531,7 +532,8 @@ ChatModule.prototype.handleCmdSMute = function (user, msg, meta) {
return;
}
if (target.account.effectiveRank >= user.account.effectiveRank) {
if (target.account.effectiveRank >= user.account.effectiveRank
|| target.account.globalRank >= user.account.globalRank) {
user.socket.emit("errorMsg", {
msg: "/smute failed - " + target.getName() + " has equal or higher rank " +
"than you."

3
lib/channel/kickban.js
View File

@ -175,7 +175,8 @@ KickBanModule.prototype.handleCmdKick = function (user, msg, meta) {
return;
}
if (target.account.effectiveRank >= user.account.effectiveRank) {
if (target.account.effectiveRank >= user.account.effectiveRank
|| target.account.globalRank >= user.account.globalRank) {
return user.socket.emit("errorMsg", {
msg: "You do not have permission to kick " + target.getName()
});