@buape/carbon 0.1.0 → 0.1.2

package/src/abstracts/BaseCommand.ts

@@ -2,8 +2,11 @@ import {
 	ApplicationCommandType,
 	type RESTPostAPIApplicationCommandsJSONBody
 } from "discord-api-types/v10"
-import { ApplicationIntegrationType, InteractionContextType } from "../index.js"
-import type { BaseComponent } from "./BaseComponent.js"
+import {
+	ApplicationIntegrationType,
+	type BaseComponent,
+	InteractionContextType
+} from "../index.js"
 
 /**
  * Represents the base data of a command that the user creates
@@ -52,6 +55,7 @@ export abstract class BaseCommand {
 	 * You mount these here so the handler can access them
 	 */
 	components?: BaseComponent[] = []
+
 	/**
 	 * All the paginators that the command is able to use.
 	 * You mount these here so the handler can access them

package/src/abstracts/BaseInteraction.ts

@@ -9,6 +9,7 @@ import type { Client } from "../classes/Client.js"
 import type { Row } from "../classes/Row.js"
 import { channelFactory } from "../factories/channelFactory.js"
 import { Guild } from "../structures/Guild.js"
+import { GuildMember } from "../structures/GuildMember.js"
 import { Message } from "../structures/Message.js"
 import { User } from "../structures/User.js"
 import { Base } from "./Base.js"
@@ -109,6 +110,12 @@ export abstract class BaseInteraction<T extends APIInteraction> extends Base {
 		return channelFactory(this.client, this.rawData.channel as APIChannel)
 	}
 
+	get member() {
+		if (!this.rawData.member) return null
+		if (!this.guild) return null
+		return new GuildMember(this.client, this.rawData.member, this.guild)
+	}
+
 	/**
 	 * Reply to an interaction.
 	 * If the interaction is deferred, this will edit the original response.

package/src/classes/Client.ts

@@ -58,6 +58,11 @@ export type ClientOptions = {
 	 * ```
 	 */
 	mode: ClientMode
+	/**
+	 * The route to use for interactions on your server.
+	 * @default "/interaction"
+	 */
+	interactionRoute?: string
 	/**
 	 * The options used to initialize the request client, if you want to customize it.
 	 */
@@ -150,71 +155,71 @@ export class Client {
 				return Response.redirect(this.options.redirectUrl, 302)
 			throw new StatusError(404)
 		})
