mirror of
https://github.com/matrix-org/mjolnir.git
synced 2024-10-01 05:36:06 +00:00
Fix messaging for bans
This commit is contained in:
parent
5409f4916a
commit
2ea3bdccb3
@ -29,6 +29,7 @@ import config from "../config";
|
|||||||
export async function applyUserBans(lists: BanList[], roomIds: string[], mjolnir: Mjolnir): Promise<RoomUpdateError[]> {
|
export async function applyUserBans(lists: BanList[], roomIds: string[], mjolnir: Mjolnir): Promise<RoomUpdateError[]> {
|
||||||
// We can only ban people who are not already banned, and who match the rules.
|
// We can only ban people who are not already banned, and who match the rules.
|
||||||
const errors: RoomUpdateError[] = [];
|
const errors: RoomUpdateError[] = [];
|
||||||
|
let bansApplied = 0;
|
||||||
for (const roomId of roomIds) {
|
for (const roomId of roomIds) {
|
||||||
try {
|
try {
|
||||||
if (config.verboseLogging) {
|
if (config.verboseLogging) {
|
||||||
@ -62,6 +63,7 @@ export async function applyUserBans(lists: BanList[], roomIds: string[], mjolnir
|
|||||||
await mjolnir.client.banUser(member['state_key'], roomId, userRule.reason);
|
await mjolnir.client.banUser(member['state_key'], roomId, userRule.reason);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bansApplied++;
|
||||||
banned = true;
|
banned = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -73,5 +75,17 @@ export async function applyUserBans(lists: BanList[], roomIds: string[], mjolnir
|
|||||||
errors.push({roomId, errorMessage: e.message || (e.body ? e.body.error : '<no message>')});
|
errors.push({roomId, errorMessage: e.message || (e.body ? e.body.error : '<no message>')});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (bansApplied > 0) {
|
||||||
|
const html = `<font color="#00cc00"><b>Banned ${bansApplied} people</b></font>`;
|
||||||
|
const text = `Banned ${bansApplied} people`;
|
||||||
|
await this.client.sendMessage(mjolnir.managementRoomId, {
|
||||||
|
msgtype: "m.notice",
|
||||||
|
body: text,
|
||||||
|
format: "org.matrix.custom.html",
|
||||||
|
formatted_body: html,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return errors;
|
return errors;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user