Skip to content

Commit

Permalink
chore(typings): merge upstream changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@izexi
izexi committed Jan 22, 2021
1 parent d837114 commit df89d04
Showing 1 changed file with 162 additions and 56 deletions.
218 changes: 162 additions & 56 deletions typings/index.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2099,18 +2099,25 @@ declare module 'discord.js' {
editMessage(message: MessageResolvable, options: WebhookEditMessageOptions): Promise<Message | object>;
send(
content: APIMessageContentResolvable | (WebhookMessageOptions & { split?: false }) | MessageAdditions,
): Promise<Message>;
send(options: WebhookMessageOptions & { split: true | SplitOptions }): Promise<Message[]>;
send(options: WebhookMessageOptions | APIMessage): Promise<Message | Message[]>;
): Promise<Message | WebhookRawMessageResponse>;
send(
options: WebhookMessageOptions & { split: true | SplitOptions },
): Promise<(Message | WebhookRawMessageResponse)[]>;
send(
options: WebhookMessageOptions | APIMessage,
): Promise<Message | WebhookRawMessageResponse | (Message | WebhookRawMessageResponse)[]>;
send(
content: StringResolvable,
options: (WebhookMessageOptions & { split?: false }) | MessageAdditions,
): Promise<Message>;
): Promise<Message | WebhookRawMessageResponse>;
send(
content: StringResolvable,
options: WebhookMessageOptions & { split: true | SplitOptions },
): Promise<Message[]>;
send(content: StringResolvable, options: WebhookMessageOptions): Promise<Message | Message[]>;
): Promise<(Message | WebhookRawMessageResponse)[]>;
send(
content: StringResolvable,
options: WebhookMessageOptions,
): Promise<Message | WebhookRawMessageResponse | (Message | WebhookRawMessageResponse)[]>;
sendSlackMessage(body: object): Promise<boolean>;
}

