From 2c74350252fc68b1c995b32342b3fb6a16e66870 Mon Sep 17 00:00:00 2001 From: Yuzu Date: Wed, 13 Jul 2022 13:00:35 -0500 Subject: [PATCH] whatever --- packages/biscuit/Actions.ts | 10 +++++----- packages/biscuit/mod.ts | 5 +---- packages/biscuit/structures/GuildEmoji.ts | 4 ++-- packages/biscuit/structures/Invite.ts | 3 +-- packages/biscuit/structures/Member.ts | 4 ++-- packages/biscuit/structures/Message.ts | 5 +---- packages/biscuit/structures/Role.ts | 2 +- packages/biscuit/structures/StageInstance.ts | 6 +++--- 8 files changed, 16 insertions(+), 23 deletions(-) diff --git a/packages/biscuit/Actions.ts b/packages/biscuit/Actions.ts index 0d0a46a..89e942d 100644 --- a/packages/biscuit/Actions.ts +++ b/packages/biscuit/Actions.ts @@ -46,7 +46,7 @@ import type { Interaction } from "./structures/interactions/InteractionFactory.t import { AutoModerationRule } from "./structures/AutoModerationRule.ts"; import { AutoModerationExecution } from "./structures/AutoModerationExecution.ts"; import { type Channel, ChannelFactory, GuildChannel, ThreadChannel } from "./structures/channels.ts"; -import { type DiscordStageInstance, StageInstance } from "./structures/StageInstance.ts"; +import { type DiscordStageInstanceB, StageInstance } from "./structures/StageInstance.ts"; import { ScheduledEvent } from "./structures/GuildScheduledEvent.ts"; import { Presence } from "./structures/Presence.ts"; @@ -55,7 +55,7 @@ import Member from "./structures/Member.ts"; import Message from "./structures/Message.ts"; import User from "./structures/User.ts"; import Integration from "./structures/Integration.ts"; -import Guild from "./structures/guilds/Guild.ts"; +import { Guild } from "./structures/guilds.ts"; import InteractionFactory from "./structures/interactions/InteractionFactory.ts"; import { InviteCreate, NewInviteCreate } from "./structures/Invite.ts"; import { @@ -325,15 +325,15 @@ export const INVITE_DELETE: RawHandler = (session, _shardId session.emit("inviteDelete", { channelId: data.channel_id, guildId: data.guild_id, code: data.code }); }; -export const STAGE_INSTANCE_CREATE: RawHandler = (session, _shardId, payload) => { +export const STAGE_INSTANCE_CREATE: RawHandler = (session, _shardId, payload) => { session.emit("stageInstanceCreate", new StageInstance(session, payload)); }; -export const STAGE_INSTANCE_UPDATE: RawHandler = (session, _shardId, payload) => { +export const STAGE_INSTANCE_UPDATE: RawHandler = (session, _shardId, payload) => { session.emit("stageInstanceUpdate", new StageInstance(session, payload)); }; -export const STAGE_INSTANCE_DELETE: RawHandler = (session, _shardId, payload) => { +export const STAGE_INSTANCE_DELETE: RawHandler = (session, _shardId, payload) => { session.emit("stageInstanceDelete", new StageInstance(session, payload)); }; diff --git a/packages/biscuit/mod.ts b/packages/biscuit/mod.ts index 801fcd3..3e91371 100644 --- a/packages/biscuit/mod.ts +++ b/packages/biscuit/mod.ts @@ -39,10 +39,7 @@ export * from "./structures/components/SelectMenuComponent.ts"; export * from "./structures/components/TextInputComponent.ts"; // guilds -export * from "./structures/guilds/AnonymousGuild.ts"; -export * from "./structures/guilds/BaseGuild.ts"; -export * from "./structures/guilds/Guild.ts"; -export * from "./structures/guilds/InviteGuild.ts"; +export * from "./structures/guilds.ts"; // builders export * from "./structures/builders/EmbedBuilder.ts"; diff --git a/packages/biscuit/structures/GuildEmoji.ts b/packages/biscuit/structures/GuildEmoji.ts index 56027c5..26e8216 100644 --- a/packages/biscuit/structures/GuildEmoji.ts +++ b/packages/biscuit/structures/GuildEmoji.ts @@ -2,8 +2,8 @@ import type { Model } from "./Base.ts"; import type { Snowflake } from "../Snowflake.ts"; import type { Session } from "../Session.ts"; import type { DiscordEmoji } from "../../discordeno/mod.ts"; -import type { ModifyGuildEmoji } from "./guilds/Guild.ts"; -import Guild from "./guilds/Guild.ts"; +import type { ModifyGuildEmoji } from "./guilds.ts"; +import Guild from "./guilds.ts"; import Emoji from "./Emoji.ts"; import User from "./User.ts"; import * as Routes from "../Routes.ts"; diff --git a/packages/biscuit/structures/Invite.ts b/packages/biscuit/structures/Invite.ts index 4bf1b61..24c9119 100644 --- a/packages/biscuit/structures/Invite.ts +++ b/packages/biscuit/structures/Invite.ts @@ -14,9 +14,8 @@ import type { import { TargetTypes } from "../../discordeno/mod.ts"; import { GuildChannel } from "./channels.ts"; import { Member } from "./Member.ts"; -import InviteGuild from "./guilds/InviteGuild.ts"; +import { InviteGuild, Guild } from "./guilds.ts"; import User from "./User.ts"; -import Guild from "./guilds/Guild.ts"; import Application from "./Application.ts"; export interface InviteStageInstance { diff --git a/packages/biscuit/structures/Member.ts b/packages/biscuit/structures/Member.ts index 3b711e9..287eb34 100644 --- a/packages/biscuit/structures/Member.ts +++ b/packages/biscuit/structures/Member.ts @@ -3,10 +3,10 @@ import type { Snowflake } from "../Snowflake.ts"; import type { Session } from "../Session.ts"; import type { DiscordMemberWithUser } from "../../discordeno/mod.ts"; import type { ImageFormat, ImageSize } from "../Util.ts"; -import type { CreateGuildBan, ModifyGuildMember } from "./guilds/Guild.ts"; +import type { CreateGuildBan, ModifyGuildMember } from "./guilds.ts"; +import { Guild } from "./guilds.ts"; import Util from "../Util.ts"; import User from "./User.ts"; -import Guild from "./guilds/Guild.ts"; import * as Routes from "../Routes.ts"; /** diff --git a/packages/biscuit/structures/Message.ts b/packages/biscuit/structures/Message.ts index e4c064c..f3ef3b4 100644 --- a/packages/biscuit/structures/Message.ts +++ b/packages/biscuit/structures/Message.ts @@ -103,7 +103,6 @@ export class Message implements Model { this.reactions = data.reactions?.map((react) => new MessageReaction(session, react)) ?? []; this.attachments = data.attachments.map((attachment) => new Attachment(session, attachment)); this.embeds = data.embeds; - this.stickers = data.stickers?.map((sticker) => new Sticker(session, sticker)) ?? []; if (data.thread && data.guild_id) { this.thread = new ThreadChannel(session, data.thread, data.guild_id); @@ -162,6 +161,7 @@ export class Message implements Model { timestamp: number; editedTimestamp?: number; + /** @deprecated */ stickers?: StickerItem[]; reactions: MessageReaction[]; attachments: Attachment[]; @@ -170,9 +170,6 @@ export class Message implements Model { thread?: ThreadChannel; components: Component[]; - /** @deprecated */ - stickers: Sticker[]; - webhook?: WebhookAuthor; activity?: { partyId?: Snowflake; diff --git a/packages/biscuit/structures/Role.ts b/packages/biscuit/structures/Role.ts index b0057cd..b879c8b 100644 --- a/packages/biscuit/structures/Role.ts +++ b/packages/biscuit/structures/Role.ts @@ -2,9 +2,9 @@ import type { Model } from "./Base.ts"; import type { DiscordRole } from "../../discordeno/mod.ts"; import type { Session } from "../Session.ts"; import { Snowflake } from "../Snowflake.ts"; +import { Guild, type ModifyGuildRole } from "./guilds.ts"; import Permissions from "./Permissions.ts"; import Util from "../Util.ts"; -import Guild, { type ModifyGuildRole } from "./guilds/Guild.ts"; export class Role implements Model { constructor(session: Session, data: DiscordRole, guildId: Snowflake) { diff --git a/packages/biscuit/structures/StageInstance.ts b/packages/biscuit/structures/StageInstance.ts index b087228..24d1825 100644 --- a/packages/biscuit/structures/StageInstance.ts +++ b/packages/biscuit/structures/StageInstance.ts @@ -4,7 +4,7 @@ import type { Snowflake } from "../Snowflake.ts"; import type { DiscordStageInstance as DiscordAutoClosingStageInstance } from "../../discordeno/mod.ts"; import * as Routes from "../Routes.ts"; -interface DiscordStageInstance extends DiscordAutoClosingStageInstance { +export interface DiscordStageInstanceB extends DiscordAutoClosingStageInstance { privacy_level: PrivacyLevels; discoverable_disabled: boolean; guild_scheduled_event_id: Snowflake; @@ -16,7 +16,7 @@ export enum PrivacyLevels { } export class StageInstance implements Model { - constructor(session: Session, data: DiscordStageInstance) { + constructor(session: Session, data: DiscordStageInstanceB) { this.session = session; this.id = data.id; this.channelId = data.channel_id; @@ -40,7 +40,7 @@ export class StageInstance implements Model { guildScheduledEventId: Snowflake; async edit(options: { topic?: string; privacyLevel?: PrivacyLevels }) { - const stageInstance = await this.session.rest.runMethod( + const stageInstance = await this.session.rest.runMethod( this.session.rest, "PATCH", Routes.STAGE_INSTANCE(this.id),