StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-17 07:05:03 +00:00
Code Releases Activity

Remove permission checks

Browse source
This commit is contained in:
iamshoXy 2023-12-12 15:28:00 +01:00
parent e94e4dba68
commit 50b1151f69
3 changed files with 2 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

14
backend/src/plugins/Slowmode/commands/SlowmodeClearCmd.ts
View file

@ -2,9 +2,6 @@ import { ChannelType, escapeInlineCode } from "discord.js";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
import { asSingleLine, renderUserUsername } from "../../../utils"; 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 { slowmodeCmd } from "../types";
import { clearBotSlowmodeFromUserId } from "../util/clearBotSlowmodeFromUserId"; import { clearBotSlowmodeFromUserId } from "../util/clearBotSlowmodeFromUserId";
@ -26,17 +23,6 @@ export const SlowmodeClearCmd = slowmodeCmd({
return; 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 { try {
if (args.channel.type === ChannelType.GuildText) { if (args.channel.type === ChannelType.GuildText) {
await clearBotSlowmodeFromUserId(pluginData, args.channel, args.user.id, args.force); await clearBotSlowmodeFromUserId(pluginData, args.channel, args.user.id, args.force);

40
backend/src/plugins/Slowmode/commands/SlowmodeSetCmd.ts
View file

@ -1,11 +1,8 @@
import { escapeInlineCode, PermissionsBitField } from "discord.js"; import { escapeInlineCode } from "discord.js";
import humanizeDuration from "humanize-duration"; import humanizeDuration from "humanize-duration";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
import { asSingleLine, DAYS, HOURS, MINUTES } from "../../../utils"; import { DAYS, HOURS, MINUTES, asSingleLine } from "../../../utils";
import { getMissingPermissions } from "../../../utils/getMissingPermissions";
import { missingPermissionError } from "../../../utils/missingPermissionError";
import { BOT_SLOWMODE_PERMISSIONS, NATIVE_SLOWMODE_PERMISSIONS } from "../requiredPermissions";
import { slowmodeCmd } from "../types"; import { slowmodeCmd } from "../types";
import { actualDisableSlowmodeCmd } from "../util/actualDisableSlowmodeCmd"; import { actualDisableSlowmodeCmd } from "../util/actualDisableSlowmodeCmd";
import { disableBotSlowmodeForChannel } from "../util/disableBotSlowmodeForChannel"; import { disableBotSlowmodeForChannel } from "../util/disableBotSlowmodeForChannel";
@ -87,39 +84,6 @@ export const SlowmodeSetCmd = slowmodeCmd({
return; 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! // Apply the slowmode!
const rateLimitSeconds = Math.ceil(args.time / 1000); const rateLimitSeconds = Math.ceil(args.time / 1000);

14
backend/src/plugins/Slowmode/util/actualDisableSlowmodeCmd.ts
View file

@ -1,9 +1,6 @@
import { Message } from "discord.js"; import { Message } from "discord.js";
import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
import { noop } from "../../../utils"; 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"; import { disableBotSlowmodeForChannel } from "./disableBotSlowmodeForChannel";
export async function actualDisableSlowmodeCmd(msg: Message, args, pluginData) { export async function actualDisableSlowmodeCmd(msg: Message, args, pluginData) {
@ -15,17 +12,6 @@ export async function actualDisableSlowmodeCmd(msg: Message, args, pluginData) {
return; 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..."); const initMsg = await msg.channel.send("Disabling slowmode...");
// Disable bot-maintained slowmode // Disable bot-maintained slowmode