Skip to content

Commit 13717b3

Browse files
QjuhQjuh
committed
fix: oversights
1 parent 901fc76 commit 13717b3

File tree

8 files changed

+104
-52
lines changed

8 files changed

+104
-52
lines changed

‎deno/gateway/v10.ts

Lines changed: 19 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎deno/gateway/v9.ts

Lines changed: 19 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎deno/payloads/v10/guild.ts

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎deno/payloads/v9/guild.ts

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gateway/v10.ts

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1616,6 +1616,23 @@ export type GatewayMessageUpdateDispatch = _DataPayload<
16161616
*/
16171617
export interface GatewayMessageUpdateDispatchData extends GatewayMessageEventExtraFields, APIBaseMessage {}
16181618

1619+
export interface APIGuildMemberNoUser
1620+
extends APIBaseGuildMember,
1621+
APIFlaggedGuildMember,
1622+
APIGuildMemberAvatar,
1623+
APIGuildMemberJoined,
1624+
APIBaseVoiceGuildMember {}
1625+
1626+
export interface APIUserWithMember extends APIUser {
1627+
/**
1628+
* The `member` field is only present in `MESSAGE_CREATE` and `MESSAGE_UPDATE` events
1629+
* from text-based guild channels
1630+
*
1631+
* @see {@link https://discord.com/developers/docs/resources/guild#guild-member-object}
1632+
*/
1633+
member?: APIGuildMemberNoUser;
1634+
}
1635+
16191636
/**
16201637
* @see {@link https://discord.com/developers/docs/topics/gateway-events#message-create-message-create-extra-fields}
16211638
*/
@@ -1632,17 +1649,13 @@ export interface GatewayMessageEventExtraFields {
16321649
*
16331650
* @see {@link https://discord.com/developers/docs/resources/guild#guild-member-object}
16341651
*/
1635-
member?: APIBaseGuildMember;
1652+
member?: APIGuildMemberNoUser;
16361653
/**
16371654
* Users specifically mentioned in the message
16381655
*
1639-
* The `member` field is only present in `MESSAGE_CREATE` and `MESSAGE_UPDATE` events
1640-
* from text-based guild channels
1641-
*
16421656
* @see {@link https://discord.com/developers/docs/resources/user#user-object}
1643-
* @see {@link https://discord.com/developers/docs/resources/guild#guild-member-object}
16441657
*/
1645-
mentions: (APIUser & { member?: APIBaseGuildMember })[];
1658+
mentions: APIUserWithMember[];
16461659
}
16471660

16481661
/**

‎gateway/v9.ts

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1615,6 +1615,23 @@ export type GatewayMessageUpdateDispatch = _DataPayload<
16151615
*/
16161616
export interface GatewayMessageUpdateDispatchData extends GatewayMessageEventExtraFields, APIBaseMessage {}
16171617

1618+
export interface APIGuildMemberNoUser
1619+
extends APIBaseGuildMember,
1620+
APIFlaggedGuildMember,
1621+
APIGuildMemberAvatar,
1622+
APIGuildMemberJoined,
1623+
APIBaseVoiceGuildMember {}
1624+
1625+
export interface APIUserWithMember extends APIUser {
1626+
/**
1627+
* The `member` field is only present in `MESSAGE_CREATE` and `MESSAGE_UPDATE` events
1628+
* from text-based guild channels
1629+
*
1630+
* @see {@link https://discord.com/developers/docs/resources/guild#guild-member-object}
1631+
*/
1632+
member?: APIGuildMemberNoUser;
1633+
}
1634+
16181635
/**
16191636
* @see {@link https://discord.com/developers/docs/topics/gateway-events#message-create-message-create-extra-fields}
16201637
*/
@@ -1631,17 +1648,13 @@ export interface GatewayMessageEventExtraFields {
16311648
*
16321649
* @see {@link https://discord.com/developers/docs/resources/guild#guild-member-object}
16331650
*/
1634-
member?: APIBaseGuildMember;
1651+
member?: APIGuildMemberNoUser;
16351652
/**
16361653
* Users specifically mentioned in the message
16371654
*
1638-
* The `member` field is only present in `MESSAGE_CREATE` and `MESSAGE_UPDATE` events
1639-
* from text-based guild channels
1640-
*
16411655
* @see {@link https://discord.com/developers/docs/resources/user#user-object}
1642-
* @see {@link https://discord.com/developers/docs/resources/guild#guild-member-object}
16431656
*/
1644-
mentions: (APIUser & { member?: APIBaseGuildMember })[];
1657+
mentions: APIUserWithMember[];
16451658
}
16461659

16471660
/**

‎payloads/v10/guild.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export interface APIUnavailableGuild extends APIBaseGuild {
3131
/**
3232
* @see {@link https://discord.com/developers/docs/resources/guild#guild-object-guild-structure}
3333
*/
34-
export interface APIPartialGuild extends APIBaseGuild, Pick<APIGuild, 'welcome_screen'> {
34+
export interface APIPartialGuild extends APIBaseGuild {
3535
/**
3636
* Guild name (2-100 characters, excluding trailing and leading whitespace)
3737
*/
@@ -74,6 +74,12 @@ export interface APIPartialGuild extends APIBaseGuild, Pick<APIGuild, 'welcome_s
7474
* The vanity url code for the guild
7575
*/
7676
vanity_url_code?: string | null;
77+
/**
78+
* The welcome screen of a Community guild, shown to new members
79+
*
80+
* Returned in the invite object
81+
*/
82+
welcome_screen?: APIGuildWelcomeScreen;
7783
}
7884

7985
/**
@@ -258,12 +264,6 @@ export interface APIGuild extends APIPartialGuild {
258264
* returned from the `GET /guilds/<id>` and `/users/@me/guilds` (OAuth2) endpoints when `with_counts` is `true`
259265
*/
260266
approximate_presence_count?: number;
261-
/**
262-
* The welcome screen of a Community guild, shown to new members
263-
*
264-
* Returned in the invite object
265-
*/
266-
welcome_screen?: APIGuildWelcomeScreen;
267267
/**
268268
* The nsfw level of the guild
269269
*

‎payloads/v9/guild.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export interface APIUnavailableGuild extends APIBaseGuild {
3131
/**
3232
* @see {@link https://discord.com/developers/docs/resources/guild#guild-object-guild-structure}
3333
*/
34-
export interface APIPartialGuild extends APIBaseGuild, Pick<APIGuild, 'welcome_screen'> {
34+
export interface APIPartialGuild extends APIBaseGuild {
3535
/**
3636
* Guild name (2-100 characters, excluding trailing and leading whitespace)
3737
*/
@@ -74,6 +74,12 @@ export interface APIPartialGuild extends APIBaseGuild, Pick<APIGuild, 'welcome_s
7474
* The vanity url code for the guild
7575
*/
7676
vanity_url_code?: string | null;
77+
/**
78+
* The welcome screen of a Community guild, shown to new members
79+
*
80+
* Returned in the invite object
81+
*/
82+
welcome_screen?: APIGuildWelcomeScreen;
7783
}
7884

7985
/**
@@ -258,12 +264,6 @@ export interface APIGuild extends APIPartialGuild {
258264
* returned from the `GET /guilds/<id>` and `/users/@me/guilds` (OAuth2) endpoints when `with_counts` is `true`
259265
*/
260266
approximate_presence_count?: number;
261-
/**
262-
* The welcome screen of a Community guild, shown to new members
263-
*
264-
* Returned in the invite object
265-
*/
266-
welcome_screen?: APIGuildWelcomeScreen;
267267
/**
268268
* The nsfw level of the guild
269269
*

0 commit comments

Comments
 (0)