From 370d62be04730e3b0ff531e6f3e7088ec8d52c41 Mon Sep 17 00:00:00 2001 From: Skillz4Killz Date: Wed, 10 Nov 2021 20:35:03 +0000 Subject: [PATCH] change: prettier code --- src/handlers/guilds/GUILD_BAN_ADD.ts | 6 +----- src/handlers/guilds/GUILD_LOADED_DD.ts | 6 +----- src/handlers/messages/MESSAGE_DELETE.ts | 12 +++++------- src/handlers/roles/GUILD_ROLE_DELETE.ts | 5 ++++- .../channels/delete_channel_overwrite.ts | 6 +----- .../interactions/send_interaction_response.ts | 14 ++++++++------ src/helpers/members/edit_bot_nickname.ts | 6 +----- src/helpers/roles/edit_role.ts | 19 +++++++------------ src/helpers/templates/get_guild_templates.ts | 6 +++++- src/helpers/webhooks/create_webhook.ts | 13 ++++--------- src/helpers/webhooks/get_webhooks.ts | 6 +----- src/transformers/role.ts | 3 ++- src/ws/identify.ts | 2 +- tests/helpers/guilds/editGuild.ts | 2 +- tests/helpers/messages/edit_message.ts | 2 +- 15 files changed, 43 insertions(+), 65 deletions(-) diff --git a/src/handlers/guilds/GUILD_BAN_ADD.ts b/src/handlers/guilds/GUILD_BAN_ADD.ts index 7a040ab9d..5b81e9b57 100644 --- a/src/handlers/guilds/GUILD_BAN_ADD.ts +++ b/src/handlers/guilds/GUILD_BAN_ADD.ts @@ -5,9 +5,5 @@ import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleGuildBanAdd(bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as SnakeCasedPropertiesDeep; - bot.events.guildBanAdd( - bot, - bot.transformers.user(bot, payload.user), - bot.transformers.snowflake(payload.guild_id) - ); + bot.events.guildBanAdd(bot, bot.transformers.user(bot, payload.user), bot.transformers.snowflake(payload.guild_id)); } diff --git a/src/handlers/guilds/GUILD_LOADED_DD.ts b/src/handlers/guilds/GUILD_LOADED_DD.ts index d7b627bd6..a62b9ae72 100644 --- a/src/handlers/guilds/GUILD_LOADED_DD.ts +++ b/src/handlers/guilds/GUILD_LOADED_DD.ts @@ -3,11 +3,7 @@ import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload. import type { Guild } from "../../types/guilds/guild.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; -export function handleGuildLoaded( - bot: Bot, - data: DiscordGatewayPayload, - shardId: number -) { +export function handleGuildLoaded(bot: Bot, data: DiscordGatewayPayload, shardId: number) { const payload = data.d as SnakeCasedPropertiesDeep; const guild = bot.transformers.guild(bot, { guild: payload, shardId }); diff --git a/src/handlers/messages/MESSAGE_DELETE.ts b/src/handlers/messages/MESSAGE_DELETE.ts index 935feffbb..0aea5be65 100644 --- a/src/handlers/messages/MESSAGE_DELETE.ts +++ b/src/handlers/messages/MESSAGE_DELETE.ts @@ -6,11 +6,9 @@ import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleMessageDelete(bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as SnakeCasedPropertiesDeep; - bot.events.messageDelete(bot, - { - id: bot.transformers.snowflake(payload.id), - channelId: bot.transformers.snowflake(payload.channel_id), - guildId: payload.guild_id ? bot.transformers.snowflake(payload.guild_id) : undefined, - }, - ); + bot.events.messageDelete(bot, { + id: bot.transformers.snowflake(payload.id), + channelId: bot.transformers.snowflake(payload.channel_id), + guildId: payload.guild_id ? bot.transformers.snowflake(payload.guild_id) : undefined, + }); } diff --git a/src/handlers/roles/GUILD_ROLE_DELETE.ts b/src/handlers/roles/GUILD_ROLE_DELETE.ts index 1ef304469..9f3480095 100644 --- a/src/handlers/roles/GUILD_ROLE_DELETE.ts +++ b/src/handlers/roles/GUILD_ROLE_DELETE.ts @@ -5,5 +5,8 @@ import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleGuildRoleDelete(bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as SnakeCasedPropertiesDeep; - bot.events.roleDelete(bot, { roleId: bot.transformers.snowflake(payload.role_id), guildId: bot.transformers.snowflake(payload.guild_id) }); + bot.events.roleDelete(bot, { + roleId: bot.transformers.snowflake(payload.role_id), + guildId: bot.transformers.snowflake(payload.guild_id), + }); } diff --git a/src/helpers/channels/delete_channel_overwrite.ts b/src/helpers/channels/delete_channel_overwrite.ts index 1ac507244..e3adb4ffa 100644 --- a/src/helpers/channels/delete_channel_overwrite.ts +++ b/src/helpers/channels/delete_channel_overwrite.ts @@ -1,11 +1,7 @@ import type { Bot } from "../../bot.ts"; /** Delete the channel permission overwrites for a user or role in this channel. Requires `MANAGE_ROLES` permission. */ -export async function deleteChannelOverwrite( - bot: Bot, - channelId: bigint, - overwriteId: bigint -): Promise { +export async function deleteChannelOverwrite(bot: Bot, channelId: bigint, overwriteId: bigint): Promise { return await bot.rest.runMethod( bot.rest, "delete", diff --git a/src/helpers/interactions/send_interaction_response.ts b/src/helpers/interactions/send_interaction_response.ts index 345eb0755..709aa9fc4 100644 --- a/src/helpers/interactions/send_interaction_response.ts +++ b/src/helpers/interactions/send_interaction_response.ts @@ -28,12 +28,14 @@ export async function sendInteractionResponse( options.data = { ...options.data, allowedMentions: { parse: [] } }; } - const allowedMentions: AllowedMentions = options.data?.allowedMentions ? { - parse: options.data?.allowedMentions.parse, - repliedUser: options.data?.allowedMentions.repliedUser, - users: options.data?.allowedMentions.users?.map(id => id.toString()), - roles: options.data?.allowedMentions.roles?.map(id => id.toString()), - } : { parse: [] }; + const allowedMentions: AllowedMentions = options.data?.allowedMentions + ? { + parse: options.data?.allowedMentions.parse, + repliedUser: options.data?.allowedMentions.repliedUser, + users: options.data?.allowedMentions.users?.map((id) => id.toString()), + roles: options.data?.allowedMentions.roles?.map((id) => id.toString()), + } + : { parse: [] }; // If its already been executed, we need to send a followup response if (bot.cache.executedSlashCommands.has(token)) { diff --git a/src/helpers/members/edit_bot_nickname.ts b/src/helpers/members/edit_bot_nickname.ts index 348f51f14..5b5d918a5 100644 --- a/src/helpers/members/edit_bot_nickname.ts +++ b/src/helpers/members/edit_bot_nickname.ts @@ -1,11 +1,7 @@ import type { Bot } from "../../bot.ts"; /** Edit the nickname of the bot in this guild */ -export async function editBotNickname( - bot: Bot, - guildId: bigint, - options: { nick: string | null; reason?: string } -) { +export async function editBotNickname(bot: Bot, guildId: bigint, options: { nick: string | null; reason?: string }) { const response = await bot.rest.runMethod<{ nick: string }>( bot.rest, "patch", diff --git a/src/helpers/roles/edit_role.ts b/src/helpers/roles/edit_role.ts index 23735c1a5..5d08bfbe7 100644 --- a/src/helpers/roles/edit_role.ts +++ b/src/helpers/roles/edit_role.ts @@ -4,18 +4,13 @@ import type { Bot } from "../../bot.ts"; /** Edit a guild role. Requires the MANAGE_ROLES permission. */ export async function editRole(bot: Bot, guildId: bigint, id: bigint, options: CreateGuildRole) { - const result = await bot.rest.runMethod( - bot.rest, - "patch", - bot.constants.endpoints.GUILD_ROLE(guildId, id), - { - name: options.name, - color: options.color, - hoist: options.hoist, - mentionable: options.mentionable, - permissions: options.permissions ? bot.utils.calculateBits(options.permissions) : undefined, - } - ); + const result = await bot.rest.runMethod(bot.rest, "patch", bot.constants.endpoints.GUILD_ROLE(guildId, id), { + name: options.name, + color: options.color, + hoist: options.hoist, + mentionable: options.mentionable, + permissions: options.permissions ? bot.utils.calculateBits(options.permissions) : undefined, + }); return bot.transformers.role(bot, { role: result, guildId }); } diff --git a/src/helpers/templates/get_guild_templates.ts b/src/helpers/templates/get_guild_templates.ts index 5e8818621..226d84ffc 100644 --- a/src/helpers/templates/get_guild_templates.ts +++ b/src/helpers/templates/get_guild_templates.ts @@ -7,7 +7,11 @@ import type { Bot } from "../../bot.ts"; * Requires the `MANAGE_GUILD` permission. */ export async function getGuildTemplates(bot: Bot, guildId: bigint) { - const templates = await bot.rest.runMethod(bot.rest, "get", bot.constants.endpoints.GUILD_TEMPLATES(guildId)); + const templates = await bot.rest.runMethod( + bot.rest, + "get", + bot.constants.endpoints.GUILD_TEMPLATES(guildId) + ); return new Collection(templates.map((template) => [template.code, template])); } diff --git a/src/helpers/webhooks/create_webhook.ts b/src/helpers/webhooks/create_webhook.ts index 120f34967..264ad79c2 100644 --- a/src/helpers/webhooks/create_webhook.ts +++ b/src/helpers/webhooks/create_webhook.ts @@ -16,13 +16,8 @@ export async function createWebhook(bot: Bot, channelId: bigint, options: Create throw new Error(bot.constants.Errors.INVALID_WEBHOOK_NAME); } - return await bot.rest.runMethod( - bot.rest, - "post", - bot.constants.endpoints.CHANNEL_WEBHOOKS(channelId), - { - ...options, - avatar: options.avatar ? await bot.utils.urlToBase64(options.avatar) : undefined, - } - ); + return await bot.rest.runMethod(bot.rest, "post", bot.constants.endpoints.CHANNEL_WEBHOOKS(channelId), { + ...options, + avatar: options.avatar ? await bot.utils.urlToBase64(options.avatar) : undefined, + }); } diff --git a/src/helpers/webhooks/get_webhooks.ts b/src/helpers/webhooks/get_webhooks.ts index ed12ab255..0983e18cd 100644 --- a/src/helpers/webhooks/get_webhooks.ts +++ b/src/helpers/webhooks/get_webhooks.ts @@ -5,11 +5,7 @@ import type { SnakeCasedPropertiesDeep } from "../../types/util.ts"; /** Returns a list of guild webhooks objects. Requires the MANAGE_WEBHOOKs permission. */ export async function getWebhooks(bot: Bot, guildId: bigint) { - const result = await bot.rest.runMethod( - bot.rest, - "get", - bot.constants.endpoints.GUILD_WEBHOOKS(guildId) - ); + const result = await bot.rest.runMethod(bot.rest, "get", bot.constants.endpoints.GUILD_WEBHOOKS(guildId)); return new Collection(result.map((webhook) => [webhook.id, webhook])); } diff --git a/src/transformers/role.ts b/src/transformers/role.ts index b9ef69900..eef414be7 100644 --- a/src/transformers/role.ts +++ b/src/transformers/role.ts @@ -32,7 +32,8 @@ export function transformRole( }; } -export interface DiscordenoRole extends Omit { +export interface DiscordenoRole + extends Omit { /** The role id */ id: bigint; /** The bot id that is associated with this role. */ diff --git a/src/ws/identify.ts b/src/ws/identify.ts index 93d7ebe62..30a0feaab 100644 --- a/src/ws/identify.ts +++ b/src/ws/identify.ts @@ -54,7 +54,7 @@ export function identify(gateway: GatewayManager, shardId: number, maxShards: nu }, intents: gateway.intents, shard: [shardId, maxShards], - presence: gateway.presence + presence: gateway.presence, }, }, true diff --git a/tests/helpers/guilds/editGuild.ts b/tests/helpers/guilds/editGuild.ts index 99a7671bd..0d3a4e049 100644 --- a/tests/helpers/guilds/editGuild.ts +++ b/tests/helpers/guilds/editGuild.ts @@ -20,6 +20,6 @@ export async function editGuildTests(bot: Bot, guildId: bigint, t: Deno.TestCont // await delayUntil(10000, async () => bot.cache.guilds.get(guild.id)?.name === "Discordeno Test 1.0"); // if (!bot.cache.guilds.has(guild.id)) { - // throw new Error(`The guild seemed to be edited but the cache didn't got updated.`); + // throw new Error(`The guild seemed to be edited but the cache didn't got updated.`); // } } diff --git a/tests/helpers/messages/edit_message.ts b/tests/helpers/messages/edit_message.ts index b34f1f278..137b79c44 100644 --- a/tests/helpers/messages/edit_message.ts +++ b/tests/helpers/messages/edit_message.ts @@ -21,6 +21,6 @@ export async function editMessageTest(bot: Bot, channelId: bigint, t: Deno.TestC // await delayUntil(10000, async () => bot.cache.messages.get(message.id)?.content === "Goodbye World!"); // Make sure it was edited // if (bot.cache.messages.get(message.id)?.content !== "Goodbye World!") { - // throw new Error("The message should have been edited but it was not."); + // throw new Error("The message should have been edited but it was not."); // } }