Merge branch 'dev'

src/commands/whois.ts

@@ -41,9 +41,13 @@ export default class Whois extends Command {
       embed.setThumbnail(member.avatarURL);
       const ackResolve = this.resolveStaffInformation(member.id);
       let description = '';
-      if (ackResolve?.title) {
+      let titleAndDepartment = `${emotes.titleAndDepartment} `;
-        description += `${emotes.titleAndDepartment} __**${ackResolve.title}**__\n\n`;
+      if (ackResolve?.title && ackResolve?.dept) {
+        titleAndDepartment += `__**${ackResolve.title}**__, __${ackResolve.dept}__\n\n`;
+      } else if (ackResolve?.dept) {
+        titleAndDepartment += `__${ackResolve.dept}__\n\n`;
       }
+      if (titleAndDepartment.length > 0) description += titleAndDepartment;
       if (ackResolve?.emailAddress) {
         description += `${emotes.email} ${ackResolve.emailAddress}\n`;
       }

src/configs/acknowledgements.json

@@ -2,7 +2,8 @@
   {
     "name": "Matthew",
     "id": "278620217221971968",
-    "title": "Board of Directors",
+    "title": "Chief Director of Engineering",
+    "dept": "Board of Directors",
     "emailAddress": "matthew@staff.libraryofcode.org",
     "gitlab": "https://gitlab.libraryofcode.org/matthew",
     "github": "https://github.com/matthew119427",
@@ -12,7 +13,7 @@
   {
     "name": "Joe",
     "id": "556969659531001858",
-    "title": "Board of Directors",
+    "dept": "Board of Directors",
     "emailAddress": "joe@staff.libraryofcode.org",
     "gitlab": "https://gitlab.libraryofcode.org/Joe",
     "github": "https://github.com/sirdroolio",
@@ -20,9 +21,10 @@
     "acknowledgements": ["Developer"]
   },
   {
-    "name": "Bsian", 
+    "name": "Bsian",
     "id": "253600545972027394",
-    "title": "Board of Directors",
+    "title": "Director of Engineering",
+    "dept": "Board of Directors",
     "emailAddress": "bsian@staff.libraryofcode.org",
     "bio": "I also like trains",
     "acknowledgements": ["Maintainer & Assistant Lead Developer"]
@@ -30,20 +32,16 @@
   {
     "name": "NightRaven",
     "id": "239261547959025665",
-    "title": "Board of Directors",
+    "title": "Director of Information Security",
+    "dept": "Board of Directors",
     "emailAddress": "nightraven@staff.libraryofcode.org",
     "bio": "I like trains"
   },
-  {
-    "name": "Midori",
-    "id": "109122112643440640",
-    "title": "Board of Directors [ON LEAVE]",
-    "emailAddress": "midori@staff.libraryofcode.org"
-  },
   {
     "name": "Unknown",
     "id": "143414786913206272",
-    "title": "Board of Directors",
+    "title": "Director of Operations",
+    "dept": "Board of Directors",
     "emailAddress": "unknown@staff.libraryofcode.org",
     "gitlab": "https://gitlab.libraryofcode.org/unknown",
     "bio": "im not a proffesional developer or anything, i just enjoy it as a hobby."
@@ -51,7 +49,8 @@
   {
     "name": "TheSkele27",
     "id": "213632190557192192",
-    "title": "Board of Directors",
+    "title": "Director of Community Engagement",
+    "dept": "Board of Directors",
     "emailAddress": "theskele27@staff.libraryofcode.org",
     "gitlab": "https://gitlab.libraryofcode.org/TheSkele27",
     "github": "https://github.com/TheSkele27",
@@ -60,7 +59,7 @@
   {
     "name": "Catbirby",
     "id": "131953641371205632",
-    "title": "Supervisor",
+    "dept": "Supervisor",
     "emailAddress": "catbirby@staff.libraryofcode.org",
     "github": "https://github.com/catbirby",
     "bio": "Computer Tech/Networking Nerd/Sysadmin/Graphic Designer/Audiophile. I don't do much coding but know my way around most languages."
@@ -68,7 +67,7 @@
   {
     "name": "D3XTER",
     "id": "468009964263178262",
-    "title": "Core Team",
+    "dept": "Core Team",
     "emailAddress": "dexter@staff.libraryofcode.org",
     "gitlab": "https://gitlab.libraryofcode.org/D3XTER",
     "bio": "Hi I'm D3XTER how are ya?"
@@ -76,7 +75,7 @@
   {
     "name": "DedShotTM",
     "id": "402154763363418142",
-    "title": "Technician & Moderator",
+    "dept": "Technician & Moderator",
     "emailAddress": "dedshot@staff.libraryofcode.org",
     "gitlab": "https://gitlab.libraryofcode.org/DedShotTM",
     "github": "https://github.com/DedShotTM",
@@ -86,7 +85,7 @@
   {
     "name": "EdgyBoi2414",
     "id": "397432516010835970",
-    "title": "Core Team",
+    "dept": "Core Team",
     "emailAddress": "edgyboi2414@gmail.com",
     "gitlab": "https://gitlab.libraryofcode.org/EdgyBoi2414",
     "github": "https://github.com/EdgyBoi2414",
@@ -95,7 +94,7 @@
   {
     "name": "Hector",
     "id": "377781496292835339",
-    "title": "Core Team",
+    "dept": "Core Team",
     "emailAddress": "hector@staff.libraryofcode.org",
     "gitlab": "https://gitlab.libraryofcode.org/Hector",
     "github": "https://github.com/Hector6704",
@@ -104,7 +103,7 @@
   {
     "name": "KhaaZ",
     "id": "179908288337412096",
-    "title": "Core Team",
+    "dept": "Core Team",
     "emailAddress": "khaaz@staff.libraryofcode.org",
     "gitlab": "https://gitlab.libraryofcode.org/KhaaZ",
     "github": "https://github.com/Khaazz",
@@ -113,7 +112,7 @@
   {
     "name": "Ryan",
     "id": "186679073764802560",
-    "title": "Associate",
+    "dept": "Associate",
     "emailAddress": "wbdvryan@staff.libraryofcode.org",
     "gitlab": "https://gitlab.libraryofcode.org/plainRyan",
     "bio": "Experiment, learn, share, repeat.",
@@ -122,7 +121,7 @@
   {
     "name": "Zloth",
     "id": "382368885267234816",
-    "title": "Associate",
+    "dept": "Associate",
     "emailAddress": "zloth@staff.libraryofcode.org",
     "github": "https://github.com/gavintjhxx",
     "bio": "Wake up. Eat. Code. Sleep. Loop()"
@@ -130,7 +129,7 @@
   {
     "name": "PlayerVMachine",
     "id": "273999507174195203",
-    "title": "Instructor & Associate",
+    "dept": "Instructor & Associate",
     "emailAddress": "nicolas@staff.libraryofcode.org",
     "bio": "I write C++ to pay off my student loans"
   },