Expand Down Expand Up @@ -2205,6 +2212,95 @@ declare module 'discord.js' {

type APIMessageContentResolvable = string | number | boolean | bigint | symbol | readonly StringResolvable[];

interface APIRawMessage {
id: Snowflake;
type: number;
content: string;
channel_id: Snowflake;
author: {
bot?: true;
id: Snowflake;
username: string;
avatar: string | null;
discriminator: string;
};
attachments: {
id: Snowflake;
filename: string;
size: number;
url: string;
proxy_url: string;
height: number | null;
width: number | null;
}[];
embeds: {
title?: string;
type?: 'rich' | 'image' | 'video' | 'gifv' | 'article' | 'link';
description?: string;
url?: string;
timestamp?: string;
color?: number;
footer?: {
text: string;
icon_url?: string;
proxy_icon_url?: string;
};
image?: {
url?: string;
proxy_url?: string;
height?: number;
width?: number;
};
thumbnail?: {
url?: string;
proxy_url?: string;
height?: number;
width?: number;
};
video?: {
url?: string;
height?: number;
width?: number;
};
provider?: { name?: string; url?: string };
author?: {
name?: string;
url?: string;
icon_url?: string;
proxy_icon_url?: string;
};
fields?: {
name: string;
value: string;
inline?: boolean;
}[];
}[];
mentions: {
id: Snowflake;
username: string;
discriminator: string;
avatar: string | null;
bot?: true;
public_flags?: number;
member?: {
nick: string | null;
roles: Snowflake[];
joined_at: string;
premium_since?: string | null;
deaf: boolean;
mute: boolean;
};
}[];
mention_roles: Snowflake[];
pinned: boolean;
mention_everyone: boolean;
tts: boolean;
timestamp: string;
edited_timestamp: string | null;
flags: number;
webhook_id: Snowflake;
}

interface ApplicationAsset {
name: string;
id: Snowflake;
Expand Down Expand Up @@ -2276,60 +2372,60 @@ declare module 'discord.js' {
type ChannelResolvable = Channel | Snowflake;

interface ClientEvents {
channelCreate: [Channel];
channelDelete: [Channel | PartialDMChannel];
channelPinsUpdate: [Channel | PartialDMChannel, Date];
channelUpdate: [Channel, Channel];
debug: [string];
warn: [string];
disconnect: [any, number];
emojiCreate: [GuildEmoji];
emojiDelete: [GuildEmoji];
emojiUpdate: [GuildEmoji, GuildEmoji];
error: [Error];
guildBanAdd: [Guild, User];
guildBanRemove: [Guild, User];
guildCreate: [Guild];
guildDelete: [Guild];
guildUnavailable: [Guild];
guildIntegrationsUpdate: [Guild];
guildMemberAdd: [GuildMember];
guildMemberAvailable: [GuildMember | PartialGuildMember];
guildMemberRemove: [GuildMember | PartialGuildMember];
channelCreate: [channel: Channel];
channelDelete: [channel: Channel | PartialDMChannel];
channelPinsUpdate: [channel: Channel | PartialDMChannel, date: Date];
channelUpdate: [oldChannel: Channel, newChannel: Channel];
debug: [message: string];
warn: [message: string];
disconnect: [closeEvent: any, status: number];
emojiCreate: [emoji: GuildEmoji];
emojiDelete: [emoji: GuildEmoji];
emojiUpdate: [oldEmoji: GuildEmoji, newEmoji: GuildEmoji];
error: [error: Error];
guildBanAdd: [guild: Guild, user: User];
guildBanRemove: [guild: Guild, user: User];
guildCreate: [guild: Guild];
guildDelete: [guild: Guild];
guildUnavailable: [guild: Guild];
guildIntegrationsUpdate: [guild: Guild];
guildMemberAdd: [member: GuildMember];
guildMemberAvailable: [member: GuildMember | PartialGuildMember];
guildMemberRemove: [member: GuildMember | PartialGuildMember];
guildMembersChunk: [
Collection<Snowflake, GuildMember>,
Guild,
{ count: number; index: number; nonce: string | undefined },
members: Collection<Snowflake, GuildMember>,
guild: Guild,
data: { count: number; index: number; nonce: string | undefined },
];
guildMemberSpeaking: [GuildMember | PartialGuildMember, Readonly<Speaking>];
guildMemberUpdate: [GuildMember | PartialGuildMember, GuildMember];
guildUpdate: [Guild, Guild];
inviteCreate: [Invite];
inviteDelete: [Invite];
message: [Message];
messageDelete: [Message | PartialMessage];
messageReactionRemoveAll: [Message | PartialMessage];
messageReactionRemoveEmoji: [MessageReaction];
messageDeleteBulk: [Collection<Snowflake, Message | PartialMessage>];
messageReactionAdd: [MessageReaction, User | PartialUser];
messageReactionRemove: [MessageReaction, User | PartialUser];
messageUpdate: [Message | PartialMessage, Message | PartialMessage];
presenceUpdate: [Presence | undefined, Presence];
rateLimit: [RateLimitData];
guildMemberSpeaking: [member: GuildMember | PartialGuildMember, speaking: Readonly<Speaking>];
guildMemberUpdate: [oldMember: GuildMember | PartialGuildMember, newMember: GuildMember];
guildUpdate: [oldGuild: Guild, newGuild: Guild];
inviteCreate: [invite: Invite];
inviteDelete: [invite: Invite];
message: [message: Message];
messageDelete: [message: Message | PartialMessage];
messageReactionRemoveAll: [message: Message | PartialMessage];
messageReactionRemoveEmoji: [reaction: MessageReaction];
messageDeleteBulk: [messages: Collection<Snowflake, Message | PartialMessage>];
messageReactionAdd: [message: MessageReaction, user: User | PartialUser];
messageReactionRemove: [reaction: MessageReaction, user: User | PartialUser];
messageUpdate: [oldMessage: Message | PartialMessage, newMessage: Message | PartialMessage];
presenceUpdate: [oldPresence: Presence | undefined, newPresence: Presence];
rateLimit: [rateLimitData: RateLimitData];
ready: [];
invalidated: [];
roleCreate: [Role];
roleDelete: [Role];
roleUpdate: [Role, Role];
typingStart: [Channel | PartialDMChannel, User | PartialUser];
userUpdate: [User | PartialUser, User];
voiceStateUpdate: [VoiceState, VoiceState];
webhookUpdate: [TextChannel];
shardDisconnect: [CloseEvent, number];
shardError: [Error, number];
shardReady: [number, Set<Snowflake> | undefined];
shardReconnecting: [number];
shardResume: [number, number];
roleCreate: [role: Role];
roleDelete: [role: Role];
roleUpdate: [oldRole: Role, newRole: Role];
typingStart: [channel: Channel | PartialDMChannel, user: User | PartialUser];
userUpdate: [oldUser: User | PartialUser, newUser: User];
voiceStateUpdate: [oldState: VoiceState, newState: VoiceState];
webhookUpdate: [channel: TextChannel];
shardDisconnect: [closeEvent: CloseEvent, shardID: number];
shardError: [error: Error, shardID: number];
shardReady: [shardID: number, unavailableGuilds: Set<Snowflake> | undefined];
shardReconnecting: [shardID: number];
shardResume: [shardID: number, replayedEvents: number];
}

interface ClientOptions {
Expand Down Expand Up @@ -3216,6 +3312,16 @@ declare module 'discord.js' {
split?: boolean | SplitOptions;
}

type WebhookRawMessageResponse = Omit<APIRawMessage, 'author'> & {
author: {
bot: true;
id: Snowflake;
username: string;
avatar: string | null;
discriminator: '0000';
};
};

type WebhookTypes = 'Incoming' | 'Channel Follower';

interface WebSocketOptions {
Expand Down

0 comments on commit df89d04

Please sign in to comment.