From 7204665e77d8001f2fe5386475e716df6399cbe8 Mon Sep 17 00:00:00 2001 From: ITOH Date: Tue, 15 Feb 2022 21:06:06 +0100 Subject: [PATCH] fix(plugins): await old function return (#2065) * fix(plugins): await old function return * Update plugins/permissions/src/channels/stage.ts lol Co-authored-by: TriForMine Co-authored-by: TriForMine --- .../permissions/src/channels/deleteChannel.ts | 4 ++-- .../src/channels/deleteChannelOverwrite.ts | 4 ++-- .../permissions/src/channels/editChannel.ts | 4 ++-- .../src/channels/editChannelOverwrite.ts | 4 ++-- .../permissions/src/channels/followChannel.ts | 4 ++-- .../src/channels/getChannelWebhooks.ts | 4 ++-- plugins/permissions/src/channels/stage.ts | 12 +++++------ .../permissions/src/channels/swapChannels.ts | 4 ++-- .../src/channels/threads/addToThread.ts | 2 +- .../channels/threads/getArchivedThreads.ts | 2 +- .../src/channels/threads/getThreadMembers.ts | 4 ++-- .../src/channels/threads/joinThread.ts | 4 ++-- .../src/channels/threads/leaveThread.ts | 4 ++-- .../channels/threads/removeThreadMember.ts | 2 +- .../permissions/src/connectToVoiceChannels.ts | 2 +- plugins/permissions/src/discovery.ts | 16 +++++++-------- plugins/permissions/src/editMember.ts | 2 +- plugins/permissions/src/emojis.ts | 12 +++++------ plugins/permissions/src/guilds/createGuild.ts | 4 ++-- plugins/permissions/src/guilds/deleteGuild.ts | 4 ++-- plugins/permissions/src/guilds/editGuild.ts | 4 ++-- plugins/permissions/src/guilds/events.ts | 8 ++++---- .../permissions/src/guilds/getAuditLogs.ts | 4 ++-- plugins/permissions/src/guilds/getBan.ts | 4 ++-- plugins/permissions/src/guilds/getBans.ts | 4 ++-- .../permissions/src/guilds/getPruneCount.ts | 4 ++-- .../permissions/src/guilds/getVanityUrl.ts | 4 ++-- .../permissions/src/guilds/welcomeScreen.ts | 8 ++++---- plugins/permissions/src/guilds/widget.ts | 4 ++-- plugins/permissions/src/integrations.ts | 8 ++++---- .../permissions/src/interactions/commands.ts | 8 ++++---- .../src/interactions/editFollowupMessage.ts | 4 ++-- plugins/permissions/src/invites.ts | 12 +++++------ plugins/permissions/src/members/ban.ts | 8 ++++---- plugins/permissions/src/members/editBot.ts | 4 ++-- plugins/permissions/src/members/editMember.ts | 4 ++-- plugins/permissions/src/members/kickMember.ts | 4 ++-- .../permissions/src/members/pruneMembers.ts | 4 ++-- plugins/permissions/src/messages/create.ts | 4 ++-- plugins/permissions/src/messages/delete.ts | 8 ++++---- plugins/permissions/src/messages/get.ts | 8 ++++---- plugins/permissions/src/messages/pin.ts | 8 ++++---- plugins/permissions/src/messages/reactions.ts | 20 +++++++++---------- plugins/permissions/src/misc/mod.ts | 4 ++-- plugins/permissions/src/roles/add.ts | 4 ++-- plugins/permissions/src/roles/create.ts | 4 ++-- plugins/permissions/src/roles/delete.ts | 4 ++-- plugins/permissions/src/roles/edit.ts | 4 ++-- plugins/permissions/src/roles/remove.ts | 4 ++-- .../permissions/src/webhooks/createWebhook.ts | 4 ++-- .../permissions/src/webhooks/deleteWebhook.ts | 4 ++-- .../permissions/src/webhooks/editWebhook.ts | 4 ++-- plugins/permissions/src/webhooks/message.ts | 4 ++-- .../permissions/src/webhooks/sendWebhook.ts | 4 ++-- r.ts | 16 +++++++++++++++ 55 files changed, 161 insertions(+), 145 deletions(-) create mode 100644 r.ts diff --git a/plugins/permissions/src/channels/deleteChannel.ts b/plugins/permissions/src/channels/deleteChannel.ts index cdc0ff571..10677f27e 100644 --- a/plugins/permissions/src/channels/deleteChannel.ts +++ b/plugins/permissions/src/channels/deleteChannel.ts @@ -4,7 +4,7 @@ import { requireBotGuildPermissions } from "../permissions.ts"; export default function deleteChannel(bot: BotWithCache) { const deleteChannelOld = bot.helpers.deleteChannel; - bot.helpers.deleteChannel = function (channelId, reason) { + bot.helpers.deleteChannel = async function (channelId, reason) { const channel = bot.channels.get(channelId); if (channel?.guildId) { @@ -32,6 +32,6 @@ export default function deleteChannel(bot: BotWithCache) { ); } - return deleteChannelOld(channelId, reason); + return await deleteChannelOld(channelId, reason); }; } diff --git a/plugins/permissions/src/channels/deleteChannelOverwrite.ts b/plugins/permissions/src/channels/deleteChannelOverwrite.ts index 58801e8c3..6c57ce019 100644 --- a/plugins/permissions/src/channels/deleteChannelOverwrite.ts +++ b/plugins/permissions/src/channels/deleteChannelOverwrite.ts @@ -4,13 +4,13 @@ import { requireBotChannelPermissions } from "../permissions.ts"; export default function deleteChannelOverwrite(bot: BotWithCache) { const deleteChannelOverwriteOld = bot.helpers.deleteChannelOverwrite; - bot.helpers.deleteChannelOverwrite = function (channelId, overwriteId) { + bot.helpers.deleteChannelOverwrite = async function (channelId, overwriteId) { const channel = bot.channels.get(channelId); if (channel?.guildId) { requireBotChannelPermissions(bot, channelId, ["MANAGE_ROLES"]); } - return deleteChannelOverwriteOld(channelId, overwriteId); + return await deleteChannelOverwriteOld(channelId, overwriteId); }; } diff --git a/plugins/permissions/src/channels/editChannel.ts b/plugins/permissions/src/channels/editChannel.ts index 41d83a19d..fb96828ee 100644 --- a/plugins/permissions/src/channels/editChannel.ts +++ b/plugins/permissions/src/channels/editChannel.ts @@ -5,7 +5,7 @@ import { requireBotChannelPermissions } from "../permissions.ts"; export default function editChannel(bot: BotWithCache) { const editChannelOld = bot.helpers.editChannel; - bot.helpers.editChannel = function (channelId, options, reason) { + bot.helpers.editChannel = async function (channelId, options, reason) { const channel = bot.channels.get(channelId); if (channel?.guildId) { @@ -118,6 +118,6 @@ export default function editChannel(bot: BotWithCache) { } } - return editChannelOld(channelId, options, reason); + return await editChannelOld(channelId, options, reason); }; } diff --git a/plugins/permissions/src/channels/editChannelOverwrite.ts b/plugins/permissions/src/channels/editChannelOverwrite.ts index 287b5e8ba..b6e721eb9 100644 --- a/plugins/permissions/src/channels/editChannelOverwrite.ts +++ b/plugins/permissions/src/channels/editChannelOverwrite.ts @@ -4,12 +4,12 @@ import { requireBotChannelPermissions } from "../permissions.ts"; export default function editChannelOverwrite(bot: BotWithCache) { const editChannelOverwriteOld = bot.helpers.editChannelOverwrite; - bot.helpers.editChannelOverwrite = function (channelId, overwriteId, options) { + bot.helpers.editChannelOverwrite = async function (channelId, overwriteId, options) { const channel = bot.channels.get(channelId); if (channel?.guildId) { requireBotChannelPermissions(bot, channelId, ["MANAGE_ROLES"]); } - return editChannelOverwriteOld(channelId, overwriteId, options); + return await editChannelOverwriteOld(channelId, overwriteId, options); }; } diff --git a/plugins/permissions/src/channels/followChannel.ts b/plugins/permissions/src/channels/followChannel.ts index b5bf0fd7c..9505ea78f 100644 --- a/plugins/permissions/src/channels/followChannel.ts +++ b/plugins/permissions/src/channels/followChannel.ts @@ -4,12 +4,12 @@ import { requireBotChannelPermissions } from "../permissions.ts"; export default function followChannel(bot: BotWithCache) { const followChannelOld = bot.helpers.followChannel; - bot.helpers.followChannel = function (sourceChannelId, targetChannelId) { + bot.helpers.followChannel = async function (sourceChannelId, targetChannelId) { const channel = bot.channels.get(targetChannelId); if (channel?.guildId) { requireBotChannelPermissions(bot, channel, ["MANAGE_WEBHOOKS"]); } - return followChannelOld(sourceChannelId, targetChannelId); + return await followChannelOld(sourceChannelId, targetChannelId); }; } diff --git a/plugins/permissions/src/channels/getChannelWebhooks.ts b/plugins/permissions/src/channels/getChannelWebhooks.ts index 6f4e672ee..15b911ea5 100644 --- a/plugins/permissions/src/channels/getChannelWebhooks.ts +++ b/plugins/permissions/src/channels/getChannelWebhooks.ts @@ -4,12 +4,12 @@ import { requireBotChannelPermissions } from "../permissions.ts"; export default function getChannelWebhooks(bot: BotWithCache) { const getChannelWebhooksOld = bot.helpers.getChannelWebhooks; - bot.helpers.getChannelWebhooks = function (channelId) { + bot.helpers.getChannelWebhooks = async function (channelId) { const channel = bot.channels.get(channelId); if (channel?.guildId) { requireBotChannelPermissions(bot, channelId, ["MANAGE_WEBHOOKS"]); } - return getChannelWebhooksOld(channelId); + return await getChannelWebhooksOld(channelId); }; } diff --git a/plugins/permissions/src/channels/stage.ts b/plugins/permissions/src/channels/stage.ts index 9d8f2bba6..06f86de31 100644 --- a/plugins/permissions/src/channels/stage.ts +++ b/plugins/permissions/src/channels/stage.ts @@ -4,7 +4,7 @@ import { requireBotChannelPermissions } from "../permissions.ts"; export function createStageInstance(bot: BotWithCache) { const createStageInstanceOld = bot.helpers.createStageInstance; - bot.helpers.createStageInstance = function (channelId, topic, privacyLevel) { + bot.helpers.createStageInstance = async function (channelId, topic, privacyLevel) { if (!bot.utils.validateLength(topic, { max: 120, min: 1 })) { throw new Error( "The topic length for creating a stage instance must be between 1-120.", @@ -17,35 +17,35 @@ export function createStageInstance(bot: BotWithCache) { "MOVE_MEMBERS", ]); - return createStageInstanceOld(channelId, topic, privacyLevel); + return await createStageInstanceOld(channelId, topic, privacyLevel); }; } export function deleteStageInstance(bot: BotWithCache) { const deleteStageInstanceOld = bot.helpers.deleteStageInstance; - bot.helpers.deleteStageInstance = function (channelId) { + bot.helpers.deleteStageInstance = async function (channelId) { requireBotChannelPermissions(bot, channelId, [ "MANAGE_CHANNELS", "MUTE_MEMBERS", "MOVE_MEMBERS", ]); - return deleteStageInstanceOld(channelId); + return await deleteStageInstanceOld(channelId); }; } export function updateStageInstance(bot: BotWithCache) { const updateStageInstanceOld = bot.helpers.updateStageInstance; - bot.helpers.updateStageInstance = function (channelId, data) { + bot.helpers.updateStageInstance = async function (channelId, data) { requireBotChannelPermissions(bot, channelId, [ "MANAGE_CHANNELS", "MUTE_MEMBERS", "MOVE_MEMBERS", ]); - return updateStageInstanceOld(channelId, data); + return await updateStageInstanceOld(channelId, data); }; } diff --git a/plugins/permissions/src/channels/swapChannels.ts b/plugins/permissions/src/channels/swapChannels.ts index 0dea16998..61680d46b 100644 --- a/plugins/permissions/src/channels/swapChannels.ts +++ b/plugins/permissions/src/channels/swapChannels.ts @@ -4,9 +4,9 @@ import { requireBotGuildPermissions } from "../permissions.ts"; export default function swapChannels(bot: BotWithCache) { const swapChannelsOld = bot.helpers.swapChannels; - bot.helpers.swapChannels = function (guildId, channelPositions) { + bot.helpers.swapChannels = async function (guildId, channelPositions) { requireBotGuildPermissions(bot, guildId, ["MANAGE_CHANNELS"]); - return swapChannelsOld(guildId, channelPositions); + return await swapChannelsOld(guildId, channelPositions); }; } diff --git a/plugins/permissions/src/channels/threads/addToThread.ts b/plugins/permissions/src/channels/threads/addToThread.ts index c052477e1..000d20d63 100644 --- a/plugins/permissions/src/channels/threads/addToThread.ts +++ b/plugins/permissions/src/channels/threads/addToThread.ts @@ -21,6 +21,6 @@ export default function addToThread(bot: BotWithCache) { await requireBotChannelPermissions(bot, channel, ["SEND_MESSAGES"]); } - return addToThreadOld(threadId, userId); + return await addToThreadOld(threadId, userId); }; } diff --git a/plugins/permissions/src/channels/threads/getArchivedThreads.ts b/plugins/permissions/src/channels/threads/getArchivedThreads.ts index 92e9db3e0..48ce2aa25 100644 --- a/plugins/permissions/src/channels/threads/getArchivedThreads.ts +++ b/plugins/permissions/src/channels/threads/getArchivedThreads.ts @@ -15,6 +15,6 @@ export default function getArchivedThreads(bot: BotWithCache) { ); } - return getArchivedThreadsOld(channelId, options); + return await getArchivedThreadsOld(channelId, options); }; } diff --git a/plugins/permissions/src/channels/threads/getThreadMembers.ts b/plugins/permissions/src/channels/threads/getThreadMembers.ts index 0d2881895..3a5ff6096 100644 --- a/plugins/permissions/src/channels/threads/getThreadMembers.ts +++ b/plugins/permissions/src/channels/threads/getThreadMembers.ts @@ -3,7 +3,7 @@ import { BotWithCache, GatewayIntents } from "../../../deps.ts"; export default function getThreadMembers(bot: BotWithCache) { const getThreadMembersOld = bot.helpers.getThreadMembers; - bot.helpers.getThreadMembers = function (threadId) { + bot.helpers.getThreadMembers = async function (threadId) { const hasIntent = bot.intents & GatewayIntents.GuildMembers; if (!hasIntent) { throw new Error( @@ -11,6 +11,6 @@ export default function getThreadMembers(bot: BotWithCache) { ); } - return getThreadMembersOld(threadId); + return await getThreadMembersOld(threadId); }; } diff --git a/plugins/permissions/src/channels/threads/joinThread.ts b/plugins/permissions/src/channels/threads/joinThread.ts index 521bf9f7d..c50a06d7e 100644 --- a/plugins/permissions/src/channels/threads/joinThread.ts +++ b/plugins/permissions/src/channels/threads/joinThread.ts @@ -3,13 +3,13 @@ import { BotWithCache } from "../../../deps.ts"; export default function joinThread(bot: BotWithCache) { const joinThreadOld = bot.helpers.joinThread; - bot.helpers.joinThread = function (threadId) { + bot.helpers.joinThread = async function (threadId) { const channel = bot.channels.get(threadId); if (channel && !channel.archived) { throw new Error("You can not join an archived channel."); } - return joinThreadOld(threadId); + return await joinThreadOld(threadId); }; } diff --git a/plugins/permissions/src/channels/threads/leaveThread.ts b/plugins/permissions/src/channels/threads/leaveThread.ts index 24cd71599..3ff3d455a 100644 --- a/plugins/permissions/src/channels/threads/leaveThread.ts +++ b/plugins/permissions/src/channels/threads/leaveThread.ts @@ -3,13 +3,13 @@ import { BotWithCache } from "../../../deps.ts"; export default function leaveThread(bot: BotWithCache) { const leaveThreadOld = bot.helpers.leaveThread; - bot.helpers.leaveThread = function (threadId) { + bot.helpers.leaveThread = async function (threadId) { const channel = bot.channels.get(threadId); if (channel && !channel.archived) { throw new Error("You can not leave an archived channel."); } - return leaveThreadOld(threadId); + return await leaveThreadOld(threadId); }; } diff --git a/plugins/permissions/src/channels/threads/removeThreadMember.ts b/plugins/permissions/src/channels/threads/removeThreadMember.ts index 14e935934..fabd893ec 100644 --- a/plugins/permissions/src/channels/threads/removeThreadMember.ts +++ b/plugins/permissions/src/channels/threads/removeThreadMember.ts @@ -28,6 +28,6 @@ export default function removeThreadMember(bot: BotWithCache) { } } - return removeThreadMemberOld(threadId, userId); + return await removeThreadMemberOld(threadId, userId); }; } diff --git a/plugins/permissions/src/connectToVoiceChannels.ts b/plugins/permissions/src/connectToVoiceChannels.ts index 7f9fbe016..26f40fd5e 100644 --- a/plugins/permissions/src/connectToVoiceChannels.ts +++ b/plugins/permissions/src/connectToVoiceChannels.ts @@ -40,6 +40,6 @@ export default function connectToVoiceChannel(bot: BotWithCache) { await requireBotChannelPermissions(bot, channel, permsNeeded); - return connectToVoiceChannelOld(guildId, channelId, options); + return await connectToVoiceChannelOld(guildId, channelId, options); }; } diff --git a/plugins/permissions/src/discovery.ts b/plugins/permissions/src/discovery.ts index caec07517..9ae3fe6ab 100644 --- a/plugins/permissions/src/discovery.ts +++ b/plugins/permissions/src/discovery.ts @@ -4,40 +4,40 @@ import { requireBotGuildPermissions } from "./permissions.ts"; export function addDiscoverySubcategory(bot: BotWithCache) { const addDiscoverySubcategoryOld = bot.helpers.addDiscoverySubcategory; - bot.helpers.addDiscoverySubcategory = function (guildId, categoryId) { + bot.helpers.addDiscoverySubcategory = async function (guildId, categoryId) { requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); - return addDiscoverySubcategoryOld(guildId, categoryId); + return await addDiscoverySubcategoryOld(guildId, categoryId); }; } export function removeDiscoverySubcategory(bot: BotWithCache) { const removeDiscoverySubcategoryOld = bot.helpers.removeDiscoverySubcategory; - bot.helpers.removeDiscoverySubcategory = function (guildId, categoryId) { + bot.helpers.removeDiscoverySubcategory = async function (guildId, categoryId) { requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); - return removeDiscoverySubcategoryOld(guildId, categoryId); + return await removeDiscoverySubcategoryOld(guildId, categoryId); }; } export function getDiscovery(bot: BotWithCache) { const getDiscoveryOld = bot.helpers.getDiscovery; - bot.helpers.getDiscovery = function (guildId) { + bot.helpers.getDiscovery = async function (guildId) { requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); - return getDiscoveryOld(guildId); + return await getDiscoveryOld(guildId); }; } export function editDiscovery(bot: BotWithCache) { const editDiscoveryOld = bot.helpers.editDiscovery; - bot.helpers.editDiscovery = function (guildId, data) { + bot.helpers.editDiscovery = async function (guildId, data) { requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); - return editDiscoveryOld(guildId, data); + return await editDiscoveryOld(guildId, data); }; } diff --git a/plugins/permissions/src/editMember.ts b/plugins/permissions/src/editMember.ts index c54b8d8fc..984b5bcdd 100644 --- a/plugins/permissions/src/editMember.ts +++ b/plugins/permissions/src/editMember.ts @@ -59,6 +59,6 @@ export default function editMember(bot: BotWithCache) { ...requiredPerms, ]); - return editMemberOld(guildId, memberId, options); + return await editMemberOld(guildId, memberId, options); }; } diff --git a/plugins/permissions/src/emojis.ts b/plugins/permissions/src/emojis.ts index e34f4880f..47d624790 100644 --- a/plugins/permissions/src/emojis.ts +++ b/plugins/permissions/src/emojis.ts @@ -4,30 +4,30 @@ import { requireBotGuildPermissions } from "./permissions.ts"; export function createEmoji(bot: BotWithCache) { const createEmojiOld = bot.helpers.createEmoji; - bot.helpers.createEmoji = function (guildId, id) { + bot.helpers.createEmoji = async function (guildId, id) { requireBotGuildPermissions(bot, guildId, ["MANAGE_EMOJIS"]); - return createEmojiOld(guildId, id); + return await createEmojiOld(guildId, id); }; } export function deleteEmoji(bot: BotWithCache) { const deleteEmojiOld = bot.helpers.deleteEmoji; - bot.helpers.deleteEmoji = function (guildId, id) { + bot.helpers.deleteEmoji = async function (guildId, id) { requireBotGuildPermissions(bot, guildId, ["MANAGE_EMOJIS"]); - return deleteEmojiOld(guildId, id); + return await deleteEmojiOld(guildId, id); }; } export function editEmoji(bot: BotWithCache) { const editEmojiOld = bot.helpers.editEmoji; - bot.helpers.editEmoji = function (guildId, id, options) { + bot.helpers.editEmoji = async function (guildId, id, options) { requireBotGuildPermissions(bot, guildId, ["MANAGE_EMOJIS"]); - return editEmojiOld(guildId, id, options); + return await editEmojiOld(guildId, id, options); }; } diff --git a/plugins/permissions/src/guilds/createGuild.ts b/plugins/permissions/src/guilds/createGuild.ts index a70a2c701..8524a0022 100644 --- a/plugins/permissions/src/guilds/createGuild.ts +++ b/plugins/permissions/src/guilds/createGuild.ts @@ -3,7 +3,7 @@ import { BotWithCache } from "../../deps.ts"; export default function createGuild(bot: BotWithCache) { const createGuildOld = bot.helpers.createGuild; - bot.helpers.createGuild = function (options) { + bot.helpers.createGuild = async function (options) { if (bot.guilds.size > 10) { throw new Error( "A bot can not create a guild if it is already in 10 guilds.", @@ -17,6 +17,6 @@ export default function createGuild(bot: BotWithCache) { throw new Error("The guild name must be between 2 and 100 characters."); } - return createGuildOld(options); + return await createGuildOld(options); }; } diff --git a/plugins/permissions/src/guilds/deleteGuild.ts b/plugins/permissions/src/guilds/deleteGuild.ts index a56a8abd9..41cfda5e2 100644 --- a/plugins/permissions/src/guilds/deleteGuild.ts +++ b/plugins/permissions/src/guilds/deleteGuild.ts @@ -3,12 +3,12 @@ import { BotWithCache } from "../../deps.ts"; export default function deleteGuild(bot: BotWithCache) { const deleteGuildOld = bot.helpers.deleteGuild; - bot.helpers.deleteGuild = function (guildId) { + bot.helpers.deleteGuild = async function (guildId) { const guild = bot.guilds.get(guildId); if (guild && guild.ownerId !== bot.id) { throw new Error("A bot can only delete a guild it owns."); } - return deleteGuildOld(guildId); + return await deleteGuildOld(guildId); }; } diff --git a/plugins/permissions/src/guilds/editGuild.ts b/plugins/permissions/src/guilds/editGuild.ts index da4cc419e..c485749f4 100644 --- a/plugins/permissions/src/guilds/editGuild.ts +++ b/plugins/permissions/src/guilds/editGuild.ts @@ -4,9 +4,9 @@ import { requireBotGuildPermissions } from "../permissions.ts"; export default function editGuild(bot: BotWithCache) { const editGuildOld = bot.helpers.editGuild; - bot.helpers.editGuild = function (guildId, options, shardId) { + bot.helpers.editGuild = async function (guildId, options, shardId) { requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); - return editGuildOld(guildId, options, shardId); + return await editGuildOld(guildId, options, shardId); }; } diff --git a/plugins/permissions/src/guilds/events.ts b/plugins/permissions/src/guilds/events.ts index f4a39cc63..eff9817c9 100644 --- a/plugins/permissions/src/guilds/events.ts +++ b/plugins/permissions/src/guilds/events.ts @@ -4,7 +4,7 @@ import { requireBotChannelPermissions, requireBotGuildPermissions } from "../per export function createScheduledEvent(bot: BotWithCache) { const createScheduledEventOld = bot.helpers.createScheduledEvent; - bot.helpers.createScheduledEvent = function (guildId, options) { + bot.helpers.createScheduledEvent = async function (guildId, options) { if (options.entityType === ScheduledEventEntityType.StageInstance) { if (!options.channelId) { throw new Error( @@ -64,14 +64,14 @@ export function createScheduledEvent(bot: BotWithCache) { "MANAGE_EVENTS", ]); - return createScheduledEventOld(guildId, options); + return await createScheduledEventOld(guildId, options); }; } export function editScheduledEvent(bot: BotWithCache) { const editScheduledEventOld = bot.helpers.editScheduledEvent; - bot.helpers.editScheduledEvent = function (guildId, eventId, options) { + bot.helpers.editScheduledEvent = async function (guildId, eventId, options) { if (options.entityType === ScheduledEventEntityType.StageInstance) { if (!options.channelId) { throw new Error( @@ -131,7 +131,7 @@ export function editScheduledEvent(bot: BotWithCache) { "MANAGE_EVENTS", ]); - return editScheduledEventOld(guildId, eventId, options); + return await editScheduledEventOld(guildId, eventId, options); }; } diff --git a/plugins/permissions/src/guilds/getAuditLogs.ts b/plugins/permissions/src/guilds/getAuditLogs.ts index 528080520..219398ba4 100644 --- a/plugins/permissions/src/guilds/getAuditLogs.ts +++ b/plugins/permissions/src/guilds/getAuditLogs.ts @@ -4,9 +4,9 @@ import { requireBotGuildPermissions } from "../permissions.ts"; export default function getAuditLogs(bot: BotWithCache) { const getAuditLogsOld = bot.helpers.getAuditLogs; - bot.helpers.getAuditLogs = function (guildId, options) { + bot.helpers.getAuditLogs = async function (guildId, options) { requireBotGuildPermissions(bot, guildId, ["VIEW_AUDIT_LOG"]); - return getAuditLogsOld(guildId, options); + return await getAuditLogsOld(guildId, options); }; } diff --git a/plugins/permissions/src/guilds/getBan.ts b/plugins/permissions/src/guilds/getBan.ts index 3e745d165..49736ac12 100644 --- a/plugins/permissions/src/guilds/getBan.ts +++ b/plugins/permissions/src/guilds/getBan.ts @@ -4,9 +4,9 @@ import { requireBotGuildPermissions } from "../permissions.ts"; export default function getBan(bot: BotWithCache) { const getBanOld = bot.helpers.getBan; - bot.helpers.getBan = function (guildId, memberId) { + bot.helpers.getBan = async function (guildId, memberId) { requireBotGuildPermissions(bot, guildId, ["BAN_MEMBERS"]); - return getBanOld(guildId, memberId); + return await getBanOld(guildId, memberId); }; } diff --git a/plugins/permissions/src/guilds/getBans.ts b/plugins/permissions/src/guilds/getBans.ts index b5a9ceec6..f59c62ee4 100644 --- a/plugins/permissions/src/guilds/getBans.ts +++ b/plugins/permissions/src/guilds/getBans.ts @@ -4,9 +4,9 @@ import { requireBotGuildPermissions } from "../permissions.ts"; export default function getBans(bot: BotWithCache) { const getBansOld = bot.helpers.getBans; - bot.helpers.getBans = function (guildId) { + bot.helpers.getBans = async function (guildId) { requireBotGuildPermissions(bot, guildId, ["BAN_MEMBERS"]); - return getBansOld(guildId); + return await getBansOld(guildId); }; } diff --git a/plugins/permissions/src/guilds/getPruneCount.ts b/plugins/permissions/src/guilds/getPruneCount.ts index 521d43f75..2669b57c4 100644 --- a/plugins/permissions/src/guilds/getPruneCount.ts +++ b/plugins/permissions/src/guilds/getPruneCount.ts @@ -4,9 +4,9 @@ import { requireBotGuildPermissions } from "../permissions.ts"; export default function getPruneCount(bot: BotWithCache) { const getPruneCountOld = bot.helpers.getPruneCount; - bot.helpers.getPruneCount = function (guildId, options) { + bot.helpers.getPruneCount = async function (guildId, options) { requireBotGuildPermissions(bot, guildId, ["KICK_MEMBERS"]); - return getPruneCountOld(guildId, options); + return await getPruneCountOld(guildId, options); }; } diff --git a/plugins/permissions/src/guilds/getVanityUrl.ts b/plugins/permissions/src/guilds/getVanityUrl.ts index acc31ce9e..a957f8ca2 100644 --- a/plugins/permissions/src/guilds/getVanityUrl.ts +++ b/plugins/permissions/src/guilds/getVanityUrl.ts @@ -4,9 +4,9 @@ import { requireBotGuildPermissions } from "../permissions.ts"; export default function getVanityUrl(bot: BotWithCache) { const getVanityUrlOld = bot.helpers.getVanityUrl; - bot.helpers.getVanityUrl = function (guildId) { + bot.helpers.getVanityUrl = async function (guildId) { requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); - return getVanityUrlOld(guildId); + return await getVanityUrlOld(guildId); }; } diff --git a/plugins/permissions/src/guilds/welcomeScreen.ts b/plugins/permissions/src/guilds/welcomeScreen.ts index 7da106632..e8ae7a073 100644 --- a/plugins/permissions/src/guilds/welcomeScreen.ts +++ b/plugins/permissions/src/guilds/welcomeScreen.ts @@ -4,23 +4,23 @@ import { requireBotGuildPermissions } from "../permissions.ts"; export function getWelcomeScreen(bot: BotWithCache) { const getWelcomeScreenOld = bot.helpers.getWelcomeScreen; - bot.helpers.getWelcomeScreen = function (guildId) { + bot.helpers.getWelcomeScreen = async function (guildId) { const guild = bot.guilds.get(guildId); if (!guild?.welcomeScreen) { requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); } - return getWelcomeScreenOld(guildId); + return await getWelcomeScreenOld(guildId); }; } export function editWelcomeScreen(bot: BotWithCache) { const editWelcomeScreenOld = bot.helpers.editWelcomeScreen; - bot.helpers.editWelcomeScreen = function (guildId, options) { + bot.helpers.editWelcomeScreen = async function (guildId, options) { requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); - return editWelcomeScreenOld(guildId, options); + return await editWelcomeScreenOld(guildId, options); }; } diff --git a/plugins/permissions/src/guilds/widget.ts b/plugins/permissions/src/guilds/widget.ts index 5b95c1666..68ba9f72d 100644 --- a/plugins/permissions/src/guilds/widget.ts +++ b/plugins/permissions/src/guilds/widget.ts @@ -4,10 +4,10 @@ import { requireBotGuildPermissions } from "../permissions.ts"; export function editWidget(bot: BotWithCache) { const editWidgetOld = bot.helpers.editWidget; - bot.helpers.editWidget = function (guildId, enabled, channelId) { + bot.helpers.editWidget = async function (guildId, enabled, channelId) { requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); - return editWidgetOld(guildId, enabled, channelId); + return await editWidgetOld(guildId, enabled, channelId); }; } diff --git a/plugins/permissions/src/integrations.ts b/plugins/permissions/src/integrations.ts index b340dbe18..c7fc1876f 100644 --- a/plugins/permissions/src/integrations.ts +++ b/plugins/permissions/src/integrations.ts @@ -4,20 +4,20 @@ import { requireBotGuildPermissions } from "./permissions.ts"; export function deleteIntegration(bot: BotWithCache) { const deleteIntegrationOld = bot.helpers.deleteIntegration; - bot.helpers.deleteIntegration = function (guildId, id) { + bot.helpers.deleteIntegration = async function (guildId, id) { requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); - return deleteIntegrationOld(guildId, id); + return await deleteIntegrationOld(guildId, id); }; } export function getIntegrations(bot: BotWithCache) { const getIntegrationsOld = bot.helpers.getIntegrations; - bot.helpers.getIntegrations = function (guildId) { + bot.helpers.getIntegrations = async function (guildId) { requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); - return getIntegrationsOld(guildId); + return await getIntegrationsOld(guildId); }; } diff --git a/plugins/permissions/src/interactions/commands.ts b/plugins/permissions/src/interactions/commands.ts index e8a2ff7fe..5c369e26c 100644 --- a/plugins/permissions/src/interactions/commands.ts +++ b/plugins/permissions/src/interactions/commands.ts @@ -76,7 +76,7 @@ export function validateApplicationCommandOptions( export function createApplicationCommand(bot: BotWithCache) { const createApplicationCommandOld = bot.helpers.createApplicationCommand; - bot.helpers.createApplicationCommand = function (options, guildId) { + bot.helpers.createApplicationCommand = async function (options, guildId) { const isChatInput = !options.type || options.type === ApplicationCommandTypes.ChatInput; @@ -135,14 +135,14 @@ export function createApplicationCommand(bot: BotWithCache) { options.options = validateApplicationCommandOptions(bot, options.options); } - return createApplicationCommandOld(options, guildId); + return await createApplicationCommandOld(options, guildId); }; } export function editInteractionResponse(bot: BotWithCache) { const editInteractionResponseOld = bot.helpers.editInteractionResponse; - bot.helpers.editInteractionResponse = function (token, options) { + bot.helpers.editInteractionResponse = async function (token, options) { if (options.content && options.content.length > 2000) { throw Error(bot.constants.Errors.MESSAGE_MAX_LENGTH); } @@ -191,7 +191,7 @@ export function editInteractionResponse(bot: BotWithCache) { } } - return editInteractionResponseOld(token, options); + return await editInteractionResponseOld(token, options); }; } diff --git a/plugins/permissions/src/interactions/editFollowupMessage.ts b/plugins/permissions/src/interactions/editFollowupMessage.ts index d9abb9a94..0917417d8 100644 --- a/plugins/permissions/src/interactions/editFollowupMessage.ts +++ b/plugins/permissions/src/interactions/editFollowupMessage.ts @@ -3,7 +3,7 @@ import { AllowedMentionsTypes, BotWithCache } from "../../deps.ts"; export default function editFollowupMessage(bot: BotWithCache) { const editFollowupMessageOld = bot.helpers.editFollowupMessage; - bot.helpers.editFollowupMessage = function ( + bot.helpers.editFollowupMessage = async function ( token, messageId, options, @@ -56,6 +56,6 @@ export default function editFollowupMessage(bot: BotWithCache) { } } - return editFollowupMessageOld(token, messageId, options); + return await editFollowupMessageOld(token, messageId, options); }; } diff --git a/plugins/permissions/src/invites.ts b/plugins/permissions/src/invites.ts index 32a1dd47b..a10b02a6c 100644 --- a/plugins/permissions/src/invites.ts +++ b/plugins/permissions/src/invites.ts @@ -4,7 +4,7 @@ import { requireBotChannelPermissions } from "./permissions.ts"; export function createInvite(bot: BotWithCache) { const createInviteOld = bot.helpers.createInvite; - bot.helpers.createInvite = function (channelId, options = {}) { + bot.helpers.createInvite = async function (channelId, options = {}) { if (options.maxAge && (options.maxAge < 0 || options.maxAge > 604800)) { throw new Error( "The max age for an invite must be between 0 and 604800.", @@ -16,27 +16,27 @@ export function createInvite(bot: BotWithCache) { requireBotChannelPermissions(bot, channelId, ["CREATE_INSTANT_INVITE"]); - return createInviteOld(channelId, options); + return await createInviteOld(channelId, options); }; } export function getChannelInvites(bot: BotWithCache) { const getChannelInvitesOld = bot.helpers.getChannelInvites; - bot.helpers.getChannelInvites = function (channelId) { + bot.helpers.getChannelInvites = async function (channelId) { requireBotChannelPermissions(bot, channelId, ["MANAGE_CHANNELS"]); - return getChannelInvitesOld(channelId); + return await getChannelInvitesOld(channelId); }; } export function getInvites(bot: BotWithCache) { const getInvitesOld = bot.helpers.getInvites; - bot.helpers.getInvites = function (guildId) { + bot.helpers.getInvites = async function (guildId) { requireBotChannelPermissions(bot, guildId, ["MANAGE_GUILD"]); - return getInvitesOld(guildId); + return await getInvitesOld(guildId); }; } diff --git a/plugins/permissions/src/members/ban.ts b/plugins/permissions/src/members/ban.ts index b1c6d729e..31031c59c 100644 --- a/plugins/permissions/src/members/ban.ts +++ b/plugins/permissions/src/members/ban.ts @@ -4,20 +4,20 @@ import { requireBotGuildPermissions } from "../permissions.ts"; export function banMember(bot: BotWithCache) { const banMemberOld = bot.helpers.banMember; - bot.helpers.banMember = function (guildId, id, options) { + bot.helpers.banMember = async function (guildId, id, options) { requireBotGuildPermissions(bot, guildId, ["BAN_MEMBERS"]); - return banMemberOld(guildId, id, options); + return await banMemberOld(guildId, id, options); }; } export function unbanMember(bot: BotWithCache) { const unbanMemberOld = bot.helpers.unbanMember; - bot.helpers.unbanMember = function (guildId, id) { + bot.helpers.unbanMember = async function (guildId, id) { requireBotGuildPermissions(bot, guildId, ["BAN_MEMBERS"]); - return unbanMemberOld(guildId, id); + return await unbanMemberOld(guildId, id); }; } diff --git a/plugins/permissions/src/members/editBot.ts b/plugins/permissions/src/members/editBot.ts index 0d246add5..cd7e94706 100644 --- a/plugins/permissions/src/members/editBot.ts +++ b/plugins/permissions/src/members/editBot.ts @@ -4,9 +4,9 @@ import { requireBotGuildPermissions } from "../permissions.ts"; export default function editBotNickname(bot: BotWithCache) { const editBotNicknameOld = bot.helpers.editBotNickname; - bot.helpers.editBotNickname = function (guildId, options) { + bot.helpers.editBotNickname = async function (guildId, options) { requireBotGuildPermissions(bot, guildId, ["CHANGE_NICKNAME"]); - return editBotNicknameOld(guildId, options); + return await editBotNicknameOld(guildId, options); }; } diff --git a/plugins/permissions/src/members/editMember.ts b/plugins/permissions/src/members/editMember.ts index 8c4f069bc..1b16b9740 100644 --- a/plugins/permissions/src/members/editMember.ts +++ b/plugins/permissions/src/members/editMember.ts @@ -4,7 +4,7 @@ import { requireBotGuildPermissions } from "../permissions.ts"; export default function editMember(bot: BotWithCache) { const editMemberOld = bot.helpers.editMember; - bot.helpers.editMember = function (guildId, memberId, options) { + bot.helpers.editMember = async function (guildId, memberId, options) { const requiredPerms: PermissionStrings[] = []; if (options.roles) requiredPerms.push("MANAGE_ROLES"); // NULL IS ALLOWED @@ -17,6 +17,6 @@ export default function editMember(bot: BotWithCache) { requireBotGuildPermissions(bot, guildId, requiredPerms); } - return editMemberOld(guildId, memberId, options); + return await editMemberOld(guildId, memberId, options); }; } diff --git a/plugins/permissions/src/members/kickMember.ts b/plugins/permissions/src/members/kickMember.ts index 71a3fd8a5..a804cdc5e 100644 --- a/plugins/permissions/src/members/kickMember.ts +++ b/plugins/permissions/src/members/kickMember.ts @@ -4,9 +4,9 @@ import { requireBotGuildPermissions } from "../permissions.ts"; export default function kickMember(bot: BotWithCache) { const editMemberOld = bot.helpers.kickMember; - bot.helpers.kickMember = function (guildId, memberId, reason) { + bot.helpers.kickMember = async function (guildId, memberId, reason) { requireBotGuildPermissions(bot, guildId, ["KICK_MEMBERS"]); - return editMemberOld(guildId, memberId, reason); + return await editMemberOld(guildId, memberId, reason); }; } diff --git a/plugins/permissions/src/members/pruneMembers.ts b/plugins/permissions/src/members/pruneMembers.ts index 55aad7138..870c41559 100644 --- a/plugins/permissions/src/members/pruneMembers.ts +++ b/plugins/permissions/src/members/pruneMembers.ts @@ -4,9 +4,9 @@ import { requireBotGuildPermissions } from "../permissions.ts"; export default function pruneMembers(bot: BotWithCache) { const pruneMembersOld = bot.helpers.pruneMembers; - bot.helpers.pruneMembers = function (guildId, options) { + bot.helpers.pruneMembers = async function (guildId, options) { requireBotGuildPermissions(bot, guildId, ["KICK_MEMBERS"]); - return pruneMembersOld(guildId, options); + return await pruneMembersOld(guildId, options); }; } diff --git a/plugins/permissions/src/messages/create.ts b/plugins/permissions/src/messages/create.ts index 70b2021fa..f26ca6a54 100644 --- a/plugins/permissions/src/messages/create.ts +++ b/plugins/permissions/src/messages/create.ts @@ -5,7 +5,7 @@ import { requireBotChannelPermissions } from "../permissions.ts"; export function sendMessage(bot: BotWithCache) { const sendMessageOld = bot.helpers.sendMessage; - bot.helpers.sendMessage = function ( + bot.helpers.sendMessage = async function ( channelId, content, ) { @@ -90,7 +90,7 @@ export function sendMessage(bot: BotWithCache) { } } - return sendMessageOld(channelId, content); + return await sendMessageOld(channelId, content); }; } diff --git a/plugins/permissions/src/messages/delete.ts b/plugins/permissions/src/messages/delete.ts index cfe53a431..57c9ec1e2 100644 --- a/plugins/permissions/src/messages/delete.ts +++ b/plugins/permissions/src/messages/delete.ts @@ -4,7 +4,7 @@ import { requireBotChannelPermissions } from "../permissions.ts"; export function deleteMessage(bot: BotWithCache) { const deleteMessageOld = bot.helpers.deleteMessage; - bot.helpers.deleteMessage = function ( + bot.helpers.deleteMessage = async function ( channelId, messageId, reason, @@ -27,14 +27,14 @@ export function deleteMessage(bot: BotWithCache) { ); } - return deleteMessageOld(channelId, messageId, reason, milliseconds); + return await deleteMessageOld(channelId, messageId, reason, milliseconds); }; } export function deleteMessages(bot: BotWithCache) { const deleteMessagesOld = bot.helpers.deleteMessages; - bot.helpers.deleteMessages = function ( + bot.helpers.deleteMessages = async function ( channelId, ids, reason, @@ -70,7 +70,7 @@ export function deleteMessages(bot: BotWithCache) { "MANAGE_MESSAGES", ]); - return deleteMessagesOld(channelId, ids, reason); + return await deleteMessagesOld(channelId, ids, reason); }; } diff --git a/plugins/permissions/src/messages/get.ts b/plugins/permissions/src/messages/get.ts index 6add29acc..129f446a0 100644 --- a/plugins/permissions/src/messages/get.ts +++ b/plugins/permissions/src/messages/get.ts @@ -4,7 +4,7 @@ import { requireBotChannelPermissions } from "../permissions.ts"; export function getMessage(bot: BotWithCache) { const getMessageOld = bot.helpers.getMessage; - bot.helpers.getMessage = function ( + bot.helpers.getMessage = async function ( channelId, messageId, ) { @@ -15,14 +15,14 @@ export function getMessage(bot: BotWithCache) { ]); } - return getMessageOld(channelId, messageId); + return await getMessageOld(channelId, messageId); }; } export function getMessages(bot: BotWithCache) { const getMessagesOld = bot.helpers.getMessages; - bot.helpers.getMessages = function ( + bot.helpers.getMessages = async function ( channelId, options, ) { @@ -34,7 +34,7 @@ export function getMessages(bot: BotWithCache) { ]); } - return getMessagesOld(channelId, options); + return await getMessagesOld(channelId, options); }; } diff --git a/plugins/permissions/src/messages/pin.ts b/plugins/permissions/src/messages/pin.ts index 6b7d04402..9be081529 100644 --- a/plugins/permissions/src/messages/pin.ts +++ b/plugins/permissions/src/messages/pin.ts @@ -4,7 +4,7 @@ import { requireBotChannelPermissions } from "../permissions.ts"; export function pinMessage(bot: BotWithCache) { const pinMessageOld = bot.helpers.pinMessage; - bot.helpers.pinMessage = function ( + bot.helpers.pinMessage = async function ( channelId, messageId, ) { @@ -12,14 +12,14 @@ export function pinMessage(bot: BotWithCache) { "MANAGE_MESSAGES", ]); - return pinMessageOld(channelId, messageId); + return await pinMessageOld(channelId, messageId); }; } export function unpinMessage(bot: BotWithCache) { const unpinMessageOld = bot.helpers.unpinMessage; - bot.helpers.unpinMessage = function ( + bot.helpers.unpinMessage = async function ( channelId, messageId, ) { @@ -27,7 +27,7 @@ export function unpinMessage(bot: BotWithCache) { "MANAGE_MESSAGES", ]); - return unpinMessageOld(channelId, messageId); + return await unpinMessageOld(channelId, messageId); }; } diff --git a/plugins/permissions/src/messages/reactions.ts b/plugins/permissions/src/messages/reactions.ts index 7ec78dd99..f510b8a87 100644 --- a/plugins/permissions/src/messages/reactions.ts +++ b/plugins/permissions/src/messages/reactions.ts @@ -4,20 +4,20 @@ import { requireBotChannelPermissions } from "../permissions.ts"; export function addReaction(bot: BotWithCache) { const addReactionOld = bot.helpers.addReaction; - bot.helpers.addReaction = function (channelId, messageId, reaction) { + bot.helpers.addReaction = async function (channelId, messageId, reaction) { requireBotChannelPermissions(bot, channelId, [ "READ_MESSAGE_HISTORY", "ADD_REACTIONS", ]); - return addReactionOld(channelId, messageId, reaction); + return await addReactionOld(channelId, messageId, reaction); }; } export function addReactions(bot: BotWithCache) { const addReactionsOld = bot.helpers.addReactions; - bot.helpers.addReactions = function ( + bot.helpers.addReactions = async function ( channelId, messageId, reactions, @@ -28,14 +28,14 @@ export function addReactions(bot: BotWithCache) { "ADD_REACTIONS", ]); - return addReactionsOld(channelId, messageId, reactions, ordered); + return await addReactionsOld(channelId, messageId, reactions, ordered); }; } export function removeReaction(bot: BotWithCache) { const removeReactionOld = bot.helpers.removeReaction; - bot.helpers.removeReaction = function ( + bot.helpers.removeReaction = async function ( channelId, messageId, reactions, @@ -48,14 +48,14 @@ export function removeReaction(bot: BotWithCache) { ]); } - return removeReactionOld(channelId, messageId, reactions, options); + return await removeReactionOld(channelId, messageId, reactions, options); }; } export function removeAllReactions(bot: BotWithCache) { const removeAllReactionsOld = bot.helpers.removeAllReactions; - bot.helpers.removeAllReactions = function ( + bot.helpers.removeAllReactions = async function ( channelId, messageId, ) { @@ -63,14 +63,14 @@ export function removeAllReactions(bot: BotWithCache) { "MANAGE_MESSAGES", ]); - return removeAllReactionsOld(channelId, messageId); + return await removeAllReactionsOld(channelId, messageId); }; } export function removeReactionEmoji(bot: BotWithCache) { const removeReactionEmojiOld = bot.helpers.removeReactionEmoji; - bot.helpers.removeReactionEmoji = function ( + bot.helpers.removeReactionEmoji = async function ( channelId, messageId, reaction, @@ -79,7 +79,7 @@ export function removeReactionEmoji(bot: BotWithCache) { "MANAGE_MESSAGES", ]); - return removeReactionEmojiOld(channelId, messageId, reaction); + return await removeReactionEmojiOld(channelId, messageId, reaction); }; } diff --git a/plugins/permissions/src/misc/mod.ts b/plugins/permissions/src/misc/mod.ts index 68a31f3dc..c6d7a4b41 100644 --- a/plugins/permissions/src/misc/mod.ts +++ b/plugins/permissions/src/misc/mod.ts @@ -3,7 +3,7 @@ import { BotWithCache } from "../../deps.ts"; export function editBotProfile(bot: BotWithCache) { const editBotProfileOld = bot.helpers.editBotProfile; - bot.helpers.editBotProfile = function ( + bot.helpers.editBotProfile = async function ( options, ) { // Nothing was edited @@ -36,7 +36,7 @@ export function editBotProfile(bot: BotWithCache) { } } - return editBotProfileOld(options); + return await editBotProfileOld(options); }; } diff --git a/plugins/permissions/src/roles/add.ts b/plugins/permissions/src/roles/add.ts index e0f16572e..2fb55848f 100644 --- a/plugins/permissions/src/roles/add.ts +++ b/plugins/permissions/src/roles/add.ts @@ -5,7 +5,7 @@ import { highestRole, requireBotGuildPermissions } from "../permissions.ts"; export default function addRole(bot: BotWithCache) { const addRoleOld = bot.helpers.addRole; - bot.helpers.addRole = function ( + bot.helpers.addRole = async function ( guildId, memberId, roleId, @@ -27,6 +27,6 @@ export default function addRole(bot: BotWithCache) { requireBotGuildPermissions(bot, guild, ["MANAGE_ROLES"]); } - return addRoleOld(guildId, memberId, roleId, reason); + return await addRoleOld(guildId, memberId, roleId, reason); }; } diff --git a/plugins/permissions/src/roles/create.ts b/plugins/permissions/src/roles/create.ts index e66fcf257..19fefc83f 100644 --- a/plugins/permissions/src/roles/create.ts +++ b/plugins/permissions/src/roles/create.ts @@ -4,13 +4,13 @@ import { requireBotGuildPermissions } from "../permissions.ts"; export default function createRole(bot: BotWithCache) { const createRoleOld = bot.helpers.createRole; - bot.helpers.createRole = function ( + bot.helpers.createRole = async function ( guildId, options, reason, ) { requireBotGuildPermissions(bot, guildId, ["MANAGE_ROLES"]); - return createRoleOld(guildId, options, reason); + return await createRoleOld(guildId, options, reason); }; } diff --git a/plugins/permissions/src/roles/delete.ts b/plugins/permissions/src/roles/delete.ts index 896d33bef..16a6eda21 100644 --- a/plugins/permissions/src/roles/delete.ts +++ b/plugins/permissions/src/roles/delete.ts @@ -4,12 +4,12 @@ import { requireBotGuildPermissions } from "../permissions.ts"; export default function deleteRole(bot: BotWithCache) { const deleteRoleOld = bot.helpers.deleteRole; - bot.helpers.deleteRole = function ( + bot.helpers.deleteRole = async function ( guildId, id, ) { requireBotGuildPermissions(bot, guildId, ["MANAGE_ROLES"]); - return deleteRoleOld(guildId, id); + return await deleteRoleOld(guildId, id); }; } diff --git a/plugins/permissions/src/roles/edit.ts b/plugins/permissions/src/roles/edit.ts index ab4034b08..ff14a4d4a 100644 --- a/plugins/permissions/src/roles/edit.ts +++ b/plugins/permissions/src/roles/edit.ts @@ -5,7 +5,7 @@ import { highestRole, requireBotGuildPermissions } from "../permissions.ts"; export default function editRole(bot: BotWithCache) { const editRoleOld = bot.helpers.editRole; - bot.helpers.editRole = function ( + bot.helpers.editRole = async function ( guildId, id, options, @@ -26,6 +26,6 @@ export default function editRole(bot: BotWithCache) { requireBotGuildPermissions(bot, guild, ["MANAGE_ROLES"]); } - return editRoleOld(guildId, id, options); + return await editRoleOld(guildId, id, options); }; } diff --git a/plugins/permissions/src/roles/remove.ts b/plugins/permissions/src/roles/remove.ts index d85a6af80..215397f47 100644 --- a/plugins/permissions/src/roles/remove.ts +++ b/plugins/permissions/src/roles/remove.ts @@ -5,7 +5,7 @@ import { highestRole, requireBotGuildPermissions } from "../permissions.ts"; export default function removeRole(bot: BotWithCache) { const removeRoleOld = bot.helpers.removeRole; - bot.helpers.removeRole = function ( + bot.helpers.removeRole = async function ( guildId, memberId, roleId, @@ -27,6 +27,6 @@ export default function removeRole(bot: BotWithCache) { requireBotGuildPermissions(bot, guild, ["MANAGE_ROLES"]); } - return removeRoleOld(guildId, memberId, roleId, reason); + return await removeRoleOld(guildId, memberId, roleId, reason); }; } diff --git a/plugins/permissions/src/webhooks/createWebhook.ts b/plugins/permissions/src/webhooks/createWebhook.ts index 95a107791..214cde9f0 100644 --- a/plugins/permissions/src/webhooks/createWebhook.ts +++ b/plugins/permissions/src/webhooks/createWebhook.ts @@ -4,7 +4,7 @@ import { requireBotChannelPermissions } from "../permissions.ts"; export default function createWebhook(bot: BotWithCache) { const createWebhookOld = bot.helpers.createWebhook; - bot.helpers.createWebhook = function (channelId, options) { + bot.helpers.createWebhook = async function (channelId, options) { requireBotChannelPermissions(bot, channelId, ["MANAGE_WEBHOOKS"]); if ( @@ -17,6 +17,6 @@ export default function createWebhook(bot: BotWithCache) { ); } - return createWebhookOld(channelId, options); + return await createWebhookOld(channelId, options); }; } diff --git a/plugins/permissions/src/webhooks/deleteWebhook.ts b/plugins/permissions/src/webhooks/deleteWebhook.ts index 1ba0cf19b..96313b30f 100644 --- a/plugins/permissions/src/webhooks/deleteWebhook.ts +++ b/plugins/permissions/src/webhooks/deleteWebhook.ts @@ -4,9 +4,9 @@ import { requireBotChannelPermissions } from "../permissions.ts"; export default function deleteWebhook(bot: BotWithCache) { const deleteWebhookOld = bot.helpers.deleteWebhook; - bot.helpers.deleteWebhook = function (channelId, options) { + bot.helpers.deleteWebhook = async function (channelId, options) { requireBotChannelPermissions(bot, channelId, ["MANAGE_WEBHOOKS"]); - return deleteWebhookOld(channelId, options); + return await deleteWebhookOld(channelId, options); }; } diff --git a/plugins/permissions/src/webhooks/editWebhook.ts b/plugins/permissions/src/webhooks/editWebhook.ts index 75c055aee..38a2b5990 100644 --- a/plugins/permissions/src/webhooks/editWebhook.ts +++ b/plugins/permissions/src/webhooks/editWebhook.ts @@ -4,7 +4,7 @@ import { requireBotChannelPermissions } from "../permissions.ts"; export default function editWebhook(bot: BotWithCache) { const editWebhookOld = bot.helpers.editWebhook; - bot.helpers.editWebhook = function (channelId, webhookId, options) { + bot.helpers.editWebhook = async function (channelId, webhookId, options) { requireBotChannelPermissions(bot, channelId, ["MANAGE_WEBHOOKS"]); if (options.name) { if ( @@ -18,6 +18,6 @@ export default function editWebhook(bot: BotWithCache) { } } - return editWebhookOld(channelId, webhookId, options); + return await editWebhookOld(channelId, webhookId, options); }; } diff --git a/plugins/permissions/src/webhooks/message.ts b/plugins/permissions/src/webhooks/message.ts index 0eb975942..a3167736f 100644 --- a/plugins/permissions/src/webhooks/message.ts +++ b/plugins/permissions/src/webhooks/message.ts @@ -4,7 +4,7 @@ import { validateComponents } from "../components.ts"; export function editWebhookMessage(bot: BotWithCache) { const editWebhookMessageOld = bot.helpers.editWebhookMessage; - bot.helpers.editWebhookMessage = function ( + bot.helpers.editWebhookMessage = async function ( webhookId, webhookToken, options, @@ -62,7 +62,7 @@ export function editWebhookMessage(bot: BotWithCache) { if (options.components) validateComponents(bot, options.components); - return editWebhookMessageOld(webhookId, webhookToken, options); + return await editWebhookMessageOld(webhookId, webhookToken, options); }; } diff --git a/plugins/permissions/src/webhooks/sendWebhook.ts b/plugins/permissions/src/webhooks/sendWebhook.ts index 4078f521c..9ab776cb2 100644 --- a/plugins/permissions/src/webhooks/sendWebhook.ts +++ b/plugins/permissions/src/webhooks/sendWebhook.ts @@ -4,7 +4,7 @@ import { validateComponents } from "../components.ts"; export default function sendWebhook(bot: BotWithCache) { const sendWebhookOld = bot.helpers.sendWebhook; - bot.helpers.sendWebhook = function (webhookId, webhookToken, options) { + bot.helpers.sendWebhook = async function (webhookId, webhookToken, options) { if ( options.content && !bot.utils.validateLength(options.content, { max: 2000 }) @@ -62,6 +62,6 @@ export default function sendWebhook(bot: BotWithCache) { ); } - return sendWebhookOld(webhookId, webhookToken, options); + return await sendWebhookOld(webhookId, webhookToken, options); }; } diff --git a/r.ts b/r.ts new file mode 100644 index 000000000..555961739 --- /dev/null +++ b/r.ts @@ -0,0 +1,16 @@ +import { createBot } from "./bot.ts"; + +const bot = createBot({ + token: "", + botId: 1n, + events: {}, + intents: [], +}); + +await bot.helpers.deleteWebhookMessage( + 943082834103500820n, + "LgGfOmEpEh13BP-u31TCUADsr0cE0LCn5ZTQM-RL1toQf0YUJBV5gd8tdpK0gC8c3J7Z", + 943083038240301056n, +); + +// https://discord.com/api/webhooks/943082834103500820/LgGfOmEpEh13BP-u31TCUADsr0cE0LCn5ZTQM-RL1toQf0YUJBV5gd8tdpK0gC8c3J7Z