diff --git a/src/bot.ts b/src/bot.ts index 107fad21f993ca86f0925e29abab2b77b0171dde..0c15ec24972995f4af0c410bdfdcde9bbb962f2b 100644 --- a/src/bot.ts +++ b/src/bot.ts @@ -503,9 +503,11 @@ export class DiscordBot { return rooms.map((room) => room.matrix.getId()); } - public async handleMatrixKickBan(roomId: string, kickeeUserId: string, kicker: string, kickban: "kick"|"ban", reason?: string) { + public async handleMatrixKickBan( + roomId: string, kickeeUserId: string, kicker: string, kickban: "kick"|"ban", reason?: string, + ) { const kickeeUser = (await this.GetDiscordUserOrMember( - new MatrixUser(kickeeUserId.replace("@", "")).localpart.substring("_discord".length) + new MatrixUser(kickeeUserId.replace("@", "")).localpart.substring("_discord".length), ))!; if (!kickeeUser || kickeeUser instanceof Discord.User) { log.error("Could not find discord user for", kicker); @@ -532,14 +534,14 @@ export class DiscordBot { } await tchan.send( `${kickee} was ${kickban === "ban" ? "banned" : "kicked"} from this channel by ${kickeeUserId}.` - + (reason ? ` Reason: ${reason}` : "") + + (reason ? ` Reason: ${reason}` : ""), ); log.info(`${kickban === "ban" ? "Banning" : "Kicking"} ${kickee}`); await tchan.overwritePermissions(kickee, { - VIEW_CHANNEL: false, SEND_MESSAGES: false, + VIEW_CHANNEL: false, }, `Matrix user was ${kickban} by ${kicker}`); if (kickban === "kick") { @@ -548,8 +550,9 @@ export class DiscordBot { log.info(`Kick was lifted for ${kickee.displayName}`); await tchan.overwritePermissions(kickee, { - VIEW_CHANNEL: null, SEND_MESSAGES: null, + VIEW_CHANNEL: null, + /* tslint:disable: no-any */ } as any, // XXX: Discord.js typings are wrong. `Lifting kick for since duration expired.`); }, this.config.room.kickFor); diff --git a/src/config.ts b/src/config.ts index e9cec8ac0ef78f63d2e545e5beeec64e2141de2a..b3a5c8514ead67ddddca703c98f27c61ee2c5100 100644 --- a/src/config.ts +++ b/src/config.ts @@ -59,7 +59,7 @@ export class DiscordBridgeConfigLogging { class DiscordBridgeConfigRoom { public defaultVisibility: string; - public kickFor:number = 30000; + public kickFor: number = 30000; } class DiscordBridgeConfigChannel {