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

revert: channel unions (#3918 69d69f2) (#3978)

Browse Source 
* revert: channel unions (#3918 69d69f25b9)

* fix: correct tslint:disable

* revert: keep the GuildChannel#setParent change

Co-authored-by: Crawl <icrawltogo@gmail.com>
This commit is contained in:
SpaceEEC
2020-03-27 20:58:11 +01:00
committed by GitHub
parent 88133d0d77
commit b441469044
2 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/structures/GuildChannel.js
View File

@@ -576,15 +576,6 @@ class GuildChannel extends Channel {
return this.permissionsFor(this.client.user).has(Permissions.FLAGS.MANAGE_CHANNELS, false); return this.permissionsFor(this.client.user).has(Permissions.FLAGS.MANAGE_CHANNELS, false);
} }
/**
* Whether this GuildChannel is a partial
* @type {boolean}
* @readonly
*/
get partial() {
return false;
}
/** /**
* Whether the channel is viewable by the client user * Whether the channel is viewable by the client user
* @type {boolean} * @type {boolean}

41
typings/index.d.ts vendored
View File

@@ -145,7 +145,7 @@ declare module 'discord.js' {
} }
export class CategoryChannel extends GuildChannel { export class CategoryChannel extends GuildChannel {
public readonly children: Collection<Snowflake, Exclude<GuildChannelTypes, CategoryChannel>>; public readonly children: Collection<Snowflake, GuildChannel>;
public type: 'category'; public type: 'category';
} }
@@ -156,8 +156,8 @@ declare module 'discord.js' {
public deleted: boolean; public deleted: boolean;
public id: Snowflake; public id: Snowflake;
public type: keyof typeof ChannelType; public type: keyof typeof ChannelType;
public delete(reason?: string): Promise<ChannelTypes>; public delete(reason?: string): Promise<this>;
public fetch(): Promise<ChannelTypes>; public fetch(): Promise<this>;
public toString(): string; public toString(): string;
} }
@@ -558,7 +558,7 @@ declare module 'discord.js' {
public recipient: User; public recipient: User;
public readonly partial: false; public readonly partial: false;
public type: 'dm'; public type: 'dm';
public fetch(): Promise<DMChannel>; public fetch(): Promise<this>;
} }
export class Emoji extends Base { export class Emoji extends Base {
@@ -578,7 +578,7 @@ declare module 'discord.js' {
export class Guild extends Base { export class Guild extends Base {
constructor(client: Client, data: object); constructor(client: Client, data: object);
private _sortedRoles(): Collection<Snowflake, Role>; private _sortedRoles(): Collection<Snowflake, Role>;
private _sortedChannels(channel: Channel): Collection<Snowflake, GuildChannelTypes>; private _sortedChannels(channel: Channel): Collection<Snowflake, GuildChannel>;
private _memberSpeakUpdate(user: Snowflake, speaking: boolean): void; private _memberSpeakUpdate(user: Snowflake, speaking: boolean): void;
public readonly afkChannel: VoiceChannel | null; public readonly afkChannel: VoiceChannel | null;
@@ -593,7 +593,7 @@ declare module 'discord.js' {
public defaultMessageNotifications: DefaultMessageNotifications | number; public defaultMessageNotifications: DefaultMessageNotifications | number;
public deleted: boolean; public deleted: boolean;
public description: string | null; public description: string | null;
public embedChannel: GuildChannelTypes | null; public embedChannel: GuildChannel | null;
public embedChannelID: Snowflake | null; public embedChannelID: Snowflake | null;
public embedEnabled: boolean; public embedEnabled: boolean;
public emojis: GuildEmojiManager; public emojis: GuildEmojiManager;
@@ -726,7 +726,6 @@ declare module 'discord.js' {
public readonly members: Collection<Snowflake, GuildMember>; public readonly members: Collection<Snowflake, GuildMember>;
public name: string; public name: string;
public readonly parent: CategoryChannel | null; public readonly parent: CategoryChannel | null;
public readonly partial: false;
public parentID: Snowflake | null; public parentID: Snowflake | null;
public permissionOverwrites: Collection<Snowflake, PermissionOverwrites>; public permissionOverwrites: Collection<Snowflake, PermissionOverwrites>;
public readonly permissionsLocked: boolean | null; public readonly permissionsLocked: boolean | null;
@@ -879,7 +878,7 @@ declare module 'discord.js' {
export class Invite extends Base { export class Invite extends Base {
constructor(client: Client, data: object); constructor(client: Client, data: object);
public channel: GuildChannelTypes | PartialGroupDMChannel; public channel: GuildChannel | PartialGroupDMChannel;
public code: string; public code: string;
public readonly deletable: boolean; public readonly deletable: boolean;
public readonly createdAt: Date | null; public readonly createdAt: Date | null;
@@ -996,11 +995,11 @@ declare module 'discord.js' {
} }
export class MessageCollector extends Collector<Snowflake, Message> { export class MessageCollector extends Collector<Snowflake, Message> {
constructor(channel: TextBasedChannelTypes, filter: CollectorFilter, options?: MessageCollectorOptions); constructor(channel: TextChannel | DMChannel, filter: CollectorFilter, options?: MessageCollectorOptions);
private _handleChannelDeletion(channel: TextBasedChannelTypes): void; private _handleChannelDeletion(channel: GuildChannel): void;
private _handleGuildDeletion(guild: Guild): void; private _handleGuildDeletion(guild: Guild): void;
public channel: TextBasedChannelTypes; public channel: Channel;
public options: MessageCollectorOptions; public options: MessageCollectorOptions;
public received: number; public received: number;
@@ -1063,7 +1062,7 @@ declare module 'discord.js' {
roles: Snowflake[] | Collection<Snowflake, Role>, roles: Snowflake[] | Collection<Snowflake, Role>,
everyone: boolean, everyone: boolean,
); );
private _channels: Collection<Snowflake, GuildChannelTypes> | null; private _channels: Collection<Snowflake, GuildChannel> | null;
private readonly _content: Message; private readonly _content: Message;
private _members: Collection<Snowflake, GuildMember> | null; private _members: Collection<Snowflake, GuildMember> | null;
@@ -1072,7 +1071,7 @@ declare module 'discord.js' {
public everyone: boolean; public everyone: boolean;
public readonly guild: Guild; public readonly guild: Guild;
public has( public has(
data: User | GuildMember | Role | GuildChannelTypes, data: User | GuildMember | Role | GuildChannel,
options?: { options?: {
ignoreDirect?: boolean; ignoreDirect?: boolean;
ignoreRoles?: boolean; ignoreRoles?: boolean;
@@ -1128,9 +1127,9 @@ declare module 'discord.js' {
} }
export class PermissionOverwrites { export class PermissionOverwrites {
constructor(guildChannel: GuildChannelTypes, data?: object); constructor(guildChannel: GuildChannel, data?: object);
public allow: Readonly<Permissions>; public allow: Readonly<Permissions>;
public readonly channel: GuildChannelTypes; public readonly channel: GuildChannel;
public deny: Readonly<Permissions>; public deny: Readonly<Permissions>;
public id: Snowflake; public id: Snowflake;
public type: OverwriteType; public type: OverwriteType;
@@ -1171,7 +1170,7 @@ declare module 'discord.js' {
export class ReactionCollector extends Collector<Snowflake, MessageReaction> { export class ReactionCollector extends Collector<Snowflake, MessageReaction> {
constructor(message: Message, filter: CollectorFilter, options?: ReactionCollectorOptions); constructor(message: Message, filter: CollectorFilter, options?: ReactionCollectorOptions);
private _handleChannelDeletion(channel: TextBasedChannelTypes): void; private _handleChannelDeletion(channel: GuildChannel): void;
private _handleGuildDeletion(guild: Guild): void; private _handleGuildDeletion(guild: Guild): void;
private _handleMessageDeletion(message: Message): void; private _handleMessageDeletion(message: Message): void;
@@ -1810,9 +1809,9 @@ declare module 'discord.js' {
//#region Managers //#region Managers
export class ChannelManager extends BaseManager<Snowflake, ChannelTypes, ChannelResolvable> { export class ChannelManager extends BaseManager<Snowflake, Channel, ChannelResolvable> {
constructor(client: Client, iterable: Iterable<any>); constructor(client: Client, iterable: Iterable<any>);
public fetch(id: Snowflake, cache?: boolean): Promise<ChannelTypes>; public fetch(id: Snowflake, cache?: boolean): Promise<Channel>;
} }
export abstract class BaseManager<K, Holds, R> { export abstract class BaseManager<K, Holds, R> {
@@ -1827,7 +1826,7 @@ declare module 'discord.js' {
public resolveID(resolvable: R): K | null; public resolveID(resolvable: R): K | null;
} }
export class GuildChannelManager extends BaseManager<Snowflake, GuildChannelTypes, GuildChannelResolvable> { export class GuildChannelManager extends BaseManager<Snowflake, GuildChannel, GuildChannelResolvable> {
constructor(guild: Guild, iterable?: Iterable<any>); constructor(guild: Guild, iterable?: Iterable<any>);
public guild: Guild; public guild: Guild;
public create(name: string, options: GuildCreateChannelOptions & { type: 'voice' }): Promise<VoiceChannel>; public create(name: string, options: GuildCreateChannelOptions & { type: 'voice' }): Promise<VoiceChannel>;
@@ -2160,10 +2159,6 @@ declare module 'discord.js' {
position: number; position: number;
} }
type ChannelTypes = DMChannel | CategoryChannel | NewsChannel | StoreChannel | TextChannel | VoiceChannel;
type GuildChannelTypes = CategoryChannel | NewsChannel | StoreChannel | TextChannel | VoiceChannel;
type TextBasedChannelTypes = DMChannel | NewsChannel | TextChannel;
type ChannelResolvable = Channel | Snowflake; type ChannelResolvable = Channel | Snowflake;
interface ClientApplicationAsset { interface ClientApplicationAsset {