From 0a2ad6cddec76b6d66b1760e32b49305da9d19d0 Mon Sep 17 00:00:00 2001
From: Matthew R <matthew@staff.libraryofcode.org>
Date: Mon, 23 Mar 2020 22:27:00 -0400
Subject: [PATCH] add tier information and perm cleanup for whois commands

---
 src/commands/whois.ts      | 8 ++++----
 src/commands/whois_user.ts | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/commands/whois.ts b/src/commands/whois.ts
index 07f3004..7ea26a3 100644
--- a/src/commands/whois.ts
+++ b/src/commands/whois.ts
@@ -38,6 +38,7 @@ export default class Whois extends Command {
       embed.addField('Username', `${account.username} | <@${account.userID}>`, true);
       embed.addField('ID', account.userID, true);
       embed.addField('Email Address', account.emailAddress, true);
+      embed.addField('Tier', String(account.tier), true);
       embed.addField('Created By', `<@${this.client.users.get(account.createdBy).id}>`, true);
       embed.addField('Created At', moment(account.createdAt).format('dddd, MMMM Do YYYY, h:mm:ss A'), true);
       const cpuUsage = await this.client.util.exec(`top -b -n 1 -u ${account.username} | awk 'NR>7 { sum += $9; } END { print sum; }'`);
@@ -47,10 +48,9 @@ export default class Whois extends Command {
       embed.addField('Storage', data, true);
       let details = '';
       if (account.locked) details += 'This account is currently locked.\n';
-      if (account.permissions.engineer) details += 'This account belongs to an Engineer.\n';
-      else if (account.permissions.communityManager) details += 'This account belongs to a Community Manager.\n';
-      else if (account.permissions.supervisor) details += 'This account belongs to a Supervisor.\n';
-      else if (account.permissions.staff) details += 'This account belongs to a Staff member.\n';
+      if (account.permissions.facultyMarshal) details += 'This account belongs to a Faculty Marshal.\n';
+      else if (account.permissions.sheriff) details += 'This account belongs to a Sheriff.\n';
+      else if (account.permissions.associate) details += 'This account belongs to a Staff member.\n';
       if (account.root) details += 'This account has root/administrative privileges.\n';
       if (details) embed.addField('Additional Details', details, true);
       embed.setFooter(this.client.user.username, this.client.user.avatarURL);
diff --git a/src/commands/whois_user.ts b/src/commands/whois_user.ts
index cd152de..2ed0ff9 100644
--- a/src/commands/whois_user.ts
+++ b/src/commands/whois_user.ts
@@ -27,6 +27,7 @@ export default class Whois_User extends Command {
       embed.setColor(0x36393f);
       embed.addField('Username', `${account.username} | <@${account.userID}>`, true);
       embed.addField('ID', account.userID, true);
+      embed.addField('Tier', String(account.tier), true);
       embed.addField('Created By', `<@${this.client.users.get(account.createdBy).id}>`, true);
       embed.addField('Created At', moment(account.createdAt).format('dddd, MMMM Do YYYY, h:mm:ss A'), true);
       const cpuUsage = await this.client.util.exec(`top -b -n 1 -u ${account.username} | awk 'NR>7 { sum += $9; } END { print sum; }'`);
@@ -36,10 +37,9 @@ export default class Whois_User extends Command {
       embed.addField('Storage', data, true);
       let details = '';
       if (account.locked) details += 'This account is currently locked.\n';
-      if (account.permissions.engineer) details += 'This account belongs to an Engineer.\n';
-      else if (account.permissions.communityManager) details += 'This account belongs to a Community Manager.\n';
-      else if (account.permissions.supervisor) details += 'This account belongs to a Supervisor.\n';
-      else if (account.permissions.staff) details += 'This account belongs to a Staff member.\n';
+      if (account.permissions.facultyMarshal) details += 'This account belongs to a Faculty Marshal.\n';
+      else if (account.permissions.sheriff) details += 'This account belongs to a Sheriff.\n';
+      else if (account.permissions.associate) details += 'This account belongs to a Staff member.\n';
       if (account.root) details += 'This account has root/administrative privileges.\n';
       if (details) embed.addField('Additional Details', details, true);
       embed.setFooter(this.client.user.username, this.client.user.avatarURL);