Merge branch 'dev'

.gitignore

@@ -12,4 +12,6 @@ build/config.yaml
 # Build/Distribution Files
 build
 dist
+
+# Storage/DB Files
 localstorage

src/commands/ban.ts

@@ -1,5 +1,5 @@
 import moment, { unitOfTime } from 'moment';
-import { Message, User, GuildTextableChannel } from 'eris';
+import { Message, User } from 'eris';
 import { Client, Command } from '../class';
 
 export default class Ban extends Command {

src/commands/index.ts

@@ -12,6 +12,7 @@ export { default as help } from './help';
 export { default as info } from './info';
 export { default as kick } from './kick';
 export { default as listredirects } from './listredirects';
+export { default as members } from './members';
 export { default as mute } from './mute';
 export { default as npm } from './npm';
 export { default as page } from './page';

src/commands/members.ts

@@ -0,0 +1,92 @@
+import { Message } from 'eris';
+import { createPaginationEmbed } from 'eris-pagination';
+import { Client, Command, RichEmbed } from '../class';
+
+export default class extends Command {
+  constructor(client: Client) {
+    super(client);
+    this.name = 'members';
+    this.description = 'Gets a list of members in the server or members in a specific role.';
+    this.usage = `${this.client.config.prefix}members [role name]`;
+    this.guildOnly = true;
+    this.enabled = false;
+  }
+
+  public async run(message: Message, args: string[]) {
+    try {
+      await this.mainGuild.fetchAllMembers();
+      if (!args[0]) {
+        const embed = new RichEmbed();
+        const membersOnline = this.mainGuild.members.filter((member) => member.status === 'online');
+        const membersIdle = this.mainGuild.members.filter((member) => member.status === 'idle');
+        const membersDnd = this.mainGuild.members.filter((member) => member.status === 'dnd');
+        const membersOffline = this.mainGuild.members.filter((member) => member.status === 'offline');
+        const membersBots = this.mainGuild.members.filter((member) => member.user.bot === true);
+        const membersHuman = this.mainGuild.members.filter((member) => member.user.bot === false);
+
+        embed.setTitle('Members');
+        embed.addField('Total', `${this.mainGuild.members.size}`, true);
+        embed.addField('Humans', `${membersHuman.length}`, true);
+        embed.addField('Bots', `${membersBots.length}`, true);
+        embed.addBlankField();
+        embed.addField('Online', `${membersOnline.length}`, true);
+        embed.addField('Idle', `${membersIdle.length}`, true);
+        embed.addField('Do Not Disturb', `${membersDnd.length}`, true);
+        embed.addField('Offline', `${membersOffline.length}`, true);
+        embed.setFooter(this.client.user.username, this.client.user.avatarURL);
+        embed.setTimestamp();
+
+        return message.channel.createMessage({ embed });
+      }
+
+      const role = this.client.util.resolveRole(args.join(' '), this.mainGuild);
+      if (!role) return this.error(message.channel, 'The role you specified doesn\'t exist.');
+      const membersArray: [{name: string, value: string}?] = [];
+      const membersOnline: string[] = [];
+      const membersIdle: string[] = [];
+      const membersDnd: string[] = [];
+      const membersOffline: string[] = [];
+      for (const member of this.mainGuild.members.filter((m) => m.roles.includes(role.id)).sort((a, b) => a.username.localeCompare(b.username))) {
+        switch (member.status) {
+          case 'online':
+            membersOnline.push(`${member.user.username}#${member.user.discriminator} | <@${member.user.id}>`);
+            break;
+          case 'idle':
+            membersIdle.push(`${member.user.username}#${member.user.discriminator} | <@${member.user.id}>`);
+            break;
+          case 'dnd':
+            membersDnd.push(`${member.user.username}#${member.user.discriminator} | <@${member.user.id}>`);
+            break;
+          case 'offline':
+            membersOffline.push(`${member.user.username}#${member.user.discriminator} | <@${member.user.id}>`);
+            break;
+          case undefined:
+            membersOffline.push(`${member.user.username}#${member.user.discriminator} | <@${member.user.id}>`);
+            break;
+          default:
+            break;
+        }
+      }
+      if (membersOnline.length > 0) membersArray.push({ name: 'Online', value: membersOnline.join('\n') });
+      if (membersIdle.length > 0) membersArray.push({ name: 'Idle', value: membersIdle.join('\n') });
+      if (membersDnd.length > 0) membersArray.push({ name: 'Do Not Disturb', value: membersDnd.join('\n') });
+      if (membersOffline.length > 0) membersArray.push({ name: 'Offline', value: membersOffline.join('\n') });
+      const membersSplit = this.client.util.splitFields(membersArray);
+      const cmdPages: RichEmbed[] = [];
+      membersSplit.forEach((split) => {
+        const embed = new RichEmbed();
+        embed.setTitle(`Members in ${role.name}`);
+        embed.setDescription(`Members in Role: ${membersOnline.length + membersIdle.length + membersDnd.length + membersOffline.length}`);
+        embed.setColor(role.color);
+        embed.setFooter(this.client.user.username, this.client.user.avatarURL);
+        embed.setTimestamp();
+        split.forEach((c) => embed.addField(c.name, c.value));
+        return cmdPages.push(embed);
+      });
+      if (cmdPages.length === 1) return message.channel.createMessage({ embed: cmdPages[0] });
+      return createPaginationEmbed(message, cmdPages);
+    } catch (err) {
+      return this.client.util.handleError(err, message, this);
+    }
+  }
+}

src/commands/rank.ts

@@ -42,6 +42,7 @@ export default class Rank extends Command {
           embed.setFooter(`Requested by: ${message.author.username}#${message.author.discriminator} | ${this.client.user.username}`, message.author.avatarURL);
           embed.setTimestamp();
           split.forEach((c) => embed.addField(c.name, c.value));
+          return cmdPages.push(embed);
         });
         if (cmdPages.length === 1) return message.channel.createMessage({ embed: cmdPages[0] });
         return createPaginationEmbed(message, cmdPages);

