From f547099b5bb976952e0f952357bf263338fc4685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Serna?= Date: Wed, 13 Jul 2022 14:10:45 -0300 Subject: [PATCH] Formatting --- README.md | 3 +- packages/biscuit/Actions.ts | 8 +- packages/biscuit/Routes.ts | 14 ++- packages/biscuit/Session.ts | 115 ++++++++++-------- packages/biscuit/Util.ts | 2 +- packages/biscuit/structures/ThreadMember.ts | 2 +- packages/biscuit/structures/guilds/Guild.ts | 9 +- .../interactions/ComponentInteraction.ts | 2 +- 8 files changed, 92 insertions(+), 63 deletions(-) diff --git a/README.md b/README.md index 271f6f2..5ce3059 100644 --- a/README.md +++ b/README.md @@ -70,8 +70,9 @@ session.start(); - Avoid sharing state between classes ### Compatibility (bun) + **⚠️ DISCLAIMER:** since bun is unestable I highly recommend running biscuit on node! + - We got the library running on EndeavourOS but it spams the ready event multiple times - We got the library running on Arch/Artix Linux but breaks when sending fetch requests - We got the library running on WSL (Ubuntu) without any trouble - diff --git a/packages/biscuit/Actions.ts b/packages/biscuit/Actions.ts index ed95423..0d0a46a 100644 --- a/packages/biscuit/Actions.ts +++ b/packages/biscuit/Actions.ts @@ -58,7 +58,13 @@ import Integration from "./structures/Integration.ts"; import Guild from "./structures/guilds/Guild.ts"; import InteractionFactory from "./structures/interactions/InteractionFactory.ts"; import { InviteCreate, NewInviteCreate } from "./structures/Invite.ts"; -import { MessageReactionAdd, MessageReactionRemove, MessageReactionRemoveAll, MessageReactionRemoveEmoji, NewMessageReactionAdd } from "./structures/MessageReaction.ts"; +import { + MessageReactionAdd, + MessageReactionRemove, + MessageReactionRemoveAll, + MessageReactionRemoveEmoji, + NewMessageReactionAdd, +} from "./structures/MessageReaction.ts"; export type RawHandler = (...args: [Session, number, T]) => void; export type Handler = (...args: T) => unknown; diff --git a/packages/biscuit/Routes.ts b/packages/biscuit/Routes.ts index 030d86a..f1cb492 100644 --- a/packages/biscuit/Routes.ts +++ b/packages/biscuit/Routes.ts @@ -348,8 +348,11 @@ export function GUILD_APPLICATION_COMMANDS_PERMISSIONS(appId: Snowflake, guildId return `/applications/${appId}/guilds/${guildId}/commands/permissions`; } - -export function APPLICATION_COMMANDS_LOCALIZATIONS(appId: Snowflake, commandId: Snowflake, withLocalizations?: boolean) { +export function APPLICATION_COMMANDS_LOCALIZATIONS( + appId: Snowflake, + commandId: Snowflake, + withLocalizations?: boolean, +) { let url = `/applications/${appId}/commands/${commandId}?`; if (withLocalizations !== undefined) { @@ -359,7 +362,12 @@ export function APPLICATION_COMMANDS_LOCALIZATIONS(appId: Snowflake, commandId: return url; } -export function GUILD_APPLICATION_COMMANDS_LOCALIZATIONS(appId: Snowflake, guildId: Snowflake, commandId: Snowflake, withLocalizations?: boolean) { +export function GUILD_APPLICATION_COMMANDS_LOCALIZATIONS( + appId: Snowflake, + guildId: Snowflake, + commandId: Snowflake, + withLocalizations?: boolean, +) { let url = `/applications/${appId}/guilds/${guildId}/commands/${commandId}?`; if (withLocalizations !== undefined) { diff --git a/packages/biscuit/Session.ts b/packages/biscuit/Session.ts index a0039c3..c3a84ed 100644 --- a/packages/biscuit/Session.ts +++ b/packages/biscuit/Session.ts @@ -1,13 +1,13 @@ import type { ApplicationCommandPermissionTypes, AtLeastOne, - Localization, DiscordApplicationCommand, DiscordApplicationCommandOption, - DiscordGuildApplicationCommandPermissions, DiscordGetGatewayBot, + DiscordGuildApplicationCommandPermissions, GatewayBot, GatewayIntents, + Localization, } from "../discordeno/mod.ts"; import type { DiscordGatewayPayload, Shard } from "../discordeno/mod.ts"; @@ -17,7 +17,12 @@ import type { PermissionResolvable } from "./structures/Permissions.ts"; import { Permissions } from "./structures/Permissions.ts"; import { Snowflake } from "./Snowflake.ts"; import { EventEmitter } from "./util/EventEmmiter.ts"; -import { ApplicationCommandTypes, createGatewayManager, createRestManager, getBotIdFromToken } from "../discordeno/mod.ts"; +import { + ApplicationCommandTypes, + createGatewayManager, + createRestManager, + getBotIdFromToken, +} from "../discordeno/mod.ts"; import * as Routes from "./Routes.ts"; import * as Actions from "./Actions.ts"; @@ -28,28 +33,28 @@ export type DiscordRawEventHandler = (shard: Shard, data: DiscordGatewayPayload) /** * @link https://discord.com/developers/docs/interactions/application-commands#endpoints-json-params - * */ + */ export interface CreateApplicationCommand { - name: string; - nameLocalizations?: Localization; - description: string; - descriptionLocalizations?: Localization; - type?: ApplicationCommandTypes; - options?: DiscordApplicationCommandOption[]; - defaultMemberPermissions?: PermissionResolvable; - dmPermission?: boolean; + name: string; + nameLocalizations?: Localization; + description: string; + descriptionLocalizations?: Localization; + type?: ApplicationCommandTypes; + options?: DiscordApplicationCommandOption[]; + defaultMemberPermissions?: PermissionResolvable; + dmPermission?: boolean; } /** * @link https://discord.com/developers/docs/interactions/application-commands#endpoints-json-params - * */ + */ export interface CreateContextApplicationCommand extends Omit { - type: ApplicationCommandTypes.Message | ApplicationCommandTypes.User; + type: ApplicationCommandTypes.Message | ApplicationCommandTypes.User; } /** * @link https://discord.com/developers/docs/interactions/application-commands#endpoints-query-string-params - * */ + */ export interface GetApplicationCommand { guildId?: Snowflake; withLocalizations?: boolean; @@ -61,7 +66,7 @@ export interface UpsertApplicationCommands extends CreateApplicationCommand { /** * @link https://discord.com/developers/docs/interactions/application-commands#edit-application-command-permissions - * */ + */ export interface ApplicationCommandPermissions { id: Snowflake; type: ApplicationCommandPermissionTypes; @@ -70,11 +75,11 @@ export interface ApplicationCommandPermissions { /** * @link https://discord.com/developers/docs/interactions/application-commands#edit-application-command-permissions - * */ + */ export interface ApplicationCommandPermissions { - id: Snowflake; - type: ApplicationCommandPermissionTypes; - permission: boolean; + id: Snowflake; + type: ApplicationCommandPermissionTypes; + permission: boolean; } // END INTERACTIONS @@ -189,22 +194,24 @@ export class Session extends EventEmitter { guildId ? Routes.GUILD_APPLICATION_COMMANDS(this.applicationId, guildId) : Routes.APPLICATION_COMMANDS(this.applicationId), - this.isContextApplicationCommand(options) ? { - name: options.name, - name_localizations: options.nameLocalizations, - type: options.type, - } : { - name: options.name, - name_localizations: options.nameLocalizations, - description: options.description, - description_localizations: options.descriptionLocalizations, - type: options.type, - options: options.options, - default_member_permissions: options.defaultMemberPermissions - ? new Permissions(options.defaultMemberPermissions).bitfield.toString() - : undefined, - dm_permission: options.dmPermission, - }, + this.isContextApplicationCommand(options) + ? { + name: options.name, + name_localizations: options.nameLocalizations, + type: options.type, + } + : { + name: options.name, + name_localizations: options.nameLocalizations, + description: options.description, + description_localizations: options.descriptionLocalizations, + type: options.type, + options: options.options, + default_member_permissions: options.defaultMemberPermissions + ? new Permissions(options.defaultMemberPermissions).bitfield.toString() + : undefined, + dm_permission: options.dmPermission, + }, ); } @@ -232,8 +239,8 @@ export class Session extends EventEmitter { permissions: options, }, { - headers: { authorization: `Bearer ${bearerToken}` } - } + headers: { authorization: `Bearer ${bearerToken}` }, + }, ); } @@ -279,10 +286,12 @@ export class Session extends EventEmitter { guildId ? Routes.GUILD_APPLICATION_COMMANDS(this.applicationId, guildId) : Routes.APPLICATION_COMMANDS(this.applicationId, id), - this.isContextApplicationCommand(options) ? { + this.isContextApplicationCommand(options) + ? { name: options.name, type: options.type, - } : { + } + : { name: options.name, description: options.description, type: options.type, @@ -291,22 +300,28 @@ export class Session extends EventEmitter { ); } - upsertApplicationCommands(options: Array, guildId?: Snowflake) { + upsertApplicationCommands( + options: Array, + guildId?: Snowflake, + ) { return this.rest.runMethod( this.rest, "PUT", guildId ? Routes.GUILD_APPLICATION_COMMANDS(this.applicationId, guildId) : Routes.APPLICATION_COMMANDS(this.applicationId), - options.map((o) => this.isContextApplicationCommand(o) ? { - name: o.name, - type: o.type, - } : { - name: o.name, - description: o.description, - type: o.type, - options: o.options, - } + options.map((o) => + this.isContextApplicationCommand(o) + ? { + name: o.name, + type: o.type, + } + : { + name: o.name, + description: o.description, + type: o.type, + options: o.options, + } ), ); } diff --git a/packages/biscuit/Util.ts b/packages/biscuit/Util.ts index a0e019a..263ed8b 100644 --- a/packages/biscuit/Util.ts +++ b/packages/biscuit/Util.ts @@ -38,7 +38,7 @@ export type ComponentBuilder = | SelectMenuBuilder | ButtonBuilder; -/*** +/** * * Utility type */ export type ComponentEmoji = { diff --git a/packages/biscuit/structures/ThreadMember.ts b/packages/biscuit/structures/ThreadMember.ts index 416f21e..bc4c194 100644 --- a/packages/biscuit/structures/ThreadMember.ts +++ b/packages/biscuit/structures/ThreadMember.ts @@ -7,7 +7,7 @@ import * as Routes from "../Routes.ts"; /** * A member that comes from a thread * @link https://discord.com/developers/docs/resources/channel#thread-member-object - * **/ + * * */ export class ThreadMember implements Model { constructor(session: Session, data: DiscordThreadMember) { this.session = session; diff --git a/packages/biscuit/structures/guilds/Guild.ts b/packages/biscuit/structures/guilds/Guild.ts index ed5de0b..59cd1f3 100644 --- a/packages/biscuit/structures/guilds/Guild.ts +++ b/packages/biscuit/structures/guilds/Guild.ts @@ -499,13 +499,13 @@ export class Guild extends BaseGuild implements Model { }; } - /*** + /** * * Makes the bot leave the guild */ async leave() { } - /*** + /** * * Deletes a guild */ async delete() { @@ -579,9 +579,8 @@ export class Guild extends BaseGuild implements Model { splash: "splashURL" in options ? options.splashURL || urlToBase64(options.splashURL!) : options.splashHash || Util.iconBigintToHash(options.iconHash!), - banner: "bannerURL" in options - ? options.bannerURL || urlToBase64(options.bannerURL!) - : options.bannerHash || Util.iconBigintToHash(options.bannerHash!), + banner: "bannerURL" in options ? options.bannerURL || urlToBase64(options.bannerURL!) + : options.bannerHash || Util.iconBigintToHash(options.bannerHash!), discovery_splash: "discoverySplashURL" in options ? options.discoverySplashURL || urlToBase64(options.discoverySplashURL!) : options.discoverySplashHash || Util.iconBigintToHash(options.discoverySplashHash!), diff --git a/packages/biscuit/structures/interactions/ComponentInteraction.ts b/packages/biscuit/structures/interactions/ComponentInteraction.ts index 95dd40e..d77c01f 100644 --- a/packages/biscuit/structures/interactions/ComponentInteraction.ts +++ b/packages/biscuit/structures/interactions/ComponentInteraction.ts @@ -2,7 +2,7 @@ import type { Model } from "../Base.ts"; import type { Snowflake } from "../../Snowflake.ts"; import type { Session } from "../../Session.ts"; import type { DiscordInteraction, InteractionTypes } from "../../../discordeno/mod.ts"; -import type { InteractionResponse, InteractionApplicationCommandCallbackData } from "./CommandInteraction.ts"; +import type { InteractionApplicationCommandCallbackData, InteractionResponse } from "./CommandInteraction.ts"; import { MessageComponentTypes } from "../../../discordeno/mod.ts"; import CommandInteraction from "./CommandInteraction.ts"; import BaseInteraction from "./BaseInteraction.ts";