Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-20 05:23:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(MessageMentions): add InGuild generic (#8828)

Browse Source 
fix(MessageMentions): add InGuild generic

Co-authored-by: Noel <buechler.noel@outlook.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
Almeida
2022-11-25 17:35:52 +00:00
committed by GitHub
parent cb77fd02d0
commit f9828034cd
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/discord.js/typings/index.d.ts vendored
View File

@@ -1859,7 +1859,7 @@ export class Message<InGuild extends boolean = boolean> extends Base {
public id: Snowflake; public id: Snowflake;
public interaction: MessageInteraction | null; public interaction: MessageInteraction | null;
public get member(): GuildMember | null; public get member(): GuildMember | null;
public mentions: MessageMentions; public mentions: MessageMentions<InGuild>;
public nonce: string | number | null; public nonce: string | number | null;
public get partial(): false; public get partial(): false;
public get pinnable(): boolean; public get pinnable(): boolean;
@@ -2018,7 +2018,7 @@ export class MessageFlagsBitField extends BitField<MessageFlagsString> {
public static resolve(bit?: BitFieldResolvable<MessageFlagsString, number>): number; public static resolve(bit?: BitFieldResolvable<MessageFlagsString, number>): number;
} }
export class MessageMentions { export class MessageMentions<InGuild extends boolean = boolean> {
private constructor( private constructor(
message: Message, message: Message,
users: APIUser[] | Collection<Snowflake, User>, users: APIUser[] | Collection<Snowflake, User>,
@@ -2034,9 +2034,9 @@ export class MessageMentions {
public get channels(): Collection<Snowflake, Channel>; public get channels(): Collection<Snowflake, Channel>;
public readonly client: Client; public readonly client: Client;
public everyone: boolean; public everyone: boolean;
public readonly guild: Guild; public readonly guild: If<InGuild, Guild>;
public has(data: UserResolvable | RoleResolvable | ChannelResolvable, options?: MessageMentionsHasOptions): boolean; public has(data: UserResolvable | RoleResolvable | ChannelResolvable, options?: MessageMentionsHasOptions): boolean;
public get members(): Collection<Snowflake, GuildMember> | null; public get members(): If<InGuild, Collection<Snowflake, GuildMember>>;
public get parsedUsers(): Collection<Snowflake, User>; public get parsedUsers(): Collection<Snowflake, User>;
public repliedUser: User | null; public repliedUser: User | null;
public roles: Collection<Snowflake, Role>; public roles: Collection<Snowflake, Role>;

9
packages/discord.js/typings/index.test-d.ts
View File

@@ -148,6 +148,7 @@ import {
RoleSelectMenuInteraction, RoleSelectMenuInteraction,
ChannelSelectMenuInteraction, ChannelSelectMenuInteraction,
MentionableSelectMenuInteraction, MentionableSelectMenuInteraction,
MessageMentions,
AutoModerationActionExecution, AutoModerationActionExecution,
AutoModerationRule, AutoModerationRule,
AutoModerationRuleManager, AutoModerationRuleManager,
@@ -361,6 +362,10 @@ client.on('messageCreate', async message => {
expectType<GuildTextBasedChannel>(message.channel); expectType<GuildTextBasedChannel>(message.channel);
expectType<Guild>(message.guild); expectType<Guild>(message.guild);
expectType<GuildMember | null>(message.member); expectType<GuildMember | null>(message.member);
expectType<MessageMentions<true>>(message.mentions);
expectType<Guild>(message.guild);
expectType<Collection<Snowflake, GuildMember>>(message.mentions.members);
} }
expectType<TextBasedChannel>(message.channel); expectType<TextBasedChannel>(message.channel);
@@ -1460,6 +1465,10 @@ declare const guildChannelManager: GuildChannelManager;
expectType<null>(message.guild); expectType<null>(message.guild);
expectType<null>(message.guildId); expectType<null>(message.guildId);
expectType<TextBasedChannel>(message.channel.messages.channel); expectType<TextBasedChannel>(message.channel.messages.channel);
expectType<MessageMentions<false>>(message.mentions);
expectType<null>(message.mentions.guild);
expectType<null>(message.mentions.members);
} }
declare const guildForumThreadManager: GuildForumThreadManager; declare const guildForumThreadManager: GuildForumThreadManager;