Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-18 12:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

types: fix duplicate props in merged interfaces (#10160)

Browse Source 
types(discord.js): fix duplicate props in merged interfaces
This commit is contained in:
Qjuh
2024-03-04 11:55:01 +01:00
committed by GitHub
parent 8de8371204
commit a1010c61f5
1 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -657,7 +657,7 @@ export class BaseGuildEmoji extends Emoji {
} }
// tslint:disable-next-line no-empty-interface // tslint:disable-next-line no-empty-interface
export interface BaseGuildTextChannel extends TextBasedChannelFields<true>, GuildChannel {} export interface BaseGuildTextChannel extends TextBasedChannelFields<true> {}
export class BaseGuildTextChannel extends GuildChannel { export class BaseGuildTextChannel extends GuildChannel {
protected constructor(guild: Guild, data?: RawGuildChannelData, client?: Client<true>, immediatePatch?: boolean); protected constructor(guild: Guild, data?: RawGuildChannelData, client?: Client<true>, immediatePatch?: boolean);
public defaultAutoArchiveDuration?: ThreadAutoArchiveDuration; public defaultAutoArchiveDuration?: ThreadAutoArchiveDuration;
@@ -678,9 +678,7 @@ export class BaseGuildTextChannel extends GuildChannel {
} }
// tslint:disable-next-line no-empty-interface // tslint:disable-next-line no-empty-interface
export interface BaseGuildVoiceChannel export interface BaseGuildVoiceChannel extends Omit<TextBasedChannelFields<true>, 'lastPinTimestamp' | 'lastPinAt'> {}
extends Omit<TextBasedChannelFields<true>, 'lastPinTimestamp' | 'lastPinAt'>,
GuildChannel {}
export class BaseGuildVoiceChannel extends GuildChannel { export class BaseGuildVoiceChannel extends GuildChannel {
public constructor(guild: Guild, data?: RawGuildChannelData); public constructor(guild: Guild, data?: RawGuildChannelData);
public bitrate: number; public bitrate: number;
@@ -1310,10 +1308,9 @@ export interface ResolvedFile {
// tslint:disable-next-line no-empty-interface // tslint:disable-next-line no-empty-interface
export interface DMChannel export interface DMChannel
extends Omit< extends Omit<
TextBasedChannelFields<false>, TextBasedChannelFields<false>,
'bulkDelete' | 'fetchWebhooks' | 'createWebhook' | 'setRateLimitPerUser' | 'setNSFW' 'bulkDelete' | 'fetchWebhooks' | 'createWebhook' | 'setRateLimitPerUser' | 'setNSFW'
>, > {}
BaseChannel {}
export class DMChannel extends BaseChannel { export class DMChannel extends BaseChannel {
private constructor(client: Client<true>, data?: RawDMChannelData); private constructor(client: Client<true>, data?: RawDMChannelData);
public flags: Readonly<ChannelFlagsBitField>; public flags: Readonly<ChannelFlagsBitField>;
@@ -1593,7 +1590,7 @@ export class GuildMemberFlagsBitField extends BitField<GuildMemberFlagsString> {
public static resolve(bit?: BitFieldResolvable<GuildMemberFlagsString, GuildMemberFlags>): number; public static resolve(bit?: BitFieldResolvable<GuildMemberFlagsString, GuildMemberFlags>): number;
} }
export interface GuildMember extends PartialTextBasedChannelFields<false>, Base {} export interface GuildMember extends PartialTextBasedChannelFields<false> {}
export class GuildMember extends Base { export class GuildMember extends Base {
private constructor(client: Client<true>, data: RawGuildMemberData, guild: Guild); private constructor(client: Client<true>, data: RawGuildMemberData, guild: Guild);
private _roles: Snowflake[]; private _roles: Snowflake[];
@@ -2499,18 +2496,17 @@ export interface DefaultReactionEmoji {
export interface ThreadOnlyChannel export interface ThreadOnlyChannel
extends Omit< extends Omit<
TextBasedChannelFields, TextBasedChannelFields,
| 'send' | 'send'
| 'lastMessage' | 'lastMessage'
| 'lastPinAt' | 'lastPinAt'
| 'bulkDelete' | 'bulkDelete'
| 'sendTyping' | 'sendTyping'
| 'createMessageCollector' | 'createMessageCollector'
| 'awaitMessages' | 'awaitMessages'
| 'createMessageComponentCollector' | 'createMessageComponentCollector'
| 'awaitMessageComponent' | 'awaitMessageComponent'
>, > {}
GuildChannel {}
export abstract class ThreadOnlyChannel extends GuildChannel { export abstract class ThreadOnlyChannel extends GuildChannel {
public type: ChannelType.GuildForum | ChannelType.GuildMedia; public type: ChannelType.GuildForum | ChannelType.GuildMedia;
public threads: GuildForumThreadManager; public threads: GuildForumThreadManager;
@@ -3176,8 +3172,7 @@ export interface PrivateThreadChannel extends ThreadChannel<false> {
// tslint:disable-next-line no-empty-interface // tslint:disable-next-line no-empty-interface
export interface ThreadChannel<ThreadOnly extends boolean = boolean> export interface ThreadChannel<ThreadOnly extends boolean = boolean>
extends Omit<TextBasedChannelFields<true>, 'fetchWebhooks' | 'createWebhook' | 'setNSFW'>, extends Omit<TextBasedChannelFields<true>, 'fetchWebhooks' | 'createWebhook' | 'setNSFW'> {}
BaseChannel {}
export class ThreadChannel<ThreadOnly extends boolean = boolean> extends BaseChannel { export class ThreadChannel<ThreadOnly extends boolean = boolean> extends BaseChannel {
private constructor(guild: Guild, data?: RawThreadChannelData, client?: Client<true>); private constructor(guild: Guild, data?: RawThreadChannelData, client?: Client<true>);
public archived: boolean | null; public archived: boolean | null;
@@ -3274,7 +3269,7 @@ export class Typing extends Base {
} }
// tslint:disable-next-line no-empty-interface // tslint:disable-next-line no-empty-interface
export interface User extends PartialTextBasedChannelFields<false>, Base {} export interface User extends PartialTextBasedChannelFields<false> {}
export class User extends Base { export class User extends Base {
protected constructor(client: Client<true>, data: RawUserData); protected constructor(client: Client<true>, data: RawUserData);
private _equals(user: APIUser): boolean; private _equals(user: APIUser): boolean;