Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mafia: Fix sub bug, update permissions #4865

Merged
merged 1 commit into from
Sep 20, 2018
Merged

Mafia: Fix sub bug, update permissions #4865

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion chat-plugins/mafia.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,6 +977,7 @@ class MafiaTracker extends Rooms.RoomGame {
this.roleString = '';
}
if (this.subs.includes(targetUser.userid)) this.subs.splice(this.subs.indexOf(targetUser.userid), 1);
this.played.push(targetUser.userid);
this.players[targetUser.userid] = player;
this.sendRoom(`${Chat.escapeHTML(targetUser.name)} has been added to the game by ${Chat.escapeHTML(user.name)}!`, {declare: true});
}
Expand Down Expand Up @@ -1049,6 +1050,8 @@ class MafiaTracker extends Rooms.RoomGame {
let lynch = this.lynches[oldPlayer.lynching];
lynch.lynchers.splice(lynch.lynchers.indexOf(oldPlayer.userid, 1));
lynch.lynchers.push(newPlayer.userid);
newPlayer.lynching = oldPlayer.lynching;
oldPlayer.lynching = '';
}
this.players[newPlayer.userid] = newPlayer;
this.players[oldPlayer.userid].destroy();
Expand Down Expand Up @@ -1860,7 +1863,8 @@ const commands = {
if (room.id !== 'mafia') return this.errorReply(`This command can only be used in the Mafia room.`);
const args = target.split(',').map(toId);
if (['forceadd', 'add', 'remove', 'del', 'delete'].includes(args[0])) {
if (['forceadd', 'add'].includes(args[0]) && !this.can('mute', null, room)) return;
const permission = (user.userid === args[1]) ? 'broadcast' : 'mute';
if (['forceadd', 'add'].includes(args[0]) && !this.can(permission, null, room)) return;
if (['remove', 'del', 'delete'].includes(args[0]) && user.userid !== args[1] && !this.can('mute', null, room)) return;
} else {
if (!this.runBroadcast()) return false;
Expand Down