-		this.router.post("/interaction", async (req, ctx?: ExecutionContext) => {
-			const isValid = await this.validateInteraction(req)
-			if (!isValid) {
-				return new Response("Invalid request signature", { status: 401 })
+		this.router.post(
+			this.options.interactionRoute || "/interaction",
+			async (req, ctx?: ExecutionContext) => {
+				return await this.handle(req, ctx)
 			}
+		)
+	}
 
-			const rawInteraction = (await req.json()) as unknown as APIInteraction
-			if (rawInteraction.type === InteractionType.Ping) {
-				return json({
-					type: InteractionResponseType.Pong
-				})
-			}
+	/**
+	 * If you want use a custom handler for HTTP requests instead of Carbon's router, you can use this method.
+	 * @param req The request to handle
+	 * @param ctx Cloudflare Workers only. The execution context of the request, provided in the fetch handler from CF.
+	 * @returns A response to send back to the client.
+	 */
+	public async handle(req: IRequestStrict, ctx?: ExecutionContext) {
+		const isValid = await this.validateInteraction(req)
+		if (!isValid) {
+			return new Response("Invalid request signature", { status: 401 })
+		}
 
-			if (rawInteraction.type === InteractionType.ApplicationCommand) {
-				if (ctx?.waitUntil) {
-					ctx.waitUntil(
-						(async () => {
-							await this.commandHandler.handleCommandInteraction(rawInteraction)
-						})()
-					)
-				} else {
-					await this.commandHandler.handleCommandInteraction(rawInteraction)
-				}
-			}
-			if (
-				rawInteraction.type === InteractionType.ApplicationCommandAutocomplete
-			) {
-				if (ctx?.waitUntil) {
-					ctx.waitUntil(
-						(async () => {
-							await this.commandHandler.handleAutocompleteInteraction(
-								rawInteraction
-							)
-						})()
-					)
-				} else {
-					await this.commandHandler.handleAutocompleteInteraction(
-						rawInteraction
-					)
-				}
+		const rawInteraction = (await req.json()) as unknown as APIInteraction
+		if (rawInteraction.type === InteractionType.Ping) {
+			return json({
+				type: InteractionResponseType.Pong
+			})
+		}
+
+		if (rawInteraction.type === InteractionType.ApplicationCommand) {
+			if (ctx?.waitUntil) {
+				ctx.waitUntil(
+					(async () => {
+						await this.commandHandler.handleCommandInteraction(rawInteraction)
+					})()
+				)
+			} else {
+				await this.commandHandler.handleCommandInteraction(rawInteraction)
 			}
-			if (rawInteraction.type === InteractionType.ApplicationCommand) {
-				if (ctx?.waitUntil) {
-					ctx.waitUntil(
-						(async () => {
-							await this.commandHandler.handleCommandInteraction(rawInteraction)
-						})()
-					)
-				} else {
-					await this.commandHandler.handleCommandInteraction(rawInteraction)
-				}
+		}
+		if (
+			rawInteraction.type === InteractionType.ApplicationCommandAutocomplete
+		) {
+			if (ctx?.waitUntil) {
+				ctx.waitUntil(
+					(async () => {
+						await this.commandHandler.handleAutocompleteInteraction(
+							rawInteraction
+						)
+					})()
+				)
+			} else {
+				await this.commandHandler.handleAutocompleteInteraction(rawInteraction)
 			}
-			if (rawInteraction.type === InteractionType.MessageComponent) {
-				if (ctx?.waitUntil) {
-					ctx.waitUntil(
-						(async () => {
-							await this.componentHandler.handleInteraction(rawInteraction)
-						})()
-					)
-				} else {
-					await this.componentHandler.handleInteraction(rawInteraction)
-				}
+		}
+		if (rawInteraction.type === InteractionType.MessageComponent) {
+			if (ctx?.waitUntil) {
+				ctx.waitUntil(
+					(async () => {
+						await this.componentHandler.handleInteraction(rawInteraction)
+					})()
+				)
+			} else {
+				await this.componentHandler.handleInteraction(rawInteraction)
 			}
-			return new Response(null, { status: 202 })
-		})
+		}
+		return new Response(null, { status: 202 })
 	}
 
 	/**

package/src/classes/Command.ts

@@ -2,9 +2,11 @@ import {
 	type APIApplicationCommandBasicOption,
 	ApplicationCommandType
 } from "discord-api-types/v10"
-import { BaseCommand } from "../abstracts/BaseCommand.js"
-import type { CommandInteraction } from "../internals/CommandInteraction.js"
-import type { AutocompleteInteraction } from "../internals/AutocompleteInteraction.js"
+import {
+	type AutocompleteInteraction,
+	BaseCommand,
+	type CommandInteraction
+} from "../index.js"
 
 export type CommandOptions = APIApplicationCommandBasicOption[]
 

package/src/internals/AutocompleteInteraction.ts

@@ -1,14 +1,14 @@
-import type { BaseCommand } from "../abstracts/BaseCommand.js"
-import { BaseInteraction } from "../abstracts/BaseInteraction.js"
 import {
+	type APIApplicationCommandAutocompleteInteraction,
 	type APIApplicationCommandInteractionDataBasicOption,
 	ApplicationCommandOptionType,
 	ApplicationCommandType,
+	InteractionResponseType,
 	InteractionType,
-	type APIApplicationCommandAutocompleteInteraction,
-	Routes,
-	InteractionResponseType
+	Routes
 } from "discord-api-types/v10"
+import type { BaseCommand } from "../abstracts/BaseCommand.js"
+import { BaseInteraction } from "../abstracts/BaseInteraction.js"
 import type { Client } from "../classes/Client.js"
 import { Command } from "../classes/Command.js"
 import { OptionsHandler } from "./OptionsHandler.js"

package/src/internals/CommandHandler.ts

@@ -9,8 +9,8 @@ import { Base } from "../abstracts/Base.js"
 import { Command } from "../classes/Command.js"
 import { CommandWithSubcommandGroups } from "../classes/CommandWithSubcommandGroups.js"
 import { CommandWithSubcommands } from "../classes/CommandWithSubcommands.js"
-import { CommandInteraction } from "./CommandInteraction.js"
 import { AutocompleteInteraction } from "./AutocompleteInteraction.js"
+import { CommandInteraction } from "./CommandInteraction.js"
 
 export class CommandHandler extends Base {
 	private getCommand(

package/src/internals/OptionsHandler.ts

@@ -57,7 +57,8 @@ export class OptionsHandler extends Base {
 		const num = this.raw.find(
 			(x) => x.name === key && x.type === ApplicationCommandOptionType.Integer
 		)?.value
-		if (!num || !Number.isSafeInteger(num)) return undefined
+		if (!num || typeof num !== "number" || !Number.isSafeInteger(num))
+			return undefined
 		return num
 	}
 

package/src/structures/Guild.ts

@@ -1,6 +1,7 @@
 import {
 	type APIChannel,
 	type APIGuild,
+	type APIGuildMember,
 	type APIRole,
 	type RESTPostAPIGuildRoleJSONBody,
 	Routes
@@ -8,6 +9,7 @@ import {
 import { Base } from "../abstracts/Base.js"
 import type { Client } from "../classes/Client.js"
 import { channelFactory } from "../factories/channelFactory.js"
+import { GuildMember } from "./GuildMember.js"
 import { Role } from "./Role.js"
 
 export class Guild extends Base {
@@ -103,6 +105,16 @@ export class Guild extends Base {
 		return new Role(this.client, role)
 	}
 
+	/**
+	 * Get a member in the guild by ID
+	 */
+	async fetchMember(memberId: string) {
+		const member = (await this.client.rest.get(
+			Routes.guildMember(this.id, memberId)
+		)) as APIGuildMember
+		return new GuildMember(this.client, member, this)
+	}
+
 	/**
 	 * Get the URL of the guild's icon
 	 */

package/src/structures/GuildMember.ts

@@ -0,0 +1,231 @@
+import type { APIGuildMember, GuildMemberFlags } from "discord-api-types/v10"
+import { Base } from "../abstracts/Base.js"
+import type { Client } from "../classes/Client.js"
+import type { Guild } from "./Guild.js"
+import { Role } from "./Role.js"
+import { User } from "./User.js"
+
+export class GuildMember extends Base {
+	/**
+	 * The guild-specific nickname of the member.
+	 */
+	nickname?: string | null
+	/**
+	 * The guild-specific avatar hash of the member.
+	 * You can use {@link GuildMember.avatarUrl} to get the URL of the avatar.
+	 */
+	avatar?: string | null
+	/**
+	 * Is this member muted in Voice Channels?
+	 */
+	mute?: boolean | null
+	/**
+	 * Is this member deafened in Voice Channels?
+	 */
+	deaf?: boolean | null
+	/**
+	 * The date since this member boosted the guild, if applicable.
+	 */
+	premiumSince?: string | null
+	/**
+	 * The flags of the member.
+	 * @see https://discord.com/developers/docs/resources/guild#guild-member-object-guild-member-flags
+	 */
+	flags?: GuildMemberFlags | null
+	/**
+	 * The roles of the member
+	 */
+	roles?: Role[] | null
+	/**
+	 * The joined date of the member
+	 */
+	joinedAt?: string | null
+	/**
+	 * The date when the member's communication privileges (timeout) will be reinstated
+	 */
+	communicationDisabledUntil?: string | null
+	/**
+	 * Is this member yet to pass the guild's Membership Screening requirements?
+	 */
+	pending?: boolean | null
+	/**
+	 * The guild object of the member
+	 */
+	guild: Guild
+	/**
+	 * The user object of the member
+	 */
+	user?: User | null
+
+	private rawData: APIGuildMember | null = null
+
+	constructor(client: Client, rawData: APIGuildMember, guild: Guild) {
+		super(client)
+		this.rawData = rawData
+		this.guild = guild
+		this.setData(rawData)
+	}
+
+	private setData(data: typeof this.rawData) {
+		if (!data) throw new Error("Cannot set data without having data... smh")
+		this.rawData = data
+		this.nickname = data.nick
+		this.avatar = data.avatar
+		this.mute = data.mute
+		this.deaf = data.deaf
+		this.premiumSince = data.premium_since
+		this.flags = data.flags
+		this.roles = data.roles?.map((roleId) => new Role(this.client, roleId))
+		this.joinedAt = data.joined_at
+		this.communicationDisabledUntil = data.communication_disabled_until
+		this.pending = data.pending
+		this.user = data.user ? new User(this.client, data.user) : null
+	}
+
+	/**
+	 * Set the nickname of the member
+	 */
+	async setNickname(nickname: string | null): Promise<void> {
+		await this.client.rest.patch(
+			`/guilds/${this.guild?.id}/members/${this.user?.id}`,
+			{
+				body: {
+					nick: nickname
+				}
+			}
+		)
+		this.nickname = nickname
+	}
+
+	/**
+	 * Add a role to the member
+	 */
+	async addRole(roleId: string): Promise<void> {
+		await this.client.rest.put(
+			`/guilds/${this.guild?.id}/members/${this.user?.id}/roles/${roleId}`,
+			{}
+		)
+		this.roles?.push(new Role(this.client, roleId))
+	}
+
+	/**
+	 * Remove a role from the member
+	 */
+	async removeRole(roleId: string): Promise<void> {
+		await this.client.rest.delete(
+			`/guilds/${this.guild?.id}/members/${this.user?.id}/roles/${roleId}`
+		)
+		this.roles = this.roles?.filter((role) => role.id !== roleId)
+	}
+
+	/**
+	 * Kick the member from the guild
+	 */
+	async kick(): Promise<void> {
+		await this.client.rest.delete(
+			`/guilds/${this.guild?.id}/members/${this.user?.id}`
+		)
+	}
+
+	/**
+	 * Ban the member from the guild
+	 */
+	async ban(
+		options: { reason?: string; deleteMessageDays?: number } = {}
+	): Promise<void> {
+		await this.client.rest.put(
+			`/guilds/${this.guild?.id}/bans/${this.user?.id}`,
+			{
+				body: {
+					reason: options.reason,
+					delete_message_days: options.deleteMessageDays
+				}
+			}
+		)
+	}
+
+	/**
+	 * Mute a member in voice channels
+	 */
+	async muteMember(): Promise<void> {
+		await this.client.rest.patch(
+			`/guilds/${this.guild?.id}/members/${this.user?.id}`,
+			{
+				body: {
+					mute: true
+				}
+			}
+		)
+		this.mute = true
+	}
+
+	/**
+	 * Unmute a member in voice channels
+	 */
+	async unmuteMember(): Promise<void> {
+		await this.client.rest.patch(
+			`/guilds/${this.guild?.id}/members/${this.user?.id}`,
+			{
+				body: {
+					mute: false
+				}
+			}
+		)
+		this.mute = false
+	}
+
+	/**
+	 * Deafen a member in voice channels
+	 */
+	async deafenMember(): Promise<void> {
+		await this.client.rest.patch(
+			`/guilds/${this.guild?.id}/members/${this.user?.id}`,
+			{
+				body: {
+					deaf: true
+				}
+			}
+		)
+		this.deaf = true
+	}
+
+	/**
+	 * Undeafen a member in voice channels
+	 */
+	async undeafenMember(): Promise<void> {
+		await this.client.rest.patch(
+			`/guilds/${this.guild?.id}/members/${this.user?.id}`,
+			{
+				body: {
+					deaf: false
+				}
+			}
+		)
+		this.deaf = false
+	}
+
+	/**
+	 * Set or remove a timeout for a member in the guild
+	 */
+	async timeoutMember(communicationDisabledUntil: string): Promise<void> {
+		await this.client.rest.patch(
+			`/guilds/${this.guild?.id}/members/${this.user?.id}`,
+			{
+				body: {
+					communication_disabled_until: communicationDisabledUntil
+				}
+			}
+		)
+		this.communicationDisabledUntil = communicationDisabledUntil
+	}
+
+	/**
+	 * Get the URL of the member's guild-specific avatar
+	 */
+	get avatarUrl(): string | null {
+		if (!this.user) return null
+		return this.avatar
+			? `https://cdn.discordapp.com/guilds/${this.guild.id}/users/${this.user?.id}/${this.avatar}.png`
+			: null
+	}
+}