From bf7052602970fca017132ad8780990d5d777b400 Mon Sep 17 00:00:00 2001 From: LTS20050703 Date: Thu, 22 Sep 2022 22:40:41 +0700 Subject: [PATCH] fix(plugins): errors caused by bigstring support (#2486) --- plugins/cache/src/addCacheCollections.ts | 3 ++- plugins/permissions/src/channels/createChannel.ts | 4 ++-- plugins/permissions/src/channels/deleteChannel.ts | 4 ++-- .../channels/deleteChannelPermissionOverride.ts | 4 ++-- plugins/permissions/src/channels/editChannel.ts | 4 ++-- .../src/channels/editChannelPermissionOverrides.ts | 4 ++-- .../src/channels/followAnnouncementChannel.ts | 8 ++++---- .../src/channels/forums/createForumThread.ts | 4 ++-- .../permissions/src/channels/getChannelWebhooks.ts | 4 ++-- .../src/channels/stages/createStageInstance.ts | 4 ++-- .../src/channels/stages/deleteStageInstances.ts | 4 ++-- .../src/channels/stages/editStageInstance.ts | 4 ++-- .../src/channels/threads/addThreadMember.ts | 2 +- .../channels/threads/getPrivateArchivedThreads.ts | 8 ++++++-- .../threads/getPrivateJoinedArchivedThreads.ts | 4 ++-- .../channels/threads/getPublicArchivedThreads.ts | 4 ++-- .../permissions/src/channels/threads/joinThread.ts | 4 ++-- .../src/channels/threads/leaveThread.ts | 4 ++-- .../src/channels/threads/removeThreadMember.ts | 2 +- plugins/permissions/src/emojis/createEmoji.ts | 2 +- plugins/permissions/src/emojis/deleteEmoji.ts | 2 +- plugins/permissions/src/emojis/editEmoji.ts | 2 +- .../src/guilds/automod/createAutomodRule.ts | 4 ++-- .../src/guilds/automod/deleteAutomodRule.ts | 2 +- .../src/guilds/automod/editAutomodRule.ts | 4 ++-- .../src/guilds/automod/getAutomodRule.ts | 2 +- .../src/guilds/automod/getAutomodRules.ts | 2 +- plugins/permissions/src/guilds/deleteGuild.ts | 2 +- plugins/permissions/src/guilds/editGuild.ts | 4 ++-- .../permissions/src/guilds/editGuildMfaLevel.ts | 2 +- .../permissions/src/guilds/editWelcomeScreen.ts | 2 +- .../src/guilds/events/createScheduledEvent.ts | 14 +++++++------- .../src/guilds/events/editScheduledEvent.ts | 14 +++++++------- plugins/permissions/src/guilds/getAuditLog.ts | 2 +- plugins/permissions/src/guilds/getBan.ts | 2 +- plugins/permissions/src/guilds/getBans.ts | 2 +- plugins/permissions/src/guilds/getPruneCount.ts | 2 +- plugins/permissions/src/guilds/getVanityUrl.ts | 2 +- plugins/permissions/src/guilds/getWelcomeScreen.ts | 4 ++-- .../src/guilds/voice/connectToVoiceChannels.ts | 2 +- .../src/guilds/widgets/editWidgetSettings.ts | 2 +- .../src/integrations/deleteIntegrations.ts | 2 +- .../src/integrations/getIntegrations.ts | 2 +- plugins/permissions/src/members/banMember.ts | 2 +- plugins/permissions/src/members/editBotMember.ts | 2 +- plugins/permissions/src/members/editMember.ts | 8 ++++---- plugins/permissions/src/members/kickMember.ts | 2 +- plugins/permissions/src/members/pruneMembers.ts | 2 +- plugins/permissions/src/members/unbanMember.ts | 2 +- plugins/permissions/src/messages/deleteMessage.ts | 4 ++-- plugins/permissions/src/messages/deleteMessages.ts | 2 +- plugins/permissions/src/messages/getMessage.ts | 2 +- plugins/permissions/src/messages/getMessages.ts | 2 +- plugins/permissions/src/messages/pinMessage.ts | 2 +- .../src/messages/reactions/addReaction.ts | 2 +- .../src/messages/reactions/addReactions.ts | 2 +- .../src/messages/reactions/deleteReactionsAll.ts | 2 +- .../src/messages/reactions/deleteReactionsEmoji.ts | 2 +- .../messages/reactions/deleteUserReaction.ts.ts | 2 +- plugins/permissions/src/messages/sendMessage.ts | 2 +- plugins/permissions/src/messages/unpinMessage.ts | 2 +- plugins/permissions/src/roles/addRole.ts | 4 ++-- plugins/permissions/src/roles/createRole.ts | 2 +- plugins/permissions/src/roles/deleteRole.ts | 2 +- plugins/permissions/src/roles/editRole.ts | 4 ++-- .../permissions/src/roles/modifyRolePositions.ts | 2 +- plugins/permissions/src/roles/removeRole.ts | 4 ++-- plugins/permissions/src/webhooks/createWebhook.ts | 2 +- plugins/permissions/src/webhooks/deleteWebhook.ts | 2 +- plugins/permissions/src/webhooks/editWebhook.ts | 7 ++++++- plugins/validations/src/messages/deleteMessages.ts | 2 +- 71 files changed, 122 insertions(+), 112 deletions(-) diff --git a/plugins/cache/src/addCacheCollections.ts b/plugins/cache/src/addCacheCollections.ts index 6c63def01..bd49c73b2 100644 --- a/plugins/cache/src/addCacheCollections.ts +++ b/plugins/cache/src/addCacheCollections.ts @@ -1,4 +1,5 @@ import { + BigString, Bot, Channel, Collection, @@ -17,7 +18,7 @@ export type BotWithCache = Omit & CacheProps export type BotHelpersWithCache = Omit & { /** The added channelId argument at the end is used to validate permission checks */ - editWebhook: (webhookId: bigint, options: ModifyWebhook, fromChannelId?: bigint) => Promise; + editWebhook: (webhookId: BigString, options: ModifyWebhook, fromChannelId?: bigint) => Promise; }; export interface CacheProps { diff --git a/plugins/permissions/src/channels/createChannel.ts b/plugins/permissions/src/channels/createChannel.ts index b71335b08..d0ee05a71 100644 --- a/plugins/permissions/src/channels/createChannel.ts +++ b/plugins/permissions/src/channels/createChannel.ts @@ -5,7 +5,7 @@ export function createChannel(bot: BotWithCache) { const createChannel = bot.helpers.createChannel; bot.helpers.createChannel = async function (guildId, options) { - const guild = bot.guilds.get(guildId); + const guild = bot.guilds.get(bot.transformers.snowflake(guildId)); if (guild) { if (options?.rateLimitPerUser && !(0 < options.rateLimitPerUser && options.rateLimitPerUser < 21600)) { @@ -38,7 +38,7 @@ export function createChannel(bot: BotWithCache) { if (options?.userLimit && options.userLimit > 99) throw new Error("The user limit must be less than 99."); if (options?.parentId) { - const category = bot.channels.get(options.parentId); + const category = bot.channels.get(bot.transformers.snowflake(options.parentId)); if (category && category.type !== ChannelTypes.GuildCategory) { throw new Error("The parent id must be for a category channel type."); } diff --git a/plugins/permissions/src/channels/deleteChannel.ts b/plugins/permissions/src/channels/deleteChannel.ts index df829c81b..507f6ceac 100644 --- a/plugins/permissions/src/channels/deleteChannel.ts +++ b/plugins/permissions/src/channels/deleteChannel.ts @@ -5,7 +5,7 @@ export function deleteChannel(bot: BotWithCache) { const deleteChannel = bot.helpers.deleteChannel; bot.helpers.deleteChannel = async function (channelId, reason) { - const channel = bot.channels.get(channelId); + const channel = bot.channels.get(bot.transformers.snowflake(channelId)); if (channel?.guildId) { const guild = bot.guilds.get(channel.guildId); @@ -25,7 +25,7 @@ export function deleteChannel(bot: BotWithCache) { if (isVoice) perms.push("CONNECT"); - requireBotChannelPermissions(bot, channelId, perms); + requireBotChannelPermissions(bot, bot.transformers.snowflake(channelId), perms); } return await deleteChannel(channelId, reason); diff --git a/plugins/permissions/src/channels/deleteChannelPermissionOverride.ts b/plugins/permissions/src/channels/deleteChannelPermissionOverride.ts index f8ce7e224..3bd888a91 100644 --- a/plugins/permissions/src/channels/deleteChannelPermissionOverride.ts +++ b/plugins/permissions/src/channels/deleteChannelPermissionOverride.ts @@ -5,7 +5,7 @@ export function deleteChannelPermissionOverride(bot: BotWithCache) { const deleteChannelPermissionOverride = bot.helpers.deleteChannelPermissionOverride; bot.helpers.deleteChannelPermissionOverride = async function (channelId, overwriteId) { - const channel = bot.channels.get(channelId); + const channel = bot.channels.get(bot.transformers.snowflake(channelId)); if (channel?.guildId) { const perms: PermissionStrings[] = ["VIEW_CHANNEL", "MANAGE_ROLES"]; @@ -13,7 +13,7 @@ export function deleteChannelPermissionOverride(bot: BotWithCache) { if (isVoice) perms.push("CONNECT"); - requireBotChannelPermissions(bot, channelId, perms); + requireBotChannelPermissions(bot, bot.transformers.snowflake(channelId), perms); } return await deleteChannelPermissionOverride(channelId, overwriteId); diff --git a/plugins/permissions/src/channels/editChannel.ts b/plugins/permissions/src/channels/editChannel.ts index 095e84e1e..ee071a948 100644 --- a/plugins/permissions/src/channels/editChannel.ts +++ b/plugins/permissions/src/channels/editChannel.ts @@ -5,7 +5,7 @@ export function editChannel(bot: BotWithCache) { const editChannel = bot.helpers.editChannel; bot.helpers.editChannel = async function (channelId, options) { - const channel = bot.channels.get(channelId); + const channel = bot.channels.get(bot.transformers.snowflake(channelId)); if (channel?.guildId) { const guild = bot.guilds.get(channel.guildId); @@ -64,7 +64,7 @@ export function editChannel(bot: BotWithCache) { if (options.userLimit && options.userLimit > 99) throw new Error("The user limit must be less than 99."); if (options.parentId) { - const category = bot.channels.get(options.parentId); + const category = bot.channels.get(bot.transformers.snowflake(options.parentId)); if (category && category.type !== ChannelTypes.GuildCategory) { throw new Error("The parent id must be for a category channel type."); } diff --git a/plugins/permissions/src/channels/editChannelPermissionOverrides.ts b/plugins/permissions/src/channels/editChannelPermissionOverrides.ts index 41b992156..71339af47 100644 --- a/plugins/permissions/src/channels/editChannelPermissionOverrides.ts +++ b/plugins/permissions/src/channels/editChannelPermissionOverrides.ts @@ -5,14 +5,14 @@ export function editChannelPermissionOverrides(bot: BotWithCache) { const editChannelPermissionOverrides = bot.helpers.editChannelPermissionOverrides; bot.helpers.editChannelPermissionOverrides = async function (channelId, overwrite) { - const channel = bot.channels.get(channelId); + const channel = bot.channels.get(bot.transformers.snowflake(channelId)); if (channel?.guildId) { const perms: PermissionStrings[] = ["VIEW_CHANNEL", "MANAGE_ROLES"]; const isVoice = [ChannelTypes.GuildVoice, ChannelTypes.GuildStageVoice].includes(channel.type); if (isVoice) perms.push("CONNECT"); - requireBotChannelPermissions(bot, channelId, perms); + requireBotChannelPermissions(bot, bot.transformers.snowflake(channelId), perms); } return await editChannelPermissionOverrides(channelId, overwrite); diff --git a/plugins/permissions/src/channels/followAnnouncementChannel.ts b/plugins/permissions/src/channels/followAnnouncementChannel.ts index 61acb0778..fbbb06acc 100644 --- a/plugins/permissions/src/channels/followAnnouncementChannel.ts +++ b/plugins/permissions/src/channels/followAnnouncementChannel.ts @@ -5,19 +5,19 @@ export function followAnnouncementChannel(bot: BotWithCache) { const followAnnouncementChannel = bot.helpers.followAnnouncementChannel; bot.helpers.followAnnouncementChannel = async function (sourceChannelId, targetChannelId) { - const sourceChannel = bot.channels.get(sourceChannelId); + const sourceChannel = bot.channels.get(bot.transformers.snowflake(sourceChannelId)); if (sourceChannel && sourceChannel.type !== ChannelTypes.GuildAnnouncement) { throw new Error("Source channel must be an announcement channel"); } - const targetChannel = bot.channels.get(targetChannelId); + const targetChannel = bot.channels.get(bot.transformers.snowflake(targetChannelId)); if (targetChannel) { const isWebhookParent = [ChannelTypes.GuildAnnouncement, ChannelTypes.GuildText].includes(targetChannel.type); if (!isWebhookParent) { throw new Error("Target channel must be a text channel or an announcement channel"); } } - requireBotChannelPermissions(bot, sourceChannelId, ["VIEW_CHANNEL"]); - requireBotChannelPermissions(bot, targetChannelId, ["VIEW_CHANNEL", "MANAGE_WEBHOOKS"]); + requireBotChannelPermissions(bot, bot.transformers.snowflake(sourceChannelId), ["VIEW_CHANNEL"]); + requireBotChannelPermissions(bot, bot.transformers.snowflake(targetChannelId), ["VIEW_CHANNEL", "MANAGE_WEBHOOKS"]); return await followAnnouncementChannel(sourceChannelId, targetChannelId); }; } diff --git a/plugins/permissions/src/channels/forums/createForumThread.ts b/plugins/permissions/src/channels/forums/createForumThread.ts index 3fe27e76b..5d89a2fb6 100644 --- a/plugins/permissions/src/channels/forums/createForumThread.ts +++ b/plugins/permissions/src/channels/forums/createForumThread.ts @@ -5,12 +5,12 @@ export function createForumThread(bot: BotWithCache) { const createForumThread = bot.helpers.createForumThread; bot.helpers.createForumThread = async function (channelId, options) { - const channel = bot.channels.get(channelId); + const channel = bot.channels.get(bot.transformers.snowflake(channelId)); if (channel && channel.type !== ChannelTypes.GuildForum) { throw new Error("Channel must be a forum channel"); } - requireBotChannelPermissions(bot, channelId, ["VIEW_CHANNEL", "SEND_MESSAGES"]); + requireBotChannelPermissions(bot, bot.transformers.snowflake(channelId), ["VIEW_CHANNEL", "SEND_MESSAGES"]); return await createForumThread(channelId, options); }; diff --git a/plugins/permissions/src/channels/getChannelWebhooks.ts b/plugins/permissions/src/channels/getChannelWebhooks.ts index 97cc3acc9..5199f746f 100644 --- a/plugins/permissions/src/channels/getChannelWebhooks.ts +++ b/plugins/permissions/src/channels/getChannelWebhooks.ts @@ -5,13 +5,13 @@ export function getChannelWebhooks(bot: BotWithCache) { const getChannelWebhooks = bot.helpers.getChannelWebhooks; bot.helpers.getChannelWebhooks = async function (channelId) { - const channel = bot.channels.get(channelId); + const channel = bot.channels.get(bot.transformers.snowflake(channelId)); if (channel) { const isWebhookParent = [ChannelTypes.GuildAnnouncement, ChannelTypes.GuildText].includes(channel.type); if (!isWebhookParent) { throw new Error("Target channel must be a text channel or an announcement channel"); } - requireBotChannelPermissions(bot, channelId, ["VIEW_CHANNEL", "MANAGE_WEBHOOKS"]); + requireBotChannelPermissions(bot, bot.transformers.snowflake(channelId), ["VIEW_CHANNEL", "MANAGE_WEBHOOKS"]); } return await getChannelWebhooks(channelId); diff --git a/plugins/permissions/src/channels/stages/createStageInstance.ts b/plugins/permissions/src/channels/stages/createStageInstance.ts index 627752786..2f5ee5f8f 100644 --- a/plugins/permissions/src/channels/stages/createStageInstance.ts +++ b/plugins/permissions/src/channels/stages/createStageInstance.ts @@ -5,14 +5,14 @@ export function createStageInstance(bot: BotWithCache) { const createStageInstance = bot.helpers.createStageInstance; bot.helpers.createStageInstance = async function (options) { - const channel = bot.channels.get(options.channelId); + const channel = bot.channels.get(bot.transformers.snowflake(options.channelId)); if (channel && channel.type !== ChannelTypes.GuildStageVoice) { throw new Error("Channel must be a stage voice channel"); } const perms: PermissionStrings[] = ["VIEW_CHANNEL", "CONNECT", "MANAGE_CHANNELS", "MUTE_MEMBERS", "MOVE_MEMBERS"]; if (options.sendStartNotification) perms.push("MENTION_EVERYONE"); - requireBotChannelPermissions(bot, options.channelId, perms); + requireBotChannelPermissions(bot, bot.transformers.snowflake(options.channelId), perms); return await createStageInstance(options); }; diff --git a/plugins/permissions/src/channels/stages/deleteStageInstances.ts b/plugins/permissions/src/channels/stages/deleteStageInstances.ts index a7a30616f..ac1cd25c1 100644 --- a/plugins/permissions/src/channels/stages/deleteStageInstances.ts +++ b/plugins/permissions/src/channels/stages/deleteStageInstances.ts @@ -5,11 +5,11 @@ export function deleteStageInstance(bot: BotWithCache) { const deleteStageInstance = bot.helpers.deleteStageInstance; bot.helpers.deleteStageInstance = async function (channelId) { - const channel = bot.channels.get(channelId); + const channel = bot.channels.get(bot.transformers.snowflake(channelId)); if (channel && channel.type !== ChannelTypes.GuildStageVoice) { throw new Error("Channel must be a stage voice channel"); } - requireBotChannelPermissions(bot, channelId, [ + requireBotChannelPermissions(bot, bot.transformers.snowflake(channelId), [ "VIEW_CHANNEL", "CONNECT", "MANAGE_CHANNELS", diff --git a/plugins/permissions/src/channels/stages/editStageInstance.ts b/plugins/permissions/src/channels/stages/editStageInstance.ts index f5966184e..5297d4335 100644 --- a/plugins/permissions/src/channels/stages/editStageInstance.ts +++ b/plugins/permissions/src/channels/stages/editStageInstance.ts @@ -5,12 +5,12 @@ export function editStageInstance(bot: BotWithCache) { const editStageInstance = bot.helpers.editStageInstance; bot.helpers.editStageInstance = async function (channelId, data) { - const channel = bot.channels.get(channelId); + const channel = bot.channels.get(bot.transformers.snowflake(channelId)); if (channel && channel.type !== ChannelTypes.GuildStageVoice) { throw new Error("Channel must be a stage voice channel"); } - requireBotChannelPermissions(bot, channelId, [ + requireBotChannelPermissions(bot, bot.transformers.snowflake(channelId), [ "VIEW_CHANNEL", "CONNECT", "MANAGE_CHANNELS", diff --git a/plugins/permissions/src/channels/threads/addThreadMember.ts b/plugins/permissions/src/channels/threads/addThreadMember.ts index 290d3b0fa..c28b08b59 100644 --- a/plugins/permissions/src/channels/threads/addThreadMember.ts +++ b/plugins/permissions/src/channels/threads/addThreadMember.ts @@ -5,7 +5,7 @@ export function addThreadMember(bot: BotWithCache) { const addThreadMember = bot.helpers.addThreadMember; bot.helpers.addThreadMember = async function (threadId, userId) { - const channel = bot.channels.get(threadId); + const channel = bot.channels.get(bot.transformers.snowflake(threadId)); if (channel) { const isThread = ![ChannelTypes.PublicThread, ChannelTypes.PrivateThread, ChannelTypes.AnnouncementThread] diff --git a/plugins/permissions/src/channels/threads/getPrivateArchivedThreads.ts b/plugins/permissions/src/channels/threads/getPrivateArchivedThreads.ts index e82d0e41f..ffda965d9 100644 --- a/plugins/permissions/src/channels/threads/getPrivateArchivedThreads.ts +++ b/plugins/permissions/src/channels/threads/getPrivateArchivedThreads.ts @@ -4,7 +4,7 @@ import { requireBotChannelPermissions } from "../../permissions.ts"; export function getPrivateArchivedThreads(bot: BotWithCache) { const getPrivateArchivedThreads = bot.helpers.getPrivateArchivedThreads; bot.helpers.getPrivateArchivedThreads = async function (channelId, options) { - const channel = bot.channels.get(channelId); + const channel = bot.channels.get(bot.transformers.snowflake(channelId)); if (channel) { const isThreadParent = [ChannelTypes.GuildText, ChannelTypes.GuildAnnouncement, ChannelTypes.GuildForum] @@ -14,7 +14,11 @@ export function getPrivateArchivedThreads(bot: BotWithCache) { } } - requireBotChannelPermissions(bot, channelId, ["VIEW_CHANNEL", "READ_MESSAGE_HISTORY", "MANAGE_MESSAGES"]); + requireBotChannelPermissions(bot, bot.transformers.snowflake(channelId), [ + "VIEW_CHANNEL", + "READ_MESSAGE_HISTORY", + "MANAGE_MESSAGES", + ]); return await getPrivateArchivedThreads(channelId, options); }; diff --git a/plugins/permissions/src/channels/threads/getPrivateJoinedArchivedThreads.ts b/plugins/permissions/src/channels/threads/getPrivateJoinedArchivedThreads.ts index c5023ffec..f3cfc6362 100644 --- a/plugins/permissions/src/channels/threads/getPrivateJoinedArchivedThreads.ts +++ b/plugins/permissions/src/channels/threads/getPrivateJoinedArchivedThreads.ts @@ -4,7 +4,7 @@ import { requireBotChannelPermissions } from "../../permissions.ts"; export function getPrivateJoinedArchivedThreads(bot: BotWithCache) { const getPrivateJoinedArchivedThreads = bot.helpers.getPrivateJoinedArchivedThreads; bot.helpers.getPrivateJoinedArchivedThreads = async function (channelId, options) { - const channel = bot.channels.get(channelId); + const channel = bot.channels.get(bot.transformers.snowflake(channelId)); if (channel) { const isThreadParent = [ChannelTypes.GuildText, ChannelTypes.GuildAnnouncement, ChannelTypes.GuildForum] @@ -13,7 +13,7 @@ export function getPrivateJoinedArchivedThreads(bot: BotWithCache) { throw new Error("Channel must be a text channel, a forum channel, or an announcement channel"); } } - requireBotChannelPermissions(bot, channelId, ["VIEW_CHANNEL", "READ_MESSAGE_HISTORY"]); + requireBotChannelPermissions(bot, bot.transformers.snowflake(channelId), ["VIEW_CHANNEL", "READ_MESSAGE_HISTORY"]); return await getPrivateJoinedArchivedThreads(channelId, options); }; diff --git a/plugins/permissions/src/channels/threads/getPublicArchivedThreads.ts b/plugins/permissions/src/channels/threads/getPublicArchivedThreads.ts index ff7e3ed34..868a47800 100644 --- a/plugins/permissions/src/channels/threads/getPublicArchivedThreads.ts +++ b/plugins/permissions/src/channels/threads/getPublicArchivedThreads.ts @@ -4,7 +4,7 @@ import { requireBotChannelPermissions } from "../../permissions.ts"; export function getPublicArchivedThreads(bot: BotWithCache) { const getPublicArchivedThreads = bot.helpers.getPublicArchivedThreads; bot.helpers.getPublicArchivedThreads = async function (channelId, options) { - const channel = bot.channels.get(channelId); + const channel = bot.channels.get(bot.transformers.snowflake(channelId)); if (channel) { const isThreadParent = [ChannelTypes.GuildText, ChannelTypes.GuildAnnouncement, ChannelTypes.GuildForum] @@ -13,7 +13,7 @@ export function getPublicArchivedThreads(bot: BotWithCache) { throw new Error("Channel must be a text channel, a forum channel, or an announcement channel"); } } - requireBotChannelPermissions(bot, channelId, ["VIEW_CHANNEL", "READ_MESSAGE_HISTORY"]); + requireBotChannelPermissions(bot, bot.transformers.snowflake(channelId), ["VIEW_CHANNEL", "READ_MESSAGE_HISTORY"]); return await getPublicArchivedThreads(channelId, options); }; diff --git a/plugins/permissions/src/channels/threads/joinThread.ts b/plugins/permissions/src/channels/threads/joinThread.ts index db047d707..d78184bd4 100644 --- a/plugins/permissions/src/channels/threads/joinThread.ts +++ b/plugins/permissions/src/channels/threads/joinThread.ts @@ -5,7 +5,7 @@ export function joinThread(bot: BotWithCache) { const joinThread = bot.helpers.joinThread; bot.helpers.joinThread = async function (threadId) { - const channel = bot.channels.get(threadId); + const channel = bot.channels.get(bot.transformers.snowflake(threadId)); if (channel) { const isThread = ![ChannelTypes.PublicThread, ChannelTypes.PrivateThread, ChannelTypes.AnnouncementThread] @@ -15,7 +15,7 @@ export function joinThread(bot: BotWithCache) { if (channel.archived) throw new Error("You can not join an archived channel."); } - requireBotChannelPermissions(bot, threadId, ["VIEW_CHANNEL"]); + requireBotChannelPermissions(bot, bot.transformers.snowflake(threadId), ["VIEW_CHANNEL"]); return await joinThread(threadId); }; diff --git a/plugins/permissions/src/channels/threads/leaveThread.ts b/plugins/permissions/src/channels/threads/leaveThread.ts index f7c4f94ff..f68c97c4d 100644 --- a/plugins/permissions/src/channels/threads/leaveThread.ts +++ b/plugins/permissions/src/channels/threads/leaveThread.ts @@ -5,7 +5,7 @@ export function leaveThread(bot: BotWithCache) { const leaveThread = bot.helpers.leaveThread; bot.helpers.leaveThread = async function (threadId) { - const channel = bot.channels.get(threadId); + const channel = bot.channels.get(bot.transformers.snowflake(threadId)); if (channel) { const isThread = ![ChannelTypes.PublicThread, ChannelTypes.PrivateThread, ChannelTypes.AnnouncementThread] @@ -15,7 +15,7 @@ export function leaveThread(bot: BotWithCache) { if (channel.archived) throw new Error("You can not leave an archived channel."); } - requireBotChannelPermissions(bot, threadId, ["VIEW_CHANNEL"]); + requireBotChannelPermissions(bot, bot.transformers.snowflake(threadId), ["VIEW_CHANNEL"]); return await leaveThread(threadId); }; diff --git a/plugins/permissions/src/channels/threads/removeThreadMember.ts b/plugins/permissions/src/channels/threads/removeThreadMember.ts index 3b5c5ef57..3d370f4b6 100644 --- a/plugins/permissions/src/channels/threads/removeThreadMember.ts +++ b/plugins/permissions/src/channels/threads/removeThreadMember.ts @@ -5,7 +5,7 @@ export function removeThreadMember(bot: BotWithCache) { const removeThreadMember = bot.helpers.removeThreadMember; bot.helpers.removeThreadMember = async function (threadId, userId) { - const channel = bot.channels.get(threadId); + const channel = bot.channels.get(bot.transformers.snowflake(threadId)); if (channel) { const isThread = ![ChannelTypes.PublicThread, ChannelTypes.PrivateThread, ChannelTypes.AnnouncementThread] diff --git a/plugins/permissions/src/emojis/createEmoji.ts b/plugins/permissions/src/emojis/createEmoji.ts index 9fa8e1e03..2314f42c9 100644 --- a/plugins/permissions/src/emojis/createEmoji.ts +++ b/plugins/permissions/src/emojis/createEmoji.ts @@ -5,7 +5,7 @@ export function createEmoji(bot: BotWithCache) { const createEmoji = bot.helpers.createEmoji; bot.helpers.createEmoji = async function (guildId, id) { - requireBotGuildPermissions(bot, guildId, ["MANAGE_EMOJIS_AND_STICKERS"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["MANAGE_EMOJIS_AND_STICKERS"]); return await createEmoji(guildId, id); }; diff --git a/plugins/permissions/src/emojis/deleteEmoji.ts b/plugins/permissions/src/emojis/deleteEmoji.ts index 7a63dbfa3..bf11ffddb 100644 --- a/plugins/permissions/src/emojis/deleteEmoji.ts +++ b/plugins/permissions/src/emojis/deleteEmoji.ts @@ -5,7 +5,7 @@ export function deleteEmoji(bot: BotWithCache) { const deleteEmoji = bot.helpers.deleteEmoji; bot.helpers.deleteEmoji = async function (guildId, id) { - requireBotGuildPermissions(bot, guildId, ["MANAGE_EMOJIS_AND_STICKERS"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["MANAGE_EMOJIS_AND_STICKERS"]); return await deleteEmoji(guildId, id); }; diff --git a/plugins/permissions/src/emojis/editEmoji.ts b/plugins/permissions/src/emojis/editEmoji.ts index 5d7f3cba5..293e9617f 100644 --- a/plugins/permissions/src/emojis/editEmoji.ts +++ b/plugins/permissions/src/emojis/editEmoji.ts @@ -5,7 +5,7 @@ export function editEmoji(bot: BotWithCache) { const editEmoji = bot.helpers.editEmoji; bot.helpers.editEmoji = async function (guildId, id, options) { - requireBotGuildPermissions(bot, guildId, ["MANAGE_EMOJIS_AND_STICKERS"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["MANAGE_EMOJIS_AND_STICKERS"]); return await editEmoji(guildId, id, options); }; diff --git a/plugins/permissions/src/guilds/automod/createAutomodRule.ts b/plugins/permissions/src/guilds/automod/createAutomodRule.ts index fd338f9e8..7f4a48c2b 100644 --- a/plugins/permissions/src/guilds/automod/createAutomodRule.ts +++ b/plugins/permissions/src/guilds/automod/createAutomodRule.ts @@ -5,7 +5,7 @@ export function createAutomodRule(bot: BotWithCache) { const createAutomodRule = bot.helpers.createAutomodRule; bot.helpers.createAutomodRule = async function (guildId, options) { - requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["MANAGE_GUILD"]); for (const action of options.actions) { // Check for maximum duration seconds @@ -19,7 +19,7 @@ export function createAutomodRule(bot: BotWithCache) { // Timeout actions require perm check if (action.type === AutoModerationActionType.Timeout) { - requireBotGuildPermissions(bot, guildId, ["MODERATE_MEMBERS"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["MODERATE_MEMBERS"]); } } diff --git a/plugins/permissions/src/guilds/automod/deleteAutomodRule.ts b/plugins/permissions/src/guilds/automod/deleteAutomodRule.ts index dcf54b041..4ec9359ef 100644 --- a/plugins/permissions/src/guilds/automod/deleteAutomodRule.ts +++ b/plugins/permissions/src/guilds/automod/deleteAutomodRule.ts @@ -5,7 +5,7 @@ export function deleteAutomodRule(bot: BotWithCache) { const deleteAutomodRule = bot.helpers.deleteAutomodRule; bot.helpers.deleteAutomodRule = async function (guildId, options) { - requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["MANAGE_GUILD"]); return await deleteAutomodRule(guildId, options); }; diff --git a/plugins/permissions/src/guilds/automod/editAutomodRule.ts b/plugins/permissions/src/guilds/automod/editAutomodRule.ts index 0bc3c5ea5..f6073ced7 100644 --- a/plugins/permissions/src/guilds/automod/editAutomodRule.ts +++ b/plugins/permissions/src/guilds/automod/editAutomodRule.ts @@ -5,7 +5,7 @@ export function editAutomodRule(bot: BotWithCache) { const editAutomodRule = bot.helpers.editAutomodRule; bot.helpers.editAutomodRule = async function (guildId, ruleId, options) { - requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["MANAGE_GUILD"]); for (const action of options.actions ?? []) { // Check for maximum duration seconds @@ -19,7 +19,7 @@ export function editAutomodRule(bot: BotWithCache) { // Timeout actions require perm check if (action.type === AutoModerationActionType.Timeout) { - requireBotGuildPermissions(bot, guildId, ["MODERATE_MEMBERS"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["MODERATE_MEMBERS"]); } } diff --git a/plugins/permissions/src/guilds/automod/getAutomodRule.ts b/plugins/permissions/src/guilds/automod/getAutomodRule.ts index 805c53a0d..6e5612619 100644 --- a/plugins/permissions/src/guilds/automod/getAutomodRule.ts +++ b/plugins/permissions/src/guilds/automod/getAutomodRule.ts @@ -5,7 +5,7 @@ export function getAutomodRule(bot: BotWithCache) { const getAutomodRule = bot.helpers.getAutomodRule; bot.helpers.getAutomodRule = async function (guildId, ruleId) { - requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["MANAGE_GUILD"]); return await getAutomodRule(guildId, ruleId); }; diff --git a/plugins/permissions/src/guilds/automod/getAutomodRules.ts b/plugins/permissions/src/guilds/automod/getAutomodRules.ts index 35c4550d3..3543a9901 100644 --- a/plugins/permissions/src/guilds/automod/getAutomodRules.ts +++ b/plugins/permissions/src/guilds/automod/getAutomodRules.ts @@ -5,7 +5,7 @@ export function getAutomodRules(bot: BotWithCache) { const getAutomodRules = bot.helpers.getAutomodRules; bot.helpers.getAutomodRules = async function (guildId) { - requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["MANAGE_GUILD"]); return await getAutomodRules(guildId); }; diff --git a/plugins/permissions/src/guilds/deleteGuild.ts b/plugins/permissions/src/guilds/deleteGuild.ts index cd2a3b57e..a29b50640 100644 --- a/plugins/permissions/src/guilds/deleteGuild.ts +++ b/plugins/permissions/src/guilds/deleteGuild.ts @@ -4,7 +4,7 @@ export function deleteGuild(bot: BotWithCache) { const deleteGuild = bot.helpers.deleteGuild; bot.helpers.deleteGuild = async function (guildId) { - const guild = bot.guilds.get(guildId); + const guild = bot.guilds.get(bot.transformers.snowflake(guildId)); if (guild && guild.ownerId !== bot.id) throw new Error("A bot can only delete a guild it owns."); return await deleteGuild(guildId); diff --git a/plugins/permissions/src/guilds/editGuild.ts b/plugins/permissions/src/guilds/editGuild.ts index f6037e464..866dbf968 100644 --- a/plugins/permissions/src/guilds/editGuild.ts +++ b/plugins/permissions/src/guilds/editGuild.ts @@ -6,8 +6,8 @@ export function editGuild(bot: BotWithCache) { bot.helpers.editGuild = async function (guildId, options, shardId) { if (options.features?.includes(GuildFeatures.Community)) { - requireBotGuildPermissions(bot, guildId, ["ADMINISTRATOR"]); - } else requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["ADMINISTRATOR"]); + } else requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["MANAGE_GUILD"]); return await editGuild(guildId, options, shardId); }; diff --git a/plugins/permissions/src/guilds/editGuildMfaLevel.ts b/plugins/permissions/src/guilds/editGuildMfaLevel.ts index 035c360a7..59c61bba8 100644 --- a/plugins/permissions/src/guilds/editGuildMfaLevel.ts +++ b/plugins/permissions/src/guilds/editGuildMfaLevel.ts @@ -4,7 +4,7 @@ export function editGuildMfaLevel(bot: BotWithCache) { const editGuildMfaLevel = bot.helpers.editGuildMfaLevel; bot.helpers.editGuildMfaLevel = async function (guildId, mfaLevel, reason) { - const guild = bot.guilds.get(guildId); + const guild = bot.guilds.get(bot.transformers.snowflake(guildId)); if (guild?.ownerId !== bot.id) throw new Error("The bot is not the owner of the guild"); return await editGuildMfaLevel(guildId, mfaLevel, reason); }; diff --git a/plugins/permissions/src/guilds/editWelcomeScreen.ts b/plugins/permissions/src/guilds/editWelcomeScreen.ts index a6dfc637d..7407a774b 100644 --- a/plugins/permissions/src/guilds/editWelcomeScreen.ts +++ b/plugins/permissions/src/guilds/editWelcomeScreen.ts @@ -5,7 +5,7 @@ export function editWelcomeScreen(bot: BotWithCache) { const editWelcomeScreen = bot.helpers.editWelcomeScreen; bot.helpers.editWelcomeScreen = async function (guildId, options) { - requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["MANAGE_GUILD"]); return await editWelcomeScreen(guildId, options); }; diff --git a/plugins/permissions/src/guilds/events/createScheduledEvent.ts b/plugins/permissions/src/guilds/events/createScheduledEvent.ts index c7968022e..84319803e 100644 --- a/plugins/permissions/src/guilds/events/createScheduledEvent.ts +++ b/plugins/permissions/src/guilds/events/createScheduledEvent.ts @@ -12,7 +12,7 @@ export function createScheduledEvent(bot: BotWithCache) { ); } - requireBotChannelPermissions(bot, options.channelId, [ + requireBotChannelPermissions(bot, bot.transformers.snowflake(options.channelId), [ "MANAGE_CHANNELS", "MUTE_MEMBERS", "MOVE_MEMBERS", @@ -20,11 +20,11 @@ export function createScheduledEvent(bot: BotWithCache) { // MANAGE_EVENTS at the guild level or at least MANAGE_EVENTS for the channel_id associated with the event try { - requireBotGuildPermissions(bot, guildId, [ + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), [ "MANAGE_EVENTS", ]); } catch { - requireBotChannelPermissions(bot, options.channelId, [ + requireBotChannelPermissions(bot, bot.transformers.snowflake(options.channelId), [ "MANAGE_EVENTS", ]); } @@ -39,18 +39,18 @@ export function createScheduledEvent(bot: BotWithCache) { ); } - requireBotChannelPermissions(bot, options.channelId, [ + requireBotChannelPermissions(bot, bot.transformers.snowflake(options.channelId), [ "VIEW_CHANNEL", "CONNECT", ]); // MANAGE_EVENTS at the guild level or at least MANAGE_EVENTS for the channel_id associated with the event try { - requireBotGuildPermissions(bot, guildId, [ + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), [ "MANAGE_EVENTS", ]); } catch { - requireBotChannelPermissions(bot, options.channelId, [ + requireBotChannelPermissions(bot, bot.transformers.snowflake(options.channelId), [ "MANAGE_EVENTS", ]); } @@ -60,7 +60,7 @@ export function createScheduledEvent(bot: BotWithCache) { // EXTERNAL EVENTS - requireBotGuildPermissions(bot, guildId, [ + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), [ "MANAGE_EVENTS", ]); diff --git a/plugins/permissions/src/guilds/events/editScheduledEvent.ts b/plugins/permissions/src/guilds/events/editScheduledEvent.ts index ccce24183..7c097b965 100644 --- a/plugins/permissions/src/guilds/events/editScheduledEvent.ts +++ b/plugins/permissions/src/guilds/events/editScheduledEvent.ts @@ -12,7 +12,7 @@ export function editScheduledEvent(bot: BotWithCache) { ); } - requireBotChannelPermissions(bot, options.channelId, [ + requireBotChannelPermissions(bot, bot.transformers.snowflake(options.channelId), [ "MANAGE_CHANNELS", "MUTE_MEMBERS", "MOVE_MEMBERS", @@ -20,11 +20,11 @@ export function editScheduledEvent(bot: BotWithCache) { // MANAGE_EVENTS at the guild level or at least MANAGE_EVENTS for the channel_id associated with the event try { - requireBotGuildPermissions(bot, guildId, [ + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), [ "MANAGE_EVENTS", ]); } catch { - requireBotChannelPermissions(bot, options.channelId, [ + requireBotChannelPermissions(bot, bot.transformers.snowflake(options.channelId), [ "MANAGE_EVENTS", ]); } @@ -39,18 +39,18 @@ export function editScheduledEvent(bot: BotWithCache) { ); } - requireBotChannelPermissions(bot, options.channelId, [ + requireBotChannelPermissions(bot, bot.transformers.snowflake(options.channelId), [ "VIEW_CHANNEL", "CONNECT", ]); // MANAGE_EVENTS at the guild level or at least MANAGE_EVENTS for the channel_id associated with the event try { - requireBotGuildPermissions(bot, guildId, [ + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), [ "MANAGE_EVENTS", ]); } catch { - requireBotChannelPermissions(bot, options.channelId, [ + requireBotChannelPermissions(bot, bot.transformers.snowflake(options.channelId), [ "MANAGE_EVENTS", ]); } @@ -60,7 +60,7 @@ export function editScheduledEvent(bot: BotWithCache) { // EXTERNAL EVENTS - requireBotGuildPermissions(bot, guildId, [ + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), [ "MANAGE_EVENTS", ]); diff --git a/plugins/permissions/src/guilds/getAuditLog.ts b/plugins/permissions/src/guilds/getAuditLog.ts index 862514a88..7cc6c22fc 100644 --- a/plugins/permissions/src/guilds/getAuditLog.ts +++ b/plugins/permissions/src/guilds/getAuditLog.ts @@ -5,7 +5,7 @@ export function getAuditLog(bot: BotWithCache) { const getAuditLog = bot.helpers.getAuditLog; bot.helpers.getAuditLog = async function (guildId, options) { - requireBotGuildPermissions(bot, guildId, ["VIEW_AUDIT_LOG"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["VIEW_AUDIT_LOG"]); return await getAuditLog(guildId, options); }; diff --git a/plugins/permissions/src/guilds/getBan.ts b/plugins/permissions/src/guilds/getBan.ts index 80b5d54ea..46b384ed4 100644 --- a/plugins/permissions/src/guilds/getBan.ts +++ b/plugins/permissions/src/guilds/getBan.ts @@ -5,7 +5,7 @@ export function getBan(bot: BotWithCache) { const getBan = bot.helpers.getBan; bot.helpers.getBan = async function (guildId, memberId) { - requireBotGuildPermissions(bot, guildId, ["BAN_MEMBERS"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["BAN_MEMBERS"]); return await getBan(guildId, memberId); }; diff --git a/plugins/permissions/src/guilds/getBans.ts b/plugins/permissions/src/guilds/getBans.ts index 059230292..93cf7589e 100644 --- a/plugins/permissions/src/guilds/getBans.ts +++ b/plugins/permissions/src/guilds/getBans.ts @@ -5,7 +5,7 @@ export function getBans(bot: BotWithCache) { const getBans = bot.helpers.getBans; bot.helpers.getBans = async function (guildId) { - requireBotGuildPermissions(bot, guildId, ["BAN_MEMBERS"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["BAN_MEMBERS"]); return await getBans(guildId); }; diff --git a/plugins/permissions/src/guilds/getPruneCount.ts b/plugins/permissions/src/guilds/getPruneCount.ts index b7ffc00a4..45fbf006a 100644 --- a/plugins/permissions/src/guilds/getPruneCount.ts +++ b/plugins/permissions/src/guilds/getPruneCount.ts @@ -5,7 +5,7 @@ export function getPruneCount(bot: BotWithCache) { const getPruneCount = bot.helpers.getPruneCount; bot.helpers.getPruneCount = async function (guildId, options) { - requireBotGuildPermissions(bot, guildId, ["KICK_MEMBERS"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["KICK_MEMBERS"]); return await getPruneCount(guildId, options); }; diff --git a/plugins/permissions/src/guilds/getVanityUrl.ts b/plugins/permissions/src/guilds/getVanityUrl.ts index 7b82dd582..5aee89d18 100644 --- a/plugins/permissions/src/guilds/getVanityUrl.ts +++ b/plugins/permissions/src/guilds/getVanityUrl.ts @@ -5,7 +5,7 @@ export function getVanityUrl(bot: BotWithCache) { const getVanityUrl = bot.helpers.getVanityUrl; bot.helpers.getVanityUrl = async function (guildId) { - requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["MANAGE_GUILD"]); return await getVanityUrl(guildId); }; diff --git a/plugins/permissions/src/guilds/getWelcomeScreen.ts b/plugins/permissions/src/guilds/getWelcomeScreen.ts index 84ff54318..fac58cebd 100644 --- a/plugins/permissions/src/guilds/getWelcomeScreen.ts +++ b/plugins/permissions/src/guilds/getWelcomeScreen.ts @@ -5,8 +5,8 @@ export function getWelcomeScreen(bot: BotWithCache) { const getWelcomeScreen = bot.helpers.getWelcomeScreen; bot.helpers.getWelcomeScreen = async function (guildId) { - const guild = bot.guilds.get(guildId); - if (!guild?.welcomeScreen) requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); + const guild = bot.guilds.get(bot.transformers.snowflake(guildId)); + if (!guild?.welcomeScreen) requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["MANAGE_GUILD"]); return await getWelcomeScreen(guildId); }; diff --git a/plugins/permissions/src/guilds/voice/connectToVoiceChannels.ts b/plugins/permissions/src/guilds/voice/connectToVoiceChannels.ts index 3180b552b..a70dda06b 100644 --- a/plugins/permissions/src/guilds/voice/connectToVoiceChannels.ts +++ b/plugins/permissions/src/guilds/voice/connectToVoiceChannels.ts @@ -5,7 +5,7 @@ export function connectToVoiceChannel(bot: BotWithCache) { const connectToVoiceChannel = bot.helpers.connectToVoiceChannel; bot.helpers.connectToVoiceChannel = async function (guildId, channelId, options) { - const channel = bot.channels.get(channelId); + const channel = bot.channels.get(bot.transformers.snowflake(channelId)); if (!channel) throw new Error("CHANNEL_NOT_FOUND"); if ( diff --git a/plugins/permissions/src/guilds/widgets/editWidgetSettings.ts b/plugins/permissions/src/guilds/widgets/editWidgetSettings.ts index 2790d1621..943447b53 100644 --- a/plugins/permissions/src/guilds/widgets/editWidgetSettings.ts +++ b/plugins/permissions/src/guilds/widgets/editWidgetSettings.ts @@ -5,7 +5,7 @@ export function editWidgetSettings(bot: BotWithCache) { const editWidgetSettings = bot.helpers.editWidgetSettings; bot.helpers.editWidgetSettings = async function (guildId, enabled, channelId) { - requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["MANAGE_GUILD"]); return await editWidgetSettings(guildId, enabled, channelId); }; diff --git a/plugins/permissions/src/integrations/deleteIntegrations.ts b/plugins/permissions/src/integrations/deleteIntegrations.ts index 852ae91ac..05f03d050 100644 --- a/plugins/permissions/src/integrations/deleteIntegrations.ts +++ b/plugins/permissions/src/integrations/deleteIntegrations.ts @@ -5,7 +5,7 @@ export function deleteIntegration(bot: BotWithCache) { const deleteIntegration = bot.helpers.deleteIntegration; bot.helpers.deleteIntegration = async function (guildId, id) { - requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["MANAGE_GUILD"]); return await deleteIntegration(guildId, id); }; diff --git a/plugins/permissions/src/integrations/getIntegrations.ts b/plugins/permissions/src/integrations/getIntegrations.ts index f5d7480bf..02b98b10d 100644 --- a/plugins/permissions/src/integrations/getIntegrations.ts +++ b/plugins/permissions/src/integrations/getIntegrations.ts @@ -5,7 +5,7 @@ export function getIntegrations(bot: BotWithCache) { const getIntegrations = bot.helpers.getIntegrations; bot.helpers.getIntegrations = async function (guildId) { - requireBotGuildPermissions(bot, guildId, ["MANAGE_GUILD"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["MANAGE_GUILD"]); return await getIntegrations(guildId); }; diff --git a/plugins/permissions/src/members/banMember.ts b/plugins/permissions/src/members/banMember.ts index dcea3e03a..74a70886c 100644 --- a/plugins/permissions/src/members/banMember.ts +++ b/plugins/permissions/src/members/banMember.ts @@ -5,7 +5,7 @@ export function banMember(bot: BotWithCache) { const banMember = bot.helpers.banMember; bot.helpers.banMember = async function (guildId, id, options) { - requireBotGuildPermissions(bot, guildId, ["BAN_MEMBERS"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["BAN_MEMBERS"]); return await banMember(guildId, id, options); }; diff --git a/plugins/permissions/src/members/editBotMember.ts b/plugins/permissions/src/members/editBotMember.ts index 78721acba..5458840d4 100644 --- a/plugins/permissions/src/members/editBotMember.ts +++ b/plugins/permissions/src/members/editBotMember.ts @@ -5,7 +5,7 @@ export function editBotMember(bot: BotWithCache) { const editBotMember = bot.helpers.editBotMember; bot.helpers.editBotMember = async function (guildId, options) { - requireBotGuildPermissions(bot, guildId, ["CHANGE_NICKNAME"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["CHANGE_NICKNAME"]); return await editBotMember(guildId, options); }; diff --git a/plugins/permissions/src/members/editMember.ts b/plugins/permissions/src/members/editMember.ts index ecf285cc3..3fad554a9 100644 --- a/plugins/permissions/src/members/editMember.ts +++ b/plugins/permissions/src/members/editMember.ts @@ -15,8 +15,8 @@ export function editMember(bot: BotWithCache) { options.mute !== undefined || options.deaf !== undefined || options.channelId !== undefined ) { - const memberVoiceState = (bot.guilds.get(guildId)) - ?.voiceStates.get(memberId); + const memberVoiceState = (bot.guilds.get(bot.transformers.snowflake(guildId))) + ?.voiceStates.get(bot.transformers.snowflake(memberId)); if (!memberVoiceState?.channelId) throw new Error("MEMBER_NOT_IN_VOICE_CHANNEL"); @@ -27,11 +27,11 @@ export function editMember(bot: BotWithCache) { if (options.channelId) { const requiredVoicePerms: PermissionStrings[] = ["CONNECT", "MOVE_MEMBERS"]; if (memberVoiceState) requireBotChannelPermissions(bot, memberVoiceState?.channelId, requiredVoicePerms); - requireBotChannelPermissions(bot, options.channelId, requiredVoicePerms); + requireBotChannelPermissions(bot, bot.transformers.snowflake(options.channelId), requiredVoicePerms); } } - requireBotGuildPermissions(bot, guildId, requiredPerms); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), requiredPerms); return await editMember(guildId, memberId, options); }; diff --git a/plugins/permissions/src/members/kickMember.ts b/plugins/permissions/src/members/kickMember.ts index fd6538365..96b04de54 100644 --- a/plugins/permissions/src/members/kickMember.ts +++ b/plugins/permissions/src/members/kickMember.ts @@ -5,7 +5,7 @@ export function kickMember(bot: BotWithCache) { const kickMember = bot.helpers.kickMember; bot.helpers.kickMember = async function (guildId, memberId, reason) { - requireBotGuildPermissions(bot, guildId, ["KICK_MEMBERS"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["KICK_MEMBERS"]); return await kickMember(guildId, memberId, reason); }; diff --git a/plugins/permissions/src/members/pruneMembers.ts b/plugins/permissions/src/members/pruneMembers.ts index 91d669b9e..b8c010dfd 100644 --- a/plugins/permissions/src/members/pruneMembers.ts +++ b/plugins/permissions/src/members/pruneMembers.ts @@ -5,7 +5,7 @@ export function pruneMembers(bot: BotWithCache) { const pruneMembers = bot.helpers.pruneMembers; bot.helpers.pruneMembers = async function (guildId, options) { - requireBotGuildPermissions(bot, guildId, ["KICK_MEMBERS"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["KICK_MEMBERS"]); return await pruneMembers(guildId, options); }; diff --git a/plugins/permissions/src/members/unbanMember.ts b/plugins/permissions/src/members/unbanMember.ts index eeb0ff9b2..51e57d1b4 100644 --- a/plugins/permissions/src/members/unbanMember.ts +++ b/plugins/permissions/src/members/unbanMember.ts @@ -5,7 +5,7 @@ export function unbanMember(bot: BotWithCache) { const unbanMember = bot.helpers.unbanMember; bot.helpers.unbanMember = async function (guildId, id) { - requireBotGuildPermissions(bot, guildId, ["BAN_MEMBERS"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["BAN_MEMBERS"]); return await unbanMember(guildId, id); }; diff --git a/plugins/permissions/src/messages/deleteMessage.ts b/plugins/permissions/src/messages/deleteMessage.ts index d35a43dfe..cb7187321 100644 --- a/plugins/permissions/src/messages/deleteMessage.ts +++ b/plugins/permissions/src/messages/deleteMessage.ts @@ -5,11 +5,11 @@ export function deleteMessage(bot: BotWithCache) { const deleteMessage = bot.helpers.deleteMessage; bot.helpers.deleteMessage = async function (channelId, messageId, reason, milliseconds) { - const message = bot.messages.get(messageId); + const message = bot.messages.get(bot.transformers.snowflake(messageId)); // DELETING SELF MESSAGES IS ALWAYS ALLOWED if (message?.authorId === bot.id) return deleteMessage(channelId, messageId, reason, milliseconds); - const channel = bot.channels.get(channelId); + const channel = bot.channels.get(bot.transformers.snowflake(channelId)); if (channel?.guildId) { requireBotChannelPermissions(bot, channel, [ "MANAGE_MESSAGES", diff --git a/plugins/permissions/src/messages/deleteMessages.ts b/plugins/permissions/src/messages/deleteMessages.ts index 3649e7c15..09f2a0b9f 100644 --- a/plugins/permissions/src/messages/deleteMessages.ts +++ b/plugins/permissions/src/messages/deleteMessages.ts @@ -5,7 +5,7 @@ export function deleteMessages(bot: BotWithCache) { const deleteMessages = bot.helpers.deleteMessages; bot.helpers.deleteMessages = async function (channelId, ids, reason) { - const channel = bot.channels.get(channelId); + const channel = bot.channels.get(bot.transformers.snowflake(channelId)); if (!channel?.guildId) { throw new Error( `Bulk deleting messages is only allowed in channels which has a guild id. Channel ID: ${channelId} IDS: ${ diff --git a/plugins/permissions/src/messages/getMessage.ts b/plugins/permissions/src/messages/getMessage.ts index 18ebc4cf0..19a73ba53 100644 --- a/plugins/permissions/src/messages/getMessage.ts +++ b/plugins/permissions/src/messages/getMessage.ts @@ -5,7 +5,7 @@ export function getMessage(bot: BotWithCache) { const getMessage = bot.helpers.getMessage; bot.helpers.getMessage = async function (channelId, messageId) { - const channel = bot.channels.get(channelId); + const channel = bot.channels.get(bot.transformers.snowflake(channelId)); if (channel?.guildId) requireBotChannelPermissions(bot, channel, ["READ_MESSAGE_HISTORY"]); return await getMessage(channelId, messageId); diff --git a/plugins/permissions/src/messages/getMessages.ts b/plugins/permissions/src/messages/getMessages.ts index 43beb1fd8..077d5a8e9 100644 --- a/plugins/permissions/src/messages/getMessages.ts +++ b/plugins/permissions/src/messages/getMessages.ts @@ -5,7 +5,7 @@ export function getMessages(bot: BotWithCache) { const getMessages = bot.helpers.getMessages; bot.helpers.getMessages = async function (channelId, options) { - const channel = bot.channels.get(channelId); + const channel = bot.channels.get(bot.transformers.snowflake(channelId)); if (channel?.guildId) { requireBotChannelPermissions(bot, channel, [ "READ_MESSAGE_HISTORY", diff --git a/plugins/permissions/src/messages/pinMessage.ts b/plugins/permissions/src/messages/pinMessage.ts index 9cef9e96d..d2aa34adb 100644 --- a/plugins/permissions/src/messages/pinMessage.ts +++ b/plugins/permissions/src/messages/pinMessage.ts @@ -8,7 +8,7 @@ export function pinMessage(bot: BotWithCache) { channelId, messageId, ) { - requireBotChannelPermissions(bot, channelId, [ + requireBotChannelPermissions(bot, bot.transformers.snowflake(channelId), [ "MANAGE_MESSAGES", ]); diff --git a/plugins/permissions/src/messages/reactions/addReaction.ts b/plugins/permissions/src/messages/reactions/addReaction.ts index ba48be219..7c0f940bc 100644 --- a/plugins/permissions/src/messages/reactions/addReaction.ts +++ b/plugins/permissions/src/messages/reactions/addReaction.ts @@ -5,7 +5,7 @@ export function addReaction(bot: BotWithCache) { const addReaction = bot.helpers.addReaction; bot.helpers.addReaction = async function (channelId, messageId, reaction) { - requireBotChannelPermissions(bot, channelId, ["READ_MESSAGE_HISTORY", "ADD_REACTIONS"]); + requireBotChannelPermissions(bot, bot.transformers.snowflake(channelId), ["READ_MESSAGE_HISTORY", "ADD_REACTIONS"]); return await addReaction(channelId, messageId, reaction); }; diff --git a/plugins/permissions/src/messages/reactions/addReactions.ts b/plugins/permissions/src/messages/reactions/addReactions.ts index 43c34afb6..e5e72b196 100644 --- a/plugins/permissions/src/messages/reactions/addReactions.ts +++ b/plugins/permissions/src/messages/reactions/addReactions.ts @@ -5,7 +5,7 @@ export function addReactions(bot: BotWithCache) { const addReactions = bot.helpers.addReactions; bot.helpers.addReactions = async function (channelId, messageId, reactions, ordered) { - requireBotChannelPermissions(bot, channelId, ["READ_MESSAGE_HISTORY", "ADD_REACTIONS"]); + requireBotChannelPermissions(bot, bot.transformers.snowflake(channelId), ["READ_MESSAGE_HISTORY", "ADD_REACTIONS"]); return await addReactions(channelId, messageId, reactions, ordered); }; diff --git a/plugins/permissions/src/messages/reactions/deleteReactionsAll.ts b/plugins/permissions/src/messages/reactions/deleteReactionsAll.ts index e6f5b3cd2..1181d8539 100644 --- a/plugins/permissions/src/messages/reactions/deleteReactionsAll.ts +++ b/plugins/permissions/src/messages/reactions/deleteReactionsAll.ts @@ -5,7 +5,7 @@ export function deleteReactionsAll(bot: BotWithCache) { const deleteReactionsAll = bot.helpers.deleteReactionsAll; bot.helpers.deleteReactionsAll = async function (channelId, messageId) { - requireBotChannelPermissions(bot, channelId, ["MANAGE_MESSAGES"]); + requireBotChannelPermissions(bot, bot.transformers.snowflake(channelId), ["MANAGE_MESSAGES"]); return await deleteReactionsAll(channelId, messageId); }; diff --git a/plugins/permissions/src/messages/reactions/deleteReactionsEmoji.ts b/plugins/permissions/src/messages/reactions/deleteReactionsEmoji.ts index 9c6b58fc8..c4d92eb96 100644 --- a/plugins/permissions/src/messages/reactions/deleteReactionsEmoji.ts +++ b/plugins/permissions/src/messages/reactions/deleteReactionsEmoji.ts @@ -5,7 +5,7 @@ export function deleteReactionsEmoji(bot: BotWithCache) { const deleteReactionsEmoji = bot.helpers.deleteReactionsEmoji; bot.helpers.deleteReactionsEmoji = async function (channelId, messageId, reaction) { - requireBotChannelPermissions(bot, channelId, ["MANAGE_MESSAGES"]); + requireBotChannelPermissions(bot, bot.transformers.snowflake(channelId), ["MANAGE_MESSAGES"]); return await deleteReactionsEmoji(channelId, messageId, reaction); }; diff --git a/plugins/permissions/src/messages/reactions/deleteUserReaction.ts.ts b/plugins/permissions/src/messages/reactions/deleteUserReaction.ts.ts index 8412aa91a..8b534e1a4 100644 --- a/plugins/permissions/src/messages/reactions/deleteUserReaction.ts.ts +++ b/plugins/permissions/src/messages/reactions/deleteUserReaction.ts.ts @@ -5,7 +5,7 @@ export function deleteUserReaction(bot: BotWithCache) { const deleteUserReaction = bot.helpers.deleteUserReaction; bot.helpers.deleteUserReaction = async function (channelId, messageId, userId, reaction) { - requireBotChannelPermissions(bot, channelId, ["MANAGE_MESSAGES"]); + requireBotChannelPermissions(bot, bot.transformers.snowflake(channelId), ["MANAGE_MESSAGES"]); return await deleteUserReaction(channelId, messageId, userId, reaction); }; diff --git a/plugins/permissions/src/messages/sendMessage.ts b/plugins/permissions/src/messages/sendMessage.ts index 149ee6a16..6ea5f13ea 100644 --- a/plugins/permissions/src/messages/sendMessage.ts +++ b/plugins/permissions/src/messages/sendMessage.ts @@ -5,7 +5,7 @@ export function sendMessage(bot: BotWithCache) { const sendMessage = bot.helpers.sendMessage; bot.helpers.sendMessage = async function (channelId, content) { - const channel = bot.channels.get(channelId); + const channel = bot.channels.get(bot.transformers.snowflake(channelId)); if ( channel && [ChannelTypes.GuildCategory, ChannelTypes.GuildStageVoice, ChannelTypes.GuildForum].includes(channel.type) diff --git a/plugins/permissions/src/messages/unpinMessage.ts b/plugins/permissions/src/messages/unpinMessage.ts index b908ae9a6..6d93d6eba 100644 --- a/plugins/permissions/src/messages/unpinMessage.ts +++ b/plugins/permissions/src/messages/unpinMessage.ts @@ -5,7 +5,7 @@ export function unpinMessage(bot: BotWithCache) { const unpinMessage = bot.helpers.unpinMessage; bot.helpers.unpinMessage = async function (channelId, messageId) { - requireBotChannelPermissions(bot, channelId, ["MANAGE_MESSAGES"]); + requireBotChannelPermissions(bot, bot.transformers.snowflake(channelId), ["MANAGE_MESSAGES"]); return await unpinMessage(channelId, messageId); }; diff --git a/plugins/permissions/src/roles/addRole.ts b/plugins/permissions/src/roles/addRole.ts index dcf6e8445..c5b22f47a 100644 --- a/plugins/permissions/src/roles/addRole.ts +++ b/plugins/permissions/src/roles/addRole.ts @@ -5,9 +5,9 @@ export function addRole(bot: BotWithCache) { const addRole = bot.helpers.addRole; bot.helpers.addRole = async function (guildId, memberId, roleId, reason) { - const guild = bot.guilds.get(guildId); + const guild = bot.guilds.get(bot.transformers.snowflake(guildId)); if (guild) { - const role = guild.roles.get(roleId); + const role = guild.roles.get(bot.transformers.snowflake(roleId)); if (role) { const botRole = highestRole(bot, guild, bot.id); diff --git a/plugins/permissions/src/roles/createRole.ts b/plugins/permissions/src/roles/createRole.ts index 48e5f73d5..eab437402 100644 --- a/plugins/permissions/src/roles/createRole.ts +++ b/plugins/permissions/src/roles/createRole.ts @@ -5,7 +5,7 @@ export function createRole(bot: BotWithCache) { const createRole = bot.helpers.createRole; bot.helpers.createRole = async function (guildId, options, reason) { - requireBotGuildPermissions(bot, guildId, ["MANAGE_ROLES"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["MANAGE_ROLES"]); return await createRole(guildId, options, reason); }; diff --git a/plugins/permissions/src/roles/deleteRole.ts b/plugins/permissions/src/roles/deleteRole.ts index dc3722d9b..e13f77bba 100644 --- a/plugins/permissions/src/roles/deleteRole.ts +++ b/plugins/permissions/src/roles/deleteRole.ts @@ -5,7 +5,7 @@ export function deleteRole(bot: BotWithCache) { const deleteRole = bot.helpers.deleteRole; bot.helpers.deleteRole = async function (guildId, id) { - requireBotGuildPermissions(bot, guildId, ["MANAGE_ROLES"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["MANAGE_ROLES"]); return await deleteRole(guildId, id); }; diff --git a/plugins/permissions/src/roles/editRole.ts b/plugins/permissions/src/roles/editRole.ts index e587e3774..1bb6a6e39 100644 --- a/plugins/permissions/src/roles/editRole.ts +++ b/plugins/permissions/src/roles/editRole.ts @@ -10,9 +10,9 @@ export function editRole(bot: BotWithCache) { id, options, ) { - const guild = bot.guilds.get(guildId); + const guild = bot.guilds.get(bot.transformers.snowflake(guildId)); if (guild) { - const role = guild.roles.get(id); + const role = guild.roles.get(bot.transformers.snowflake(id)); if (role) { const botRole = highestRole(bot, guild, bot.id); diff --git a/plugins/permissions/src/roles/modifyRolePositions.ts b/plugins/permissions/src/roles/modifyRolePositions.ts index e50285f26..97bcab58b 100644 --- a/plugins/permissions/src/roles/modifyRolePositions.ts +++ b/plugins/permissions/src/roles/modifyRolePositions.ts @@ -5,7 +5,7 @@ export function modifyRolePositions(bot: BotWithCache) { const modifyRolePositions = bot.helpers.modifyRolePositions; bot.helpers.modifyRolePositions = async function (guildId, categoryId) { - requireBotGuildPermissions(bot, guildId, ["MANAGE_ROLES"]); + requireBotGuildPermissions(bot, bot.transformers.snowflake(guildId), ["MANAGE_ROLES"]); return await modifyRolePositions(guildId, categoryId); }; diff --git a/plugins/permissions/src/roles/removeRole.ts b/plugins/permissions/src/roles/removeRole.ts index 650195917..323f82da7 100644 --- a/plugins/permissions/src/roles/removeRole.ts +++ b/plugins/permissions/src/roles/removeRole.ts @@ -10,9 +10,9 @@ export function removeRole(bot: BotWithCache) { roleId, reason, ) { - const guild = bot.guilds.get(guildId); + const guild = bot.guilds.get(bot.transformers.snowflake(guildId)); if (guild) { - const role = guild.roles.get(roleId); + const role = guild.roles.get(bot.transformers.snowflake(roleId)); if (role) { const botRole = highestRole(bot, guild, bot.id); diff --git a/plugins/permissions/src/webhooks/createWebhook.ts b/plugins/permissions/src/webhooks/createWebhook.ts index 7d08e39ed..688107d07 100644 --- a/plugins/permissions/src/webhooks/createWebhook.ts +++ b/plugins/permissions/src/webhooks/createWebhook.ts @@ -5,7 +5,7 @@ export function createWebhook(bot: BotWithCache) { const createWebhook = bot.helpers.createWebhook; bot.helpers.createWebhook = async function (channelId, options) { - requireBotChannelPermissions(bot, channelId, ["MANAGE_WEBHOOKS", "VIEW_CHANNEL"]); + requireBotChannelPermissions(bot, bot.transformers.snowflake(channelId), ["MANAGE_WEBHOOKS", "VIEW_CHANNEL"]); return await createWebhook(channelId, options); }; diff --git a/plugins/permissions/src/webhooks/deleteWebhook.ts b/plugins/permissions/src/webhooks/deleteWebhook.ts index ea556a09f..fdd8616d5 100644 --- a/plugins/permissions/src/webhooks/deleteWebhook.ts +++ b/plugins/permissions/src/webhooks/deleteWebhook.ts @@ -5,7 +5,7 @@ export function deleteWebhook(bot: BotWithCache) { const deleteWebhook = bot.helpers.deleteWebhook; bot.helpers.deleteWebhook = async function (channelId, options) { - requireBotChannelPermissions(bot, channelId, ["MANAGE_WEBHOOKS", "VIEW_CHANNEL"]); + requireBotChannelPermissions(bot, bot.transformers.snowflake(channelId), ["MANAGE_WEBHOOKS", "VIEW_CHANNEL"]); return await deleteWebhook(channelId, options); }; diff --git a/plugins/permissions/src/webhooks/editWebhook.ts b/plugins/permissions/src/webhooks/editWebhook.ts index a18ccfa4a..e1d816943 100644 --- a/plugins/permissions/src/webhooks/editWebhook.ts +++ b/plugins/permissions/src/webhooks/editWebhook.ts @@ -5,7 +5,12 @@ export function editWebhook(bot: BotWithCache) { const editWebhook = bot.helpers.editWebhook; bot.helpers.editWebhook = async function (webhookId, options, fromChannelId) { - if (options.channelId) requireBotChannelPermissions(bot, options.channelId, ["MANAGE_WEBHOOKS", "VIEW_CHANNEL"]); + if (options.channelId) { + requireBotChannelPermissions(bot, bot.transformers.snowflake(options.channelId), [ + "MANAGE_WEBHOOKS", + "VIEW_CHANNEL", + ]); + } if (fromChannelId) requireBotChannelPermissions(bot, fromChannelId, ["MANAGE_WEBHOOKS", "VIEW_CHANNEL"]); return await editWebhook(webhookId, options); diff --git a/plugins/validations/src/messages/deleteMessages.ts b/plugins/validations/src/messages/deleteMessages.ts index 4dcbe260c..dda17b8a9 100644 --- a/plugins/validations/src/messages/deleteMessages.ts +++ b/plugins/validations/src/messages/deleteMessages.ts @@ -12,7 +12,7 @@ export function deleteMessages(bot: Bot) { const oldestAllowed = Date.now() - 1209600000; ids = ids.filter((id) => { - const createdAt = Number(id / 4194304n + 1420070400000n); + const createdAt = Number(bot.transformers.snowflake(id) / 4194304n + 1420070400000n); // IF MESSAGE IS OLDER THAN 2 WEEKS if (createdAt > oldestAllowed) return true;