From 4dc18f7266d7138566014b04f78c4ecd650f1df9 Mon Sep 17 00:00:00 2001 From: DjDeveloperr Date: Mon, 29 Mar 2021 10:10:26 +0530 Subject: [PATCH 1/4] fix typo --- src/structures/channel.ts | 24 ++++++++++++------------ src/test/index.ts | 14 +++++++------- src/types/channel.ts | 14 +++++++------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/structures/channel.ts b/src/structures/channel.ts index 65caf4d..36e60e9 100644 --- a/src/structures/channel.ts +++ b/src/structures/channel.ts @@ -74,7 +74,7 @@ export class GuildChannel extends Channel { const stringToObject = typeof target === 'string' ? (await this.guild.members.get(target)) ?? - (await this.guild.roles.get(target)) + (await this.guild.roles.get(target)) : target if (stringToObject === undefined) { @@ -121,7 +121,7 @@ export class GuildChannel extends Channel { const stringToObject = typeof target === 'string' ? (await this.guild.members.get(target)) ?? - (await this.guild.roles.get(target)) + (await this.guild.roles.get(target)) : target if (stringToObject === undefined) { @@ -193,8 +193,8 @@ export class GuildChannel extends Channel { overwrite.id instanceof Role ? 0 : overwrite.id instanceof Member - ? 1 - : overwrite.type + ? 1 + : overwrite.type if (type === undefined) { throw new Error('Overwrite type is undefined.') } @@ -226,8 +226,8 @@ export class GuildChannel extends Channel { overwrite.id instanceof Role ? 0 : overwrite.id instanceof Member - ? 1 - : overwrite.type + ? 1 + : overwrite.type if (type === undefined) { throw new Error('Overwrite type is undefined.') } @@ -257,11 +257,11 @@ export class GuildChannel extends Channel { async editOverwrite( overwrite: OverwriteAsArg, { - overriteAllow = OverrideType.ADD, - overriteDeny = OverrideType.ADD + overwriteAllow = OverrideType.ADD, + overwriteDeny = OverrideType.ADD }: { - overriteAllow?: OverrideType - overriteDeny?: OverrideType + overwriteAllow?: OverrideType + overwriteDeny?: OverrideType } ): Promise { const id = typeof overwrite.id === 'string' ? overwrite.id : overwrite.id.id @@ -327,8 +327,8 @@ export class GuildChannel extends Channel { overwrite.id instanceof Role ? 0 : overwrite.id instanceof Member - ? 1 - : overwrite.type + ? 1 + : overwrite.type if (type === undefined) { throw new Error('Overwrite type is undefined.') } diff --git a/src/test/index.ts b/src/test/index.ts index 992efb5..22096c7 100644 --- a/src/test/index.ts +++ b/src/test/index.ts @@ -74,12 +74,12 @@ client.on('messageCreate', async (msg: Message) => { const guilds = await msg.client.guilds.collection() msg.channel.send( 'Guild List:\n' + - (guilds - .array() - .map((c: Guild, i: number) => { - return `${i + 1}. ${c.name} - ${c.memberCount} members` - }) - .join('\n') as string) + (guilds + .array() + .map((c: Guild, i: number) => { + return `${i + 1}. ${c.name} - ${c.memberCount} members` + }) + .join('\n') as string) ) } else if (msg.content === '!roles') { const col = await msg.guild?.roles.collection() @@ -246,7 +246,7 @@ client.on('messageCreate', async (msg: Message) => { allow: Permissions.DEFAULT.toString() }, { - overriteAllow: OverrideType.REMOVE + overwriteAllow: OverrideType.REMOVE } ) msg.channel.send(`Done!`) diff --git a/src/types/channel.ts b/src/types/channel.ts index 80bf065..26cd456 100644 --- a/src/types/channel.ts +++ b/src/types/channel.ts @@ -28,7 +28,7 @@ export interface GuildChannelPayload extends ChannelPayload { export interface GuildTextBasedChannelPayload extends TextChannelPayload, - GuildChannelPayload { + GuildChannelPayload { topic?: string } @@ -36,7 +36,7 @@ export interface GuildTextChannelPayload extends GuildTextBasedChannelPayload { rate_limit_per_user: number } -export interface GuildNewsChannelPayload extends GuildTextBasedChannelPayload {} +export interface GuildNewsChannelPayload extends GuildTextBasedChannelPayload { } export interface GuildVoiceChannelPayload extends GuildChannelPayload { bitrate: string @@ -55,7 +55,7 @@ export interface GroupDMChannelPayload extends DMChannelPayload { export interface GuildCategoryChannelPayload extends ChannelPayload, - GuildChannelPayload {} + GuildChannelPayload { } export interface ModifyChannelPayload { name?: string @@ -66,7 +66,7 @@ export interface ModifyChannelPayload { } export interface ModifyGuildCategoryChannelPayload - extends ModifyChannelPayload {} + extends ModifyChannelPayload { } export interface ModifyGuildTextBasedChannelPayload extends ModifyChannelPayload { @@ -80,7 +80,7 @@ export interface ModifyGuildTextChannelPayload } export interface ModifyGuildNewsChannelPayload - extends ModifyGuildTextBasedChannelPayload {} + extends ModifyGuildTextBasedChannelPayload { } export interface ModifyVoiceChannelPayload extends ModifyChannelPayload { bitrate?: number | null @@ -95,7 +95,7 @@ export interface ModifyChannelOption { nsfw?: boolean | null } -export interface ModifyGuildCategoryChannelOption extends ModifyChannelOption {} +export interface ModifyGuildCategoryChannelOption extends ModifyChannelOption { } export interface ModifyGuildTextBasedChannelOption extends ModifyChannelOption { type?: number @@ -108,7 +108,7 @@ export interface ModifyGuildTextChannelOption } export interface ModifyGuildNewsChannelOption - extends ModifyGuildTextBasedChannelOption {} + extends ModifyGuildTextBasedChannelOption { } export interface ModifyVoiceChannelOption extends ModifyChannelOption { bitrate?: number | null From 004bf22126cc8a16d571656a7ea2ae26eb6b6903 Mon Sep 17 00:00:00 2001 From: DjDeveloperr Date: Mon, 29 Mar 2021 10:15:09 +0530 Subject: [PATCH 2/4] lol i forgot to save --- src/structures/channel.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/structures/channel.ts b/src/structures/channel.ts index 36e60e9..d993825 100644 --- a/src/structures/channel.ts +++ b/src/structures/channel.ts @@ -274,9 +274,9 @@ export class GuildChannel extends Channel { if ( overwrite.allow !== undefined && - overriteAllow !== OverrideType.REPLACE + overwriteAllow !== OverrideType.REPLACE ) { - switch (overriteAllow) { + switch (overwriteAllow) { case OverrideType.ADD: { const originalAllow = new Permissions(overwrites[index].allow) const newAllow = new Permissions(overwrite.allow) @@ -299,8 +299,8 @@ export class GuildChannel extends Channel { : overwrite.allow?.toJSON() ?? overwrites[index].allow } - if (overwrite.deny !== undefined && overriteDeny !== OverrideType.REPLACE) { - switch (overriteDeny) { + if (overwrite.deny !== undefined && overwriteDeny !== OverrideType.REPLACE) { + switch (overwriteDeny) { case OverrideType.ADD: { const originalDeny = new Permissions(overwrites[index].deny) const newDeny = new Permissions(overwrite.deny) From 0692276f3a53777687e91f2ffc0d6a44502a416a Mon Sep 17 00:00:00 2001 From: DjDeveloperr Date: Mon, 29 Mar 2021 10:22:52 +0530 Subject: [PATCH 3/4] x --- mod.ts | 3 ++- src/structures/channel.ts | 16 ++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/mod.ts b/mod.ts index 8b22bfa..3faff80 100644 --- a/mod.ts +++ b/mod.ts @@ -46,7 +46,8 @@ export { UsersManager } from './src/managers/users.ts' export { InviteManager } from './src/managers/invites.ts' export { Application } from './src/structures/application.ts' // export { ImageURL } from './src/structures/cdn.ts' -export { Channel } from './src/structures/channel.ts' +export { Channel, GuildChannel } from './src/structures/channel.ts' +export type { EditOverwriteOptions } from './src/structures/channel.ts' export { DMChannel } from './src/structures/dmChannel.ts' export { Embed } from './src/structures/embed.ts' export { Emoji } from './src/structures/emoji.ts' diff --git a/src/structures/channel.ts b/src/structures/channel.ts index d993825..9aad184 100644 --- a/src/structures/channel.ts +++ b/src/structures/channel.ts @@ -38,6 +38,13 @@ export class Channel extends SnowflakeBase { } } +export interface EditOverwriteOptions { + /** Allow Override Type */ + allow?: OverrideType + /** Deny Override Type */ + deny?: OverrideType +} + export class GuildChannel extends Channel { guildID: string name: string @@ -257,12 +264,9 @@ export class GuildChannel extends Channel { async editOverwrite( overwrite: OverwriteAsArg, { - overwriteAllow = OverrideType.ADD, - overwriteDeny = OverrideType.ADD - }: { - overwriteAllow?: OverrideType - overwriteDeny?: OverrideType - } + allow: overwriteAllow = OverrideType.ADD, + deny: overwriteDeny = OverrideType.ADD + }: EditOverwriteOptions ): Promise { const id = typeof overwrite.id === 'string' ? overwrite.id : overwrite.id.id const index = this.permissionOverwrites.findIndex((e) => e.id === id) From 0e57401a6bc19e448e73c1613bd94da1523c5b2e Mon Sep 17 00:00:00 2001 From: DjDeveloperr Date: Mon, 29 Mar 2021 10:24:18 +0530 Subject: [PATCH 4/4] fix --- src/test/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/index.ts b/src/test/index.ts index 22096c7..bb9a439 100644 --- a/src/test/index.ts +++ b/src/test/index.ts @@ -246,7 +246,7 @@ client.on('messageCreate', async (msg: Message) => { allow: Permissions.DEFAULT.toString() }, { - overwriteAllow: OverrideType.REMOVE + allow: OverrideType.REMOVE } ) msg.channel.send(`Done!`)