From 090eb79cbb41a0eda7da95450125fcfec89a6f47 Mon Sep 17 00:00:00 2001 From: Donovan Daniels Date: Mon, 2 Dec 2019 08:26:48 -0600 Subject: [PATCH 01/15] OldChannel is missing nsfw & type --- index.d.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.d.ts b/index.d.ts index f48b4b1c0..7288870fe 100644 --- a/index.d.ts +++ b/index.d.ts @@ -74,7 +74,9 @@ declare namespace Eris { interface OldChannel { name: string; position: string; + nsfw: boolean; topic?: string; + type: 1 | 2 | 4 | 5 | 6; bitrate?: number; permissionOverwrites: Collection; } From d54025041e3cf16dccdaadf4e07f7638c25d5160 Mon Sep 17 00:00:00 2001 From: Donovan Daniels Date: Mon, 2 Dec 2019 09:57:47 -0600 Subject: [PATCH 02/15] parentID & rateLimitPerUser Co-Authored-By: Skillz4Killz <23035000+Skillz4Killz@users.noreply.github.com> --- index.d.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.d.ts b/index.d.ts index 7288870fe..5138eb0a4 100644 --- a/index.d.ts +++ b/index.d.ts @@ -79,6 +79,8 @@ declare namespace Eris { type: 1 | 2 | 4 | 5 | 6; bitrate?: number; permissionOverwrites: Collection; + parentID?: string; + rateLimitPerUser?: number; } type FriendSuggestionReasons = { type: number; platform_type: string; name: string }[]; From 9947ead5ff685a8278f6ddc6c720d525536b6c28 Mon Sep 17 00:00:00 2001 From: Donovan Daniels Date: Mon, 2 Dec 2019 10:17:49 -0600 Subject: [PATCH 03/15] type specifics for channels --- index.d.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/index.d.ts b/index.d.ts index 5138eb0a4..29a4a7719 100644 --- a/index.d.ts +++ b/index.d.ts @@ -71,16 +71,13 @@ declare namespace Eris { unavailable: boolean; } - interface OldChannel { + interface GenericOldChannel { name: string; position: string; nsfw: boolean; - topic?: string; type: 1 | 2 | 4 | 5 | 6; - bitrate?: number; permissionOverwrites: Collection; parentID?: string; - rateLimitPerUser?: number; } type FriendSuggestionReasons = { type: number; platform_type: string; name: string }[]; @@ -666,7 +663,7 @@ declare namespace Eris { event: "channelRecipientAdd" | "channelRecipientRemove", listener: (channel: GroupChannel, user: User) => void ): T; - (event: "channelUpdate", listener: (channel: AnyChannel, oldChannel: OldChannel) => void): T; + (event: "channelUpdate", listener: (channel: AnyChannel, oldChannel: GenericOldChannel & ({ type: 0; topic?: string; rateLimitPerUser: number; } | { type: 2; bitrate: number; } | { type: 5; topic?: string; rateLimitPerUser: 0 } | { type: 4 | 6; })) => void): T; (event: "friendSuggestionCreate", listener: (user: User, reasons: FriendSuggestionReasons) => void): T; (event: "friendSuggestionDelete", listener: (user: User) => void): T; (event: "guildAvailable" | "guildBanAdd" | "guildBanRemove", listener: (guild: Guild, user: User) => void): T; From 3124960bc04d9fba0769629e139e95a7ddfb1262 Mon Sep 17 00:00:00 2001 From: Donovan Daniels Date: Mon, 2 Dec 2019 10:23:26 -0600 Subject: [PATCH 04/15] annoying but ok --- index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.d.ts b/index.d.ts index 29a4a7719..60e7a1693 100644 --- a/index.d.ts +++ b/index.d.ts @@ -663,7 +663,7 @@ declare namespace Eris { event: "channelRecipientAdd" | "channelRecipientRemove", listener: (channel: GroupChannel, user: User) => void ): T; - (event: "channelUpdate", listener: (channel: AnyChannel, oldChannel: GenericOldChannel & ({ type: 0; topic?: string; rateLimitPerUser: number; } | { type: 2; bitrate: number; } | { type: 5; topic?: string; rateLimitPerUser: 0 } | { type: 4 | 6; })) => void): T; + (event: "channelUpdate", listener: (channel: AnyChannel, oldChannel: GenericOldChannel & ({ type: 0; topic?: string; rateLimitPerUser: number } | { type: 2; bitrate: number } | { type: 5; topic?: string; rateLimitPerUser: 0 } | { type: 4 | 6 })) => void): T; (event: "friendSuggestionCreate", listener: (user: User, reasons: FriendSuggestionReasons) => void): T; (event: "friendSuggestionDelete", listener: (user: User) => void): T; (event: "guildAvailable" | "guildBanAdd" | "guildBanRemove", listener: (guild: Guild, user: User) => void): T; From babf3a4a65ba27c07f180c0fbc102e00a2cdd6dd Mon Sep 17 00:00:00 2001 From: Donovan Daniels Date: Mon, 2 Dec 2019 10:31:15 -0600 Subject: [PATCH 05/15] this being here breaks it --- index.d.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/index.d.ts b/index.d.ts index 60e7a1693..c69d63a82 100644 --- a/index.d.ts +++ b/index.d.ts @@ -75,7 +75,6 @@ declare namespace Eris { name: string; position: string; nsfw: boolean; - type: 1 | 2 | 4 | 5 | 6; permissionOverwrites: Collection; parentID?: string; } From 50e0009e8b0ec219ab1ad03bf618c0f93c8bc077 Mon Sep 17 00:00:00 2001 From: Donovan Daniels Date: Tue, 3 Dec 2019 10:21:18 -0600 Subject: [PATCH 06/15] Revert to simpler types & change guildRoleUpdate types. --- index.d.ts | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/index.d.ts b/index.d.ts index c69d63a82..2bf929c11 100644 --- a/index.d.ts +++ b/index.d.ts @@ -71,12 +71,15 @@ declare namespace Eris { unavailable: boolean; } - interface GenericOldChannel { + interface OldChannel { name: string; - position: string; - nsfw: boolean; - permissionOverwrites: Collection; + position?: string; + nsfw?: boolean; + permissionOverwrites?: Collection; parentID?: string; + topic?: string; + rateLimitPerUser?: number; + type?: 0 | 2 | 4 | 5 | 6; } type FriendSuggestionReasons = { type: number; platform_type: string; name: string }[]; @@ -487,7 +490,19 @@ declare namespace Eris { color?: number; hoist?: boolean; mentionable?: boolean; + managed?: boolean; } + + interface OldRole { + color: number; + hoist: boolean; + managed: boolean; + name: string; + permissions: Permission; + position: number; + mentionable: boolean; + } + interface GamePresence { name: string; type?: number; @@ -662,7 +677,7 @@ declare namespace Eris { event: "channelRecipientAdd" | "channelRecipientRemove", listener: (channel: GroupChannel, user: User) => void ): T; - (event: "channelUpdate", listener: (channel: AnyChannel, oldChannel: GenericOldChannel & ({ type: 0; topic?: string; rateLimitPerUser: number } | { type: 2; bitrate: number } | { type: 5; topic?: string; rateLimitPerUser: 0 } | { type: 4 | 6 })) => void): T; + (event: "channelUpdate", listener: (channel: AnyGuildChannel, oldChannel: OldChannel) => void): T; (event: "friendSuggestionCreate", listener: (user: User, reasons: FriendSuggestionReasons) => void): T; (event: "friendSuggestionDelete", listener: (user: User) => void): T; (event: "guildAvailable" | "guildBanAdd" | "guildBanRemove", listener: (guild: Guild, user: User) => void): T; @@ -676,7 +691,7 @@ declare namespace Eris { listener: (guild: Guild, member: Member, oldMember: { roles: string[]; nick?: string }) => void ): T; (event: "guildRoleCreate" | "guildRoleDelete", listener: (guild: Guild, role: Role) => void): T; - (event: "guildRoleUpdate", listener: (guild: Guild, role: Role, oldRole: RoleOptions) => void): T; + (event: "guildRoleUpdate", listener: (guild: Guild, role: Role, oldRole: OldRole) => void): T; (event: "guildUpdate", listener: (guild: Guild, oldGuild: GuildOptions) => void): T; (event: "hello", listener: (trace: string[], id: number) => void): T; (event: "messageCreate", listener: (message: Message) => void): T; From ff5c0e630cf7929c848088e55d0971d8516da9a3 Mon Sep 17 00:00:00 2001 From: Donovan Daniels Date: Tue, 3 Dec 2019 10:22:32 -0600 Subject: [PATCH 07/15] Make these not optional. They were optional, due to the channel parameter being `AnyChannel`, but it's `AnyGuildChannel` now, therefore they will be there. --- index.d.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.d.ts b/index.d.ts index 2bf929c11..0b6b0d339 100644 --- a/index.d.ts +++ b/index.d.ts @@ -73,13 +73,13 @@ declare namespace Eris { interface OldChannel { name: string; - position?: string; - nsfw?: boolean; - permissionOverwrites?: Collection; + position: string; + nsfw: boolean; + permissionOverwrites: Collection; parentID?: string; topic?: string; rateLimitPerUser?: number; - type?: 0 | 2 | 4 | 5 | 6; + type: 0 | 2 | 4 | 5 | 6; } type FriendSuggestionReasons = { type: number; platform_type: string; name: string }[]; From 806e7fc4533eae1185fa24312e9e000262995eff Mon Sep 17 00:00:00 2001 From: Donovan Daniels Date: Tue, 3 Dec 2019 10:48:23 -0600 Subject: [PATCH 08/15] add bitrate Co-Authored-By: Skillz4Killz <23035000+Skillz4Killz@users.noreply.github.com> --- index.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/index.d.ts b/index.d.ts index 0b6b0d339..5c87169d6 100644 --- a/index.d.ts +++ b/index.d.ts @@ -80,6 +80,7 @@ declare namespace Eris { topic?: string; rateLimitPerUser?: number; type: 0 | 2 | 4 | 5 | 6; + bitrate?: number; } type FriendSuggestionReasons = { type: number; platform_type: string; name: string }[]; From d0be06ba3a8f3e751e86571bc1c64d7cc205cb99 Mon Sep 17 00:00:00 2001 From: Donovan Daniels Date: Tue, 3 Dec 2019 10:49:01 -0600 Subject: [PATCH 09/15] Remove `managed` from RoleOptions. --- index.d.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/index.d.ts b/index.d.ts index 5c87169d6..d258c10c8 100644 --- a/index.d.ts +++ b/index.d.ts @@ -491,7 +491,6 @@ declare namespace Eris { color?: number; hoist?: boolean; mentionable?: boolean; - managed?: boolean; } interface OldRole { From ff0634b8aa228e986c4c86abe7eb6427cf3cc9e0 Mon Sep 17 00:00:00 2001 From: Donovan Daniels Date: Wed, 4 Dec 2019 08:43:03 -0600 Subject: [PATCH 10/15] Move `guildUpdate` from `GuildOptions` to a new `OldGuild`. --- index.d.ts | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/index.d.ts b/index.d.ts index 69b433d3a..c9b39864f 100644 --- a/index.d.ts +++ b/index.d.ts @@ -485,6 +485,24 @@ declare namespace Eris { splash?: string; banner?: string; } + interface OldGuild { + name: string, + verificationLevel: 0 | 1 | 2 | 3 | 4, + splash?: string, + banner?: string, + region: string, + ownerID: string, + icon: string, + features: string[], + emojis: Emoji[], + afkChannelID?: string, + afkTimeout: number, + mfaLevel: 0 | 1, + large: boolean, + maxPresences?: number, + explicitContentFilter: 0 | 1 | 2, + systemChannelID?: string + } interface MemberOptions { roles?: string[]; nick?: string; @@ -699,7 +717,7 @@ declare namespace Eris { ): T; (event: "guildRoleCreate" | "guildRoleDelete", listener: (guild: Guild, role: Role) => void): T; (event: "guildRoleUpdate", listener: (guild: Guild, role: Role, oldRole: OldRole) => void): T; - (event: "guildUpdate", listener: (guild: Guild, oldGuild: GuildOptions) => void): T; + (event: "guildUpdate", listener: (guild: Guild, oldGuild: OldGuild) => void): T; (event: "hello", listener: (trace: string[], id: number) => void): T; (event: "messageCreate", listener: (message: Message) => void): T; (event: "messageDelete" | "messageReactionRemoveAll", listener: (message: PossiblyUncachedMessage) => void): T; From cc341b0dfaf3a7cccb863841be7a35fe7cd00021 Mon Sep 17 00:00:00 2001 From: Donovan Daniels Date: Wed, 4 Dec 2019 08:45:07 -0600 Subject: [PATCH 11/15] forgot to replace with semicolons --- index.d.ts | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/index.d.ts b/index.d.ts index c9b39864f..7d4dd87e6 100644 --- a/index.d.ts +++ b/index.d.ts @@ -486,22 +486,22 @@ declare namespace Eris { banner?: string; } interface OldGuild { - name: string, - verificationLevel: 0 | 1 | 2 | 3 | 4, - splash?: string, - banner?: string, - region: string, - ownerID: string, - icon: string, - features: string[], + name: string; + verificationLevel: 0 | 1 | 2 | 3 | 4; + splash?: string; + banner?: string; + region: string; + ownerID: string; + icon: string; + features: string[]; emojis: Emoji[], - afkChannelID?: string, - afkTimeout: number, - mfaLevel: 0 | 1, - large: boolean, - maxPresences?: number, - explicitContentFilter: 0 | 1 | 2, - systemChannelID?: string + afkChannelID?: string; + afkTimeout: number; + mfaLevel: 0 | 1; + large: boolean; + maxPresences?: number; + explicitContentFilter: 0 | 1 | 2; + systemChannelID?: string; } interface MemberOptions { roles?: string[]; From c989078385d3af72930c4aa9390d587c9cb5a14e Mon Sep 17 00:00:00 2001 From: Donovan Daniels Date: Wed, 4 Dec 2019 09:39:07 -0600 Subject: [PATCH 12/15] missed a semicolon --- index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.d.ts b/index.d.ts index 7d4dd87e6..62a382903 100644 --- a/index.d.ts +++ b/index.d.ts @@ -494,7 +494,7 @@ declare namespace Eris { ownerID: string; icon: string; features: string[]; - emojis: Emoji[], + emojis: Emoji[]; afkChannelID?: string; afkTimeout: number; mfaLevel: 0 | 1; From cc928c26500471f46086f3f1adc73eed06e71599 Mon Sep 17 00:00:00 2001 From: Donovan Daniels Date: Wed, 4 Dec 2019 09:56:30 -0600 Subject: [PATCH 13/15] `emojis` seems to be a bit different than originally thought. --- index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.d.ts b/index.d.ts index 62a382903..b76b581c0 100644 --- a/index.d.ts +++ b/index.d.ts @@ -494,7 +494,7 @@ declare namespace Eris { ownerID: string; icon: string; features: string[]; - emojis: Emoji[]; + emojis: (Omit & { available: boolean; })[]; afkChannelID?: string; afkTimeout: number; mfaLevel: 0 | 1; From ed17e4a57a247ef9be2c38994eb97e6288fe3e73 Mon Sep 17 00:00:00 2001 From: Donovan Daniels Date: Wed, 4 Dec 2019 13:13:14 -0600 Subject: [PATCH 14/15] Same ol' semicolon stuff --- index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.d.ts b/index.d.ts index b76b581c0..cfeead9fc 100644 --- a/index.d.ts +++ b/index.d.ts @@ -494,7 +494,7 @@ declare namespace Eris { ownerID: string; icon: string; features: string[]; - emojis: (Omit & { available: boolean; })[]; + emojis: (Omit & { available: boolean })[]; afkChannelID?: string; afkTimeout: number; mfaLevel: 0 | 1; From ecfe4994134fd8a652d641da00288ad6d1eaaa5a Mon Sep 17 00:00:00 2001 From: abal Date: Thu, 5 Dec 2019 19:37:35 -0800 Subject: [PATCH 15/15] Update index.d.ts --- index.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.d.ts b/index.d.ts index cfeead9fc..5a8833743 100644 --- a/index.d.ts +++ b/index.d.ts @@ -71,7 +71,7 @@ declare namespace Eris { unavailable: boolean; } - interface OldChannel { + interface OldGuildChannel { name: string; position: string; nsfw: boolean; @@ -702,7 +702,7 @@ declare namespace Eris { event: "channelRecipientAdd" | "channelRecipientRemove", listener: (channel: GroupChannel, user: User) => void ): T; - (event: "channelUpdate", listener: (channel: AnyGuildChannel, oldChannel: OldChannel) => void): T; + (event: "channelUpdate", listener: (channel: AnyGuildChannel, oldChannel: OldGuildChannel) => void): T; (event: "friendSuggestionCreate", listener: (user: User, reasons: FriendSuggestionReasons) => void): T; (event: "friendSuggestionDelete", listener: (user: User) => void): T; (event: "guildAvailable" | "guildBanAdd" | "guildBanRemove", listener: (guild: Guild, user: User) => void): T;