Matrix-Mirrors/mjolnir
1
0
Fork 0
mirror of https://github.com/matrix-org/mjolnir.git synced 2024-10-01 01:36:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't explode if we fail to leave protected rooms when de-protecting

Browse Source
This commit is contained in:
Travis Ralston 2020-02-19 15:52:41 -07:00
parent ba7ea90fcb
commit 39903ee298
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/commands/AddRemoveProtectedRoomsCommand.ts
View File

@ -15,7 +15,8 @@ limitations under the License.
*/
import { Mjolnir } from "../Mjolnir";
import { RichReply } from "matrix-bot-sdk";
import { LogLevel, LogService, RichReply } from "matrix-bot-sdk";
import { logMessage } from "../LogProxy";
// !mjolnir rooms add <room alias/ID>
export async function execAddProtectedRoom(roomId: string, event: any, mjolnir: Mjolnir, parts: string[]) {
@ -28,6 +29,11 @@ export async function execAddProtectedRoom(roomId: string, event: any, mjolnir:
export async function execRemoveProtectedRoom(roomId: string, event: any, mjolnir: Mjolnir, parts: string[]) {
const protectedRoomId = await mjolnir.client.resolveRoom(parts[3]);
await mjolnir.removeProtectedRoom(protectedRoomId);
await mjolnir.client.leaveRoom(protectedRoomId);
try {
await mjolnir.client.leaveRoom(protectedRoomId);
} catch (e) {
LogService.warn("AddRemoveProtectedRoomsCommand", e);
await logMessage(LogLevel.WARN, "AddRemoveProtectedRoomsCommand", `Failed to leave ${protectedRoomId} - the room is no longer being protected, but the bot could not leave`);
}
await mjolnir.client.unstableApis.addReactionToEvent(roomId, event['event_id'], '✅');
}