src/intervals/departmentPager.ts

@@ -70,6 +70,7 @@ async function setupDepartmentCodes(client: Client): Promise<void> {
 }
 
 function logNewPager(client: Client, num: string, member: Member): void {
+  client.util.signale.log(`Pager Number '${num}' created for '${member.user.username}#${member.user.discriminator}'.`);
   const channel = <TextableChannel> client.guilds.get(client.config.guildID).channels.get('722636436716781619');
   channel.createMessage(`__**'${member.user.username}#${member.user.discriminator}' assigned to pager number '${num}'.**__`);
 }
@@ -81,29 +82,34 @@ export default function departmentPager(client: Client): NodeJS.Timeout {
     function resolveStaffInformation(id: string) {
       return acknowledgements.find((m) => m.id === id);
     }
-    // await client.guilds.get(client.config.guildID).fetchAllMembers();
+    await client.guilds.get(client.config.guildID).fetchAllMembers();
     const { members } = client.guilds.get(client.config.guildID);
 
     for (const member of members.values()) {
       const pager = await client.db.PagerNumber.findOne({ individualAssignID: member.id }).lean().exec();
       if (!pager) continue;
       if (pager.num.startsWith('00') && !member.roles.includes('662163685439045632')) {
-        client.db.PagerNumber.deleteOne({ num: pager.num });
+        await client.db.PagerNumber.deleteOne({ num: pager.num });
         client.util.signale.log(`Pager Number '${pager.num}' has been deleted.`);
-      } else if (pager.num.startsWith('01') && !member.roles.includes('701454855952138300')) {
+      }
-        client.db.PagerNumber.deleteOne({ num: pager.num });
+      if (pager.num.startsWith('01') && !member.roles.includes('701454855952138300')) {
+        await client.db.PagerNumber.deleteOne({ num: pager.num });
         client.util.signale.log(`Pager Number '${pager.num}' has been deleted.`);
-      } else if (pager.num.startsWith('10') && !member.roles.includes('701454780828221450')) {
+      }
-        client.db.PagerNumber.deleteOne({ num: pager.num });
+      if (pager.num.startsWith('10') && !member.roles.includes('701454780828221450')) {
+        await client.db.PagerNumber.deleteOne({ num: pager.num });
         client.util.signale.log(`Pager Number '${pager.num}' has been deleted.`);
-      } else if (pager.num.startsWith('20') && !member.roles.includes('455972169449734144')) {
+      }
-        client.db.PagerNumber.deleteOne({ num: pager.num });
+      if (pager.num.startsWith('20') && !member.roles.includes('455972169449734144')) {
+        await client.db.PagerNumber.deleteOne({ num: pager.num });
         client.util.signale.log(`Pager Number '${pager.num}' has been deleted.`);
-      } else if (pager.num.startsWith('21') && !member.roles.includes('453689940140883988')) {
+      }
-        client.db.PagerNumber.deleteOne({ num: pager.num });
+      if (pager.num.startsWith('21') && !member.roles.includes('453689940140883988')) {
+        await client.db.PagerNumber.deleteOne({ num: pager.num });
         client.util.signale.log(`Pager Number '${pager.num}' has been deleted.`);
-      } else if (pager.num.startsWith('22') && !member.roles.includes('701481967149121627')) {
+      }
-        client.db.PagerNumber.deleteOne({ num: pager.num });
+      if (pager.num.startsWith('22') && !member.roles.includes('701481967149121627')) {
+        await client.db.PagerNumber.deleteOne({ num: pager.num });
         client.util.signale.log(`Pager Number '${pager.num}' has been deleted.`);
       }
     }