From 50b1151f698965b71a2ccd6208449fb9d6861ebc Mon Sep 17 00:00:00 2001 From: iamshoXy Date: Tue, 12 Dec 2023 15:28:00 +0100 Subject: [PATCH] Remove permission checks --- .../Slowmode/commands/SlowmodeClearCmd.ts | 14 ------- .../Slowmode/commands/SlowmodeSetCmd.ts | 40 +------------------ .../Slowmode/util/actualDisableSlowmodeCmd.ts | 14 ------- 3 files changed, 2 insertions(+), 66 deletions(-) diff --git a/backend/src/plugins/Slowmode/commands/SlowmodeClearCmd.ts b/backend/src/plugins/Slowmode/commands/SlowmodeClearCmd.ts index 246a048e..ffa0b9ff 100644 --- a/backend/src/plugins/Slowmode/commands/SlowmodeClearCmd.ts +++ b/backend/src/plugins/Slowmode/commands/SlowmodeClearCmd.ts @@ -2,9 +2,6 @@ import { ChannelType, escapeInlineCode } from "discord.js"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { asSingleLine, renderUserUsername } from "../../../utils"; -import { getMissingChannelPermissions } from "../../../utils/getMissingChannelPermissions"; -import { missingPermissionError } from "../../../utils/missingPermissionError"; -import { BOT_SLOWMODE_CLEAR_PERMISSIONS } from "../requiredPermissions"; import { slowmodeCmd } from "../types"; import { clearBotSlowmodeFromUserId } from "../util/clearBotSlowmodeFromUserId"; @@ -26,17 +23,6 @@ export const SlowmodeClearCmd = slowmodeCmd({ return; } - const me = pluginData.guild.members.cache.get(pluginData.client.user!.id)!; - const missingPermissions = getMissingChannelPermissions(me, args.channel, BOT_SLOWMODE_CLEAR_PERMISSIONS); - if (missingPermissions) { - sendErrorMessage( - pluginData, - msg.channel, - `Unable to clear slowmode. ${missingPermissionError(missingPermissions)}`, - ); - return; - } - try { if (args.channel.type === ChannelType.GuildText) { await clearBotSlowmodeFromUserId(pluginData, args.channel, args.user.id, args.force); diff --git a/backend/src/plugins/Slowmode/commands/SlowmodeSetCmd.ts b/backend/src/plugins/Slowmode/commands/SlowmodeSetCmd.ts index 44d5c111..e49ceea0 100644 --- a/backend/src/plugins/Slowmode/commands/SlowmodeSetCmd.ts +++ b/backend/src/plugins/Slowmode/commands/SlowmodeSetCmd.ts @@ -1,11 +1,8 @@ -import { escapeInlineCode, PermissionsBitField } from "discord.js"; +import { escapeInlineCode } from "discord.js"; import humanizeDuration from "humanize-duration"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; -import { asSingleLine, DAYS, HOURS, MINUTES } from "../../../utils"; -import { getMissingPermissions } from "../../../utils/getMissingPermissions"; -import { missingPermissionError } from "../../../utils/missingPermissionError"; -import { BOT_SLOWMODE_PERMISSIONS, NATIVE_SLOWMODE_PERMISSIONS } from "../requiredPermissions"; +import { DAYS, HOURS, MINUTES, asSingleLine } from "../../../utils"; import { slowmodeCmd } from "../types"; import { actualDisableSlowmodeCmd } from "../util/actualDisableSlowmodeCmd"; import { disableBotSlowmodeForChannel } from "../util/disableBotSlowmodeForChannel"; @@ -87,39 +84,6 @@ export const SlowmodeSetCmd = slowmodeCmd({ return; } - // Verify permissions - const channelPermissions = channel.permissionsFor(pluginData.client.user!.id); - - if (mode === "native") { - const missingPermissions = getMissingPermissions( - channelPermissions ?? new PermissionsBitField(), - NATIVE_SLOWMODE_PERMISSIONS, - ); - if (missingPermissions) { - sendErrorMessage( - pluginData, - msg.channel, - `Unable to set native slowmode. ${missingPermissionError(missingPermissions)}`, - ); - return; - } - } - - if (mode === "bot") { - const missingPermissions = getMissingPermissions( - channelPermissions ?? new PermissionsBitField(), - BOT_SLOWMODE_PERMISSIONS, - ); - if (missingPermissions) { - sendErrorMessage( - pluginData, - msg.channel, - `Unable to set bot managed slowmode. ${missingPermissionError(missingPermissions)}`, - ); - return; - } - } - // Apply the slowmode! const rateLimitSeconds = Math.ceil(args.time / 1000); diff --git a/backend/src/plugins/Slowmode/util/actualDisableSlowmodeCmd.ts b/backend/src/plugins/Slowmode/util/actualDisableSlowmodeCmd.ts index 2bc00bed..e4f90040 100644 --- a/backend/src/plugins/Slowmode/util/actualDisableSlowmodeCmd.ts +++ b/backend/src/plugins/Slowmode/util/actualDisableSlowmodeCmd.ts @@ -1,9 +1,6 @@ import { Message } from "discord.js"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { noop } from "../../../utils"; -import { getMissingChannelPermissions } from "../../../utils/getMissingChannelPermissions"; -import { missingPermissionError } from "../../../utils/missingPermissionError"; -import { BOT_SLOWMODE_DISABLE_PERMISSIONS } from "../requiredPermissions"; import { disableBotSlowmodeForChannel } from "./disableBotSlowmodeForChannel"; export async function actualDisableSlowmodeCmd(msg: Message, args, pluginData) { @@ -15,17 +12,6 @@ export async function actualDisableSlowmodeCmd(msg: Message, args, pluginData) { return; } - const me = pluginData.guild.members.cache.get(pluginData.client.user!.id); - const missingPermissions = getMissingChannelPermissions(me, args.channel, BOT_SLOWMODE_DISABLE_PERMISSIONS); - if (missingPermissions) { - sendErrorMessage( - pluginData, - msg.channel, - `Unable to disable slowmode. ${missingPermissionError(missingPermissions)}`, - ); - return; - } - const initMsg = await msg.channel.send("Disabling slowmode..."); // Disable bot-maintained slowmode