Merge pull request #425 from calzoneman/muteadmin

site admins should be immune from kick/mute
This commit is contained in:
Erik Little 2015-01-06 23:00:14 -05:00
commit 7dab3276a6
2 changed files with 6 additions and 3 deletions

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."

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()
});