From fcf4745a43d58b2d7049109d009dd7d3b5eaf530 Mon Sep 17 00:00:00 2001 From: SpaceEEC Date: Thu, 4 Oct 2018 19:29:12 +0200 Subject: [PATCH] typings: fix lint script and linter errors --- package.json | 2 +- tsconfig.json | 2 +- typings/discord.js-test.ts | 4 +- typings/index.d.ts | 78 +++++++++++++++++++------------------- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/package.json b/package.json index 39a3c2af8..60fb0e700 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "docs:test": "docgen --source src --custom docs/index.yml", "lint": "eslint src", "lint:fix": "eslint --fix src", - "lint:typings": "tslint index.d.ts discord.js-test.ts", + "lint:typings": "tslint typings/index.d.ts typings/discord.js-test.ts", "webpack": "parallel-webpack" }, "repository": { diff --git a/tsconfig.json b/tsconfig.json index 6c5e479d8..37aa901ee 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,6 +8,6 @@ "forceConsistentCasingInFileNames": true }, "files": [ - "index.d.ts" + "typings/index.d.ts" ] } diff --git a/typings/discord.js-test.ts b/typings/discord.js-test.ts index 6792dba87..afa957382 100644 --- a/typings/discord.js-test.ts +++ b/typings/discord.js-test.ts @@ -22,7 +22,7 @@ client.login('dsfsd754.4fds4f68d4f6sd46f4s.7878easfdsgdfFDSIJIO'); export class TestCollector extends Collector { public filter: CollectorFilter; - public constructor(client: Client, filter: CollectorFilter, ) { + public constructor(client: Client, filter: CollectorFilter) { super(client, filter); } @@ -64,6 +64,6 @@ class ReactionCollector extends Collector { } public cleanup(): void { - this.client.removeListener('messageReactionAdd', this.listener); + this.client.removeListener('messageReactionAdd', this.listener as any); } } diff --git a/typings/index.d.ts b/typings/index.d.ts index ac1dc5add..3897af4a2 100644 --- a/typings/index.d.ts +++ b/typings/index.d.ts @@ -243,7 +243,7 @@ declare module 'discord.js' { public premium: boolean; public settings: ClientUserSettings; public verified: boolean; - public acceptInvite(invite: Invite | string): Promise + public acceptInvite(invite: Invite | string): Promise; public addFriend(user?: UserResolvable): Promise; public createGroupDM(recipients: GroupDMRecipientOptions[]): Promise; public createGuild(name: string, region: string, icon?: BufferResolvable | Base64Resolvable): Promise; @@ -462,7 +462,7 @@ declare module 'discord.js' { public readonly owner: User; public ownerID: string; public recipients: Collection; - public addUser(accessTokenOrID: UserResolvable | string, nick?: string): Promise + public addUser(accessTokenOrID: UserResolvable | string, nick?: string): Promise; public equals(channel: GroupDMChannel): boolean; public setIcon(icon: Base64Resolvable | BufferResolvable): Promise; public toString(): string; @@ -471,7 +471,7 @@ declare module 'discord.js' { export class Guild { constructor(client: Client, data: object); private readonly _sortedRoles: Collection; - private _sortedChannels(type: string): Collection + private _sortedChannels(type: string): Collection; private _sortPositionWithID(collection: Collection): Collection; protected setup(data: any): void; @@ -608,7 +608,7 @@ declare module 'discord.js' { public position: number; public clone(name?: string, withPermissions?: boolean, withTopic?: boolean, reason?: string): Promise; public createInvite(options?: InviteOptions, reason?: string): Promise; - public delete(reason?: string): Promise + public delete(reason?: string): Promise; public edit(data: ChannelData, reason?: string): Promise; public equals(channel: GuildChannel): boolean; public fetchInvites(): Promise>; @@ -619,7 +619,7 @@ declare module 'discord.js' { public replacePermissionOverwrites(options?: { overwrites?: (PermissionOverwrites | ChannelCreationOverwrites)[] | Collection, reason?: string }): Promise; public rolePermissions(role: RoleResolvable): Permissions; public setName(name: string, reason?: string): Promise; - public setParent(parent: ChannelResolvable, reason?: string): Promise + public setParent(parent: ChannelResolvable, reason?: string): Promise; public setPosition(position: number, relative?: boolean): Promise; public setTopic(topic: string, reason?: string): Promise; public toString(): string; @@ -945,14 +945,14 @@ declare module 'discord.js' { public bitfield: number; public member: GuildMember; - public add(...permissions: PermissionResolvable): this; + public add(...permissions: PermissionResolvable[]): this; public freeze(): this; public has(permission: PermissionResolvable, checkAdmin?: boolean): boolean; public hasPermission(permission: PermissionResolvable, explicit?: boolean): boolean; public hasPermissions(permissions: PermissionResolvable, explicit?: boolean): boolean; public missing(permissions: PermissionResolvable, checkAdmin?: boolean): PermissionResolvable; public missingPermissions(permissions: PermissionResolvable, checkAdmin?: boolean): PermissionResolvable; - public remove(...permissions: PermissionResolvable): this; + public remove(...permissions: PermissionResolvable[]): this; public serialize(checkAdmin?: boolean): PermissionObject; public toArray(checkAdmin?: boolean): PermissionString[]; public valueOf(): number; @@ -1583,7 +1583,7 @@ declare module 'discord.js' { roles?: Collection | Role[] | string[]; mute?: boolean; deaf?: boolean; - } + }; type AuditLogChange = { key: string; @@ -1698,7 +1698,7 @@ declare module 'discord.js' { }; type DefaultMessageNotifications = 'ALL' - | 'MENTIONS' + | 'MENTIONS'; type EmojiEditData = { name?: string; @@ -1721,33 +1721,33 @@ declare module 'discord.js' { type GuildAuditLogsAction = keyof GuildAuditLogsActions; type GuildAuditLogsActions = { - ALL?: null, - GUILD_UPDATE?: number, - CHANNEL_CREATE?: number, - CHANNEL_UPDATE?: number, - CHANNEL_DELETE?: number, - CHANNEL_OVERWRITE_CREATE?: number, - CHANNEL_OVERWRITE_UPDATE?: number, - CHANNEL_OVERWRITE_DELETE?: number, - MEMBER_KICK?: number, - MEMBER_PRUNE?: number, - MEMBER_BAN_ADD?: number, - MEMBER_BAN_REMOVE?: number, - MEMBER_UPDATE?: number, - MEMBER_ROLE_UPDATE?: number, - ROLE_CREATE?: number, - ROLE_UPDATE?: number, - ROLE_DELETE?: number, - INVITE_CREATE?: number, - INVITE_UPDATE?: number, - INVITE_DELETE?: number, - WEBHOOK_CREATE?: number, - WEBHOOK_UPDATE?: number, - WEBHOOK_DELETE?: number, - EMOJI_CREATE?: number, - EMOJI_UPDATE?: number, - EMOJI_DELETE?: number, - MESSAGE_DELETE?: number, + ALL?: null; + GUILD_UPDATE?: number; + CHANNEL_CREATE?: number; + CHANNEL_UPDATE?: number; + CHANNEL_DELETE?: number; + CHANNEL_OVERWRITE_CREATE?: number; + CHANNEL_OVERWRITE_UPDATE?: number; + CHANNEL_OVERWRITE_DELETE?: number; + MEMBER_KICK?: number; + MEMBER_PRUNE?: number; + MEMBER_BAN_ADD?: number; + MEMBER_BAN_REMOVE?: number; + MEMBER_UPDATE?: number; + MEMBER_ROLE_UPDATE?: number; + ROLE_CREATE?: number; + ROLE_UPDATE?: number; + ROLE_DELETE?: number; + INVITE_CREATE?: number; + INVITE_UPDATE?: number; + INVITE_DELETE?: number; + WEBHOOK_CREATE?: number; + WEBHOOK_UPDATE?: number; + WEBHOOK_DELETE?: number; + EMOJI_CREATE?: number; + EMOJI_UPDATE?: number; + EMOJI_DELETE?: number; + MESSAGE_DELETE?: number; }; type GuildAuditLogsActionType = 'CREATE' @@ -1896,7 +1896,7 @@ declare module 'discord.js' { type MessageSearchResult = { totalResults: number; messages: Message[][]; - } + }; type ActivityFlags = { INSTANCE?: number; @@ -1905,7 +1905,7 @@ declare module 'discord.js' { JOIN_REQUEST?: number; SYNC?: number; PLAY?: number; - } + }; type PermissionFlags = { ADMINISTRATOR?: number; @@ -2024,7 +2024,7 @@ declare module 'discord.js' { url?: string; type?: ActivityType; } | null; - } + }; type PresenceStatus = 'online' | 'idle' | 'invisible' | 'dnd';