From 7a3ccd7bd71c1f9a5ade3426425358ed6e0ffac1 Mon Sep 17 00:00:00 2001 From: Bsian Date: Tue, 9 Jun 2020 23:19:20 +0100 Subject: [PATCH] Simplication --- src/commands/ban.ts | 6 +++--- src/commands/game.ts | 2 +- src/commands/kick.ts | 2 +- src/commands/roleinfo.ts | 4 ++-- src/commands/unban.ts | 2 +- src/commands/whois.ts | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/commands/ban.ts b/src/commands/ban.ts index 8d6e375..87c93c3 100644 --- a/src/commands/ban.ts +++ b/src/commands/ban.ts @@ -1,5 +1,5 @@ import moment, { unitOfTime } from 'moment'; -import { Message, User } from 'eris'; +import { Message, User, GuildTextableChannel } from 'eris'; import { Client, Command } from '../class'; export default class Ban extends Command { @@ -16,7 +16,7 @@ export default class Ban extends Command { public async run(message: Message, args: string[]) { try { if (!args[0]) return this.client.commands.get('help').run(message, [this.name]); - const member = this.client.util.resolveMember(args[0], this.client.guilds.get(this.client.config.guildID)); + const member = this.client.util.resolveMember(args[0], message.guild); let user: User; if (!member) { try { @@ -28,7 +28,7 @@ export default class Ban extends Command { user = member.user; } try { - await this.client.guilds.get(this.client.config.guildID).getBan(args[0]); + await message.guild.getBan(args[0]); return this.error(message.channel, 'This user is already banned.'); } catch {} // eslint-disable-line no-empty if (member && !this.client.util.moderation.checkPermissions(member, message.member)) return this.error(message.channel, 'Permission Denied.'); diff --git a/src/commands/game.ts b/src/commands/game.ts index 40ecb6f..382b640 100644 --- a/src/commands/game.ts +++ b/src/commands/game.ts @@ -27,7 +27,7 @@ export default class Game extends Command { let member: Member; if (!args[0]) member = message.member; else { - member = this.client.util.resolveMember(args.join(' '), this.client.guilds.get(this.client.config.guildID)); + member = this.client.util.resolveMember(args.join(' '), message.guild); if (!member) { return this.error(message.channel, 'Member not found.'); } diff --git a/src/commands/kick.ts b/src/commands/kick.ts index 2bf5c51..8ad74e3 100644 --- a/src/commands/kick.ts +++ b/src/commands/kick.ts @@ -15,7 +15,7 @@ export default class Kick extends Command { public async run(message: Message, args: string[]) { try { if (!args[0]) return this.client.commands.get('help').run(message, [this.name]); - let user: Member = this.client.util.resolveMember(args[0], this.client.guilds.get(this.client.config.guildID)); + let user: Member = this.client.util.resolveMember(args[0], message.guild); if (!user) { try { user = await this.client.getRESTGuildMember(this.client.config.guildID, args[0]); diff --git a/src/commands/roleinfo.ts b/src/commands/roleinfo.ts index fb39158..59ed6b4 100644 --- a/src/commands/roleinfo.ts +++ b/src/commands/roleinfo.ts @@ -17,9 +17,9 @@ export default class Roleinfo extends Command { try { if (!args[0]) return this.client.commands.get('help').run(message, [this.name]); - let role: Role = this.client.guilds.get(this.client.config.guildID).roles.find((r: Role) => r.id === args[0]); + let role: Role = message.guild.roles.find((r: Role) => r.id === args[0]); if (!role) { // if it's a role name - role = this.client.guilds.get(this.client.config.guildID).roles.find((r: Role) => r.name.toLowerCase().includes(args.join(' ').toLowerCase())); + role = message.guild.roles.find((r: Role) => r.name.toLowerCase().includes(args.join(' ').toLowerCase())); } if (!role) return this.error(message.channel, 'Could not find role.'); diff --git a/src/commands/unban.ts b/src/commands/unban.ts index 3eb0cae..1bcfc9d 100644 --- a/src/commands/unban.ts +++ b/src/commands/unban.ts @@ -22,7 +22,7 @@ export default class Unban extends Command { return this.error(message.channel, 'Could find find user.'); } try { - await this.client.guilds.get(this.client.config.guildID).getBan(args[0]); + await message.guild.getBan(args[0]); } catch { return this.error(message.channel, 'This user is not banned.'); } diff --git a/src/commands/whois.ts b/src/commands/whois.ts index 6b52b8e..9f56a6a 100644 --- a/src/commands/whois.ts +++ b/src/commands/whois.ts @@ -21,7 +21,7 @@ export default class Whois extends Command { let member: Member; if (!args[0]) member = message.member; else { - member = this.client.util.resolveMember(args.join(' '), this.client.guilds.get(this.client.config.guildID)); + member = this.client.util.resolveMember(args.join(' '), message.guild); } if (!member) { @@ -59,7 +59,7 @@ export default class Whois extends Command { description += `\n<@${member.id}>`; embed.setDescription(description); - for (const role of member.roles.map((r) => this.client.guilds.get(this.client.config.guildID).roles.get(r)).sort((a, b) => b.position - a.position)) { + for (const role of member.roles.map((r) => message.guild.roles.get(r)).sort((a, b) => b.position - a.position)) { if (role?.color !== 0) { embed.setColor(role.color); break; @@ -80,12 +80,12 @@ export default class Whois extends Command { embed.addField('Joined At', `${moment(new Date(member.joinedAt)).format('dddd, MMMM Do YYYY, h:mm:ss A')} ET`, true); embed.addField('Created At', `${moment(new Date(member.user.createdAt)).format('dddd, MMMM Do YYYY, h:mm:ss A')} ET`, true); if (member.roles.length > 0) { - embed.addField(`Roles [${member.roles.length}]`, member.roles.map((r) => this.client.guilds.get(this.client.config.guildID).roles.get(r)).sort((a, b) => b.position - a.position).map((r) => `<@&${r.id}>`).join(', ')); + embed.addField(`Roles [${member.roles.length}]`, member.roles.map((r) => message.guild.roles.get(r)).sort((a, b) => b.position - a.position).map((r) => `<@&${r.id}>`).join(', ')); } const permissions: string[] = []; const serverAcknowledgements: string[] = []; const bit = member.permission.allow; - if (this.client.guilds.get(this.client.config.guildID).ownerID === member.id) serverAcknowledgements.push('Server Owner'); + if (message.guild.ownerID === member.id) serverAcknowledgements.push('Server Owner'); if ((bit | 8) === bit) { permissions.push('Administrator'); serverAcknowledgements.push('Server Admin'); } if ((bit | 32) === bit) { permissions.push('Manage Server'); serverAcknowledgements.push('Server Manager'); } if ((bit | 16) === bit) permissions.push('Manage Channels');