From 6f3aad5f2f4cf26bc0e2b23ea617ffe1f5f9d365 Mon Sep 17 00:00:00 2001 From: Dark <7890309+DarkView@users.noreply.github.com> Date: Sat, 3 Apr 2021 21:09:57 +0200 Subject: [PATCH] Add BOT_ALERT for failed invite deletion --- .../plugins/ModActions/functions/actualKickMemberCmd.ts | 8 ++++++-- backend/src/plugins/ModActions/functions/banUserId.ts | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/backend/src/plugins/ModActions/functions/actualKickMemberCmd.ts b/backend/src/plugins/ModActions/functions/actualKickMemberCmd.ts index 783741b1..b3c07e0a 100644 --- a/backend/src/plugins/ModActions/functions/actualKickMemberCmd.ts +++ b/backend/src/plugins/ModActions/functions/actualKickMemberCmd.ts @@ -1,7 +1,7 @@ import { Member, TextChannel } from "eris"; import { LogType } from "../../../data/LogType"; import { IgnoredEventType, ModActionsPluginType } from "../types"; -import { errorMessage, resolveUser, resolveMember } from "../../../utils"; +import { errorMessage, resolveUser, resolveMember, noop } from "../../../utils"; import { GuildPluginData } from "knub"; import { sendErrorMessage, canActOn, sendSuccessMessage } from "../../../pluginUtils"; import { hasPermission } from "knub/dist/helpers"; @@ -80,7 +80,11 @@ export async function actualKickMemberCmd( if (pluginData.config.getForMember(msg.member).delete_invites_on_kick) { const userInvites = (await pluginData.guild.getInvites()).filter(inv => inv.inviter?.id === user.id); userInvites.forEach(invite => { - invite.delete("User kicked from server"); + try { + invite.delete("User kicked from server"); + } catch (e) { + pluginData.state.serverLogs.log(LogType.BOT_ALERT, `Error deleting invite \`${invite.code}\`: ${e}`); + } }); } diff --git a/backend/src/plugins/ModActions/functions/banUserId.ts b/backend/src/plugins/ModActions/functions/banUserId.ts index 3328c3b4..e5cc3383 100644 --- a/backend/src/plugins/ModActions/functions/banUserId.ts +++ b/backend/src/plugins/ModActions/functions/banUserId.ts @@ -100,7 +100,11 @@ export async function banUserId( if (pluginData.config.get().delete_invites_on_ban) { const userInvites = (await pluginData.guild.getInvites()).filter(inv => inv.inviter?.id === user.id); userInvites.forEach(invite => { - invite.delete("User banned from server"); + try { + invite.delete("User banned from server"); + } catch (e) { + pluginData.state.serverLogs.log(LogType.BOT_ALERT, `Error deleting invite \`${invite.code}\`: ${e}`); + } }); }