From 179add27c9b744138277814fa99681f2667c1b32 Mon Sep 17 00:00:00 2001 From: itohatweb Date: Fri, 21 May 2021 15:55:49 +0000 Subject: [PATCH] Prettified Code! --- src/bot.ts | 6 +- src/cache.ts | 119 +++---------- src/handlers/channels/CHANNEL_DELETE.ts | 15 +- src/handlers/channels/CHANNEL_PINS_UPDATE.ts | 9 +- src/handlers/channels/CHANNEL_UPDATE.ts | 5 +- src/handlers/channels/THREAD_DELETE.ts | 10 +- src/handlers/channels/THREAD_LIST_SYNC.ts | 21 +-- .../channels/THREAD_MEMBERS_UPDATE.ts | 5 +- src/handlers/channels/THREAD_MEMBER_UPDATE.ts | 5 +- src/handlers/channels/THREAD_UPDATE.ts | 5 +- .../commands/APPLICATION_COMMAND_CREATE.ts | 4 +- .../commands/APPLICATION_COMMAND_DELETE.ts | 4 +- .../commands/APPLICATION_COMMAND_UPDATE.ts | 4 +- src/handlers/emojis/GUILD_EMOJIS_UPDATE.ts | 9 +- src/handlers/guilds/GUILD_BAN_ADD.ts | 10 +- src/handlers/guilds/GUILD_BAN_REMOVE.ts | 10 +- src/handlers/guilds/GUILD_CREATE.ts | 5 +- src/handlers/guilds/GUILD_DELETE.ts | 25 +-- .../guilds/GUILD_INTEGRATIONS_UPDATE.ts | 9 +- src/handlers/guilds/GUILD_UPDATE.ts | 19 +-- .../interactions/INTERACTION_CREATE.ts | 5 +- src/handlers/members/GUILD_MEMBERS_CHUNK.ts | 9 +- src/handlers/members/GUILD_MEMBER_ADD.ts | 10 +- src/handlers/members/GUILD_MEMBER_REMOVE.ts | 10 +- src/handlers/members/GUILD_MEMBER_UPDATE.ts | 38 +---- src/handlers/messages/MESSAGE_CREATE.ts | 15 +- src/handlers/messages/MESSAGE_DELETE.ts | 5 +- src/handlers/messages/MESSAGE_DELETE_BULK.ts | 10 +- src/handlers/messages/MESSAGE_REACTION_ADD.ts | 29 +--- .../messages/MESSAGE_REACTION_REMOVE.ts | 8 +- .../messages/MESSAGE_REACTION_REMOVE_ALL.ts | 15 +- .../messages/MESSAGE_REACTION_REMOVE_EMOJI.ts | 14 +- src/handlers/messages/MESSAGE_UPDATE.ts | 10 +- src/handlers/misc/PRESENCE_UPDATE.ts | 11 +- src/handlers/misc/READY.ts | 4 +- src/handlers/misc/USER_UPDATE.ts | 5 +- src/handlers/roles/GUILD_ROLE_CREATE.ts | 5 +- src/handlers/roles/GUILD_ROLE_DELETE.ts | 15 +- src/handlers/roles/GUILD_ROLE_UPDATE.ts | 5 +- src/handlers/voice/VOICE_SERVER_UPDATE.ts | 5 +- src/handlers/voice/VOICE_STATE_UPDATE.ts | 21 +-- src/handlers/webhooks/WEBHOOKS_UPDATE.ts | 5 +- src/helpers/channels/category_children.ts | 5 +- .../channel_overwrite_has_permission.ts | 4 +- src/helpers/channels/clone_channel.ts | 15 +- src/helpers/channels/create_channel.ts | 40 ++--- src/helpers/channels/create_stage_instance.ts | 18 +- src/helpers/channels/delete_channel.ts | 14 +- .../channels/delete_channel_overwrite.ts | 5 +- src/helpers/channels/delete_stage_instance.ts | 11 +- src/helpers/channels/edit_channel.ts | 43 ++--- .../channels/edit_channel_overwrite.ts | 19 +-- src/helpers/channels/follow_channel.ts | 15 +- src/helpers/channels/get_channel.ts | 11 +- src/helpers/channels/get_channel_webhooks.ts | 5 +- src/helpers/channels/get_channels.ts | 16 +- src/helpers/channels/get_pins.ts | 9 +- src/helpers/channels/get_stage_instance.ts | 5 +- src/helpers/channels/is_channel_synced.ts | 8 +- src/helpers/channels/start_typing.ts | 9 +- src/helpers/channels/swap_channels.ts | 11 +- src/helpers/channels/threads/add_to_thread.ts | 12 +- .../channels/threads/get_thread_members.ts | 8 +- .../channels/threads/remove_from_thread.ts | 12 +- src/helpers/channels/threads/start_thread.ts | 9 +- src/helpers/channels/update_stage_instance.ts | 16 +- src/helpers/channels/update_voice_state.ts | 5 +- .../discovery/add_discovery_subcategory.ts | 5 +- src/helpers/discovery/edit_discovery.ts | 11 +- .../discovery/get_discovery_categories.ts | 9 +- .../discovery/remove_discovery_subcategory.ts | 10 +- src/helpers/discovery/valid_discovery_term.ts | 6 +- src/helpers/emojis/create_emoji.ts | 21 +-- src/helpers/emojis/delete_emoji.ts | 12 +- src/helpers/emojis/edit_emoji.ts | 18 +- src/helpers/emojis/get_emoji.ts | 11 +- src/helpers/emojis/get_emojis.ts | 5 +- src/helpers/guilds/delete_guild.ts | 5 +- src/helpers/guilds/edit_guild.ts | 11 +- src/helpers/guilds/edit_welcome_screen.ts | 11 +- src/helpers/guilds/edit_widget.ts | 18 +- src/helpers/guilds/get_audit_logs.ts | 5 +- src/helpers/guilds/get_ban.ts | 5 +- src/helpers/guilds/get_bans.ts | 9 +- src/helpers/guilds/get_guild.ts | 10 +- src/helpers/guilds/get_guild_preview.ts | 5 +- src/helpers/guilds/get_prune_count.ts | 11 +- src/helpers/guilds/get_voice_regions.ts | 9 +- src/helpers/guilds/get_welcome_screen.ts | 5 +- src/helpers/guilds/get_widget.ts | 5 +- src/helpers/guilds/get_widget_image_url.ts | 9 +- src/helpers/guilds/get_widget_settings.ts | 5 +- src/helpers/guilds/guild_icon_url.ts | 4 +- src/helpers/guilds/leave_guild.ts | 5 +- .../integrations/delete_integration.ts | 5 +- src/helpers/integrations/get_integrations.ts | 5 +- .../batch_edit_slash_command_permissions.ts | 6 +- .../commands/create_slash_command.ts | 9 +- .../commands/delete_slash_command.ts | 4 +- .../commands/delete_slash_response.ts | 6 +- .../edit_slash_command_permissions.ts | 8 +- .../commands/edit_slash_response.ts | 35 +--- .../commands/get_slash_command_permission.ts | 5 +- .../commands/get_slash_commands.ts | 4 +- .../commands/upsert_slash_command.ts | 6 +- .../commands/upsert_slash_commands.ts | 9 +- .../get_original_interaction_response.ts | 5 +- .../interactions/send_interaction_response.ts | 27 +-- src/helpers/invites/create_invite.ts | 11 +- src/helpers/invites/delete_invite.ts | 9 +- src/helpers/invites/get_channel_invites.ts | 5 +- src/helpers/invites/get_invite.ts | 6 +- src/helpers/invites/get_invites.ts | 5 +- src/helpers/members/ban_member.ts | 12 +- src/helpers/members/edit_bot_nickname.ts | 15 +- src/helpers/members/edit_member.ts | 26 +-- src/helpers/members/fetch_members.ts | 11 +- src/helpers/members/get_member.ts | 16 +- src/helpers/members/get_members.ts | 42 ++--- src/helpers/members/kick_member.ts | 17 +- src/helpers/members/move_member.ts | 6 +- src/helpers/members/prune_members.ts | 6 +- src/helpers/members/search_members.ts | 27 +-- src/helpers/members/send_direct_message.ts | 19 +-- src/helpers/members/unban_member.ts | 5 +- src/helpers/messages/add_reaction.ts | 16 +- src/helpers/messages/add_reactions.ts | 16 +- src/helpers/messages/delete_message.ts | 13 +- src/helpers/messages/delete_messages.ts | 22 +-- src/helpers/messages/edit_message.ts | 5 +- src/helpers/messages/get_message.ts | 10 +- src/helpers/messages/get_messages.ts | 21 +-- src/helpers/messages/get_reactions.ts | 7 +- src/helpers/messages/pin_message.ts | 5 +- src/helpers/messages/publish_message.ts | 5 +- src/helpers/messages/remove_all_reactions.ts | 5 +- src/helpers/messages/remove_reaction.ts | 7 +- src/helpers/messages/remove_reaction_emoji.ts | 11 +- src/helpers/messages/send_message.ts | 48 ++---- src/helpers/messages/unpin_message.ts | 10 +- src/helpers/misc/edit_bot_status.ts | 5 +- src/helpers/roles/add_role.ts | 18 +- src/helpers/roles/create_role.ts | 25 +-- src/helpers/roles/delete_role.ts | 5 +- src/helpers/roles/edit_role.ts | 25 +-- src/helpers/roles/get_roles.ts | 9 +- src/helpers/roles/remove_role.ts | 18 +- .../templates/create_guild_from_template.ts | 22 +-- .../templates/create_guild_template.ts | 6 +- .../templates/delete_guild_template.ts | 10 +- src/helpers/templates/edit_guild_template.ts | 12 +- src/helpers/templates/get_guild_templates.ts | 5 +- src/helpers/templates/get_template.ts | 5 +- src/helpers/templates/sync_guild_template.ts | 5 +- src/helpers/type_guards/is_action_row.ts | 4 +- src/helpers/type_guards/is_button.ts | 4 +- src/helpers/webhooks/create_webhook.ts | 12 +- src/helpers/webhooks/delete_webhook.ts | 5 +- .../webhooks/delete_webhook_message.ts | 11 +- .../webhooks/delete_webhook_with_token.ts | 10 +- src/helpers/webhooks/edit_webhook.ts | 18 +- src/helpers/webhooks/edit_webhook_message.ts | 30 +--- .../webhooks/edit_webhook_with_token.ts | 6 +- src/helpers/webhooks/get_webhook_message.ts | 11 +- .../webhooks/get_webhook_with_token.ts | 5 +- src/helpers/webhooks/get_webhooks.ts | 5 +- src/helpers/webhooks/send_webhook.ts | 42 ++--- src/interactions/verify_signature.ts | 10 +- src/plugins/proxyEvents.ts | 4 +- src/rest/cleanup_queues.ts | 5 +- src/rest/create_request_body.ts | 28 +--- src/rest/process_queue.ts | 63 ++----- src/rest/process_rate_limited_paths.ts | 10 +- src/rest/process_request.ts | 5 +- src/rest/run_method.ts | 11 +- src/rest/simplify_url.ts | 14 +- src/structures/channel.ts | 65 ++----- src/structures/guild.ts | 63 ++----- src/structures/member.ts | 38 +---- src/structures/message.ts | 84 ++-------- src/structures/role.ts | 30 +--- src/structures/voice_state.ts | 19 +-- src/types/audit_log/audit_log_change_value.ts | 10 +- src/types/channels/modify_channel.ts | 5 +- src/types/discordeno/create_slash_command.ts | 3 +- src/types/discordeno/event_handlers.ts | 92 ++-------- src/types/embeds/embed_types.ts | 8 +- src/types/gateway/status_types.ts | 7 +- src/types/guilds/create_guild_channel.ts | 4 +- src/types/guilds/create_guild_role.ts | 3 +- .../default_message_notification_levels.ts | 6 +- .../get_guild_widget_image_style_options.ts | 6 +- src/types/guilds/modify_guild_role.ts | 3 +- ...pplication_command_create_update_delete.ts | 3 +- ...ication_command_interaction_data_option.ts | 73 ++++---- ...ation_command_interaction_data_resolved.ts | 10 +- .../application_command_option_types.ts | 6 +- .../application_command_permission_types.ts | 6 +- src/types/messages/create_message.ts | 4 +- src/types/messages/get_messages.ts | 5 +- .../messages/message_reaction_remove_all.ts | 5 +- .../messages/message_reaction_remove_emoji.ts | 5 +- src/types/teams/team_member.ts | 3 +- src/types/util.ts | 115 +++++-------- src/types/webhooks/execute_webhook.ts | 4 +- src/types/webhooks/webhook.ts | 3 +- src/util/cache_members.ts | 27 +-- src/util/collection.ts | 10 +- src/util/constants.ts | 158 +++++------------- src/util/loop_object.ts | 7 +- src/util/permissions.ts | 100 +++-------- src/util/utils.ts | 64 ++----- src/util/validate_length.ts | 5 +- src/ws/create_shard.ts | 19 +-- src/ws/events.ts | 46 +---- src/ws/handle_discord_payload.ts | 5 +- src/ws/handle_on_message.ts | 8 +- src/ws/heartbeat.ts | 5 +- src/ws/process_queue.ts | 3 +- src/ws/resharder.ts | 7 +- src/ws/send_shard_message.ts | 6 +- src/ws/spawn_shards.ts | 10 +- src/ws/start_gateway.ts | 3 +- src/ws/tell_cluster_to_identify.ts | 6 +- src/ws/ws.ts | 5 +- tests/channels/category_children.ts | 21 +-- .../channel_overwrite_has_permission.ts | 5 +- tests/channels/clone_channel.ts | 52 ++---- tests/channels/create_channel.ts | 13 +- tests/channels/delete_channel.ts | 16 +- tests/channels/delete_channel_overwrite.ts | 14 +- tests/channels/edit_channel.ts | 9 +- tests/channels/edit_channel_overwrite.ts | 25 +-- tests/channels/get_channel.ts | 4 +- tests/channels/get_pins.ts | 15 +- tests/channels/is_channel_synced.ts | 8 +- tests/channels/start_typing.ts | 4 +- tests/channels/swap_channels.ts | 25 +-- tests/emojis/create_emoji.ts | 9 +- tests/emojis/delete_emoji.ts | 14 +- tests/emojis/edit_emoji.ts | 13 +- tests/emojis/get_emoji.ts | 13 +- tests/emojis/get_emojis.ts | 10 +- tests/guilds/create_guild.ts | 6 +- tests/invites/create_invite.ts | 4 +- tests/invites/delete_invite.ts | 4 +- tests/invites/get_channel_invites.ts | 4 +- tests/invites/get_invite.ts | 4 +- tests/members/search_members.ts | 10 +- tests/messages/add_reaction.ts | 25 +-- tests/messages/add_reactions.ts | 26 +-- tests/messages/create_message.ts | 20 +-- tests/messages/delete_message.ts | 4 +- tests/messages/delete_messages.ts | 16 +- tests/messages/edit_message.ts | 5 +- tests/messages/get_messages.ts | 14 +- tests/messages/get_reactions.ts | 6 +- tests/messages/pin_message.ts | 5 +- tests/messages/remove_all_reactions.ts | 17 +- tests/messages/remove_reaction.ts | 17 +- tests/messages/remove_reaction_emoji.ts | 17 +- tests/messages/unpin_message.ts | 11 +- tests/roles/add_role.ts | 19 +-- tests/roles/create_role.ts | 4 +- tests/roles/delete_role.ts | 13 +- tests/roles/edit_role.ts | 17 +- tests/roles/get_roles.ts | 11 +- tests/roles/remove_role.ts | 32 +--- tests/util/delay_until.ts | 6 +- tests/util/utils.ts | 6 +- tests/ws/start_bot.ts | 7 +- 271 files changed, 889 insertions(+), 3067 deletions(-) diff --git a/src/bot.ts b/src/bot.ts index 79ad4fcec..637df063d 100644 --- a/src/bot.ts +++ b/src/bot.ts @@ -20,16 +20,14 @@ export async function startBot(config: BotConfig) { ws.identifyPayload.token = `Bot ${config.token}`; rest.token = `Bot ${config.token}`; ws.identifyPayload.intents = config.intents.reduce( - (bits, next) => - (bits |= typeof next === "string" ? DiscordGatewayIntents[next] : next), + (bits, next) => (bits |= typeof next === "string" ? DiscordGatewayIntents[next] : next), 0 ); // Initial API connection to get info about bots connection ws.botGatewayData = await getGatewayBot(); ws.maxShards = ws.maxShards || ws.botGatewayData.shards; - ws.lastShardId = - ws.lastShardId === 1 ? ws.botGatewayData.shards - 1 : ws.lastShardId; + ws.lastShardId = ws.lastShardId === 1 ? ws.botGatewayData.shards - 1 : ws.lastShardId; // Explicitly append gateway version and encoding ws.botGatewayData.url += `?v=${GATEWAY_VERSION}&encoding=json`; diff --git a/src/cache.ts b/src/cache.ts index ac57ec792..02f30ca09 100644 --- a/src/cache.ts +++ b/src/cache.ts @@ -23,19 +23,12 @@ export const cache = { presences: new Collection(), fetchAllMembersProcessingRequests: new Collection< string, - ( - value: - | Collection - | PromiseLike> - ) => void + (value: Collection | PromiseLike>) => void >(), executedSlashCommands: new Set(), get emojis() { return new Collection( - this.guilds.reduce( - (a, b) => [...a, ...b.emojis.map((e) => [e.id, e])], - [] as any[] - ) + this.guilds.reduce((a, b) => [...a, ...b.emojis.map((e) => [e.id, e])], [] as any[]) ); }, }; @@ -70,83 +63,31 @@ export let cacheHandlers = { filter, }; -export type TableName = - | "guilds" - | "unavailableGuilds" - | "channels" - | "messages" - | "members" - | "presences"; +export type TableName = "guilds" | "unavailableGuilds" | "channels" | "messages" | "members" | "presences"; -function set( - table: "guilds", - key: bigint, - value: DiscordenoGuild -): Promise>; -function set( - table: "channels", - key: bigint, - value: DiscordenoChannel -): Promise>; -function set( - table: "messages", - key: bigint, - value: DiscordenoMessage -): Promise>; -function set( - table: "members", - key: bigint, - value: DiscordenoMember -): Promise>; -function set( - table: "presences", - key: bigint, - value: PresenceUpdate -): Promise>; -function set( - table: "unavailableGuilds", - key: bigint, - value: number -): Promise>; +function set(table: "guilds", key: bigint, value: DiscordenoGuild): Promise>; +function set(table: "channels", key: bigint, value: DiscordenoChannel): Promise>; +function set(table: "messages", key: bigint, value: DiscordenoMessage): Promise>; +function set(table: "members", key: bigint, value: DiscordenoMember): Promise>; +function set(table: "presences", key: bigint, value: PresenceUpdate): Promise>; +function set(table: "unavailableGuilds", key: bigint, value: number): Promise>; async function set(table: TableName, key: bigint, value: any) { return cache[table].set(key, value); } -function get( - table: "guilds", - key: bigint -): Promise; -function get( - table: "channels", - key: bigint -): Promise; -function get( - table: "messages", - key: bigint -): Promise; -function get( - table: "members", - key: bigint -): Promise; -function get( - table: "presences", - key: bigint -): Promise; -function get( - table: "unavailableGuilds", - key: bigint -): Promise; +function get(table: "guilds", key: bigint): Promise; +function get(table: "channels", key: bigint): Promise; +function get(table: "messages", key: bigint): Promise; +function get(table: "members", key: bigint): Promise; +function get(table: "presences", key: bigint): Promise; +function get(table: "unavailableGuilds", key: bigint): Promise; async function get(table: TableName, key: bigint) { return cache[table].get(key); } function forEach( table: "guilds", - callback: ( - value: DiscordenoGuild, - key: bigint, - map: Map - ) => unknown + callback: (value: DiscordenoGuild, key: bigint, map: Map) => unknown ): void; function forEach( table: "unavailableGuilds", @@ -154,32 +95,17 @@ function forEach( ): void; function forEach( table: "channels", - callback: ( - value: DiscordenoChannel, - key: bigint, - map: Map - ) => unknown + callback: (value: DiscordenoChannel, key: bigint, map: Map) => unknown ): void; function forEach( table: "messages", - callback: ( - value: DiscordenoMessage, - key: bigint, - map: Map - ) => unknown + callback: (value: DiscordenoMessage, key: bigint, map: Map) => unknown ): void; function forEach( table: "members", - callback: ( - value: DiscordenoMember, - key: bigint, - map: Map - ) => unknown + callback: (value: DiscordenoMember, key: bigint, map: Map) => unknown ): void; -function forEach( - table: TableName, - callback: (value: any, key: bigint, map: Map) => unknown -) { +function forEach(table: TableName, callback: (value: any, key: bigint, map: Map) => unknown) { return cache[table].forEach(callback); } @@ -203,9 +129,6 @@ function filter( table: "members", callback: (value: DiscordenoMember, key: bigint) => boolean ): Promise>; -async function filter( - table: TableName, - callback: (value: any, key: bigint) => boolean -) { +async function filter(table: TableName, callback: (value: any, key: bigint) => boolean) { return cache[table].filter(callback); } diff --git a/src/handlers/channels/CHANNEL_DELETE.ts b/src/handlers/channels/CHANNEL_DELETE.ts index 956a94eb1..72feac12a 100644 --- a/src/handlers/channels/CHANNEL_DELETE.ts +++ b/src/handlers/channels/CHANNEL_DELETE.ts @@ -8,16 +8,10 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleChannelDelete(data: DiscordGatewayPayload) { const payload = data.d as Channel; - const cachedChannel = await cacheHandlers.get( - "channels", - snowflakeToBigint(payload.id) - ); + const cachedChannel = await cacheHandlers.get("channels", snowflakeToBigint(payload.id)); if (!cachedChannel) return; - if ( - cachedChannel.type === DiscordChannelTypes.GuildVoice && - payload.guildId - ) { + if (cachedChannel.type === DiscordChannelTypes.GuildVoice && payload.guildId) { const guild = await cacheHandlers.get("guilds", cachedChannel.guildId); if (guild) { @@ -47,10 +41,7 @@ export async function handleChannelDelete(data: DiscordGatewayPayload) { ) { await cacheHandlers.delete("channels", snowflakeToBigint(payload.id)); cacheHandlers.forEach("messages", (message) => { - eventHandlers.debug?.( - "loop", - `Running forEach messages loop in CHANNEL_DELTE file.` - ); + eventHandlers.debug?.("loop", `Running forEach messages loop in CHANNEL_DELTE file.`); if (message.channelId === snowflakeToBigint(payload.id)) { cacheHandlers.delete("messages", message.id); } diff --git a/src/handlers/channels/CHANNEL_PINS_UPDATE.ts b/src/handlers/channels/CHANNEL_PINS_UPDATE.ts index 73d917226..19dad784c 100644 --- a/src/handlers/channels/CHANNEL_PINS_UPDATE.ts +++ b/src/handlers/channels/CHANNEL_PINS_UPDATE.ts @@ -7,15 +7,10 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleChannelPinsUpdate(data: DiscordGatewayPayload) { const payload = data.d as ChannelPinsUpdate; - const channel = await cacheHandlers.get( - "channels", - snowflakeToBigint(payload.channelId) - ); + const channel = await cacheHandlers.get("channels", snowflakeToBigint(payload.channelId)); if (!channel) return; - const guild = payload.guildId - ? await cacheHandlers.get("guilds", snowflakeToBigint(payload.guildId)) - : undefined; + const guild = payload.guildId ? await cacheHandlers.get("guilds", snowflakeToBigint(payload.guildId)) : undefined; eventHandlers.channelPinsUpdate?.(channel, guild, payload.lastPinTimestamp); } diff --git a/src/handlers/channels/CHANNEL_UPDATE.ts b/src/handlers/channels/CHANNEL_UPDATE.ts index be7cf0b50..b0a5209f0 100644 --- a/src/handlers/channels/CHANNEL_UPDATE.ts +++ b/src/handlers/channels/CHANNEL_UPDATE.ts @@ -7,10 +7,7 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleChannelUpdate(data: DiscordGatewayPayload) { const payload = data.d as Channel; - const cachedChannel = await cacheHandlers.get( - "channels", - snowflakeToBigint(payload.id) - ); + const cachedChannel = await cacheHandlers.get("channels", snowflakeToBigint(payload.id)); if (!cachedChannel) return; const discordenoChannel = await structures.createDiscordenoChannel(payload); diff --git a/src/handlers/channels/THREAD_DELETE.ts b/src/handlers/channels/THREAD_DELETE.ts index ad45ea401..8ffc7bccc 100644 --- a/src/handlers/channels/THREAD_DELETE.ts +++ b/src/handlers/channels/THREAD_DELETE.ts @@ -7,18 +7,12 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleThreadDelete(data: DiscordGatewayPayload) { const payload = data.d as Channel; - const cachedChannel = await cacheHandlers.get( - "channels", - snowflakeToBigint(payload.id) - ); + const cachedChannel = await cacheHandlers.get("channels", snowflakeToBigint(payload.id)); if (!cachedChannel) return; await cacheHandlers.delete("channels", snowflakeToBigint(payload.id)); cacheHandlers.forEach("messages", (message) => { - eventHandlers.debug?.( - "loop", - `Running forEach messages loop in CHANNEL_DELTE file.` - ); + eventHandlers.debug?.("loop", `Running forEach messages loop in CHANNEL_DELTE file.`); if (message.channelId === snowflakeToBigint(payload.id)) { cacheHandlers.delete("messages", message.id); } diff --git a/src/handlers/channels/THREAD_LIST_SYNC.ts b/src/handlers/channels/THREAD_LIST_SYNC.ts index e34c5787e..7745267e1 100644 --- a/src/handlers/channels/THREAD_LIST_SYNC.ts +++ b/src/handlers/channels/THREAD_LIST_SYNC.ts @@ -12,28 +12,15 @@ export async function handleThreadListSync(data: DiscordGatewayPayload) { const discordenoChannels = await Promise.all( payload.threads.map(async (thread) => { - const discordenoChannel = await structures.createDiscordenoChannel( - thread, - snowflakeToBigint(payload.guildId) - ); + const discordenoChannel = await structures.createDiscordenoChannel(thread, snowflakeToBigint(payload.guildId)); - await cacheHandlers.set( - "channels", - discordenoChannel.id, - discordenoChannel - ); + await cacheHandlers.set("channels", discordenoChannel.id, discordenoChannel); return discordenoChannel; }) ); - const threads = new Collection( - discordenoChannels.map((t) => [t.id, t]) - ); + const threads = new Collection(discordenoChannels.map((t) => [t.id, t])); - eventHandlers.threadListSync?.( - threads, - payload.members, - snowflakeToBigint(payload.guildId) - ); + eventHandlers.threadListSync?.(threads, payload.members, snowflakeToBigint(payload.guildId)); } diff --git a/src/handlers/channels/THREAD_MEMBERS_UPDATE.ts b/src/handlers/channels/THREAD_MEMBERS_UPDATE.ts index c44dd93e5..f779c8faa 100644 --- a/src/handlers/channels/THREAD_MEMBERS_UPDATE.ts +++ b/src/handlers/channels/THREAD_MEMBERS_UPDATE.ts @@ -6,10 +6,7 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleThreadMembersUpdate(data: DiscordGatewayPayload) { const payload = data.d as ThreadMembersUpdate; - const thread = await cacheHandlers.get( - "channels", - snowflakeToBigint(payload.id) - ); + const thread = await cacheHandlers.get("channels", snowflakeToBigint(payload.id)); if (!thread) return; thread.memberCount = payload.memberCount; diff --git a/src/handlers/channels/THREAD_MEMBER_UPDATE.ts b/src/handlers/channels/THREAD_MEMBER_UPDATE.ts index adebb04c9..70c5f1c75 100644 --- a/src/handlers/channels/THREAD_MEMBER_UPDATE.ts +++ b/src/handlers/channels/THREAD_MEMBER_UPDATE.ts @@ -6,10 +6,7 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleThreadMemberUpdate(data: DiscordGatewayPayload) { const payload = data.d as ThreadMember; - const thread = await cacheHandlers.get( - "channels", - snowflakeToBigint(payload.id) - ); + const thread = await cacheHandlers.get("channels", snowflakeToBigint(payload.id)); if (!thread) return; thread.member = payload; diff --git a/src/handlers/channels/THREAD_UPDATE.ts b/src/handlers/channels/THREAD_UPDATE.ts index 00805ce87..9c3756d02 100644 --- a/src/handlers/channels/THREAD_UPDATE.ts +++ b/src/handlers/channels/THREAD_UPDATE.ts @@ -7,10 +7,7 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleThreadUpdate(data: DiscordGatewayPayload) { const payload = data.d as Channel; - const oldChannel = await cacheHandlers.get( - "channels", - snowflakeToBigint(payload.id) - ); + const oldChannel = await cacheHandlers.get("channels", snowflakeToBigint(payload.id)); if (!oldChannel) return; const discordenoChannel = await structures.createDiscordenoChannel(payload); diff --git a/src/handlers/commands/APPLICATION_COMMAND_CREATE.ts b/src/handlers/commands/APPLICATION_COMMAND_CREATE.ts index a6bde991d..06ff0d83d 100644 --- a/src/handlers/commands/APPLICATION_COMMAND_CREATE.ts +++ b/src/handlers/commands/APPLICATION_COMMAND_CREATE.ts @@ -3,7 +3,5 @@ import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload. import type { ApplicationCommandCreateUpdateDelete } from "../../types/interactions/commands/application_command_create_update_delete.ts"; export function handleApplicationCommandCreate(data: DiscordGatewayPayload) { - eventHandlers.applicationCommandCreate?.( - data.d as ApplicationCommandCreateUpdateDelete - ); + eventHandlers.applicationCommandCreate?.(data.d as ApplicationCommandCreateUpdateDelete); } diff --git a/src/handlers/commands/APPLICATION_COMMAND_DELETE.ts b/src/handlers/commands/APPLICATION_COMMAND_DELETE.ts index 825ff1db7..b37ace927 100644 --- a/src/handlers/commands/APPLICATION_COMMAND_DELETE.ts +++ b/src/handlers/commands/APPLICATION_COMMAND_DELETE.ts @@ -3,7 +3,5 @@ import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload. import type { ApplicationCommandCreateUpdateDelete } from "../../types/interactions/commands/application_command_create_update_delete.ts"; export function handleApplicationCommandDelete(data: DiscordGatewayPayload) { - eventHandlers.applicationCommandDelete?.( - data.d as ApplicationCommandCreateUpdateDelete - ); + eventHandlers.applicationCommandDelete?.(data.d as ApplicationCommandCreateUpdateDelete); } diff --git a/src/handlers/commands/APPLICATION_COMMAND_UPDATE.ts b/src/handlers/commands/APPLICATION_COMMAND_UPDATE.ts index 9b84d0d2c..51fc2d063 100644 --- a/src/handlers/commands/APPLICATION_COMMAND_UPDATE.ts +++ b/src/handlers/commands/APPLICATION_COMMAND_UPDATE.ts @@ -3,7 +3,5 @@ import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload. import type { ApplicationCommandCreateUpdateDelete } from "../../types/interactions/commands/application_command_create_update_delete.ts"; export function handleApplicationCommandUpdate(data: DiscordGatewayPayload) { - eventHandlers.applicationCommandUpdate?.( - data.d as ApplicationCommandCreateUpdateDelete - ); + eventHandlers.applicationCommandUpdate?.(data.d as ApplicationCommandCreateUpdateDelete); } diff --git a/src/handlers/emojis/GUILD_EMOJIS_UPDATE.ts b/src/handlers/emojis/GUILD_EMOJIS_UPDATE.ts index eb201184c..e5e27ed24 100644 --- a/src/handlers/emojis/GUILD_EMOJIS_UPDATE.ts +++ b/src/handlers/emojis/GUILD_EMOJIS_UPDATE.ts @@ -7,16 +7,11 @@ import { Collection } from "../../util/collection.ts"; export async function handleGuildEmojisUpdate(data: DiscordGatewayPayload) { const payload = data.d as GuildEmojisUpdate; - const guild = await cacheHandlers.get( - "guilds", - snowflakeToBigint(payload.guildId) - ); + const guild = await cacheHandlers.get("guilds", snowflakeToBigint(payload.guildId)); if (!guild) return; const cachedEmojis = guild.emojis; - guild.emojis = new Collection( - payload.emojis.map((emoji) => [snowflakeToBigint(emoji.id!), emoji]) - ); + guild.emojis = new Collection(payload.emojis.map((emoji) => [snowflakeToBigint(emoji.id!), emoji])); await cacheHandlers.set("guilds", guild.id, guild); diff --git a/src/handlers/guilds/GUILD_BAN_ADD.ts b/src/handlers/guilds/GUILD_BAN_ADD.ts index 2d8a5ebd9..68070fcb1 100644 --- a/src/handlers/guilds/GUILD_BAN_ADD.ts +++ b/src/handlers/guilds/GUILD_BAN_ADD.ts @@ -6,15 +6,9 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleGuildBanAdd(data: DiscordGatewayPayload) { const payload = data.d as GuildBanAddRemove; - const guild = await cacheHandlers.get( - "guilds", - snowflakeToBigint(payload.guildId) - ); + const guild = await cacheHandlers.get("guilds", snowflakeToBigint(payload.guildId)); if (!guild) return; - const member = await cacheHandlers.get( - "members", - snowflakeToBigint(payload.user.id) - ); + const member = await cacheHandlers.get("members", snowflakeToBigint(payload.user.id)); eventHandlers.guildBanAdd?.(guild, payload.user, member); } diff --git a/src/handlers/guilds/GUILD_BAN_REMOVE.ts b/src/handlers/guilds/GUILD_BAN_REMOVE.ts index 73f233731..04a913b5c 100644 --- a/src/handlers/guilds/GUILD_BAN_REMOVE.ts +++ b/src/handlers/guilds/GUILD_BAN_REMOVE.ts @@ -6,15 +6,9 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleGuildBanRemove(data: DiscordGatewayPayload) { const payload = data.d as GuildBanAddRemove; - const guild = await cacheHandlers.get( - "guilds", - snowflakeToBigint(payload.guildId) - ); + const guild = await cacheHandlers.get("guilds", snowflakeToBigint(payload.guildId)); if (!guild) return; - const member = await cacheHandlers.get( - "members", - snowflakeToBigint(payload.user.id) - ); + const member = await cacheHandlers.get("members", snowflakeToBigint(payload.user.id)); eventHandlers.guildBanRemove?.(guild, payload.user, member); } diff --git a/src/handlers/guilds/GUILD_CREATE.ts b/src/handlers/guilds/GUILD_CREATE.ts index 08f511213..2b6999194 100644 --- a/src/handlers/guilds/GUILD_CREATE.ts +++ b/src/handlers/guilds/GUILD_CREATE.ts @@ -6,10 +6,7 @@ import type { Guild } from "../../types/guilds/guild.ts"; import { snowflakeToBigint } from "../../util/bigint.ts"; import { ws } from "../../ws/ws.ts"; -export async function handleGuildCreate( - data: DiscordGatewayPayload, - shardId: number -) { +export async function handleGuildCreate(data: DiscordGatewayPayload, shardId: number) { const payload = data.d as Guild; // When shards resume they emit GUILD_CREATE again. if (await cacheHandlers.has("guilds", snowflakeToBigint(payload.id))) return; diff --git a/src/handlers/guilds/GUILD_DELETE.ts b/src/handlers/guilds/GUILD_DELETE.ts index 22eade409..4235e351e 100644 --- a/src/handlers/guilds/GUILD_DELETE.ts +++ b/src/handlers/guilds/GUILD_DELETE.ts @@ -5,16 +5,10 @@ import type { UnavailableGuild } from "../../types/guilds/unavailable_guild.ts"; import { snowflakeToBigint } from "../../util/bigint.ts"; import { ws } from "../../ws/ws.ts"; -export async function handleGuildDelete( - data: DiscordGatewayPayload, - shardId: number -) { +export async function handleGuildDelete(data: DiscordGatewayPayload, shardId: number) { const payload = data.d as UnavailableGuild; - const guild = await cacheHandlers.get( - "guilds", - snowflakeToBigint(payload.id) - ); + const guild = await cacheHandlers.get("guilds", snowflakeToBigint(payload.id)); if (!guild) return; await cacheHandlers.delete("guilds", guild.id); @@ -30,30 +24,21 @@ export async function handleGuildDelete( } cacheHandlers.forEach("messages", (message) => { - eventHandlers.debug?.( - "loop", - `1. Running forEach messages loop in CHANNEL_DELTE file.` - ); + eventHandlers.debug?.("loop", `1. Running forEach messages loop in CHANNEL_DELTE file.`); if (message.guildId === guild.id) { cacheHandlers.delete("messages", message.id); } }); cacheHandlers.forEach("channels", (channel) => { - eventHandlers.debug?.( - "loop", - `2. Running forEach channels loop in CHANNEL_DELTE file.` - ); + eventHandlers.debug?.("loop", `2. Running forEach channels loop in CHANNEL_DELTE file.`); if (channel.guildId === guild.id) { cacheHandlers.delete("channels", channel.id); } }); cacheHandlers.forEach("members", (member) => { - eventHandlers.debug?.( - "loop", - `3. Running forEach members loop in CHANNEL_DELTE file.` - ); + eventHandlers.debug?.("loop", `3. Running forEach members loop in CHANNEL_DELTE file.`); if (!member.guilds.has(guild.id)) return; member.guilds.delete(guild.id); diff --git a/src/handlers/guilds/GUILD_INTEGRATIONS_UPDATE.ts b/src/handlers/guilds/GUILD_INTEGRATIONS_UPDATE.ts index 1699dda50..57d6df937 100644 --- a/src/handlers/guilds/GUILD_INTEGRATIONS_UPDATE.ts +++ b/src/handlers/guilds/GUILD_INTEGRATIONS_UPDATE.ts @@ -4,15 +4,10 @@ import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload. import type { GuildIntegrationsUpdate } from "../../types/integrations/guild_integrations_update.ts"; import { snowflakeToBigint } from "../../util/bigint.ts"; -export async function handleGuildIntegrationsUpdate( - data: DiscordGatewayPayload -) { +export async function handleGuildIntegrationsUpdate(data: DiscordGatewayPayload) { const payload = data.d as GuildIntegrationsUpdate; - const guild = await cacheHandlers.get( - "guilds", - snowflakeToBigint(payload.guildId) - ); + const guild = await cacheHandlers.get("guilds", snowflakeToBigint(payload.guildId)); if (!guild) return; eventHandlers.guildIntegrationsUpdate?.(guild); diff --git a/src/handlers/guilds/GUILD_UPDATE.ts b/src/handlers/guilds/GUILD_UPDATE.ts index f323fe705..41289d333 100644 --- a/src/handlers/guilds/GUILD_UPDATE.ts +++ b/src/handlers/guilds/GUILD_UPDATE.ts @@ -6,25 +6,12 @@ import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload. import type { Guild } from "../../types/guilds/guild.ts"; import { snowflakeToBigint } from "../../util/bigint.ts"; -export async function handleGuildUpdate( - data: DiscordGatewayPayload, - shardId: number -) { +export async function handleGuildUpdate(data: DiscordGatewayPayload, shardId: number) { const payload = data.d as Guild; - const oldGuild = await cacheHandlers.get( - "guilds", - snowflakeToBigint(payload.id) - ); + const oldGuild = await cacheHandlers.get("guilds", snowflakeToBigint(payload.id)); if (!oldGuild) return; - const keysToSkip = [ - "id", - "roles", - "guildHashes", - "guildId", - "maxMembers", - "emojis", - ]; + const keysToSkip = ["id", "roles", "guildHashes", "guildId", "maxMembers", "emojis"]; const newGuild = await structures.createDiscordenoGuild(payload, shardId); diff --git a/src/handlers/interactions/INTERACTION_CREATE.ts b/src/handlers/interactions/INTERACTION_CREATE.ts index cc51dbb72..ce6b3211f 100644 --- a/src/handlers/interactions/INTERACTION_CREATE.ts +++ b/src/handlers/interactions/INTERACTION_CREATE.ts @@ -9,10 +9,7 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleInteractionCreate(data: DiscordGatewayPayload) { const payload = data.d as Interaction; const discordenoMember = payload.guildId - ? await structures.createDiscordenoMember( - payload.member as GuildMemberWithUser, - snowflakeToBigint(payload.guildId) - ) + ? await structures.createDiscordenoMember(payload.member as GuildMemberWithUser, snowflakeToBigint(payload.guildId)) : undefined; if (discordenoMember) { await cacheHandlers.set("members", discordenoMember.id, discordenoMember); diff --git a/src/handlers/members/GUILD_MEMBERS_CHUNK.ts b/src/handlers/members/GUILD_MEMBERS_CHUNK.ts index be2dcf659..006eda9f8 100644 --- a/src/handlers/members/GUILD_MEMBERS_CHUNK.ts +++ b/src/handlers/members/GUILD_MEMBERS_CHUNK.ts @@ -12,10 +12,7 @@ export async function handleGuildMembersChunk(data: DiscordGatewayPayload) { const members = await Promise.all( payload.members.map(async (member) => { - const discordenoMember = await structures.createDiscordenoMember( - member, - guildId - ); + const discordenoMember = await structures.createDiscordenoMember(member, guildId); await cacheHandlers.set("members", discordenoMember.id, discordenoMember); return discordenoMember; @@ -34,9 +31,7 @@ export async function handleGuildMembersChunk(data: DiscordGatewayPayload) { return resolve(new Collection(members.map((m) => [m.id, m]))); } - return resolve( - await cacheHandlers.filter("members", (m) => m.guilds.has(guildId)) - ); + return resolve(await cacheHandlers.filter("members", (m) => m.guilds.has(guildId))); } } } diff --git a/src/handlers/members/GUILD_MEMBER_ADD.ts b/src/handlers/members/GUILD_MEMBER_ADD.ts index 385155db9..f75ad1555 100644 --- a/src/handlers/members/GUILD_MEMBER_ADD.ts +++ b/src/handlers/members/GUILD_MEMBER_ADD.ts @@ -7,17 +7,11 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleGuildMemberAdd(data: DiscordGatewayPayload) { const payload = data.d as GuildMemberAdd; - const guild = await cacheHandlers.get( - "guilds", - snowflakeToBigint(payload.guildId) - ); + const guild = await cacheHandlers.get("guilds", snowflakeToBigint(payload.guildId)); if (!guild) return; guild.memberCount++; - const discordenoMember = await structures.createDiscordenoMember( - payload, - guild.id - ); + const discordenoMember = await structures.createDiscordenoMember(payload, guild.id); await cacheHandlers.set("members", discordenoMember.id, discordenoMember); eventHandlers.guildMemberAdd?.(guild, discordenoMember); diff --git a/src/handlers/members/GUILD_MEMBER_REMOVE.ts b/src/handlers/members/GUILD_MEMBER_REMOVE.ts index 2cc4bfb8d..98cacb5ab 100644 --- a/src/handlers/members/GUILD_MEMBER_REMOVE.ts +++ b/src/handlers/members/GUILD_MEMBER_REMOVE.ts @@ -6,17 +6,11 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleGuildMemberRemove(data: DiscordGatewayPayload) { const payload = data.d as GuildMemberRemove; - const guild = await cacheHandlers.get( - "guilds", - snowflakeToBigint(payload.guildId) - ); + const guild = await cacheHandlers.get("guilds", snowflakeToBigint(payload.guildId)); if (!guild) return; guild.memberCount--; - const member = await cacheHandlers.get( - "members", - snowflakeToBigint(payload.user.id) - ); + const member = await cacheHandlers.get("members", snowflakeToBigint(payload.user.id)); eventHandlers.guildMemberRemove?.(guild, payload.user, member); member?.guilds.delete(guild.id); diff --git a/src/handlers/members/GUILD_MEMBER_UPDATE.ts b/src/handlers/members/GUILD_MEMBER_UPDATE.ts index c7d8594c3..4f8ca7fe4 100644 --- a/src/handlers/members/GUILD_MEMBER_UPDATE.ts +++ b/src/handlers/members/GUILD_MEMBER_UPDATE.ts @@ -7,16 +7,10 @@ import { bigintToSnowflake, snowflakeToBigint } from "../../util/bigint.ts"; export async function handleGuildMemberUpdate(data: DiscordGatewayPayload) { const payload = data.d as GuildMemberUpdate; - const guild = await cacheHandlers.get( - "guilds", - snowflakeToBigint(payload.guildId) - ); + const guild = await cacheHandlers.get("guilds", snowflakeToBigint(payload.guildId)); if (!guild) return; - const cachedMember = await cacheHandlers.get( - "members", - snowflakeToBigint(payload.user.id) - ); + const cachedMember = await cacheHandlers.get("members", snowflakeToBigint(payload.user.id)); const guildMember = cachedMember?.guilds.get(guild.id); const newMemberData = { @@ -27,20 +21,12 @@ export async function handleGuildMemberUpdate(data: DiscordGatewayPayload) { mute: guildMember?.mute || false, roles: payload.roles, }; - const discordenoMember = await structures.createDiscordenoMember( - newMemberData, - guild.id - ); + const discordenoMember = await structures.createDiscordenoMember(newMemberData, guild.id); await cacheHandlers.set("members", discordenoMember.id, discordenoMember); if (guildMember) { if (guildMember.nick !== payload.nick) { - eventHandlers.nicknameUpdate?.( - guild, - discordenoMember, - payload.nick!, - guildMember.nick ?? undefined - ); + eventHandlers.nicknameUpdate?.(guild, discordenoMember, payload.nick!, guildMember.nick ?? undefined); } if (payload.pending === false && guildMember.pending === true) { @@ -50,26 +36,16 @@ export async function handleGuildMemberUpdate(data: DiscordGatewayPayload) { const roleIds = guildMember.roles || []; roleIds.forEach((id) => { - eventHandlers.debug?.( - "loop", - `1. Running forEach loop in GUILD_MEMBER_UPDATE file.` - ); + eventHandlers.debug?.("loop", `1. Running forEach loop in GUILD_MEMBER_UPDATE file.`); if (!payload.roles.includes(bigintToSnowflake(id))) { eventHandlers.roleLost?.(guild, discordenoMember, id); } }); payload.roles.forEach((id) => { - eventHandlers.debug?.( - "loop", - `2. Running forEach loop in GUILD_MEMBER_UPDATE file.` - ); + eventHandlers.debug?.("loop", `2. Running forEach loop in GUILD_MEMBER_UPDATE file.`); if (!roleIds.includes(snowflakeToBigint(id))) { - eventHandlers.roleGained?.( - guild, - discordenoMember, - snowflakeToBigint(id) - ); + eventHandlers.roleGained?.(guild, discordenoMember, snowflakeToBigint(id)); } }); } diff --git a/src/handlers/messages/MESSAGE_CREATE.ts b/src/handlers/messages/MESSAGE_CREATE.ts index 4db90067e..b8c541c1c 100644 --- a/src/handlers/messages/MESSAGE_CREATE.ts +++ b/src/handlers/messages/MESSAGE_CREATE.ts @@ -8,15 +8,10 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleMessageCreate(data: DiscordGatewayPayload) { const payload = data.d as Message; - const channel = await cacheHandlers.get( - "channels", - snowflakeToBigint(payload.channelId) - ); + const channel = await cacheHandlers.get("channels", snowflakeToBigint(payload.channelId)); if (channel) channel.lastMessageId = snowflakeToBigint(payload.id); - const guild = payload.guildId - ? await cacheHandlers.get("guilds", snowflakeToBigint(payload.guildId)) - : undefined; + const guild = payload.guildId ? await cacheHandlers.get("guilds", snowflakeToBigint(payload.guildId)) : undefined; if (payload.member && guild) { // If in a guild cache the author as a member @@ -37,11 +32,7 @@ export async function handleMessageCreate(data: DiscordGatewayPayload) { guild.id ); - return cacheHandlers.set( - "members", - snowflakeToBigint(mention.id), - discordenoMember - ); + return cacheHandlers.set("members", snowflakeToBigint(mention.id), discordenoMember); } }) ); diff --git a/src/handlers/messages/MESSAGE_DELETE.ts b/src/handlers/messages/MESSAGE_DELETE.ts index c93957ad2..afbfc20a0 100644 --- a/src/handlers/messages/MESSAGE_DELETE.ts +++ b/src/handlers/messages/MESSAGE_DELETE.ts @@ -6,10 +6,7 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleMessageDelete(data: DiscordGatewayPayload) { const payload = data.d as MessageDelete; - const channel = await cacheHandlers.get( - "channels", - snowflakeToBigint(payload.channelId) - ); + const channel = await cacheHandlers.get("channels", snowflakeToBigint(payload.channelId)); if (!channel) return; eventHandlers.messageDelete?.( diff --git a/src/handlers/messages/MESSAGE_DELETE_BULK.ts b/src/handlers/messages/MESSAGE_DELETE_BULK.ts index 3911b2675..64987feeb 100644 --- a/src/handlers/messages/MESSAGE_DELETE_BULK.ts +++ b/src/handlers/messages/MESSAGE_DELETE_BULK.ts @@ -6,18 +6,12 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleMessageDeleteBulk(data: DiscordGatewayPayload) { const payload = data.d as MessageDeleteBulk; - const channel = await cacheHandlers.get( - "channels", - snowflakeToBigint(payload.channelId) - ); + const channel = await cacheHandlers.get("channels", snowflakeToBigint(payload.channelId)); if (!channel) return; return Promise.all( payload.ids.map(async (id) => { - eventHandlers.messageDelete?.( - { id, channel }, - await cacheHandlers.get("messages", snowflakeToBigint(id)) - ); + eventHandlers.messageDelete?.({ id, channel }, await cacheHandlers.get("messages", snowflakeToBigint(id))); await cacheHandlers.delete("messages", snowflakeToBigint(id)); }) ); diff --git a/src/handlers/messages/MESSAGE_REACTION_ADD.ts b/src/handlers/messages/MESSAGE_REACTION_ADD.ts index 198745bd1..1dffcaf89 100644 --- a/src/handlers/messages/MESSAGE_REACTION_ADD.ts +++ b/src/handlers/messages/MESSAGE_REACTION_ADD.ts @@ -7,16 +7,11 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleMessageReactionAdd(data: DiscordGatewayPayload) { const payload = data.d as MessageReactionAdd; - const message = await cacheHandlers.get( - "messages", - snowflakeToBigint(payload.messageId) - ); + const message = await cacheHandlers.get("messages", snowflakeToBigint(payload.messageId)); if (message) { const reactionExisted = message.reactions?.find( - (reaction) => - reaction.emoji.id === payload.emoji.id && - reaction.emoji.name === payload.emoji.name + (reaction) => reaction.emoji.id === payload.emoji.id && reaction.emoji.name === payload.emoji.name ); if (reactionExisted) reactionExisted.count++; @@ -26,28 +21,16 @@ export async function handleMessageReactionAdd(data: DiscordGatewayPayload) { me: snowflakeToBigint(payload.userId) === botId, emoji: { ...payload.emoji, id: payload.emoji.id || undefined }, }; - message.reactions = message.reactions - ? [...message.reactions, newReaction] - : [newReaction]; + message.reactions = message.reactions ? [...message.reactions, newReaction] : [newReaction]; } - await cacheHandlers.set( - "messages", - snowflakeToBigint(payload.messageId), - message - ); + await cacheHandlers.set("messages", snowflakeToBigint(payload.messageId), message); } if (payload.member && payload.guildId) { - const guild = await cacheHandlers.get( - "guilds", - snowflakeToBigint(payload.guildId) - ); + const guild = await cacheHandlers.get("guilds", snowflakeToBigint(payload.guildId)); if (guild) { - const discordenoMember = await structures.createDiscordenoMember( - payload.member, - guild.id - ); + const discordenoMember = await structures.createDiscordenoMember(payload.member, guild.id); await cacheHandlers.set("members", discordenoMember.id, discordenoMember); } } diff --git a/src/handlers/messages/MESSAGE_REACTION_REMOVE.ts b/src/handlers/messages/MESSAGE_REACTION_REMOVE.ts index b06051e34..603568af7 100644 --- a/src/handlers/messages/MESSAGE_REACTION_REMOVE.ts +++ b/src/handlers/messages/MESSAGE_REACTION_REMOVE.ts @@ -6,17 +6,13 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleMessageReactionRemove(data: DiscordGatewayPayload) { const payload = data.d as MessageReactionRemove; - const message = await cacheHandlers.get( - "messages", - snowflakeToBigint(payload.messageId) - ); + const message = await cacheHandlers.get("messages", snowflakeToBigint(payload.messageId)); if (message) { const reaction = message.reactions?.find( (reaction) => // MUST USE == because discord sends null and we use undefined - reaction.emoji.id == payload.emoji.id && - reaction.emoji.name === payload.emoji.name + reaction.emoji.id == payload.emoji.id && reaction.emoji.name === payload.emoji.name ); if (reaction) { diff --git a/src/handlers/messages/MESSAGE_REACTION_REMOVE_ALL.ts b/src/handlers/messages/MESSAGE_REACTION_REMOVE_ALL.ts index 07ca1e7b9..79d84995e 100644 --- a/src/handlers/messages/MESSAGE_REACTION_REMOVE_ALL.ts +++ b/src/handlers/messages/MESSAGE_REACTION_REMOVE_ALL.ts @@ -4,23 +4,14 @@ import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload. import type { MessageReactionRemoveAll } from "../../types/messages/message_reaction_remove_all.ts"; import { snowflakeToBigint } from "../../util/bigint.ts"; -export async function handleMessageReactionRemoveAll( - data: DiscordGatewayPayload -) { +export async function handleMessageReactionRemoveAll(data: DiscordGatewayPayload) { const payload = data.d as MessageReactionRemoveAll; - const message = await cacheHandlers.get( - "messages", - snowflakeToBigint(payload.messageId) - ); + const message = await cacheHandlers.get("messages", snowflakeToBigint(payload.messageId)); if (message?.reactions) { message.reactions = undefined; - await cacheHandlers.set( - "messages", - snowflakeToBigint(payload.messageId), - message - ); + await cacheHandlers.set("messages", snowflakeToBigint(payload.messageId), message); } eventHandlers.reactionRemoveAll?.(payload, message); diff --git a/src/handlers/messages/MESSAGE_REACTION_REMOVE_EMOJI.ts b/src/handlers/messages/MESSAGE_REACTION_REMOVE_EMOJI.ts index f1b1a79a1..422ab74be 100644 --- a/src/handlers/messages/MESSAGE_REACTION_REMOVE_EMOJI.ts +++ b/src/handlers/messages/MESSAGE_REACTION_REMOVE_EMOJI.ts @@ -4,24 +4,16 @@ import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload. import type { MessageReactionRemoveEmoji } from "../../types/messages/message_reaction_remove_emoji.ts"; import { snowflakeToBigint } from "../../util/bigint.ts"; -export async function handleMessageReactionRemoveEmoji( - data: DiscordGatewayPayload -) { +export async function handleMessageReactionRemoveEmoji(data: DiscordGatewayPayload) { const payload = data.d as MessageReactionRemoveEmoji; - const message = await cacheHandlers.get( - "messages", - snowflakeToBigint(payload.messageId) - ); + const message = await cacheHandlers.get("messages", snowflakeToBigint(payload.messageId)); if (message?.reactions) { message.reactions = message.reactions.filter( (reaction) => !( // MUST USE == because discord sends null and we use undefined - ( - reaction.emoji.id == payload.emoji.id && - reaction.emoji.name === payload.emoji.name - ) + (reaction.emoji.id == payload.emoji.id && reaction.emoji.name === payload.emoji.name) ) ); diff --git a/src/handlers/messages/MESSAGE_UPDATE.ts b/src/handlers/messages/MESSAGE_UPDATE.ts index 39073d5bb..32a6b21c0 100644 --- a/src/handlers/messages/MESSAGE_UPDATE.ts +++ b/src/handlers/messages/MESSAGE_UPDATE.ts @@ -7,16 +7,10 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleMessageUpdate(data: DiscordGatewayPayload) { const payload = data.d as Message; - const channel = await cacheHandlers.get( - "channels", - snowflakeToBigint(payload.channelId) - ); + const channel = await cacheHandlers.get("channels", snowflakeToBigint(payload.channelId)); if (!channel) return; - const oldMessage = await cacheHandlers.get( - "messages", - snowflakeToBigint(payload.id) - ); + const oldMessage = await cacheHandlers.get("messages", snowflakeToBigint(payload.id)); if (!oldMessage) return; // Messages with embeds can trigger update but they wont have edited_timestamp diff --git a/src/handlers/misc/PRESENCE_UPDATE.ts b/src/handlers/misc/PRESENCE_UPDATE.ts index ccda0889e..ce801616a 100644 --- a/src/handlers/misc/PRESENCE_UPDATE.ts +++ b/src/handlers/misc/PRESENCE_UPDATE.ts @@ -7,15 +7,8 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handlePresenceUpdate(data: DiscordGatewayPayload) { const payload = data.d as PresenceUpdate; - const oldPresence = await cacheHandlers.get( - "presences", - snowflakeToBigint(payload.user.id) - ); - await cacheHandlers.set( - "presences", - snowflakeToBigint(payload.user.id), - payload - ); + const oldPresence = await cacheHandlers.get("presences", snowflakeToBigint(payload.user.id)); + await cacheHandlers.set("presences", snowflakeToBigint(payload.user.id), payload); eventHandlers.presenceUpdate?.(payload, oldPresence); } diff --git a/src/handlers/misc/READY.ts b/src/handlers/misc/READY.ts index 60657a2ab..8bee0fbdf 100644 --- a/src/handlers/misc/READY.ts +++ b/src/handlers/misc/READY.ts @@ -22,9 +22,7 @@ export function handleReady(data: DiscordGatewayPayload, shardId: number) { // Set ready to false just to go sure shard.ready = false; // All guilds are unavailable at first - shard.unavailableGuildIds = new Set( - payload.guilds.map((g) => snowflakeToBigint(g.id)) - ); + shard.unavailableGuildIds = new Set(payload.guilds.map((g) => snowflakeToBigint(g.id))); // Set the last available to now shard.lastAvailable = Date.now(); diff --git a/src/handlers/misc/USER_UPDATE.ts b/src/handlers/misc/USER_UPDATE.ts index 3b1c0ac46..3ebc74323 100644 --- a/src/handlers/misc/USER_UPDATE.ts +++ b/src/handlers/misc/USER_UPDATE.ts @@ -7,10 +7,7 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleUserUpdate(data: DiscordGatewayPayload) { const userData = data.d as User; - const member = await cacheHandlers.get( - "members", - snowflakeToBigint(userData.id) - ); + const member = await cacheHandlers.get("members", snowflakeToBigint(userData.id)); if (!member) return; Object.entries(userData).forEach(([key, value]) => { diff --git a/src/handlers/roles/GUILD_ROLE_CREATE.ts b/src/handlers/roles/GUILD_ROLE_CREATE.ts index fd0899f74..82cf77a59 100644 --- a/src/handlers/roles/GUILD_ROLE_CREATE.ts +++ b/src/handlers/roles/GUILD_ROLE_CREATE.ts @@ -7,10 +7,7 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleGuildRoleCreate(data: DiscordGatewayPayload) { const payload = data.d as GuildRoleCreate; - const guild = await cacheHandlers.get( - "guilds", - snowflakeToBigint(payload.guildId) - ); + const guild = await cacheHandlers.get("guilds", snowflakeToBigint(payload.guildId)); if (!guild) return; const role = await structures.createDiscordenoRole({ diff --git a/src/handlers/roles/GUILD_ROLE_DELETE.ts b/src/handlers/roles/GUILD_ROLE_DELETE.ts index 243ea06f8..171286373 100644 --- a/src/handlers/roles/GUILD_ROLE_DELETE.ts +++ b/src/handlers/roles/GUILD_ROLE_DELETE.ts @@ -6,10 +6,7 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleGuildRoleDelete(data: DiscordGatewayPayload) { const payload = data.d as GuildRoleDelete; - const guild = await cacheHandlers.get( - "guilds", - snowflakeToBigint(payload.guildId) - ); + const guild = await cacheHandlers.get("guilds", snowflakeToBigint(payload.guildId)); if (!guild) return; const roleId = snowflakeToBigint(payload.roleId); @@ -21,18 +18,12 @@ export async function handleGuildRoleDelete(data: DiscordGatewayPayload) { // For bots without GUILD_MEMBERS member.roles is never updated breaking permissions checking. cacheHandlers.forEach("members", (member) => { - eventHandlers.debug?.( - "loop", - `1. Running forEach members loop in GUILD_ROLE_DELETE file.` - ); + eventHandlers.debug?.("loop", `1. Running forEach members loop in GUILD_ROLE_DELETE file.`); // Not in the relevant guild so just skip. if (!member.guilds.has(guild.id)) return; member.guilds.forEach((g) => { - eventHandlers.debug?.( - "loop", - `2. Running forEach loop in CHANNEL_DELTE file.` - ); + eventHandlers.debug?.("loop", `2. Running forEach loop in CHANNEL_DELTE file.`); // Member does not have this role if (!g.roles.includes(roleId)) return; // Remove this role from the members cache diff --git a/src/handlers/roles/GUILD_ROLE_UPDATE.ts b/src/handlers/roles/GUILD_ROLE_UPDATE.ts index 3813d5180..8c1a004a8 100644 --- a/src/handlers/roles/GUILD_ROLE_UPDATE.ts +++ b/src/handlers/roles/GUILD_ROLE_UPDATE.ts @@ -7,10 +7,7 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleGuildRoleUpdate(data: DiscordGatewayPayload) { const payload = data.d as GuildRoleUpdate; - const guild = await cacheHandlers.get( - "guilds", - snowflakeToBigint(payload.guildId) - ); + const guild = await cacheHandlers.get("guilds", snowflakeToBigint(payload.guildId)); if (!guild) return; const cachedRole = guild.roles.get(snowflakeToBigint(payload.role.id)); diff --git a/src/handlers/voice/VOICE_SERVER_UPDATE.ts b/src/handlers/voice/VOICE_SERVER_UPDATE.ts index 8f2ad05a0..d93a41ded 100644 --- a/src/handlers/voice/VOICE_SERVER_UPDATE.ts +++ b/src/handlers/voice/VOICE_SERVER_UPDATE.ts @@ -7,10 +7,7 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleVoiceServerUpdate(data: DiscordGatewayPayload) { const payload = data.d as VoiceServerUpdate; - const guild = await cacheHandlers.get( - "guilds", - snowflakeToBigint(payload.guildId) - ); + const guild = await cacheHandlers.get("guilds", snowflakeToBigint(payload.guildId)); if (!guild) return; eventHandlers.voiceServerUpdate?.(payload, guild); diff --git a/src/handlers/voice/VOICE_STATE_UPDATE.ts b/src/handlers/voice/VOICE_STATE_UPDATE.ts index 6c183c16b..8e2f3b514 100644 --- a/src/handlers/voice/VOICE_STATE_UPDATE.ts +++ b/src/handlers/voice/VOICE_STATE_UPDATE.ts @@ -9,10 +9,7 @@ export async function handleVoiceStateUpdate(data: DiscordGatewayPayload) { const payload = data.d as VoiceState; if (!payload.guildId) return; - const guild = await cacheHandlers.get( - "guilds", - snowflakeToBigint(payload.guildId) - ); + const guild = await cacheHandlers.get("guilds", snowflakeToBigint(payload.guildId)); if (!guild) return; const member = payload.member @@ -30,25 +27,15 @@ export async function handleVoiceStateUpdate(data: DiscordGatewayPayload) { await cacheHandlers.set("guilds", guild.id, guild); - if ( - cachedState?.channelId !== - (payload.channelId ? snowflakeToBigint(payload.channelId) : null) - ) { + if (cachedState?.channelId !== (payload.channelId ? snowflakeToBigint(payload.channelId) : null)) { // Either joined or moved channels if (payload.channelId) { if (cachedState?.channelId) { // Was in a channel before - eventHandlers.voiceChannelSwitch?.( - member, - snowflakeToBigint(payload.channelId), - cachedState.channelId - ); + eventHandlers.voiceChannelSwitch?.(member, snowflakeToBigint(payload.channelId), cachedState.channelId); } else { // Was not in a channel before so user just joined - eventHandlers.voiceChannelJoin?.( - member, - snowflakeToBigint(payload.channelId) - ); + eventHandlers.voiceChannelJoin?.(member, snowflakeToBigint(payload.channelId)); } } // Left the channel else if (cachedState?.channelId) { diff --git a/src/handlers/webhooks/WEBHOOKS_UPDATE.ts b/src/handlers/webhooks/WEBHOOKS_UPDATE.ts index db641dfc3..8b2e621d7 100644 --- a/src/handlers/webhooks/WEBHOOKS_UPDATE.ts +++ b/src/handlers/webhooks/WEBHOOKS_UPDATE.ts @@ -5,8 +5,5 @@ import { snowflakeToBigint } from "../../util/bigint.ts"; export function handleWebhooksUpdate(data: DiscordGatewayPayload) { const options = data.d as WebhookUpdate; - eventHandlers.webhooksUpdate?.( - snowflakeToBigint(options.channelId), - snowflakeToBigint(options.guildId) - ); + eventHandlers.webhooksUpdate?.(snowflakeToBigint(options.channelId), snowflakeToBigint(options.guildId)); } diff --git a/src/helpers/channels/category_children.ts b/src/helpers/channels/category_children.ts index a5e2406a3..b3c32e520 100644 --- a/src/helpers/channels/category_children.ts +++ b/src/helpers/channels/category_children.ts @@ -2,8 +2,5 @@ import { cacheHandlers } from "../../cache.ts"; /** Gets an array of all the channels ids that are the children of this category. */ export async function categoryChildren(id: bigint) { - return await cacheHandlers.filter( - "channels", - (channel) => channel.parentId === id - ); + return await cacheHandlers.filter("channels", (channel) => channel.parentId === id); } diff --git a/src/helpers/channels/channel_overwrite_has_permission.ts b/src/helpers/channels/channel_overwrite_has_permission.ts index 3cd003776..f21fbc26a 100644 --- a/src/helpers/channels/channel_overwrite_has_permission.ts +++ b/src/helpers/channels/channel_overwrite_has_permission.ts @@ -13,9 +13,7 @@ export function channelOverwriteHasPermission( })[], permissions: PermissionStrings[] ) { - const overwrite = - overwrites.find((perm) => perm.id === id) || - overwrites.find((perm) => perm.id === guildId); + const overwrite = overwrites.find((perm) => perm.id === id) || overwrites.find((perm) => perm.id === guildId); if (!overwrite) return false; diff --git a/src/helpers/channels/clone_channel.ts b/src/helpers/channels/clone_channel.ts index 8ea8a5ecb..52ec7c145 100644 --- a/src/helpers/channels/clone_channel.ts +++ b/src/helpers/channels/clone_channel.ts @@ -11,10 +11,7 @@ export async function cloneChannel(channelId: bigint, reason?: string) { if (!channelToClone) throw new Error(Errors.CHANNEL_NOT_FOUND); //Check for DM channel - if ( - channelToClone.type === DiscordChannelTypes.DM || - channelToClone.type === DiscordChannelTypes.GroupDm - ) { + if (channelToClone.type === DiscordChannelTypes.DM || channelToClone.type === DiscordChannelTypes.GroupDm) { throw new Error(Errors.CHANNEL_NOT_IN_GUILD); } @@ -22,9 +19,7 @@ export async function cloneChannel(channelId: bigint, reason?: string) { ...channelToClone, name: channelToClone.name!, topic: channelToClone.topic || undefined, - permissionOverwrites: channelToClone.permissionOverwrites.map(( - overwrite, - ) => ({ + permissionOverwrites: channelToClone.permissionOverwrites.map((overwrite) => ({ id: overwrite.id.toString(), type: overwrite.type, allow: calculatePermissions(overwrite.allow.toString()), @@ -33,9 +28,5 @@ export async function cloneChannel(channelId: bigint, reason?: string) { }; //Create the channel (also handles permissions) - return await helpers.createChannel( - channelToClone.guildId!, - createChannelOptions, - reason, - ); + return await helpers.createChannel(channelToClone.guildId!, createChannelOptions, reason); } diff --git a/src/helpers/channels/create_channel.ts b/src/helpers/channels/create_channel.ts index 9d4efe3db..8d6e251c3 100644 --- a/src/helpers/channels/create_channel.ts +++ b/src/helpers/channels/create_channel.ts @@ -3,23 +3,13 @@ import { rest } from "../../rest/rest.ts"; import { structures } from "../../structures/mod.ts"; import type { Channel } from "../../types/channels/channel.ts"; import { DiscordChannelTypes } from "../../types/channels/channel_types.ts"; -import type { - CreateGuildChannel, - DiscordCreateGuildChannel, -} from "../../types/guilds/create_guild_channel.ts"; +import type { CreateGuildChannel, DiscordCreateGuildChannel } from "../../types/guilds/create_guild_channel.ts"; import { endpoints } from "../../util/constants.ts"; -import { - calculateBits, - requireOverwritePermissions, -} from "../../util/permissions.ts"; +import { calculateBits, requireOverwritePermissions } from "../../util/permissions.ts"; import { snakelize } from "../../util/utils.ts"; /** Create a channel in your server. Bot needs MANAGE_CHANNEL permissions in the server. */ -export async function createChannel( - guildId: bigint, - options?: CreateGuildChannel, - reason?: string -) { +export async function createChannel(guildId: bigint, options?: CreateGuildChannel, reason?: string) { if (options?.permissionOverwrites) { await requireOverwritePermissions(guildId, options.permissionOverwrites); } @@ -27,20 +17,16 @@ export async function createChannel( // BITRATES ARE IN THOUSANDS SO IF USER PROVIDES 32 WE CONVERT TO 32000 if (options?.bitrate && options.bitrate < 1000) options.bitrate *= 1000; - const result = await rest.runMethod( - "post", - endpoints.GUILD_CHANNELS(guildId), - { - ...snakelize(options ?? {}), - permission_overwrites: options?.permissionOverwrites?.map((perm) => ({ - ...perm, - allow: calculateBits(perm.allow), - deny: calculateBits(perm.deny), - })), - type: options?.type || DiscordChannelTypes.GuildText, - reason, - } - ); + const result = await rest.runMethod("post", endpoints.GUILD_CHANNELS(guildId), { + ...snakelize(options ?? {}), + permission_overwrites: options?.permissionOverwrites?.map((perm) => ({ + ...perm, + allow: calculateBits(perm.allow), + deny: calculateBits(perm.deny), + })), + type: options?.type || DiscordChannelTypes.GuildText, + reason, + }); const discordenoChannel = await structures.createDiscordenoChannel(result); await cacheHandlers.set("channels", discordenoChannel.id, discordenoChannel); diff --git a/src/helpers/channels/create_stage_instance.ts b/src/helpers/channels/create_stage_instance.ts index cbd454552..e0da13859 100644 --- a/src/helpers/channels/create_stage_instance.ts +++ b/src/helpers/channels/create_stage_instance.ts @@ -16,23 +16,15 @@ export async function createStageInstance(channelId: bigint, topic: string) { throw new Error(Errors.CHANNEL_NOT_STAGE_VOICE); } - await requireBotChannelPermissions(channel, [ - "MANAGE_CHANNELS", - "MUTE_MEMBERS", - "MOVE_MEMBERS", - ]); + await requireBotChannelPermissions(channel, ["MANAGE_CHANNELS", "MUTE_MEMBERS", "MOVE_MEMBERS"]); } if (!validateLength(topic, { max: 120, min: 1 })) { throw new Error(Errors.INVALID_TOPIC_LENGTH); } - return await rest.runMethod( - "post", - endpoints.STAGE_INSTANCES, - { - channel_id: channelId, - topic, - } - ); + return await rest.runMethod("post", endpoints.STAGE_INSTANCES, { + channel_id: channelId, + topic, + }); } diff --git a/src/helpers/channels/delete_channel.ts b/src/helpers/channels/delete_channel.ts index 85089f77b..9a805b2bb 100644 --- a/src/helpers/channels/delete_channel.ts +++ b/src/helpers/channels/delete_channel.ts @@ -16,11 +16,9 @@ export async function deleteChannel(channelId: bigint, reason?: string) { // TODO(threads): check if this requires guild perms or channel is enough await requireBotGuildPermissions( guild, - [ - ChannelTypes.GuildNewsThread, - ChannelTypes.GuildPivateThread, - ChannelTypes.GuildPublicThread, - ].includes(channel.type) + [ChannelTypes.GuildNewsThread, ChannelTypes.GuildPivateThread, ChannelTypes.GuildPublicThread].includes( + channel.type + ) ? ["MANAGE_THREADS"] : ["MANAGE_CHANNELS"] ); @@ -33,9 +31,5 @@ export async function deleteChannel(channelId: bigint, reason?: string) { } } - return await rest.runMethod( - "delete", - endpoints.CHANNEL_BASE(channelId), - { reason } - ); + return await rest.runMethod("delete", endpoints.CHANNEL_BASE(channelId), { reason }); } diff --git a/src/helpers/channels/delete_channel_overwrite.ts b/src/helpers/channels/delete_channel_overwrite.ts index ca389fd73..40dd141f7 100644 --- a/src/helpers/channels/delete_channel_overwrite.ts +++ b/src/helpers/channels/delete_channel_overwrite.ts @@ -10,8 +10,5 @@ export async function deleteChannelOverwrite( ): Promise { await requireBotGuildPermissions(guildId, ["MANAGE_ROLES"]); - return await rest.runMethod( - "delete", - endpoints.CHANNEL_OVERWRITE(channelId, overwriteId) - ); + return await rest.runMethod("delete", endpoints.CHANNEL_OVERWRITE(channelId, overwriteId)); } diff --git a/src/helpers/channels/delete_stage_instance.ts b/src/helpers/channels/delete_stage_instance.ts index f30bcdaf8..735da6353 100644 --- a/src/helpers/channels/delete_stage_instance.ts +++ b/src/helpers/channels/delete_stage_instance.ts @@ -14,15 +14,8 @@ export async function deleteStageInstance(channelId: bigint) { throw new Error(Errors.CHANNEL_NOT_STAGE_VOICE); } - await requireBotChannelPermissions(channel, [ - "MUTE_MEMBERS", - "MANAGE_CHANNELS", - "MOVE_MEMBERS", - ]); + await requireBotChannelPermissions(channel, ["MUTE_MEMBERS", "MANAGE_CHANNELS", "MOVE_MEMBERS"]); } - return await rest.runMethod( - "delete", - endpoints.STAGE_INSTANCE(channelId) - ); + return await rest.runMethod("delete", endpoints.STAGE_INSTANCE(channelId)); } diff --git a/src/helpers/channels/edit_channel.ts b/src/helpers/channels/edit_channel.ts index 7c161f9f2..75e59c266 100644 --- a/src/helpers/channels/edit_channel.ts +++ b/src/helpers/channels/edit_channel.ts @@ -9,21 +9,13 @@ import type { ModifyChannel } from "../../types/channels/modify_channel.ts"; import type { ModifyThread } from "../../types/channels/threads/modify_thread.ts"; import type { PermissionStrings } from "../../types/permissions/permission_strings.ts"; import { endpoints } from "../../util/constants.ts"; -import { - calculateBits, - requireBotChannelPermissions, - requireOverwritePermissions, -} from "../../util/permissions.ts"; +import { calculateBits, requireBotChannelPermissions, requireOverwritePermissions } from "../../util/permissions.ts"; import { hasOwnProperty, snakelize } from "../../util/utils.ts"; //TODO: implement DM group channel edit //TODO(threads): check thread perms /** Update a channel's settings. Requires the `MANAGE_CHANNELS` permission for the guild. */ -export async function editChannel( - channelId: bigint, - options: ModifyChannel | ModifyThread, - reason?: string -) { +export async function editChannel(channelId: bigint, options: ModifyChannel | ModifyThread, reason?: string) { const channel = await cacheHandlers.get("channels", channelId); if (channel) { @@ -46,19 +38,11 @@ export async function editChannel( permissions.add("MANAGE_THREADS"); } - await requireBotChannelPermissions(channel.parentId ?? 0n, [ - ...permissions, - ]); + await requireBotChannelPermissions(channel.parentId ?? 0n, [...permissions]); } - if ( - hasOwnProperty(options, "permissionOverwrites") && - Array.isArray(options.permissionOverwrites) - ) { - await requireOverwritePermissions( - channel.guildId, - options.permissionOverwrites - ); + if (hasOwnProperty(options, "permissionOverwrites") && Array.isArray(options.permissionOverwrites)) { + await requireOverwritePermissions(channel.guildId, options.permissionOverwrites); } } @@ -91,10 +75,7 @@ export async function editChannel( const payload = { ...snakelize>(options), // deno-lint-ignore camelcase - permission_overwrites: hasOwnProperty( - options, - "permissionOverwrites" - ) + permission_overwrites: hasOwnProperty(options, "permissionOverwrites") ? options.permissionOverwrites?.map((overwrite) => { return { ...overwrite, @@ -105,14 +86,10 @@ export async function editChannel( : undefined, }; - const result = await rest.runMethod( - "patch", - endpoints.CHANNEL_BASE(channelId), - { - ...payload, - reason, - } - ); + const result = await rest.runMethod("patch", endpoints.CHANNEL_BASE(channelId), { + ...payload, + reason, + }); return await structures.createDiscordenoChannel(result); } diff --git a/src/helpers/channels/edit_channel_overwrite.ts b/src/helpers/channels/edit_channel_overwrite.ts index 112820664..c9b6c2db7 100644 --- a/src/helpers/channels/edit_channel_overwrite.ts +++ b/src/helpers/channels/edit_channel_overwrite.ts @@ -1,10 +1,7 @@ import { rest } from "../../rest/rest.ts"; import type { Overwrite } from "../../types/channels/overwrite.ts"; import { endpoints } from "../../util/constants.ts"; -import { - calculateBits, - requireBotGuildPermissions, -} from "../../util/permissions.ts"; +import { calculateBits, requireBotGuildPermissions } from "../../util/permissions.ts"; /** Edit the channel permission overwrites for a user or role in this channel. Requires `MANAGE_ROLES` permission. */ export async function editChannelOverwrite( @@ -15,13 +12,9 @@ export async function editChannelOverwrite( ): Promise { await requireBotGuildPermissions(guildId, ["MANAGE_ROLES"]); - return await rest.runMethod( - "put", - endpoints.CHANNEL_OVERWRITE(channelId, overwriteId), - { - allow: calculateBits(options.allow), - deny: calculateBits(options.deny), - type: options.type, - } - ); + return await rest.runMethod("put", endpoints.CHANNEL_OVERWRITE(channelId, overwriteId), { + allow: calculateBits(options.allow), + deny: calculateBits(options.deny), + type: options.type, + }); } diff --git a/src/helpers/channels/follow_channel.ts b/src/helpers/channels/follow_channel.ts index 834e2d00d..bd9d7d6ad 100644 --- a/src/helpers/channels/follow_channel.ts +++ b/src/helpers/channels/follow_channel.ts @@ -4,19 +4,12 @@ import { endpoints } from "../../util/constants.ts"; import { requireBotChannelPermissions } from "../../util/permissions.ts"; /** Follow a News Channel to send messages to a target channel. Requires the `MANAGE_WEBHOOKS` permission in the target channel. Returns the webhook id. */ -export async function followChannel( - sourceChannelId: bigint, - targetChannelId: bigint -) { +export async function followChannel(sourceChannelId: bigint, targetChannelId: bigint) { await requireBotChannelPermissions(targetChannelId, ["MANAGE_WEBHOOKS"]); - const data = await rest.runMethod( - "post", - endpoints.CHANNEL_FOLLOW(sourceChannelId), - { - webhook_channel_id: targetChannelId, - } - ); + const data = await rest.runMethod("post", endpoints.CHANNEL_FOLLOW(sourceChannelId), { + webhook_channel_id: targetChannelId, + }); return data.webhookId; } diff --git a/src/helpers/channels/get_channel.ts b/src/helpers/channels/get_channel.ts index 3e36c46c8..3b14c40c4 100644 --- a/src/helpers/channels/get_channel.ts +++ b/src/helpers/channels/get_channel.ts @@ -10,21 +10,14 @@ import { endpoints } from "../../util/constants.ts"; * ⚠️ **If you need this, you are probably doing something wrong. This is not intended for use. Your channels will be cached in your guild.** */ export async function getChannel(channelId: bigint, addToCache = true) { - const result = await rest.runMethod( - "get", - endpoints.CHANNEL_BASE(channelId) - ); + const result = await rest.runMethod("get", endpoints.CHANNEL_BASE(channelId)); const discordenoChannel = await structures.createDiscordenoChannel( result, result.guildId ? snowflakeToBigint(result.guildId) : undefined ); if (addToCache) { - await cacheHandlers.set( - "channels", - discordenoChannel.id, - discordenoChannel - ); + await cacheHandlers.set("channels", discordenoChannel.id, discordenoChannel); } return discordenoChannel; diff --git a/src/helpers/channels/get_channel_webhooks.ts b/src/helpers/channels/get_channel_webhooks.ts index 472aa2335..fc1bac9cb 100644 --- a/src/helpers/channels/get_channel_webhooks.ts +++ b/src/helpers/channels/get_channel_webhooks.ts @@ -8,10 +8,7 @@ import { requireBotChannelPermissions } from "../../util/permissions.ts"; export async function getChannelWebhooks(channelId: bigint) { await requireBotChannelPermissions(channelId, ["MANAGE_WEBHOOKS"]); - const result = await rest.runMethod( - "get", - endpoints.CHANNEL_WEBHOOKS(channelId) - ); + const result = await rest.runMethod("get", endpoints.CHANNEL_WEBHOOKS(channelId)); return new Collection(result.map((webhook) => [webhook.id, webhook])); } diff --git a/src/helpers/channels/get_channels.ts b/src/helpers/channels/get_channels.ts index 488727a3e..30c78ecfd 100644 --- a/src/helpers/channels/get_channels.ts +++ b/src/helpers/channels/get_channels.ts @@ -10,25 +10,15 @@ import { endpoints } from "../../util/constants.ts"; * ⚠️ **If you need this, you are probably doing something wrong. This is not intended for use. Your channels will be cached in your guild.** */ export async function getChannels(guildId: bigint, addToCache = true) { - const result = await rest.runMethod( - "get", - endpoints.GUILD_CHANNELS(guildId) - ); + const result = await rest.runMethod("get", endpoints.GUILD_CHANNELS(guildId)); return new Collection( ( await Promise.all( result.map(async (res) => { - const discordenoChannel = await structures.createDiscordenoChannel( - res, - guildId - ); + const discordenoChannel = await structures.createDiscordenoChannel(res, guildId); if (addToCache) { - await cacheHandlers.set( - "channels", - discordenoChannel.id, - discordenoChannel - ); + await cacheHandlers.set("channels", discordenoChannel.id, discordenoChannel); } return discordenoChannel; diff --git a/src/helpers/channels/get_pins.ts b/src/helpers/channels/get_pins.ts index 557ab1908..1b58916c1 100644 --- a/src/helpers/channels/get_pins.ts +++ b/src/helpers/channels/get_pins.ts @@ -5,12 +5,7 @@ import { endpoints } from "../../util/constants.ts"; /** Get pinned messages in this channel. */ export async function getPins(channelId: bigint) { - const result = await rest.runMethod( - "get", - endpoints.CHANNEL_PINS(channelId) - ); + const result = await rest.runMethod("get", endpoints.CHANNEL_PINS(channelId)); - return Promise.all( - result.map((res) => structures.createDiscordenoMessage(res)) - ); + return Promise.all(result.map((res) => structures.createDiscordenoMessage(res))); } diff --git a/src/helpers/channels/get_stage_instance.ts b/src/helpers/channels/get_stage_instance.ts index c72778e0c..5a3b4e633 100644 --- a/src/helpers/channels/get_stage_instance.ts +++ b/src/helpers/channels/get_stage_instance.ts @@ -15,8 +15,5 @@ export async function getStageInstance(channelId: bigint) { } } - return await rest.runMethod( - "get", - endpoints.STAGE_INSTANCE(channelId) - ); + return await rest.runMethod("get", endpoints.STAGE_INSTANCE(channelId)); } diff --git a/src/helpers/channels/is_channel_synced.ts b/src/helpers/channels/is_channel_synced.ts index 616bffbcd..ed6798f78 100644 --- a/src/helpers/channels/is_channel_synced.ts +++ b/src/helpers/channels/is_channel_synced.ts @@ -9,12 +9,8 @@ export async function isChannelSynced(channelId: bigint) { if (!parentChannel) return false; return channel.permissionOverwrites?.every((overwrite) => { - const permission = parentChannel.permissionOverwrites?.find( - (ow) => ow.id === overwrite.id - ); + const permission = parentChannel.permissionOverwrites?.find((ow) => ow.id === overwrite.id); if (!permission) return false; - return !( - overwrite.allow !== permission.allow || overwrite.deny !== permission.deny - ); + return !(overwrite.allow !== permission.allow || overwrite.deny !== permission.deny); }); } diff --git a/src/helpers/channels/start_typing.ts b/src/helpers/channels/start_typing.ts index 3b214b9ce..173a73f3b 100644 --- a/src/helpers/channels/start_typing.ts +++ b/src/helpers/channels/start_typing.ts @@ -27,16 +27,11 @@ export async function startTyping(channelId: bigint) { throw new Error(Errors.CHANNEL_NOT_TEXT_BASED); } - const hasSendMessagesPerm = await botHasChannelPermissions(channelId, [ - "SEND_MESSAGES", - ]); + const hasSendMessagesPerm = await botHasChannelPermissions(channelId, ["SEND_MESSAGES"]); if (!hasSendMessagesPerm) { throw new Error(Errors.MISSING_SEND_MESSAGES); } } - return await rest.runMethod( - "post", - endpoints.CHANNEL_TYPING(channelId) - ); + return await rest.runMethod("post", endpoints.CHANNEL_TYPING(channelId)); } diff --git a/src/helpers/channels/swap_channels.ts b/src/helpers/channels/swap_channels.ts index f1f717dff..92cd14462 100644 --- a/src/helpers/channels/swap_channels.ts +++ b/src/helpers/channels/swap_channels.ts @@ -3,17 +3,10 @@ import type { ModifyGuildChannelPositions } from "../../types/guilds/modify_guil import { endpoints } from "../../util/constants.ts"; /** Modify the positions of channels on the guild. Requires MANAGE_CHANNELS permisison. */ -export async function swapChannels( - guildId: bigint, - channelPositions: ModifyGuildChannelPositions[] -) { +export async function swapChannels(guildId: bigint, channelPositions: ModifyGuildChannelPositions[]) { if (channelPositions.length < 2) { throw "You must provide at least two channels to be swapped."; } - return await rest.runMethod( - "patch", - endpoints.GUILD_CHANNELS(guildId), - channelPositions - ); + return await rest.runMethod("patch", endpoints.GUILD_CHANNELS(guildId), channelPositions); } diff --git a/src/helpers/channels/threads/add_to_thread.ts b/src/helpers/channels/threads/add_to_thread.ts index 457536c56..fe0c2138d 100644 --- a/src/helpers/channels/threads/add_to_thread.ts +++ b/src/helpers/channels/threads/add_to_thread.ts @@ -12,11 +12,9 @@ export async function addToThread(channelId: bigint, userId?: bigint) { const channel = await cacheHandlers.get("channels", channelId); if (channel) { if ( - ![ - ChannelTypes.GuildNewsThread, - ChannelTypes.GuildPivateThread, - ChannelTypes.GuildPublicThread, - ].includes(channel.type) + ![ChannelTypes.GuildNewsThread, ChannelTypes.GuildPivateThread, ChannelTypes.GuildPublicThread].includes( + channel.type + ) ) { throw new Error(Errors.NOT_A_THREAD_CHANNEL); } @@ -24,8 +22,6 @@ export async function addToThread(channelId: bigint, userId?: bigint) { return await rest.runMethod( "put", - userId - ? endpoints.THREAD_USER(channelId, userId) - : endpoints.THREAD_ME(channelId) + userId ? endpoints.THREAD_USER(channelId, userId) : endpoints.THREAD_ME(channelId) ); } diff --git a/src/helpers/channels/threads/get_thread_members.ts b/src/helpers/channels/threads/get_thread_members.ts index 89fe6a2ed..7aa90d6db 100644 --- a/src/helpers/channels/threads/get_thread_members.ts +++ b/src/helpers/channels/threads/get_thread_members.ts @@ -12,11 +12,9 @@ export async function getThreadMembers(channelId: bigint) { const channel = await cacheHandlers.get("channels", channelId); if (channel) { if ( - ![ - ChannelTypes.GuildNewsThread, - ChannelTypes.GuildPivateThread, - ChannelTypes.GuildPublicThread, - ].includes(channel.type) + ![ChannelTypes.GuildNewsThread, ChannelTypes.GuildPivateThread, ChannelTypes.GuildPublicThread].includes( + channel.type + ) ) { throw new Error(Errors.NOT_A_THREAD_CHANNEL); } diff --git a/src/helpers/channels/threads/remove_from_thread.ts b/src/helpers/channels/threads/remove_from_thread.ts index 46044e8a6..fdd381022 100644 --- a/src/helpers/channels/threads/remove_from_thread.ts +++ b/src/helpers/channels/threads/remove_from_thread.ts @@ -10,11 +10,9 @@ export async function removeFromThread(channelId: bigint, userId?: bigint) { const channel = await cacheHandlers.get("channels", channelId); if (channel) { if ( - ![ - ChannelTypes.GuildNewsThread, - ChannelTypes.GuildPivateThread, - ChannelTypes.GuildPublicThread, - ].includes(channel.type) + ![ChannelTypes.GuildNewsThread, ChannelTypes.GuildPivateThread, ChannelTypes.GuildPublicThread].includes( + channel.type + ) ) { throw new Error(Errors.NOT_A_THREAD_CHANNEL); } @@ -22,8 +20,6 @@ export async function removeFromThread(channelId: bigint, userId?: bigint) { return await rest.runMethod( "delete", - userId - ? endpoints.THREAD_USER(channelId, userId) - : endpoints.THREAD_ME(channelId) + userId ? endpoints.THREAD_USER(channelId, userId) : endpoints.THREAD_ME(channelId) ); } diff --git a/src/helpers/channels/threads/start_thread.ts b/src/helpers/channels/threads/start_thread.ts index 134f6f0a0..7202d7091 100644 --- a/src/helpers/channels/threads/start_thread.ts +++ b/src/helpers/channels/threads/start_thread.ts @@ -10,16 +10,11 @@ import { snakelize } from "../../../util/utils.ts"; * Creates a new public thread from an existing message. Returns a channel on success, and a 400 BAD REQUEST on invalid parameters. Fires a Thread Create Gateway event. * @param messageId when provided the thread will be public */ -export async function startThread( - channelId: bigint, - options: StartThread & { messageId?: bigint } -) { +export async function startThread(channelId: bigint, options: StartThread & { messageId?: bigint }) { const channel = await cacheHandlers.get("channels", channelId); if (channel) { // TODO(threads): perm check - if ( - ![ChannelTypes.GuildText, ChannelTypes.GuildNews].includes(channel.type) - ) { + if (![ChannelTypes.GuildText, ChannelTypes.GuildNews].includes(channel.type)) { throw new Error(Errors.INVALID_THREAD_PARENT_CHANNEL_TYPE); } diff --git a/src/helpers/channels/update_stage_instance.ts b/src/helpers/channels/update_stage_instance.ts index f14af2fe2..08e34f86f 100644 --- a/src/helpers/channels/update_stage_instance.ts +++ b/src/helpers/channels/update_stage_instance.ts @@ -16,11 +16,7 @@ export async function updateStageInstance(channelId: bigint, topic: string) { throw new Error(Errors.CHANNEL_NOT_STAGE_VOICE); } - await requireBotChannelPermissions(channel, [ - "MOVE_MEMBERS", - "MUTE_MEMBERS", - "MANAGE_CHANNELS", - ]); + await requireBotChannelPermissions(channel, ["MOVE_MEMBERS", "MUTE_MEMBERS", "MANAGE_CHANNELS"]); } if ( @@ -32,11 +28,7 @@ export async function updateStageInstance(channelId: bigint, topic: string) { throw new Error(Errors.INVALID_TOPIC_LENGTH); } - return await rest.runMethod( - "patch", - endpoints.STAGE_INSTANCE(channelId), - { - topic, - } - ); + return await rest.runMethod("patch", endpoints.STAGE_INSTANCE(channelId), { + topic, + }); } diff --git a/src/helpers/channels/update_voice_state.ts b/src/helpers/channels/update_voice_state.ts index 65f170e5e..f2e37f9cf 100644 --- a/src/helpers/channels/update_voice_state.ts +++ b/src/helpers/channels/update_voice_state.ts @@ -21,10 +21,7 @@ export async function updateBotVoiceState( ) { return await rest.runMethod( "patch", - endpoints.UPDATE_VOICE_STATE( - guildId, - hasOwnProperty(options, "userId") ? options.userId : undefined - ), + endpoints.UPDATE_VOICE_STATE(guildId, hasOwnProperty(options, "userId") ? options.userId : undefined), snakelize(options) ); } diff --git a/src/helpers/discovery/add_discovery_subcategory.ts b/src/helpers/discovery/add_discovery_subcategory.ts index 0c61a8571..038431dcf 100644 --- a/src/helpers/discovery/add_discovery_subcategory.ts +++ b/src/helpers/discovery/add_discovery_subcategory.ts @@ -4,10 +4,7 @@ import { endpoints } from "../../util/constants.ts"; import { requireBotGuildPermissions } from "../../util/permissions.ts"; /** Add a discovery subcategory to the guild. Requires the `MANAGE_GUILD` permission. */ -export async function addDiscoverySubcategory( - guildId: bigint, - categoryId: number -) { +export async function addDiscoverySubcategory(guildId: bigint, categoryId: number) { await requireBotGuildPermissions(guildId, ["MANAGE_GUILD"]); return await rest.runMethod( diff --git a/src/helpers/discovery/edit_discovery.ts b/src/helpers/discovery/edit_discovery.ts index e5464092f..9e87fd636 100644 --- a/src/helpers/discovery/edit_discovery.ts +++ b/src/helpers/discovery/edit_discovery.ts @@ -6,15 +6,8 @@ import { requireBotGuildPermissions } from "../../util/permissions.ts"; import { snakelize } from "../../util/utils.ts"; /** Modify the discovery metadata for the guild. Requires the MANAGE_GUILD permission. Returns the updated discovery metadata object on success. */ -export async function editDiscovery( - guildId: bigint, - data: ModifyGuildDiscoveryMetadata -) { +export async function editDiscovery(guildId: bigint, data: ModifyGuildDiscoveryMetadata) { await requireBotGuildPermissions(guildId, ["MANAGE_GUILD"]); - return await rest.runMethod( - "patch", - endpoints.DISCOVERY_MODIFY(guildId), - snakelize(data) - ); + return await rest.runMethod("patch", endpoints.DISCOVERY_MODIFY(guildId), snakelize(data)); } diff --git a/src/helpers/discovery/get_discovery_categories.ts b/src/helpers/discovery/get_discovery_categories.ts index 74fb24a04..0ca2ab9aa 100644 --- a/src/helpers/discovery/get_discovery_categories.ts +++ b/src/helpers/discovery/get_discovery_categories.ts @@ -5,12 +5,7 @@ import { endpoints } from "../../util/constants.ts"; /** Returns an array of discovery category objects that can be used when editing guilds */ export async function getDiscoveryCategories() { - const result = await rest.runMethod( - "get", - endpoints.DISCOVERY_CATEGORIES - ); + const result = await rest.runMethod("get", endpoints.DISCOVERY_CATEGORIES); - return new Collection( - result.map((category) => [category.id, category]) - ); + return new Collection(result.map((category) => [category.id, category])); } diff --git a/src/helpers/discovery/remove_discovery_subcategory.ts b/src/helpers/discovery/remove_discovery_subcategory.ts index 29ad722fc..aaa9f219c 100644 --- a/src/helpers/discovery/remove_discovery_subcategory.ts +++ b/src/helpers/discovery/remove_discovery_subcategory.ts @@ -3,14 +3,8 @@ import { endpoints } from "../../util/constants.ts"; import { requireBotGuildPermissions } from "../../util/permissions.ts"; /** Removes a discovery subcategory from the guild. Requires the MANAGE_GUILD permission. Returns a 204 No Content on success. */ -export async function removeDiscoverySubcategory( - guildId: bigint, - categoryId: number -) { +export async function removeDiscoverySubcategory(guildId: bigint, categoryId: number) { await requireBotGuildPermissions(guildId, ["MANAGE_GUILD"]); - return await rest.runMethod( - "delete", - endpoints.DISCOVERY_SUBCATEGORY(guildId, categoryId) - ); + return await rest.runMethod("delete", endpoints.DISCOVERY_SUBCATEGORY(guildId, categoryId)); } diff --git a/src/helpers/discovery/valid_discovery_term.ts b/src/helpers/discovery/valid_discovery_term.ts index c30a58d7b..9e2a850f6 100644 --- a/src/helpers/discovery/valid_discovery_term.ts +++ b/src/helpers/discovery/valid_discovery_term.ts @@ -3,11 +3,7 @@ import type { ValidateDiscoverySearchTerm } from "../../types/discovery/validate import { endpoints } from "../../util/constants.ts"; export async function validDiscoveryTerm(term: string) { - const result = await rest.runMethod( - "get", - endpoints.DISCOVERY_VALID_TERM, - { term } - ); + const result = await rest.runMethod("get", endpoints.DISCOVERY_VALID_TERM, { term }); return result.valid; } diff --git a/src/helpers/emojis/create_emoji.ts b/src/helpers/emojis/create_emoji.ts index 8428cc52d..e16adbe5d 100644 --- a/src/helpers/emojis/create_emoji.ts +++ b/src/helpers/emojis/create_emoji.ts @@ -7,27 +7,18 @@ import { requireBotGuildPermissions } from "../../util/permissions.ts"; import { urlToBase64 } from "../../util/utils.ts"; /** Create an emoji in the server. Emojis and animated emojis have a maximum file size of 256kb. Attempting to upload an emoji larger than this limit will fail and return 400 Bad Request and an error message, but not a JSON status code. If a URL is provided to the image parameter, Discordeno will automatically convert it to a base64 string internally. */ -export async function createEmoji( - guildId: bigint, - name: string, - image: string, - options: CreateGuildEmoji -) { +export async function createEmoji(guildId: bigint, name: string, image: string, options: CreateGuildEmoji) { await requireBotGuildPermissions(guildId, ["MANAGE_EMOJIS"]); if (image && !image.startsWith("data:image/")) { image = await urlToBase64(image); } - const emoji = await rest.runMethod( - "post", - endpoints.GUILD_EMOJIS(guildId), - { - ...options, - name, - image, - } - ); + const emoji = await rest.runMethod("post", endpoints.GUILD_EMOJIS(guildId), { + ...options, + name, + image, + }); return { ...emoji, diff --git a/src/helpers/emojis/delete_emoji.ts b/src/helpers/emojis/delete_emoji.ts index 48c78d48e..402a095dd 100644 --- a/src/helpers/emojis/delete_emoji.ts +++ b/src/helpers/emojis/delete_emoji.ts @@ -3,16 +3,8 @@ import { endpoints } from "../../util/constants.ts"; import { requireBotGuildPermissions } from "../../util/permissions.ts"; /** Delete the given emoji. Requires the MANAGE_EMOJIS permission. Returns 204 No Content on success. */ -export async function deleteEmoji( - guildId: bigint, - id: bigint, - reason?: string -) { +export async function deleteEmoji(guildId: bigint, id: bigint, reason?: string) { await requireBotGuildPermissions(guildId, ["MANAGE_EMOJIS"]); - return await rest.runMethod( - "delete", - endpoints.GUILD_EMOJI(guildId, id), - { reason } - ); + return await rest.runMethod("delete", endpoints.GUILD_EMOJI(guildId, id), { reason }); } diff --git a/src/helpers/emojis/edit_emoji.ts b/src/helpers/emojis/edit_emoji.ts index 6274a17dc..669efeed5 100644 --- a/src/helpers/emojis/edit_emoji.ts +++ b/src/helpers/emojis/edit_emoji.ts @@ -5,19 +5,11 @@ import { endpoints } from "../../util/constants.ts"; import { requireBotGuildPermissions } from "../../util/permissions.ts"; /** Modify the given emoji. Requires the MANAGE_EMOJIS permission. */ -export async function editEmoji( - guildId: bigint, - id: bigint, - options: ModifyGuildEmoji -) { +export async function editEmoji(guildId: bigint, id: bigint, options: ModifyGuildEmoji) { await requireBotGuildPermissions(guildId, ["MANAGE_EMOJIS"]); - return await rest.runMethod( - "patch", - endpoints.GUILD_EMOJI(guildId, id), - { - name: options.name, - roles: options.roles, - } - ); + return await rest.runMethod("patch", endpoints.GUILD_EMOJI(guildId, id), { + name: options.name, + roles: options.roles, + }); } diff --git a/src/helpers/emojis/get_emoji.ts b/src/helpers/emojis/get_emoji.ts index 845f462df..7bde027ef 100644 --- a/src/helpers/emojis/get_emoji.ts +++ b/src/helpers/emojis/get_emoji.ts @@ -9,15 +9,8 @@ import { endpoints } from "../../util/constants.ts"; * * ⚠️ **If you need this, you are probably doing something wrong. Always use cache.guilds.get()?.emojis */ -export async function getEmoji( - guildId: bigint, - emojiId: bigint, - addToCache = true -) { - const result = await rest.runMethod( - "get", - endpoints.GUILD_EMOJI(guildId, emojiId) - ); +export async function getEmoji(guildId: bigint, emojiId: bigint, addToCache = true) { + const result = await rest.runMethod("get", endpoints.GUILD_EMOJI(guildId, emojiId)); if (addToCache) { const guild = await cacheHandlers.get("guilds", guildId); diff --git a/src/helpers/emojis/get_emojis.ts b/src/helpers/emojis/get_emojis.ts index 5b4a53212..babbeb3c7 100644 --- a/src/helpers/emojis/get_emojis.ts +++ b/src/helpers/emojis/get_emojis.ts @@ -13,10 +13,7 @@ import { endpoints } from "../../util/constants.ts"; * ⚠️ **If you need this, you are probably doing something wrong. Always use cache.guilds.get()?.emojis */ export async function getEmojis(guildId: bigint, addToCache = true) { - const result = await rest.runMethod( - "get", - endpoints.GUILD_EMOJIS(guildId) - ); + const result = await rest.runMethod("get", endpoints.GUILD_EMOJIS(guildId)); if (addToCache) { const guild = await cacheHandlers.get("guilds", guildId); diff --git a/src/helpers/guilds/delete_guild.ts b/src/helpers/guilds/delete_guild.ts index e846cf80a..8e98de769 100644 --- a/src/helpers/guilds/delete_guild.ts +++ b/src/helpers/guilds/delete_guild.ts @@ -3,8 +3,5 @@ import { endpoints } from "../../util/constants.ts"; /** Delete a guild permanently. User must be owner. Returns 204 No Content on success. Fires a Guild Delete Gateway event. */ export async function deleteGuild(guildId: bigint) { - return await rest.runMethod( - "delete", - endpoints.GUILDS_BASE(guildId) - ); + return await rest.runMethod("delete", endpoints.GUILDS_BASE(guildId)); } diff --git a/src/helpers/guilds/edit_guild.ts b/src/helpers/guilds/edit_guild.ts index 6fd8e273a..145efbd69 100644 --- a/src/helpers/guilds/edit_guild.ts +++ b/src/helpers/guilds/edit_guild.ts @@ -24,18 +24,11 @@ export async function editGuild(guildId: bigint, options: ModifyGuild) { options.splash = await urlToBase64(options.splash); } - const result = await rest.runMethod( - "patch", - endpoints.GUILDS_BASE(guildId), - options - ); + const result = await rest.runMethod("patch", endpoints.GUILDS_BASE(guildId), options); const cached = await cacheHandlers.get("guilds", guildId); return structures.createDiscordenoGuild( result, - cached?.shardId || - Number( - (BigInt(result.id) >> 22n % BigInt(ws.botGatewayData.shards)).toString() - ) + cached?.shardId || Number((BigInt(result.id) >> 22n % BigInt(ws.botGatewayData.shards)).toString()) ); } diff --git a/src/helpers/guilds/edit_welcome_screen.ts b/src/helpers/guilds/edit_welcome_screen.ts index ee6a48a75..8ab1e4759 100644 --- a/src/helpers/guilds/edit_welcome_screen.ts +++ b/src/helpers/guilds/edit_welcome_screen.ts @@ -4,13 +4,6 @@ import type { WelcomeScreen } from "../../types/guilds/welcome_screen.ts"; import { endpoints } from "../../util/constants.ts"; import { snakelize } from "../../util/utils.ts"; -export async function editWelcomeScreen( - guildId: bigint, - options: ModifyGuildWelcomeScreen -) { - return await rest.runMethod( - "patch", - endpoints.GUILD_WELCOME_SCREEN(guildId), - snakelize(options) - ); +export async function editWelcomeScreen(guildId: bigint, options: ModifyGuildWelcomeScreen) { + return await rest.runMethod("patch", endpoints.GUILD_WELCOME_SCREEN(guildId), snakelize(options)); } diff --git a/src/helpers/guilds/edit_widget.ts b/src/helpers/guilds/edit_widget.ts index 4241410b8..66cd803e4 100644 --- a/src/helpers/guilds/edit_widget.ts +++ b/src/helpers/guilds/edit_widget.ts @@ -4,19 +4,11 @@ import { endpoints } from "../../util/constants.ts"; import { requireBotGuildPermissions } from "../../util/permissions.ts"; /** Modify a guild widget object for the guild. Requires the MANAGE_GUILD permission. */ -export async function editWidget( - guildId: bigint, - enabled: boolean, - channelId?: string | null -) { +export async function editWidget(guildId: bigint, enabled: boolean, channelId?: string | null) { await requireBotGuildPermissions(guildId, ["MANAGE_GUILD"]); - return await rest.runMethod( - "patch", - endpoints.GUILD_WIDGET(guildId), - { - enabled, - channel_id: channelId, - } - ); + return await rest.runMethod("patch", endpoints.GUILD_WIDGET(guildId), { + enabled, + channel_id: channelId, + }); } diff --git a/src/helpers/guilds/get_audit_logs.ts b/src/helpers/guilds/get_audit_logs.ts index 702258474..f0260db57 100644 --- a/src/helpers/guilds/get_audit_logs.ts +++ b/src/helpers/guilds/get_audit_logs.ts @@ -14,10 +14,7 @@ export async function getAuditLogs(guildId: bigint, options: GetGuildAuditLog) { endpoints.GUILD_AUDIT_LOGS(guildId), snakelize({ ...options, - limit: - options.limit && options.limit >= 1 && options.limit <= 100 - ? options.limit - : 50, + limit: options.limit && options.limit >= 1 && options.limit <= 100 ? options.limit : 50, }) ); } diff --git a/src/helpers/guilds/get_ban.ts b/src/helpers/guilds/get_ban.ts index f91ae6773..125277417 100644 --- a/src/helpers/guilds/get_ban.ts +++ b/src/helpers/guilds/get_ban.ts @@ -7,8 +7,5 @@ import { requireBotGuildPermissions } from "../../util/permissions.ts"; export async function getBan(guildId: bigint, memberId: bigint) { await requireBotGuildPermissions(guildId, ["BAN_MEMBERS"]); - return await rest.runMethod( - "get", - endpoints.GUILD_BAN(guildId, memberId) - ); + return await rest.runMethod("get", endpoints.GUILD_BAN(guildId, memberId)); } diff --git a/src/helpers/guilds/get_bans.ts b/src/helpers/guilds/get_bans.ts index 11c286345..dd158e1aa 100644 --- a/src/helpers/guilds/get_bans.ts +++ b/src/helpers/guilds/get_bans.ts @@ -9,12 +9,7 @@ import { requireBotGuildPermissions } from "../../util/permissions.ts"; export async function getBans(guildId: bigint) { await requireBotGuildPermissions(guildId, ["BAN_MEMBERS"]); - const results = await rest.runMethod( - "get", - endpoints.GUILD_BANS(guildId) - ); + const results = await rest.runMethod("get", endpoints.GUILD_BANS(guildId)); - return new Collection( - results.map((res) => [snowflakeToBigint(res.user.id), res]) - ); + return new Collection(results.map((res) => [snowflakeToBigint(res.user.id), res])); } diff --git a/src/helpers/guilds/get_guild.ts b/src/helpers/guilds/get_guild.ts index 0a04efac1..4e38d934d 100644 --- a/src/helpers/guilds/get_guild.ts +++ b/src/helpers/guilds/get_guild.ts @@ -19,13 +19,9 @@ export async function getGuild( addToCache: true, } ) { - const result = await rest.runMethod( - "get", - endpoints.GUILDS_BASE(guildId), - { - with_counts: options.counts, - } - ); + const result = await rest.runMethod("get", endpoints.GUILDS_BASE(guildId), { + with_counts: options.counts, + }); const guild = await structures.createDiscordenoGuild( result, diff --git a/src/helpers/guilds/get_guild_preview.ts b/src/helpers/guilds/get_guild_preview.ts index 5e0bf7f2a..04238da4d 100644 --- a/src/helpers/guilds/get_guild_preview.ts +++ b/src/helpers/guilds/get_guild_preview.ts @@ -4,8 +4,5 @@ import { endpoints } from "../../util/constants.ts"; /** Returns the guild preview object for the given id. If the bot is not in the guild, then the guild must be Discoverable. */ export async function getGuildPreview(guildId: bigint) { - return await rest.runMethod( - "get", - endpoints.GUILD_PREVIEW(guildId) - ); + return await rest.runMethod("get", endpoints.GUILD_PREVIEW(guildId)); } diff --git a/src/helpers/guilds/get_prune_count.ts b/src/helpers/guilds/get_prune_count.ts index 0c3339020..3614aae14 100644 --- a/src/helpers/guilds/get_prune_count.ts +++ b/src/helpers/guilds/get_prune_count.ts @@ -6,10 +6,7 @@ import { requireBotGuildPermissions } from "../../util/permissions.ts"; import { snakelize } from "../../util/utils.ts"; /** Check how many members would be removed from the server in a prune operation. Requires the KICK_MEMBERS permission */ -export async function getPruneCount( - guildId: bigint, - options?: GetGuildPruneCountQuery -) { +export async function getPruneCount(guildId: bigint, options?: GetGuildPruneCountQuery) { if (options?.days && options.days < 1) throw new Error(Errors.PRUNE_MIN_DAYS); if (options?.days && options.days > 30) { throw new Error(Errors.PRUNE_MAX_DAYS); @@ -17,11 +14,7 @@ export async function getPruneCount( await requireBotGuildPermissions(guildId, ["KICK_MEMBERS"]); - const result = await rest.runMethod( - "get", - endpoints.GUILD_PRUNE(guildId), - snakelize(options ?? {}) - ); + const result = await rest.runMethod("get", endpoints.GUILD_PRUNE(guildId), snakelize(options ?? {})); return result.pruned as number; } diff --git a/src/helpers/guilds/get_voice_regions.ts b/src/helpers/guilds/get_voice_regions.ts index ab2661b9b..756d876b3 100644 --- a/src/helpers/guilds/get_voice_regions.ts +++ b/src/helpers/guilds/get_voice_regions.ts @@ -5,12 +5,7 @@ import { endpoints } from "../../util/constants.ts"; /** Returns a list of voice region objects for the guild. Unlike the similar /voice route, this returns VIP servers when the guild is VIP-enabled. */ export async function getVoiceRegions(guildId: bigint) { - const result = await rest.runMethod( - "get", - endpoints.GUILD_REGIONS(guildId) - ); + const result = await rest.runMethod("get", endpoints.GUILD_REGIONS(guildId)); - return new Collection( - result.map((region) => [region.id, region]) - ); + return new Collection(result.map((region) => [region.id, region])); } diff --git a/src/helpers/guilds/get_welcome_screen.ts b/src/helpers/guilds/get_welcome_screen.ts index b5bf7098f..d048baf0b 100644 --- a/src/helpers/guilds/get_welcome_screen.ts +++ b/src/helpers/guilds/get_welcome_screen.ts @@ -3,8 +3,5 @@ import type { WelcomeScreen } from "../../types/guilds/welcome_screen.ts"; import { endpoints } from "../../util/constants.ts"; export async function getWelcomeScreen(guildId: bigint) { - return await rest.runMethod( - "get", - endpoints.GUILD_WELCOME_SCREEN(guildId) - ); + return await rest.runMethod("get", endpoints.GUILD_WELCOME_SCREEN(guildId)); } diff --git a/src/helpers/guilds/get_widget.ts b/src/helpers/guilds/get_widget.ts index 38c160d40..c66020cee 100644 --- a/src/helpers/guilds/get_widget.ts +++ b/src/helpers/guilds/get_widget.ts @@ -12,8 +12,5 @@ export async function getWidget(guildId: bigint, options?: { force: boolean }) { if (!guild?.widgetEnabled) throw new Error(Errors.GUILD_WIDGET_NOT_ENABLED); } - return await rest.runMethod( - "get", - `${endpoints.GUILD_WIDGET(guildId)}.json` - ); + return await rest.runMethod("get", `${endpoints.GUILD_WIDGET(guildId)}.json`); } diff --git a/src/helpers/guilds/get_widget_image_url.ts b/src/helpers/guilds/get_widget_image_url.ts index 978a79a06..28cd5d94f 100644 --- a/src/helpers/guilds/get_widget_image_url.ts +++ b/src/helpers/guilds/get_widget_image_url.ts @@ -4,17 +4,12 @@ import { Errors } from "../../types/discordeno/errors.ts"; import { endpoints } from "../../util/constants.ts"; /** Returns the widget image URL for the guild. */ -export async function getWidgetImageURL( - guildId: bigint, - options?: GetGuildWidgetImageQuery & { force?: boolean } -) { +export async function getWidgetImageURL(guildId: bigint, options?: GetGuildWidgetImageQuery & { force?: boolean }) { if (!options?.force) { const guild = await cacheHandlers.get("guilds", guildId); if (!guild) throw new Error(Errors.GUILD_NOT_FOUND); if (!guild.widgetEnabled) throw new Error(Errors.GUILD_WIDGET_NOT_ENABLED); } - return `${endpoints.GUILD_WIDGET(guildId)}.png?style=${ - options?.style ?? "shield" - }`; + return `${endpoints.GUILD_WIDGET(guildId)}.png?style=${options?.style ?? "shield"}`; } diff --git a/src/helpers/guilds/get_widget_settings.ts b/src/helpers/guilds/get_widget_settings.ts index d285daf01..23417a61a 100644 --- a/src/helpers/guilds/get_widget_settings.ts +++ b/src/helpers/guilds/get_widget_settings.ts @@ -7,8 +7,5 @@ import { requireBotGuildPermissions } from "../../util/permissions.ts"; export async function getWidgetSettings(guildId: bigint) { await requireBotGuildPermissions(guildId, ["MANAGE_GUILD"]); - return await rest.runMethod( - "get", - endpoints.GUILD_WIDGET(guildId) - ); + return await rest.runMethod("get", endpoints.GUILD_WIDGET(guildId)); } diff --git a/src/helpers/guilds/guild_icon_url.ts b/src/helpers/guilds/guild_icon_url.ts index 78de00651..3d7af4a4d 100644 --- a/src/helpers/guilds/guild_icon_url.ts +++ b/src/helpers/guilds/guild_icon_url.ts @@ -18,9 +18,7 @@ export function guildIconURL( ? formatImageURL( endpoints.GUILD_ICON( id, - typeof options.icon === "string" - ? options.icon - : iconBigintToHash(options.icon, options.animated ?? true) + typeof options.icon === "string" ? options.icon : iconBigintToHash(options.icon, options.animated ?? true) ), options.size || 128, options.format diff --git a/src/helpers/guilds/leave_guild.ts b/src/helpers/guilds/leave_guild.ts index 8a2d79caa..3e8813535 100644 --- a/src/helpers/guilds/leave_guild.ts +++ b/src/helpers/guilds/leave_guild.ts @@ -3,8 +3,5 @@ import { endpoints } from "../../util/constants.ts"; /** Leave a guild */ export async function leaveGuild(guildId: bigint) { - return await rest.runMethod( - "delete", - endpoints.GUILD_LEAVE(guildId) - ); + return await rest.runMethod("delete", endpoints.GUILD_LEAVE(guildId)); } diff --git a/src/helpers/integrations/delete_integration.ts b/src/helpers/integrations/delete_integration.ts index e6a7f53c6..8de324a4b 100644 --- a/src/helpers/integrations/delete_integration.ts +++ b/src/helpers/integrations/delete_integration.ts @@ -6,8 +6,5 @@ import { requireBotGuildPermissions } from "../../util/permissions.ts"; export async function deleteIntegration(guildId: bigint, id: bigint) { await requireBotGuildPermissions(guildId, ["MANAGE_GUILD"]); - return await rest.runMethod( - "delete", - endpoints.GUILD_INTEGRATION(guildId, id) - ); + return await rest.runMethod("delete", endpoints.GUILD_INTEGRATION(guildId, id)); } diff --git a/src/helpers/integrations/get_integrations.ts b/src/helpers/integrations/get_integrations.ts index 9b86332d8..c7070e582 100644 --- a/src/helpers/integrations/get_integrations.ts +++ b/src/helpers/integrations/get_integrations.ts @@ -7,8 +7,5 @@ import { requireBotGuildPermissions } from "../../util/permissions.ts"; export async function getIntegrations(guildId: bigint) { await requireBotGuildPermissions(guildId, ["MANAGE_GUILD"]); - return await rest.runMethod( - "get", - endpoints.GUILD_INTEGRATIONS(guildId) - ); + return await rest.runMethod("get", endpoints.GUILD_INTEGRATIONS(guildId)); } diff --git a/src/helpers/interactions/commands/batch_edit_slash_command_permissions.ts b/src/helpers/interactions/commands/batch_edit_slash_command_permissions.ts index eef65bf2b..5671947d5 100644 --- a/src/helpers/interactions/commands/batch_edit_slash_command_permissions.ts +++ b/src/helpers/interactions/commands/batch_edit_slash_command_permissions.ts @@ -9,9 +9,5 @@ export async function batchEditSlashCommandPermissions( guildId: bigint, options: { id: string; permissions: ApplicationCommandPermissions[] }[] ) { - return await rest.runMethod( - "put", - endpoints.COMMANDS_PERMISSIONS(applicationId, guildId), - snakelize(options) - ); + return await rest.runMethod("put", endpoints.COMMANDS_PERMISSIONS(applicationId, guildId), snakelize(options)); } diff --git a/src/helpers/interactions/commands/create_slash_command.ts b/src/helpers/interactions/commands/create_slash_command.ts index 208d63490..6cce269ba 100644 --- a/src/helpers/interactions/commands/create_slash_command.ts +++ b/src/helpers/interactions/commands/create_slash_command.ts @@ -16,17 +16,12 @@ import { snakelize, validateSlashCommands } from "../../../util/utils.ts"; * Global commands are cached for **1 hour**. That means that new global commands will fan out slowly across all guilds, and will be guaranteed to be updated in an hour. * Guild commands update **instantly**. We recommend you use guild commands for quick testing, and global commands when they're ready for public use. */ -export async function createSlashCommand( - options: CreateGlobalApplicationCommand, - guildId?: bigint -) { +export async function createSlashCommand(options: CreateGlobalApplicationCommand, guildId?: bigint) { validateSlashCommands([options], true); return await rest.runMethod( "post", - guildId - ? endpoints.COMMANDS_GUILD(applicationId, guildId) - : endpoints.COMMANDS(applicationId), + guildId ? endpoints.COMMANDS_GUILD(applicationId, guildId) : endpoints.COMMANDS(applicationId), snakelize(options) ); } diff --git a/src/helpers/interactions/commands/delete_slash_command.ts b/src/helpers/interactions/commands/delete_slash_command.ts index 553ceb0b7..d4e8c71b2 100644 --- a/src/helpers/interactions/commands/delete_slash_command.ts +++ b/src/helpers/interactions/commands/delete_slash_command.ts @@ -6,8 +6,6 @@ import { endpoints } from "../../../util/constants.ts"; export async function deleteSlashCommand(id: bigint, guildId?: bigint) { return await rest.runMethod( "delete", - guildId - ? endpoints.COMMANDS_GUILD_ID(applicationId, guildId, id) - : endpoints.COMMANDS_ID(applicationId, id) + guildId ? endpoints.COMMANDS_GUILD_ID(applicationId, guildId, id) : endpoints.COMMANDS_ID(applicationId, id) ); } diff --git a/src/helpers/interactions/commands/delete_slash_response.ts b/src/helpers/interactions/commands/delete_slash_response.ts index 14ca2b466..25f1a1c59 100644 --- a/src/helpers/interactions/commands/delete_slash_response.ts +++ b/src/helpers/interactions/commands/delete_slash_response.ts @@ -7,11 +7,7 @@ export async function deleteSlashResponse(token: string, messageId?: bigint) { return await rest.runMethod( "delete", messageId - ? endpoints.INTERACTION_ID_TOKEN_MESSAGE_ID( - applicationId, - token, - messageId - ) + ? endpoints.INTERACTION_ID_TOKEN_MESSAGE_ID(applicationId, token, messageId) : endpoints.INTERACTION_ORIGINAL_ID_TOKEN(applicationId, token) ); } diff --git a/src/helpers/interactions/commands/edit_slash_command_permissions.ts b/src/helpers/interactions/commands/edit_slash_command_permissions.ts index c8e4a4bca..d633d7080 100644 --- a/src/helpers/interactions/commands/edit_slash_command_permissions.ts +++ b/src/helpers/interactions/commands/edit_slash_command_permissions.ts @@ -10,9 +10,7 @@ export async function editSlashCommandPermissions( commandId: bigint, options: ApplicationCommandPermissions[] ) { - return await rest.runMethod( - "put", - endpoints.COMMANDS_PERMISSION(applicationId, guildId, commandId), - { permissions: snakelize(options) } - ); + return await rest.runMethod("put", endpoints.COMMANDS_PERMISSION(applicationId, guildId, commandId), { + permissions: snakelize(options), + }); } diff --git a/src/helpers/interactions/commands/edit_slash_response.ts b/src/helpers/interactions/commands/edit_slash_response.ts index 35de57921..62920889c 100644 --- a/src/helpers/interactions/commands/edit_slash_response.ts +++ b/src/helpers/interactions/commands/edit_slash_response.ts @@ -7,10 +7,7 @@ import { DiscordAllowedMentionsTypes } from "../../../types/messages/allowed_men import { endpoints } from "../../../util/constants.ts"; /** To edit your response to a slash command. If a messageId is not provided it will default to editing the original response. */ -export async function editSlashResponse( - token: string, - options: DiscordenoEditWebhookMessage -) { +export async function editSlashResponse(token: string, options: DiscordenoEditWebhookMessage) { if (options.content && options.content.length > 2000) { throw Error(Errors.MESSAGE_MAX_LENGTH); } @@ -21,40 +18,22 @@ export async function editSlashResponse( if (options.allowedMentions) { if (options.allowedMentions.users?.length) { - if ( - options.allowedMentions.parse?.includes( - DiscordAllowedMentionsTypes.UserMentions - ) - ) { - options.allowedMentions.parse = options.allowedMentions.parse.filter( - (p) => p !== "users" - ); + if (options.allowedMentions.parse?.includes(DiscordAllowedMentionsTypes.UserMentions)) { + options.allowedMentions.parse = options.allowedMentions.parse.filter((p) => p !== "users"); } if (options.allowedMentions.users.length > 100) { - options.allowedMentions.users = options.allowedMentions.users.slice( - 0, - 100 - ); + options.allowedMentions.users = options.allowedMentions.users.slice(0, 100); } } if (options.allowedMentions.roles?.length) { - if ( - options.allowedMentions.parse?.includes( - DiscordAllowedMentionsTypes.RoleMentions - ) - ) { - options.allowedMentions.parse = options.allowedMentions.parse.filter( - (p) => p !== "roles" - ); + if (options.allowedMentions.parse?.includes(DiscordAllowedMentionsTypes.RoleMentions)) { + options.allowedMentions.parse = options.allowedMentions.parse.filter((p) => p !== "roles"); } if (options.allowedMentions.roles.length > 100) { - options.allowedMentions.roles = options.allowedMentions.roles.slice( - 0, - 100 - ); + options.allowedMentions.roles = options.allowedMentions.roles.slice(0, 100); } } } diff --git a/src/helpers/interactions/commands/get_slash_command_permission.ts b/src/helpers/interactions/commands/get_slash_command_permission.ts index ee90d8fd2..55bc8a7a7 100644 --- a/src/helpers/interactions/commands/get_slash_command_permission.ts +++ b/src/helpers/interactions/commands/get_slash_command_permission.ts @@ -4,10 +4,7 @@ import type { GuildApplicationCommandPermissions } from "../../../types/interact import { endpoints } from "../../../util/constants.ts"; /** Fetches command permissions for a specific command for your application in a guild. Returns a GuildApplicationCommandPermissions object. */ -export async function getSlashCommandPermission( - guildId: bigint, - commandId: bigint -) { +export async function getSlashCommandPermission(guildId: bigint, commandId: bigint) { return await rest.runMethod( "get", endpoints.COMMANDS_PERMISSION(applicationId, guildId, commandId) diff --git a/src/helpers/interactions/commands/get_slash_commands.ts b/src/helpers/interactions/commands/get_slash_commands.ts index d046dd428..a83d2e4dc 100644 --- a/src/helpers/interactions/commands/get_slash_commands.ts +++ b/src/helpers/interactions/commands/get_slash_commands.ts @@ -8,9 +8,7 @@ import { endpoints } from "../../../util/constants.ts"; export async function getSlashCommands(guildId?: bigint) { const result = await rest.runMethod( "get", - guildId - ? endpoints.COMMANDS_GUILD(applicationId, guildId) - : endpoints.COMMANDS(applicationId) + guildId ? endpoints.COMMANDS_GUILD(applicationId, guildId) : endpoints.COMMANDS(applicationId) ); return new Collection(result.map((command) => [command.name, command])); diff --git a/src/helpers/interactions/commands/upsert_slash_command.ts b/src/helpers/interactions/commands/upsert_slash_command.ts index 27e84fa7a..5c8ccb007 100644 --- a/src/helpers/interactions/commands/upsert_slash_command.ts +++ b/src/helpers/interactions/commands/upsert_slash_command.ts @@ -8,11 +8,7 @@ import { validateSlashCommands } from "../../../util/utils.ts"; /** * Edit an existing slash command. If this command did not exist, it will create it. */ -export async function upsertSlashCommand( - commandId: bigint, - options: EditGlobalApplicationCommand, - guildId?: bigint -) { +export async function upsertSlashCommand(commandId: bigint, options: EditGlobalApplicationCommand, guildId?: bigint) { validateSlashCommands([options]); return await rest.runMethod( diff --git a/src/helpers/interactions/commands/upsert_slash_commands.ts b/src/helpers/interactions/commands/upsert_slash_commands.ts index bd0dc6783..a42f06fe6 100644 --- a/src/helpers/interactions/commands/upsert_slash_commands.ts +++ b/src/helpers/interactions/commands/upsert_slash_commands.ts @@ -10,17 +10,12 @@ import { validateSlashCommands } from "../../../util/utils.ts"; * * **NOTE:** Any slash commands that are not specified in this function will be **deleted**. If you don't provide the commandId and rename your command, the command gets a new Id. */ -export async function upsertSlashCommands( - options: EditGlobalApplicationCommand[], - guildId?: bigint -) { +export async function upsertSlashCommands(options: EditGlobalApplicationCommand[], guildId?: bigint) { validateSlashCommands(options); return await rest.runMethod( "put", - guildId - ? endpoints.COMMANDS_GUILD(applicationId, guildId) - : endpoints.COMMANDS(applicationId), + guildId ? endpoints.COMMANDS_GUILD(applicationId, guildId) : endpoints.COMMANDS(applicationId), options ); } diff --git a/src/helpers/interactions/get_original_interaction_response.ts b/src/helpers/interactions/get_original_interaction_response.ts index a4edfc473..51a72d268 100644 --- a/src/helpers/interactions/get_original_interaction_response.ts +++ b/src/helpers/interactions/get_original_interaction_response.ts @@ -6,10 +6,7 @@ import { endpoints } from "../../util/constants.ts"; /** Returns the initial Interactio response. Functions the same as Get Webhook Message */ export async function getOriginalInteractionResponse(token: string) { - const result = await rest.runMethod( - "get", - endpoints.INTERACTION_ORIGINAL_ID_TOKEN(applicationId, token) - ); + const result = await rest.runMethod("get", endpoints.INTERACTION_ORIGINAL_ID_TOKEN(applicationId, token)); return await structures.createDiscordenoMessage(result); } diff --git a/src/helpers/interactions/send_interaction_response.ts b/src/helpers/interactions/send_interaction_response.ts index 51a1004e8..44bbc31c5 100644 --- a/src/helpers/interactions/send_interaction_response.ts +++ b/src/helpers/interactions/send_interaction_response.ts @@ -11,31 +11,20 @@ import { validateComponents } from "../../util/utils.ts"; * * NOTE: By default we will suppress mentions. To enable mentions, just pass any mentions object. */ -export async function sendInteractionResponse( - id: bigint, - token: string, - options: DiscordenoInteractionResponse -) { +export async function sendInteractionResponse(id: bigint, token: string, options: DiscordenoInteractionResponse) { // TODO: add more options validations if (options.data?.components) validateComponents(options.data?.components); // If its already been executed, we need to send a followup response if (cache.executedSlashCommands.has(token)) { - return await rest.runMethod( - "post", - endpoints.WEBHOOK(applicationId, token), - { - ...options, - } - ); + return await rest.runMethod("post", endpoints.WEBHOOK(applicationId, token), { + ...options, + }); } // Expire in 15 minutes cache.executedSlashCommands.add(token); setTimeout(() => { - eventHandlers.debug?.( - "loop", - `Running setTimeout in send_interaction_response file.` - ); + eventHandlers.debug?.("loop", `Running setTimeout in send_interaction_response file.`); cache.executedSlashCommands.delete(token); }, 900000); @@ -49,9 +38,5 @@ export async function sendInteractionResponse( options.data = { ...options.data, allowedMentions: { parse: [] } }; } - return await rest.runMethod( - "post", - endpoints.INTERACTION_ID_TOKEN(id, token), - options - ); + return await rest.runMethod("post", endpoints.INTERACTION_ID_TOKEN(id, token), options); } diff --git a/src/helpers/invites/create_invite.ts b/src/helpers/invites/create_invite.ts index 114a8f7ed..7711b05d2 100644 --- a/src/helpers/invites/create_invite.ts +++ b/src/helpers/invites/create_invite.ts @@ -6,10 +6,7 @@ import { endpoints } from "../../util/constants.ts"; import { requireBotChannelPermissions } from "../../util/permissions.ts"; /** Creates a new invite for this channel. Requires CREATE_INSTANT_INVITE */ -export async function createInvite( - channelId: bigint, - options: CreateChannelInvite -) { +export async function createInvite(channelId: bigint, options: CreateChannelInvite) { await requireBotChannelPermissions(channelId, ["CREATE_INSTANT_INVITE"]); if (options.maxAge && (options.maxAge < 0 || options.maxAge > 604800)) { @@ -19,9 +16,5 @@ export async function createInvite( throw new Error(Errors.INVITE_MAX_USES_INVALID); } - return await rest.runMethod( - "post", - endpoints.CHANNEL_INVITES(channelId), - options - ); + return await rest.runMethod("post", endpoints.CHANNEL_INVITES(channelId), options); } diff --git a/src/helpers/invites/delete_invite.ts b/src/helpers/invites/delete_invite.ts index 1dae5b350..b9b18c8d7 100644 --- a/src/helpers/invites/delete_invite.ts +++ b/src/helpers/invites/delete_invite.ts @@ -2,18 +2,13 @@ import { cacheHandlers } from "../../cache.ts"; import { rest } from "../../rest/rest.ts"; import type { Invite } from "../../types/invites/invite.ts"; import { endpoints } from "../../util/constants.ts"; -import { - botHasChannelPermissions, - requireBotGuildPermissions, -} from "../../util/permissions.ts"; +import { botHasChannelPermissions, requireBotGuildPermissions } from "../../util/permissions.ts"; /** Deletes an invite for the given code. Requires `MANAGE_CHANNELS` or `MANAGE_GUILD` permission */ export async function deleteInvite(channelId: bigint, inviteCode: string) { const channel = await cacheHandlers.get("channels", channelId); if (channel) { - const hasPerm = await botHasChannelPermissions(channel, [ - "MANAGE_CHANNELS", - ]); + const hasPerm = await botHasChannelPermissions(channel, ["MANAGE_CHANNELS"]); if (!hasPerm) { await requireBotGuildPermissions(channel.guildId, ["MANAGE_GUILD"]); diff --git a/src/helpers/invites/get_channel_invites.ts b/src/helpers/invites/get_channel_invites.ts index 86db39683..db8b3834c 100644 --- a/src/helpers/invites/get_channel_invites.ts +++ b/src/helpers/invites/get_channel_invites.ts @@ -8,10 +8,7 @@ import { requireBotChannelPermissions } from "../../util/permissions.ts"; export async function getChannelInvites(channelId: bigint) { await requireBotChannelPermissions(channelId, ["MANAGE_CHANNELS"]); - const result = await rest.runMethod( - "get", - endpoints.CHANNEL_INVITES(channelId) - ); + const result = await rest.runMethod("get", endpoints.CHANNEL_INVITES(channelId)); return new Collection(result.map((invite) => [invite.code, invite])); } diff --git a/src/helpers/invites/get_invite.ts b/src/helpers/invites/get_invite.ts index 4e3c4559b..d6a58e4ec 100644 --- a/src/helpers/invites/get_invite.ts +++ b/src/helpers/invites/get_invite.ts @@ -6,9 +6,5 @@ import { snakelize } from "../../util/utils.ts"; /** Returns an invite for the given code or throws an error if the invite doesn't exists. */ export async function getInvite(inviteCode: string, options?: GetInvite) { - return await rest.runMethod( - "get", - endpoints.INVITE(inviteCode), - snakelize(options ?? {}) - ); + return await rest.runMethod("get", endpoints.INVITE(inviteCode), snakelize(options ?? {})); } diff --git a/src/helpers/invites/get_invites.ts b/src/helpers/invites/get_invites.ts index d7f25e02f..a74e2bbec 100644 --- a/src/helpers/invites/get_invites.ts +++ b/src/helpers/invites/get_invites.ts @@ -8,10 +8,7 @@ import { requireBotGuildPermissions } from "../../util/permissions.ts"; export async function getInvites(guildId: bigint) { await requireBotGuildPermissions(guildId, ["MANAGE_GUILD"]); - const result = await rest.runMethod( - "get", - endpoints.GUILD_INVITES(guildId) - ); + const result = await rest.runMethod("get", endpoints.GUILD_INVITES(guildId)); return new Collection(result.map((invite) => [invite.code, invite])); } diff --git a/src/helpers/members/ban_member.ts b/src/helpers/members/ban_member.ts index 6bcb55a33..0f9ee8d4e 100644 --- a/src/helpers/members/ban_member.ts +++ b/src/helpers/members/ban_member.ts @@ -5,18 +5,10 @@ import { requireBotGuildPermissions } from "../../util/permissions.ts"; import { snakelize } from "../../util/utils.ts"; /** Ban a user from the guild and optionally delete previous messages sent by the user. Requires the BAN_MEMBERS permission. */ -export async function ban( - guildId: bigint, - id: bigint, - options: CreateGuildBan -) { +export async function ban(guildId: bigint, id: bigint, options: CreateGuildBan) { await requireBotGuildPermissions(guildId, ["BAN_MEMBERS"]); - return await rest.runMethod( - "put", - endpoints.GUILD_BAN(guildId, id), - snakelize(options) - ); + return await rest.runMethod("put", endpoints.GUILD_BAN(guildId, id), snakelize(options)); } // aliases diff --git a/src/helpers/members/edit_bot_nickname.ts b/src/helpers/members/edit_bot_nickname.ts index 1f975015a..9ab18893b 100644 --- a/src/helpers/members/edit_bot_nickname.ts +++ b/src/helpers/members/edit_bot_nickname.ts @@ -3,19 +3,12 @@ import { endpoints } from "../../util/constants.ts"; import { requireBotGuildPermissions } from "../../util/permissions.ts"; /** Edit the nickname of the bot in this guild */ -export async function editBotNickname( - guildId: bigint, - nickname: string | null -) { +export async function editBotNickname(guildId: bigint, nickname: string | null) { await requireBotGuildPermissions(guildId, ["CHANGE_NICKNAME"]); - const response = await rest.runMethod<{ nick: string }>( - "patch", - endpoints.USER_NICK(guildId), - { - nick: nickname, - } - ); + const response = await rest.runMethod<{ nick: string }>("patch", endpoints.USER_NICK(guildId), { + nick: nickname, + }); return response.nick; } diff --git a/src/helpers/members/edit_member.ts b/src/helpers/members/edit_member.ts index b5bd1c739..970670b3b 100644 --- a/src/helpers/members/edit_member.ts +++ b/src/helpers/members/edit_member.ts @@ -7,10 +7,7 @@ import type { GuildMemberWithUser } from "../../types/members/guild_member.ts"; import type { PermissionStrings } from "../../types/permissions/permission_strings.ts"; import { bigintToSnowflake } from "../../util/bigint.ts"; import { endpoints } from "../../util/constants.ts"; -import { - requireBotChannelPermissions, - requireBotGuildPermissions, -} from "../../util/permissions.ts"; +import { requireBotChannelPermissions, requireBotGuildPermissions } from "../../util/permissions.ts"; import { snakelize } from "../../util/utils.ts"; /** Edit the member */ @@ -36,9 +33,7 @@ export async function editMember( typeof options.channelId !== "undefined" || "null" ) { - const memberVoiceState = ( - await cacheHandlers.get("guilds", guildId) - )?.voiceStates.get(memberId); + const memberVoiceState = (await cacheHandlers.get("guilds", guildId))?.voiceStates.get(memberId); if (!memberVoiceState?.channelId) { throw new Error(Errors.MEMBER_NOT_IN_VOICE_CHANNEL); @@ -53,18 +48,11 @@ export async function editMember( } if (options.channelId) { - const requiredVoicePerms: Set = new Set([ - "CONNECT", - "MOVE_MEMBERS", - ]); + const requiredVoicePerms: Set = new Set(["CONNECT", "MOVE_MEMBERS"]); if (memberVoiceState) { - await requireBotChannelPermissions(memberVoiceState?.channelId, [ - ...requiredVoicePerms, - ]); + await requireBotChannelPermissions(memberVoiceState?.channelId, [...requiredVoicePerms]); } - await requireBotChannelPermissions(options.channelId, [ - ...requiredVoicePerms, - ]); + await requireBotChannelPermissions(options.channelId, [...requiredVoicePerms]); } } @@ -75,9 +63,7 @@ export async function editMember( endpoints.GUILD_MEMBER(guildId, memberId), snakelize({ ...options, - channelId: options.channelId - ? bigintToSnowflake(options.channelId) - : undefined, + channelId: options.channelId ? bigintToSnowflake(options.channelId) : undefined, }) as ModifyGuildMember ); diff --git a/src/helpers/members/fetch_members.ts b/src/helpers/members/fetch_members.ts index d59bf9a91..8ce49fd29 100644 --- a/src/helpers/members/fetch_members.ts +++ b/src/helpers/members/fetch_members.ts @@ -15,16 +15,9 @@ import { ws } from "../../ws/ws.ts"; * REST: 50/s global(across all shards) rate limit with ALL requests this included * GW(this function): 120/m(PER shard) rate limit. Meaning if you have 8 shards your limit is now 960/m. */ -export function fetchMembers( - guildId: bigint, - shardId: number, - options?: Omit -) { +export function fetchMembers(guildId: bigint, shardId: number, options?: Omit) { // You can request 1 member without the intent - if ( - (!options?.limit || options.limit > 1) && - !(ws.identifyPayload.intents & DiscordGatewayIntents.GuildMembers) - ) { + if ((!options?.limit || options.limit > 1) && !(ws.identifyPayload.intents & DiscordGatewayIntents.GuildMembers)) { throw new Error(Errors.MISSING_INTENT_GUILD_MEMBERS); } diff --git a/src/helpers/members/get_member.ts b/src/helpers/members/get_member.ts index 3ac84d13a..0aff1bde9 100644 --- a/src/helpers/members/get_member.ts +++ b/src/helpers/members/get_member.ts @@ -8,23 +8,13 @@ import { endpoints } from "../../util/constants.ts"; * * ⚠️ **ADVANCED USE ONLY: Your members will be cached in your guild most likely. Only use this when you are absolutely sure the member is not cached.** */ -export async function getMember( - guildId: bigint, - id: bigint, - options?: { force?: boolean } -) { +export async function getMember(guildId: bigint, id: bigint, options?: { force?: boolean }) { const guild = await cacheHandlers.get("guilds", guildId); if (!guild && !options?.force) return; - const data = await rest.runMethod( - "get", - endpoints.GUILD_MEMBER(guildId, id) - ); + const data = await rest.runMethod("get", endpoints.GUILD_MEMBER(guildId, id)); - const discordenoMember = await structures.createDiscordenoMember( - data, - guildId - ); + const discordenoMember = await structures.createDiscordenoMember(data, guildId); await cacheHandlers.set("members", discordenoMember.id, discordenoMember); return discordenoMember; diff --git a/src/helpers/members/get_members.ts b/src/helpers/members/get_members.ts index 89a52ba80..768cba54e 100644 --- a/src/helpers/members/get_members.ts +++ b/src/helpers/members/get_members.ts @@ -20,10 +20,7 @@ import { ws } from "../../ws/ws.ts"; * REST(this function): 50/s global(across all shards) rate limit with ALL requests this included * GW(fetchMembers): 120/m(PER shard) rate limit. Meaning if you have 8 shards your limit is 960/m. */ -export async function getMembers( - guildId: bigint, - options?: ListGuildMembers & { addToCache?: boolean } -) { +export async function getMembers(guildId: bigint, options?: ListGuildMembers & { addToCache?: boolean }) { if (!(ws.identifyPayload.intents && DiscordGatewayIntents.GuildMembers)) { throw new Error(Errors.MISSING_INTENT_GUILD_MEMBERS); } @@ -35,40 +32,26 @@ export async function getMembers( let membersLeft = options?.limit ?? guild.memberCount; let loops = 1; - while ( - (options?.limit ?? guild.memberCount) > members.size && - membersLeft > 0 - ) { + while ((options?.limit ?? guild.memberCount) > members.size && membersLeft > 0) { eventHandlers.debug?.("loop", "Running while loop in getMembers function."); if (options?.limit && options.limit > 1000) { - console.log( - `Paginating get members from REST. #${loops} / ${Math.ceil( - (options?.limit ?? 1) / 1000 - )}` - ); + console.log(`Paginating get members from REST. #${loops} / ${Math.ceil((options?.limit ?? 1) / 1000)}`); } const result = await rest.runMethod( "get", - `${endpoints.GUILD_MEMBERS(guildId)}?limit=${ - membersLeft > 1000 ? 1000 : membersLeft - }${options?.after ? `&after=${options.after}` : ""}` + `${endpoints.GUILD_MEMBERS(guildId)}?limit=${membersLeft > 1000 ? 1000 : membersLeft}${ + options?.after ? `&after=${options.after}` : "" + }` ); const discordenoMembers = await Promise.all( result.map(async (member) => { - const discordenoMember = await structures.createDiscordenoMember( - member, - guildId - ); + const discordenoMember = await structures.createDiscordenoMember(member, guildId); if (options?.addToCache !== false) { - await cacheHandlers.set( - "members", - discordenoMember.id, - discordenoMember - ); + await cacheHandlers.set("members", discordenoMember.id, discordenoMember); } return discordenoMember; @@ -78,18 +61,13 @@ export async function getMembers( if (!discordenoMembers.length) break; discordenoMembers.forEach((member) => { - eventHandlers.debug?.( - "loop", - `Running forEach loop in get_members file.` - ); + eventHandlers.debug?.("loop", `Running forEach loop in get_members file.`); members.set(member.id, member); }); options = { limit: options?.limit, - after: bigintToSnowflake( - discordenoMembers[discordenoMembers.length - 1].id - ), + after: bigintToSnowflake(discordenoMembers[discordenoMembers.length - 1].id), }; membersLeft -= 1000; diff --git a/src/helpers/members/kick_member.ts b/src/helpers/members/kick_member.ts index 6745d0b41..4f9306a9a 100644 --- a/src/helpers/members/kick_member.ts +++ b/src/helpers/members/kick_member.ts @@ -2,30 +2,19 @@ import { botId } from "../../bot.ts"; import { rest } from "../../rest/rest.ts"; import { Errors } from "../../types/discordeno/errors.ts"; import { endpoints } from "../../util/constants.ts"; -import { - highestRole, - requireBotGuildPermissions, -} from "../../util/permissions.ts"; +import { highestRole, requireBotGuildPermissions } from "../../util/permissions.ts"; /** Kick a member from the server */ export async function kick(guildId: bigint, memberId: bigint, reason?: string) { const botsHighestRole = await highestRole(guildId, botId); const membersHighestRole = await highestRole(guildId, memberId); - if ( - botsHighestRole && - membersHighestRole && - botsHighestRole.position <= membersHighestRole.position - ) { + if (botsHighestRole && membersHighestRole && botsHighestRole.position <= membersHighestRole.position) { throw new Error(Errors.BOTS_HIGHEST_ROLE_TOO_LOW); } await requireBotGuildPermissions(guildId, ["KICK_MEMBERS"]); - return await rest.runMethod( - "delete", - endpoints.GUILD_MEMBER(guildId, memberId), - { reason } - ); + return await rest.runMethod("delete", endpoints.GUILD_MEMBER(guildId, memberId), { reason }); } // aliases diff --git a/src/helpers/members/move_member.ts b/src/helpers/members/move_member.ts index f9d172b1c..fd1b871d1 100644 --- a/src/helpers/members/move_member.ts +++ b/src/helpers/members/move_member.ts @@ -6,10 +6,6 @@ import { editMember } from "./edit_member.ts"; * @param memberId the id of the member to move. * @param channelId id of channel to move user to (if they are connected to voice) */ -export function moveMember( - guildId: bigint, - memberId: bigint, - channelId: bigint -) { +export function moveMember(guildId: bigint, memberId: bigint, channelId: bigint) { return editMember(guildId, memberId, { channelId }); } diff --git a/src/helpers/members/prune_members.ts b/src/helpers/members/prune_members.ts index 61a77c37c..c6ad13bc7 100644 --- a/src/helpers/members/prune_members.ts +++ b/src/helpers/members/prune_members.ts @@ -16,11 +16,7 @@ export async function pruneMembers(guildId: bigint, options: BeginGuildPrune) { await requireBotGuildPermissions(guildId, ["KICK_MEMBERS"]); - const result = await rest.runMethod<{ pruned: number }>( - "post", - endpoints.GUILD_PRUNE(guildId), - snakelize(options) - ); + const result = await rest.runMethod<{ pruned: number }>("post", endpoints.GUILD_PRUNE(guildId), snakelize(options)); return result.pruned; } diff --git a/src/helpers/members/search_members.ts b/src/helpers/members/search_members.ts index 776cc9902..06c389a23 100644 --- a/src/helpers/members/search_members.ts +++ b/src/helpers/members/search_members.ts @@ -24,34 +24,21 @@ export async function searchMembers( } } - const result = await rest.runMethod( - "get", - endpoints.GUILD_MEMBERS_SEARCH(guildId), - { - ...options, - query, - } - ); + const result = await rest.runMethod("get", endpoints.GUILD_MEMBERS_SEARCH(guildId), { + ...options, + query, + }); const members = await Promise.all( result.map(async (member) => { - const discordenoMember = await structures.createDiscordenoMember( - member, - guildId - ); + const discordenoMember = await structures.createDiscordenoMember(member, guildId); if (options?.cache) { - await cacheHandlers.set( - "members", - discordenoMember.id, - discordenoMember - ); + await cacheHandlers.set("members", discordenoMember.id, discordenoMember); } return discordenoMember; }) ); - return new Collection( - members.map((member) => [member.id, member]) - ); + return new Collection(members.map((member) => [member.id, member])); } diff --git a/src/helpers/members/send_direct_message.ts b/src/helpers/members/send_direct_message.ts index 297626ede..e03cfa0ca 100644 --- a/src/helpers/members/send_direct_message.ts +++ b/src/helpers/members/send_direct_message.ts @@ -7,23 +7,14 @@ import { endpoints } from "../../util/constants.ts"; import { sendMessage } from "../messages/send_message.ts"; /** Send a message to a users DM. Note: this takes 2 API calls. 1 is to fetch the users dm channel. 2 is to send a message to that channel. */ -export async function sendDirectMessage( - memberId: bigint, - content: string | CreateMessage -) { +export async function sendDirectMessage(memberId: bigint, content: string | CreateMessage) { let dmChannel = await cacheHandlers.get("channels", memberId); if (!dmChannel) { // If not available in cache create a new one. - const dmChannelData = await rest.runMethod( - "post", - endpoints.USER_DM, - { - recipient_id: memberId, - } - ); - const discordenoChannel = await structures.createDiscordenoChannel( - dmChannelData - ); + const dmChannelData = await rest.runMethod("post", endpoints.USER_DM, { + recipient_id: memberId, + }); + const discordenoChannel = await structures.createDiscordenoChannel(dmChannelData); // Recreate the channel and add it undert he users id await cacheHandlers.set("channels", memberId, discordenoChannel); dmChannel = discordenoChannel; diff --git a/src/helpers/members/unban_member.ts b/src/helpers/members/unban_member.ts index 3f87bfec6..75beb27a6 100644 --- a/src/helpers/members/unban_member.ts +++ b/src/helpers/members/unban_member.ts @@ -6,10 +6,7 @@ import { requireBotGuildPermissions } from "../../util/permissions.ts"; export async function unban(guildId: bigint, id: bigint) { await requireBotGuildPermissions(guildId, ["BAN_MEMBERS"]); - return await rest.runMethod( - "delete", - endpoints.GUILD_BAN(guildId, id) - ); + return await rest.runMethod("delete", endpoints.GUILD_BAN(guildId, id)); } // aliases diff --git a/src/helpers/messages/add_reaction.ts b/src/helpers/messages/add_reaction.ts index 3125b8eaf..cc8691179 100644 --- a/src/helpers/messages/add_reaction.ts +++ b/src/helpers/messages/add_reaction.ts @@ -3,15 +3,8 @@ import { endpoints } from "../../util/constants.ts"; import { requireBotChannelPermissions } from "../../util/permissions.ts"; /** Create a reaction for the message. Reaction takes the form of **name:id** for custom guild emoji, or Unicode characters. Requires READ_MESSAGE_HISTORY and ADD_REACTIONS */ -export async function addReaction( - channelId: bigint, - messageId: bigint, - reaction: string -) { - await requireBotChannelPermissions(channelId, [ - "ADD_REACTIONS", - "READ_MESSAGE_HISTORY", - ]); +export async function addReaction(channelId: bigint, messageId: bigint, reaction: string) { + await requireBotChannelPermissions(channelId, ["ADD_REACTIONS", "READ_MESSAGE_HISTORY"]); if (reaction.startsWith("<:")) { reaction = reaction.substring(2, reaction.length - 1); @@ -19,8 +12,5 @@ export async function addReaction( reaction = reaction.substring(3, reaction.length - 1); } - return await rest.runMethod( - "put", - endpoints.CHANNEL_MESSAGE_REACTION_ME(channelId, messageId, reaction) - ); + return await rest.runMethod("put", endpoints.CHANNEL_MESSAGE_REACTION_ME(channelId, messageId, reaction)); } diff --git a/src/helpers/messages/add_reactions.ts b/src/helpers/messages/add_reactions.ts index 2ad3e15ef..00d3d6803 100644 --- a/src/helpers/messages/add_reactions.ts +++ b/src/helpers/messages/add_reactions.ts @@ -2,22 +2,12 @@ import { eventHandlers } from "../../bot.ts"; import { addReaction } from "./add_reaction.ts"; /** Adds multiple reactions to a message. If `ordered` is true(default is false), it will add the reactions one at a time in the order provided. Note: Reaction takes the form of **name:id** for custom guild emoji, or Unicode characters. Requires READ_MESSAGE_HISTORY and ADD_REACTIONS */ -export async function addReactions( - channelId: bigint, - messageId: bigint, - reactions: string[], - ordered = false -) { +export async function addReactions(channelId: bigint, messageId: bigint, reactions: string[], ordered = false) { if (!ordered) { - await Promise.all( - reactions.map((reaction) => addReaction(channelId, messageId, reaction)) - ); + await Promise.all(reactions.map((reaction) => addReaction(channelId, messageId, reaction))); } else { for (const reaction of reactions) { - eventHandlers.debug?.( - "loop", - "Running for of loop in addReactions function." - ); + eventHandlers.debug?.("loop", "Running for of loop in addReactions function."); await addReaction(channelId, messageId, reaction); } } diff --git a/src/helpers/messages/delete_message.ts b/src/helpers/messages/delete_message.ts index c06fd3d7e..1753254cf 100644 --- a/src/helpers/messages/delete_message.ts +++ b/src/helpers/messages/delete_message.ts @@ -6,12 +6,7 @@ import { requireBotChannelPermissions } from "../../util/permissions.ts"; import { delay } from "../../util/utils.ts"; /** Delete a message with the channel id and message id only. */ -export async function deleteMessage( - channelId: bigint, - messageId: bigint, - reason?: string, - delayMilliseconds = 0 -) { +export async function deleteMessage(channelId: bigint, messageId: bigint, reason?: string, delayMilliseconds = 0) { const message = await cacheHandlers.get("messages", messageId); if (message && message.authorId !== botId) { @@ -20,9 +15,5 @@ export async function deleteMessage( if (delayMilliseconds) await delay(delayMilliseconds); - return await rest.runMethod( - "delete", - endpoints.CHANNEL_MESSAGE(channelId, messageId), - { reason } - ); + return await rest.runMethod("delete", endpoints.CHANNEL_MESSAGE(channelId, messageId), { reason }); } diff --git a/src/helpers/messages/delete_messages.ts b/src/helpers/messages/delete_messages.ts index 8fa35f44c..f95ec54dd 100644 --- a/src/helpers/messages/delete_messages.ts +++ b/src/helpers/messages/delete_messages.ts @@ -4,11 +4,7 @@ import { endpoints } from "../../util/constants.ts"; import { requireBotChannelPermissions } from "../../util/permissions.ts"; /** Delete messages from the channel. 2-100. Requires the MANAGE_MESSAGES permission */ -export async function deleteMessages( - channelId: bigint, - ids: bigint[], - reason?: string -) { +export async function deleteMessages(channelId: bigint, ids: bigint[], reason?: string) { await requireBotChannelPermissions(channelId, ["MANAGE_MESSAGES"]); if (ids.length < 2) { @@ -16,17 +12,11 @@ export async function deleteMessages( } if (ids.length > 100) { - console.warn( - `This endpoint only accepts a maximum of 100 messages. Deleting the first 100 message ids provided.` - ); + console.warn(`This endpoint only accepts a maximum of 100 messages. Deleting the first 100 message ids provided.`); } - return await rest.runMethod( - "post", - endpoints.CHANNEL_BULK_DELETE(channelId), - { - messages: ids.splice(0, 100), - reason, - } - ); + return await rest.runMethod("post", endpoints.CHANNEL_BULK_DELETE(channelId), { + messages: ids.splice(0, 100), + reason, + }); } diff --git a/src/helpers/messages/edit_message.ts b/src/helpers/messages/edit_message.ts index 82eea8b22..c7f8f1522 100644 --- a/src/helpers/messages/edit_message.ts +++ b/src/helpers/messages/edit_message.ts @@ -11,10 +11,7 @@ import { requireBotChannelPermissions } from "../../util/permissions.ts"; import { validateComponents } from "../../util/utils.ts"; /** Edit the message. */ -export async function editMessage( - message: DiscordenoMessage, - content: string | EditMessage -) { +export async function editMessage(message: DiscordenoMessage, content: string | EditMessage) { if (message.authorId !== botId) { throw "You can only edit a message that was sent by the bot."; } diff --git a/src/helpers/messages/get_message.ts b/src/helpers/messages/get_message.ts index afba13441..b925abf98 100644 --- a/src/helpers/messages/get_message.ts +++ b/src/helpers/messages/get_message.ts @@ -8,16 +8,10 @@ import { requireBotChannelPermissions } from "../../util/permissions.ts"; /** Fetch a single message from the server. Requires VIEW_CHANNEL and READ_MESSAGE_HISTORY */ export async function getMessage(channelId: bigint, id: bigint) { if (await cacheHandlers.has("channels", channelId)) { - await requireBotChannelPermissions(channelId, [ - "VIEW_CHANNEL", - "READ_MESSAGE_HISTORY", - ]); + await requireBotChannelPermissions(channelId, ["VIEW_CHANNEL", "READ_MESSAGE_HISTORY"]); } - const result = await rest.runMethod( - "get", - endpoints.CHANNEL_MESSAGE(channelId, id) - ); + const result = await rest.runMethod("get", endpoints.CHANNEL_MESSAGE(channelId, id)); return await structures.createDiscordenoMessage(result); } diff --git a/src/helpers/messages/get_messages.ts b/src/helpers/messages/get_messages.ts index 6d2b4a3f3..38e9c2ea8 100644 --- a/src/helpers/messages/get_messages.ts +++ b/src/helpers/messages/get_messages.ts @@ -14,28 +14,15 @@ import { requireBotChannelPermissions } from "../../util/permissions.ts"; /** Fetches between 2-100 messages. Requires VIEW_CHANNEL and READ_MESSAGE_HISTORY */ export async function getMessages( channelId: bigint, - options?: - | GetMessagesAfter - | GetMessagesBefore - | GetMessagesAround - | GetMessagesLimit + options?: GetMessagesAfter | GetMessagesBefore | GetMessagesAround | GetMessagesLimit ) { - await requireBotChannelPermissions(channelId, [ - "VIEW_CHANNEL", - "READ_MESSAGE_HISTORY", - ]); + await requireBotChannelPermissions(channelId, ["VIEW_CHANNEL", "READ_MESSAGE_HISTORY"]); if (options?.limit && (options.limit < 0 || options.limit > 100)) { throw new Error(Errors.INVALID_GET_MESSAGES_LIMIT); } - const result = await rest.runMethod( - "get", - endpoints.CHANNEL_MESSAGES(channelId), - options - ); + const result = await rest.runMethod("get", endpoints.CHANNEL_MESSAGES(channelId), options); - return await Promise.all( - result.map((res) => structures.createDiscordenoMessage(res)) - ); + return await Promise.all(result.map((res) => structures.createDiscordenoMessage(res))); } diff --git a/src/helpers/messages/get_reactions.ts b/src/helpers/messages/get_reactions.ts index af41ba6fc..7bf1ba976 100644 --- a/src/helpers/messages/get_reactions.ts +++ b/src/helpers/messages/get_reactions.ts @@ -5,12 +5,7 @@ import { Collection } from "../../util/collection.ts"; import { endpoints } from "../../util/constants.ts"; /** Get a list of users that reacted with this emoji. */ -export async function getReactions( - channelId: bigint, - messageId: bigint, - reaction: string, - options?: GetReactions -) { +export async function getReactions(channelId: bigint, messageId: bigint, reaction: string, options?: GetReactions) { const users = await rest.runMethod( "get", endpoints.CHANNEL_MESSAGE_REACTION(channelId, messageId, reaction), diff --git a/src/helpers/messages/pin_message.ts b/src/helpers/messages/pin_message.ts index 95c6a28b1..9bc16270c 100644 --- a/src/helpers/messages/pin_message.ts +++ b/src/helpers/messages/pin_message.ts @@ -6,10 +6,7 @@ import { requireBotChannelPermissions } from "../../util/permissions.ts"; export async function pin(channelId: bigint, messageId: bigint) { await requireBotChannelPermissions(channelId, ["MANAGE_MESSAGES"]); - return await rest.runMethod( - "put", - endpoints.CHANNEL_PIN(channelId, messageId) - ); + return await rest.runMethod("put", endpoints.CHANNEL_PIN(channelId, messageId)); } // aliases diff --git a/src/helpers/messages/publish_message.ts b/src/helpers/messages/publish_message.ts index de8ec758e..e2c858c43 100644 --- a/src/helpers/messages/publish_message.ts +++ b/src/helpers/messages/publish_message.ts @@ -5,10 +5,7 @@ import { endpoints } from "../../util/constants.ts"; /** Crosspost a message in a News Channel to following channels. */ export async function publishMessage(channelId: bigint, messageId: bigint) { - const data = await rest.runMethod( - "post", - endpoints.CHANNEL_MESSAGE_CROSSPOST(channelId, messageId) - ); + const data = await rest.runMethod("post", endpoints.CHANNEL_MESSAGE_CROSSPOST(channelId, messageId)); return await structures.createDiscordenoMessage(data); } diff --git a/src/helpers/messages/remove_all_reactions.ts b/src/helpers/messages/remove_all_reactions.ts index c4aa69bd8..a2682e71b 100644 --- a/src/helpers/messages/remove_all_reactions.ts +++ b/src/helpers/messages/remove_all_reactions.ts @@ -6,8 +6,5 @@ import { requireBotChannelPermissions } from "../../util/permissions.ts"; export async function removeAllReactions(channelId: bigint, messageId: bigint) { await requireBotChannelPermissions(channelId, ["MANAGE_MESSAGES"]); - return await rest.runMethod( - "delete", - endpoints.CHANNEL_MESSAGE_REACTIONS(channelId, messageId) - ); + return await rest.runMethod("delete", endpoints.CHANNEL_MESSAGE_REACTIONS(channelId, messageId)); } diff --git a/src/helpers/messages/remove_reaction.ts b/src/helpers/messages/remove_reaction.ts index 5dab9745a..081488cad 100644 --- a/src/helpers/messages/remove_reaction.ts +++ b/src/helpers/messages/remove_reaction.ts @@ -22,12 +22,7 @@ export async function removeReaction( return await rest.runMethod( "delete", options?.userId - ? endpoints.CHANNEL_MESSAGE_REACTION_USER( - channelId, - messageId, - reaction, - options.userId - ) + ? endpoints.CHANNEL_MESSAGE_REACTION_USER(channelId, messageId, reaction, options.userId) : endpoints.CHANNEL_MESSAGE_REACTION_ME(channelId, messageId, reaction) ); } diff --git a/src/helpers/messages/remove_reaction_emoji.ts b/src/helpers/messages/remove_reaction_emoji.ts index 118a91529..69a70805d 100644 --- a/src/helpers/messages/remove_reaction_emoji.ts +++ b/src/helpers/messages/remove_reaction_emoji.ts @@ -3,11 +3,7 @@ import { endpoints } from "../../util/constants.ts"; import { requireBotChannelPermissions } from "../../util/permissions.ts"; /** Removes all reactions for a single emoji on this message. Reaction takes the form of **name:id** for custom guild emoji, or Unicode characters. */ -export async function removeReactionEmoji( - channelId: bigint, - messageId: bigint, - reaction: string -) { +export async function removeReactionEmoji(channelId: bigint, messageId: bigint, reaction: string) { await requireBotChannelPermissions(channelId, ["MANAGE_MESSAGES"]); if (reaction.startsWith("<:")) { @@ -16,8 +12,5 @@ export async function removeReactionEmoji( reaction = reaction.substring(3, reaction.length - 1); } - return await rest.runMethod( - "delete", - endpoints.CHANNEL_MESSAGE_REACTION(channelId, messageId, reaction) - ); + return await rest.runMethod("delete", endpoints.CHANNEL_MESSAGE_REACTION(channelId, messageId, reaction)); } diff --git a/src/helpers/messages/send_message.ts b/src/helpers/messages/send_message.ts index 7de6c288c..9bcb2372e 100644 --- a/src/helpers/messages/send_message.ts +++ b/src/helpers/messages/send_message.ts @@ -13,10 +13,7 @@ import { snakelize, validateComponents } from "../../util/utils.ts"; import { validateLength } from "../../util/validate_length.ts"; /** Send a message to the channel. Requires SEND_MESSAGES permission. */ -export async function sendMessage( - channelId: bigint, - content: string | CreateMessage -) { +export async function sendMessage(channelId: bigint, content: string | CreateMessage) { if (typeof content === "string") content = { content }; const channel = await cacheHandlers.get("channels", channelId); @@ -34,17 +31,11 @@ export async function sendMessage( throw new Error(Errors.CHANNEL_NOT_TEXT_BASED); } - const requiredPerms: Set = new Set([ - "SEND_MESSAGES", - "VIEW_CHANNEL", - ]); + const requiredPerms: Set = new Set(["SEND_MESSAGES", "VIEW_CHANNEL"]); if (content.tts) requiredPerms.add("SEND_TTS_MESSAGES"); if (content.embed) requiredPerms.add("EMBED_LINKS"); - if ( - content.messageReference?.messageId || - content.allowedMentions?.repliedUser - ) { + if (content.messageReference?.messageId || content.allowedMentions?.repliedUser) { requiredPerms.add("READ_MESSAGE_HISTORY"); } @@ -58,40 +49,22 @@ export async function sendMessage( if (content.allowedMentions) { if (content.allowedMentions.users?.length) { - if ( - content.allowedMentions.parse?.includes( - DiscordAllowedMentionsTypes.UserMentions - ) - ) { - content.allowedMentions.parse = content.allowedMentions.parse.filter( - (p) => p !== "users" - ); + if (content.allowedMentions.parse?.includes(DiscordAllowedMentionsTypes.UserMentions)) { + content.allowedMentions.parse = content.allowedMentions.parse.filter((p) => p !== "users"); } if (content.allowedMentions.users.length > 100) { - content.allowedMentions.users = content.allowedMentions.users.slice( - 0, - 100 - ); + content.allowedMentions.users = content.allowedMentions.users.slice(0, 100); } } if (content.allowedMentions.roles?.length) { - if ( - content.allowedMentions.parse?.includes( - DiscordAllowedMentionsTypes.RoleMentions - ) - ) { - content.allowedMentions.parse = content.allowedMentions.parse.filter( - (p) => p !== "roles" - ); + if (content.allowedMentions.parse?.includes(DiscordAllowedMentionsTypes.RoleMentions)) { + content.allowedMentions.parse = content.allowedMentions.parse.filter((p) => p !== "roles"); } if (content.allowedMentions.roles.length > 100) { - content.allowedMentions.roles = content.allowedMentions.roles.slice( - 0, - 100 - ); + content.allowedMentions.roles = content.allowedMentions.roles.slice(0, 100); } } } @@ -109,8 +82,7 @@ export async function sendMessage( ? { messageReference: { ...content.messageReference, - failIfNotExists: - content.messageReference.failIfNotExists === true, + failIfNotExists: content.messageReference.failIfNotExists === true, }, } : {}), diff --git a/src/helpers/messages/unpin_message.ts b/src/helpers/messages/unpin_message.ts index bf054e0f0..ee7542c42 100644 --- a/src/helpers/messages/unpin_message.ts +++ b/src/helpers/messages/unpin_message.ts @@ -3,16 +3,10 @@ import { endpoints } from "../../util/constants.ts"; import { requireBotChannelPermissions } from "../../util/permissions.ts"; /** Unpin a message in a channel. Requires MANAGE_MESSAGES. */ -export async function unpin( - channelId: bigint, - messageId: bigint -): Promise { +export async function unpin(channelId: bigint, messageId: bigint): Promise { await requireBotChannelPermissions(channelId, ["MANAGE_MESSAGES"]); - return await rest.runMethod( - "delete", - endpoints.CHANNEL_PIN(channelId, messageId) - ); + return await rest.runMethod("delete", endpoints.CHANNEL_PIN(channelId, messageId)); } // aliases diff --git a/src/helpers/misc/edit_bot_status.ts b/src/helpers/misc/edit_bot_status.ts index 1c8c87aab..5c05cabce 100644 --- a/src/helpers/misc/edit_bot_status.ts +++ b/src/helpers/misc/edit_bot_status.ts @@ -5,10 +5,7 @@ import { ws } from "../../ws/ws.ts"; export function editBotStatus(data: Omit) { ws.shards.forEach((shard) => { - eventHandlers.debug?.( - "loop", - `Running forEach loop in editBotStatus function.` - ); + eventHandlers.debug?.("loop", `Running forEach loop in editBotStatus function.`); ws.sendShardMessage(shard, { op: DiscordGatewayOpcodes.StatusUpdate, diff --git a/src/helpers/roles/add_role.ts b/src/helpers/roles/add_role.ts index 31526e995..367e3911c 100644 --- a/src/helpers/roles/add_role.ts +++ b/src/helpers/roles/add_role.ts @@ -2,18 +2,10 @@ import { botId } from "../../bot.ts"; import { rest } from "../../rest/rest.ts"; import { Errors } from "../../types/discordeno/errors.ts"; import { endpoints } from "../../util/constants.ts"; -import { - isHigherPosition, - requireBotGuildPermissions, -} from "../../util/permissions.ts"; +import { isHigherPosition, requireBotGuildPermissions } from "../../util/permissions.ts"; /** Add a role to the member */ -export async function addRole( - guildId: bigint, - memberId: bigint, - roleId: bigint, - reason?: string -) { +export async function addRole(guildId: bigint, memberId: bigint, roleId: bigint, reason?: string) { const isHigherRolePosition = await isHigherPosition(guildId, botId, roleId); if (!isHigherRolePosition) { throw new Error(Errors.BOTS_HIGHEST_ROLE_TOO_LOW); @@ -21,9 +13,5 @@ export async function addRole( await requireBotGuildPermissions(guildId, ["MANAGE_ROLES"]); - return await rest.runMethod( - "put", - endpoints.GUILD_MEMBER_ROLE(guildId, memberId, roleId), - { reason } - ); + return await rest.runMethod("put", endpoints.GUILD_MEMBER_ROLE(guildId, memberId, roleId), { reason }); } diff --git a/src/helpers/roles/create_role.ts b/src/helpers/roles/create_role.ts index a8bcdec9c..978a790f3 100644 --- a/src/helpers/roles/create_role.ts +++ b/src/helpers/roles/create_role.ts @@ -4,28 +4,17 @@ import { structures } from "../../structures/mod.ts"; import { CreateGuildRole } from "../../types/guilds/create_guild_role.ts"; import type { Role } from "../../types/permissions/role.ts"; import { endpoints } from "../../util/constants.ts"; -import { - calculateBits, - requireBotGuildPermissions, -} from "../../util/permissions.ts"; +import { calculateBits, requireBotGuildPermissions } from "../../util/permissions.ts"; /** Create a new role for the guild. Requires the MANAGE_ROLES permission. */ -export async function createRole( - guildId: bigint, - options: CreateGuildRole, - reason?: string -) { +export async function createRole(guildId: bigint, options: CreateGuildRole, reason?: string) { await requireBotGuildPermissions(guildId, ["MANAGE_ROLES"]); - const result = await rest.runMethod( - "post", - endpoints.GUILD_ROLES(guildId), - { - ...options, - permissions: calculateBits(options?.permissions || []), - reason, - } - ); + const result = await rest.runMethod("post", endpoints.GUILD_ROLES(guildId), { + ...options, + permissions: calculateBits(options?.permissions || []), + reason, + }); const role = await structures.createDiscordenoRole({ role: result, diff --git a/src/helpers/roles/delete_role.ts b/src/helpers/roles/delete_role.ts index 953a7f6ce..8825234f9 100644 --- a/src/helpers/roles/delete_role.ts +++ b/src/helpers/roles/delete_role.ts @@ -6,8 +6,5 @@ import { requireBotGuildPermissions } from "../../util/permissions.ts"; export async function deleteRole(guildId: bigint, id: bigint) { await requireBotGuildPermissions(guildId, ["MANAGE_ROLES"]); - return await rest.runMethod( - "delete", - endpoints.GUILD_ROLE(guildId, id) - ); + return await rest.runMethod("delete", endpoints.GUILD_ROLE(guildId, id)); } diff --git a/src/helpers/roles/edit_role.ts b/src/helpers/roles/edit_role.ts index 005314cc7..35ef00dbf 100644 --- a/src/helpers/roles/edit_role.ts +++ b/src/helpers/roles/edit_role.ts @@ -3,29 +3,16 @@ import { structures } from "../../structures/mod.ts"; import type { CreateGuildRole } from "../../types/guilds/create_guild_role.ts"; import type { Role } from "../../types/permissions/role.ts"; import { endpoints } from "../../util/constants.ts"; -import { - calculateBits, - requireBotGuildPermissions, -} from "../../util/permissions.ts"; +import { calculateBits, requireBotGuildPermissions } from "../../util/permissions.ts"; /** Edit a guild role. Requires the MANAGE_ROLES permission. */ -export async function editRole( - guildId: bigint, - id: bigint, - options: CreateGuildRole -) { +export async function editRole(guildId: bigint, id: bigint, options: CreateGuildRole) { await requireBotGuildPermissions(guildId, ["MANAGE_ROLES"]); - const result = await rest.runMethod( - "patch", - endpoints.GUILD_ROLE(guildId, id), - { - ...options, - permissions: options.permissions - ? calculateBits(options.permissions) - : undefined, - } - ); + const result = await rest.runMethod("patch", endpoints.GUILD_ROLE(guildId, id), { + ...options, + permissions: options.permissions ? calculateBits(options.permissions) : undefined, + }); return await structures.createDiscordenoRole({ role: result, guildId }); } diff --git a/src/helpers/roles/get_roles.ts b/src/helpers/roles/get_roles.ts index d84763223..5dc55535e 100644 --- a/src/helpers/roles/get_roles.ts +++ b/src/helpers/roles/get_roles.ts @@ -13,15 +13,10 @@ import { requireBotGuildPermissions } from "../../util/permissions.ts"; export async function getRoles(guildId: bigint, addToCache = true) { await requireBotGuildPermissions(guildId, ["MANAGE_ROLES"]); - const result = await rest.runMethod( - "get", - endpoints.GUILD_ROLES(guildId) - ); + const result = await rest.runMethod("get", endpoints.GUILD_ROLES(guildId)); const roleStructures = await Promise.all( - result.map( - async (role) => await structures.createDiscordenoRole({ role, guildId }) - ) + result.map(async (role) => await structures.createDiscordenoRole({ role, guildId })) ); const roles = new Collection(roleStructures.map((role) => [role.id, role])); diff --git a/src/helpers/roles/remove_role.ts b/src/helpers/roles/remove_role.ts index 8708c760c..d97c78314 100644 --- a/src/helpers/roles/remove_role.ts +++ b/src/helpers/roles/remove_role.ts @@ -2,18 +2,10 @@ import { botId } from "../../bot.ts"; import { rest } from "../../rest/rest.ts"; import { Errors } from "../../types/discordeno/errors.ts"; import { endpoints } from "../../util/constants.ts"; -import { - isHigherPosition, - requireBotGuildPermissions, -} from "../../util/permissions.ts"; +import { isHigherPosition, requireBotGuildPermissions } from "../../util/permissions.ts"; /** Remove a role from the member */ -export async function removeRole( - guildId: bigint, - memberId: bigint, - roleId: bigint, - reason?: string -) { +export async function removeRole(guildId: bigint, memberId: bigint, roleId: bigint, reason?: string) { const isHigherRolePosition = await isHigherPosition(guildId, botId, roleId); if (!isHigherRolePosition) { throw new Error(Errors.BOTS_HIGHEST_ROLE_TOO_LOW); @@ -21,9 +13,5 @@ export async function removeRole( await requireBotGuildPermissions(guildId, ["MANAGE_ROLES"]); - return await rest.runMethod( - "delete", - endpoints.GUILD_MEMBER_ROLE(guildId, memberId, roleId), - { reason } - ); + return await rest.runMethod("delete", endpoints.GUILD_MEMBER_ROLE(guildId, memberId, roleId), { reason }); } diff --git a/src/helpers/templates/create_guild_from_template.ts b/src/helpers/templates/create_guild_from_template.ts index 71f454cf7..f3ef0d468 100644 --- a/src/helpers/templates/create_guild_from_template.ts +++ b/src/helpers/templates/create_guild_from_template.ts @@ -11,33 +11,19 @@ import { ws } from "../../ws/ws.ts"; * Create a new guild based on a template * NOTE: This endpoint can be used only by bots in less than 10 guilds. */ -export async function createGuildFromTemplate( - templateCode: string, - data: CreateGuildFromTemplate -) { +export async function createGuildFromTemplate(templateCode: string, data: CreateGuildFromTemplate) { if ((await cacheHandlers.size("guilds")) >= 10) { - throw new Error( - "This function can only be used by bots in less than 10 guilds." - ); + throw new Error("This function can only be used by bots in less than 10 guilds."); } if (data.icon) { data.icon = await urlToBase64(data.icon); } - const createdGuild = await rest.runMethod( - "post", - endpoints.GUILD_TEMPLATE(templateCode), - data - ); + const createdGuild = await rest.runMethod("post", endpoints.GUILD_TEMPLATE(templateCode), data); return await structures.createDiscordenoGuild( createdGuild, - Number( - ( - BigInt(createdGuild.id) >> - 22n % BigInt(ws.botGatewayData.shards) - ).toString() - ) + Number((BigInt(createdGuild.id) >> 22n % BigInt(ws.botGatewayData.shards)).toString()) ); } diff --git a/src/helpers/templates/create_guild_template.ts b/src/helpers/templates/create_guild_template.ts index 85db3fd8a..7dc10961c 100644 --- a/src/helpers/templates/create_guild_template.ts +++ b/src/helpers/templates/create_guild_template.ts @@ -20,9 +20,5 @@ export async function createGuildTemplate(guildId: bigint, data: Template) { throw new Error("The description can only be in between 0-120 characters."); } - return await rest.runMethod