This commit is contained in:
Yuzu 2022-07-13 13:00:35 -05:00
parent ceef031f10
commit 2c74350252
8 changed files with 16 additions and 23 deletions

View File

@ -46,7 +46,7 @@ import type { Interaction } from "./structures/interactions/InteractionFactory.t
import { AutoModerationRule } from "./structures/AutoModerationRule.ts"; import { AutoModerationRule } from "./structures/AutoModerationRule.ts";
import { AutoModerationExecution } from "./structures/AutoModerationExecution.ts"; import { AutoModerationExecution } from "./structures/AutoModerationExecution.ts";
import { type Channel, ChannelFactory, GuildChannel, ThreadChannel } from "./structures/channels.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 { ScheduledEvent } from "./structures/GuildScheduledEvent.ts";
import { Presence } from "./structures/Presence.ts"; import { Presence } from "./structures/Presence.ts";
@ -55,7 +55,7 @@ import Member from "./structures/Member.ts";
import Message from "./structures/Message.ts"; import Message from "./structures/Message.ts";
import User from "./structures/User.ts"; import User from "./structures/User.ts";
import Integration from "./structures/Integration.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 InteractionFactory from "./structures/interactions/InteractionFactory.ts";
import { InviteCreate, NewInviteCreate } from "./structures/Invite.ts"; import { InviteCreate, NewInviteCreate } from "./structures/Invite.ts";
import { import {
@ -325,15 +325,15 @@ export const INVITE_DELETE: RawHandler<DiscordInviteDelete> = (session, _shardId
session.emit("inviteDelete", { channelId: data.channel_id, guildId: data.guild_id, code: data.code }); session.emit("inviteDelete", { channelId: data.channel_id, guildId: data.guild_id, code: data.code });
}; };
export const STAGE_INSTANCE_CREATE: RawHandler<DiscordStageInstance> = (session, _shardId, payload) => { export const STAGE_INSTANCE_CREATE: RawHandler<DiscordStageInstanceB> = (session, _shardId, payload) => {
session.emit("stageInstanceCreate", new StageInstance(session, payload)); session.emit("stageInstanceCreate", new StageInstance(session, payload));
}; };
export const STAGE_INSTANCE_UPDATE: RawHandler<DiscordStageInstance> = (session, _shardId, payload) => { export const STAGE_INSTANCE_UPDATE: RawHandler<DiscordStageInstanceB> = (session, _shardId, payload) => {
session.emit("stageInstanceUpdate", new StageInstance(session, payload)); session.emit("stageInstanceUpdate", new StageInstance(session, payload));
}; };
export const STAGE_INSTANCE_DELETE: RawHandler<DiscordStageInstance> = (session, _shardId, payload) => { export const STAGE_INSTANCE_DELETE: RawHandler<DiscordStageInstanceB> = (session, _shardId, payload) => {
session.emit("stageInstanceDelete", new StageInstance(session, payload)); session.emit("stageInstanceDelete", new StageInstance(session, payload));
}; };

View File

@ -39,10 +39,7 @@ export * from "./structures/components/SelectMenuComponent.ts";
export * from "./structures/components/TextInputComponent.ts"; export * from "./structures/components/TextInputComponent.ts";
// guilds // guilds
export * from "./structures/guilds/AnonymousGuild.ts"; export * from "./structures/guilds.ts";
export * from "./structures/guilds/BaseGuild.ts";
export * from "./structures/guilds/Guild.ts";
export * from "./structures/guilds/InviteGuild.ts";
// builders // builders
export * from "./structures/builders/EmbedBuilder.ts"; export * from "./structures/builders/EmbedBuilder.ts";

View File

@ -2,8 +2,8 @@ import type { Model } from "./Base.ts";
import type { Snowflake } from "../Snowflake.ts"; import type { Snowflake } from "../Snowflake.ts";
import type { Session } from "../Session.ts"; import type { Session } from "../Session.ts";
import type { DiscordEmoji } from "../../discordeno/mod.ts"; import type { DiscordEmoji } from "../../discordeno/mod.ts";
import type { ModifyGuildEmoji } from "./guilds/Guild.ts"; import type { ModifyGuildEmoji } from "./guilds.ts";
import Guild from "./guilds/Guild.ts"; import Guild from "./guilds.ts";
import Emoji from "./Emoji.ts"; import Emoji from "./Emoji.ts";
import User from "./User.ts"; import User from "./User.ts";
import * as Routes from "../Routes.ts"; import * as Routes from "../Routes.ts";

View File

@ -14,9 +14,8 @@ import type {
import { TargetTypes } from "../../discordeno/mod.ts"; import { TargetTypes } from "../../discordeno/mod.ts";
import { GuildChannel } from "./channels.ts"; import { GuildChannel } from "./channels.ts";
import { Member } from "./Member.ts"; import { Member } from "./Member.ts";
import InviteGuild from "./guilds/InviteGuild.ts"; import { InviteGuild, Guild } from "./guilds.ts";
import User from "./User.ts"; import User from "./User.ts";
import Guild from "./guilds/Guild.ts";
import Application from "./Application.ts"; import Application from "./Application.ts";
export interface InviteStageInstance { export interface InviteStageInstance {

View File

@ -3,10 +3,10 @@ import type { Snowflake } from "../Snowflake.ts";
import type { Session } from "../Session.ts"; import type { Session } from "../Session.ts";
import type { DiscordMemberWithUser } from "../../discordeno/mod.ts"; import type { DiscordMemberWithUser } from "../../discordeno/mod.ts";
import type { ImageFormat, ImageSize } from "../Util.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 Util from "../Util.ts";
import User from "./User.ts"; import User from "./User.ts";
import Guild from "./guilds/Guild.ts";
import * as Routes from "../Routes.ts"; import * as Routes from "../Routes.ts";
/** /**

View File

@ -103,7 +103,6 @@ export class Message implements Model {
this.reactions = data.reactions?.map((react) => new MessageReaction(session, react)) ?? []; this.reactions = data.reactions?.map((react) => new MessageReaction(session, react)) ?? [];
this.attachments = data.attachments.map((attachment) => new Attachment(session, attachment)); this.attachments = data.attachments.map((attachment) => new Attachment(session, attachment));
this.embeds = data.embeds; this.embeds = data.embeds;
this.stickers = data.stickers?.map((sticker) => new Sticker(session, sticker)) ?? [];
if (data.thread && data.guild_id) { if (data.thread && data.guild_id) {
this.thread = new ThreadChannel(session, 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; timestamp: number;
editedTimestamp?: number; editedTimestamp?: number;
/** @deprecated */
stickers?: StickerItem[]; stickers?: StickerItem[];
reactions: MessageReaction[]; reactions: MessageReaction[];
attachments: Attachment[]; attachments: Attachment[];
@ -170,9 +170,6 @@ export class Message implements Model {
thread?: ThreadChannel; thread?: ThreadChannel;
components: Component[]; components: Component[];
/** @deprecated */
stickers: Sticker[];
webhook?: WebhookAuthor; webhook?: WebhookAuthor;
activity?: { activity?: {
partyId?: Snowflake; partyId?: Snowflake;

View File

@ -2,9 +2,9 @@ import type { Model } from "./Base.ts";
import type { DiscordRole } from "../../discordeno/mod.ts"; import type { DiscordRole } from "../../discordeno/mod.ts";
import type { Session } from "../Session.ts"; import type { Session } from "../Session.ts";
import { Snowflake } from "../Snowflake.ts"; import { Snowflake } from "../Snowflake.ts";
import { Guild, type ModifyGuildRole } from "./guilds.ts";
import Permissions from "./Permissions.ts"; import Permissions from "./Permissions.ts";
import Util from "../Util.ts"; import Util from "../Util.ts";
import Guild, { type ModifyGuildRole } from "./guilds/Guild.ts";
export class Role implements Model { export class Role implements Model {
constructor(session: Session, data: DiscordRole, guildId: Snowflake) { constructor(session: Session, data: DiscordRole, guildId: Snowflake) {

View File

@ -4,7 +4,7 @@ import type { Snowflake } from "../Snowflake.ts";
import type { DiscordStageInstance as DiscordAutoClosingStageInstance } from "../../discordeno/mod.ts"; import type { DiscordStageInstance as DiscordAutoClosingStageInstance } from "../../discordeno/mod.ts";
import * as Routes from "../Routes.ts"; import * as Routes from "../Routes.ts";
interface DiscordStageInstance extends DiscordAutoClosingStageInstance { export interface DiscordStageInstanceB extends DiscordAutoClosingStageInstance {
privacy_level: PrivacyLevels; privacy_level: PrivacyLevels;
discoverable_disabled: boolean; discoverable_disabled: boolean;
guild_scheduled_event_id: Snowflake; guild_scheduled_event_id: Snowflake;
@ -16,7 +16,7 @@ export enum PrivacyLevels {
} }
export class StageInstance implements Model { export class StageInstance implements Model {
constructor(session: Session, data: DiscordStageInstance) { constructor(session: Session, data: DiscordStageInstanceB) {
this.session = session; this.session = session;
this.id = data.id; this.id = data.id;
this.channelId = data.channel_id; this.channelId = data.channel_id;
@ -40,7 +40,7 @@ export class StageInstance implements Model {
guildScheduledEventId: Snowflake; guildScheduledEventId: Snowflake;
async edit(options: { topic?: string; privacyLevel?: PrivacyLevels }) { async edit(options: { topic?: string; privacyLevel?: PrivacyLevels }) {
const stageInstance = await this.session.rest.runMethod<DiscordStageInstance>( const stageInstance = await this.session.rest.runMethod<DiscordStageInstanceB>(
this.session.rest, this.session.rest,
"PATCH", "PATCH",
Routes.STAGE_INSTANCE(this.id), Routes.STAGE_INSTANCE(this.id),