package.json

@@ -42,7 +42,7 @@
     "bull": "^3.20.1",
     "cheerio": "^1.0.0-rc.5",
     "cron": "^1.8.2",
-    "eris": "^0.13.3",
+    "eris": "^0.14.0",
     "eris-pagination": "github:bsian03/eris-pagination",
     "express": "^4.17.1",
     "helmet": "^3.22.0",

src/api/board.ins/routes/root.ts

@@ -13,14 +13,15 @@ export default class Root extends Route {
 
   public bind() {
     this.router.post('/eo', async (req, res) => {
-      if (!req.body.pin) {
+      if (!req.headers.authorization) {
         return res.status(401).json({
           code: this.constants.codes.UNAUTHORIZED,
           message: this.constants.messages.UNAUTHORIZED,
         });
       }
 
-      const director = await this.server.client.db.Score.findOne({ pin: req.body.pin });
+      const users = await this.server.client.db.Score.find();
+      const director = users.filter((user) => user.pin.join('-') === req.headers.authorization)[0];
       const staffGuild = this.server.client.guilds.get(this.server.client.config.guildID) || await this.server.client.getRESTGuild(this.server.client.config.guildID);
 
       if (!director || !staffGuild.members.get(director.userID)?.roles?.includes('662163685439045632')) {
@@ -48,7 +49,6 @@ export default class Root extends Route {
       embed.setColor('#dd3acd');
       embed.addField('Subject', req.body.subject);
       embed.addField('Body', req.body.body);
-      embed.addField('Director', directorDiscord.mention);
       embed.setDescription(eoID);
       embed.setTimestamp(new Date());
 
@@ -59,7 +59,7 @@ export default class Root extends Route {
         issuer: director.userID,
         subject: req.body.subject,
         body: req.body.body,
-        at: new Date(),
+        at: Date.now(),
         oID: eoID,
         msg: msg.id,
       });
@@ -70,15 +70,75 @@ export default class Root extends Route {
       });
     });
 
-    this.router.post('/proc', async (req: Request, res: Response) => {
+    this.router.post('/motion', async (req, res) => {
-      if (!req.body.pin) {
+      if (!req.headers.authorization) {
         return res.status(401).json({
           code: this.constants.codes.UNAUTHORIZED,
           message: this.constants.messages.UNAUTHORIZED,
         });
       }
 
-      const director = await this.server.client.db.Score.findOne({ pin: req.body.pin });
+      const users = await this.server.client.db.Score.find();
+      const director = users.filter((user) => user.pin.join('-') === req.headers.authorization)[0];
+      const staffGuild = this.server.client.guilds.get(this.server.client.config.guildID) || await this.server.client.getRESTGuild(this.server.client.config.guildID);
+
+      if (!director || !staffGuild.members.get(director.userID)?.roles?.includes('662163685439045632')) {
+        return res.status(403).json({
+          code: this.constants.codes.UNAUTHORIZED,
+          message: this.constants.messages.UNAUTHORIZED,
+        });
+      }
+
+      if (typeof req.body.subject !== 'string' || typeof req.body.body !== 'string' || req.body.subject.length > 1024 || req.body.body.length > 1024) {
+        return res.status(400).json({
+          code: this.constants.codes.CLIENT_ERROR,
+          message: this.constants.messages.CLIENT_ERROR,
+        });
+      }
+
+      const motionID = genUUID();
+
+      const directorDiscord = this.server.client.users.get(director.userID) || await this.server.client.getRESTUser(director.userID);
+      const directorInformation = await this.server.client.db.Staff.findOne({ userID: director.userID });
+
+      const embed = new RichEmbed();
+      embed.setTitle('Motion');
+      embed.setAuthor(`${directorDiscord.username}#${directorDiscord.discriminator}, ${directorInformation.pn.join(', ')}`, directorDiscord.avatarURL);
+      embed.setColor('#dd3acd');
+      embed.addField('Subject', req.body.subject);
+      embed.addField('Body', req.body.body);
+      embed.setDescription(motionID);
+      embed.setTimestamp(new Date());
+
+      const channel = <TextChannel>this.server.client.getChannel('807444198969835550');
+      const msg = await channel.createMessage({ embed });
+
+      const motion = await this.server.client.db.Motion.create({
+        issuer: director.userID,
+        subject: req.body.subject,
+        body: req.body.body,
+        at: Date.now(),
+        oID: motionID,
+        msg: msg.id,
+        processed: false,
+      });
+
+      res.status(200).json({
+        code: this.constants.codes.SUCCESS,
+        message: `Created new Motion with ID ${motion.oID} by ${directorDiscord.username}#${directorDiscord.discriminator}, ${directorInformation.pn.join(', ')}.`,
+      });
+    });
+
+    this.router.post('/proc', async (req: Request, res: Response) => {
+      if (!req.headers.authorization) {
+        return res.status(401).json({
+          code: this.constants.codes.UNAUTHORIZED,
+          message: this.constants.messages.UNAUTHORIZED,
+        });
+      }
+
+      const users = await this.server.client.db.Score.find();
+      const director = users.filter((user) => user.pin.join('-') === req.headers.authorization)[0];
       const staffGuild = this.server.client.guilds.get(this.server.client.config.guildID) || await this.server.client.getRESTGuild(this.server.client.config.guildID);
 
       if (!director || !staffGuild.members.get(director.userID)?.roles?.includes('662163685439045632')) {
@@ -106,21 +166,20 @@ export default class Root extends Route {
       embed.setColor('#66e1ff');
       embed.addField('Subject', req.body.subject);
       embed.addField('Body', req.body.body);
-      embed.addField('ID', proclamationID);
+      embed.setDescription(proclamationID);
-      embed.addField('Director', directorDiscord.mention);
       embed.setTimestamp(new Date());
 
       const channel = <TextChannel>this.server.client.getChannel('807444198969835550');
       const procMessage = await channel.createMessage({ embed });
-      await procMessage.addReaction(this.server.client.util.emojis.SUCCESS);
+      await procMessage.addReaction('modSuccess:578750988907970567');
-      await procMessage.addReaction(this.server.client.util.emojis.ERROR);
+      await procMessage.addReaction('modError:578750737920688128');
-      await procMessage.getReaction('🙋');
+      await procMessage.addReaction('🙋');
 
       const proclamation = await this.server.client.db.Proclamation.create({
         issuer: director.userID,
         subject: req.body.subject,
         body: req.body.body,
-        at: new Date(),
+        at: Date.now(),
         oID: proclamationID,
         processed: false,
         msg: procMessage.id,
@@ -133,14 +192,15 @@ export default class Root extends Route {
     });
 
     this.router.delete('/eo/:id', async (req, res) => {
-      if (!req.body.pin) {
+      if (!req.headers.authorization) {
         return res.status(401).json({
           code: this.constants.codes.UNAUTHORIZED,
           message: this.constants.messages.UNAUTHORIZED,
         });
       }
 
-      const director = await this.server.client.db.Score.findOne({ pin: req.body.pin });
+      const users = await this.server.client.db.Score.find();
+      const director = users.filter((user) => user.pin.join('-') === req.headers.authorization)[0];
       const staffGuild = this.server.client.guilds.get(this.server.client.config.guildID) || await this.server.client.getRESTGuild(this.server.client.config.guildID);
 
       if (!director || !staffGuild.members.get(director.userID)?.roles?.includes('662163685439045632')) {
@@ -179,14 +239,15 @@ export default class Root extends Route {
     });
 
     this.router.delete('/motion/:id', async (req, res) => {
-      if (!req.body.pin) {
+      if (!req.headers.authorization) {
         return res.status(401).json({
           code: this.constants.codes.UNAUTHORIZED,
           message: this.constants.messages.UNAUTHORIZED,
         });
       }
 
-      const director = await this.server.client.db.Score.findOne({ pin: req.body.pin });
+      const users = await this.server.client.db.Score.find();
+      const director = users.filter((user) => user.pin.join('-') === req.headers.authorization)[0];
       const staffGuild = this.server.client.guilds.get(this.server.client.config.guildID) || await this.server.client.getRESTGuild(this.server.client.config.guildID);
 
       if (!director || !staffGuild.members.get(director.userID)?.roles?.includes('662163685439045632')) {
@@ -225,14 +286,15 @@ export default class Root extends Route {
     });
 
     this.router.delete('/proc/:id', async (req, res) => {
-      if (!req.body.pin) {
+      if (!req.headers.authorization) {
         return res.status(401).json({
           code: this.constants.codes.UNAUTHORIZED,
           message: this.constants.messages.UNAUTHORIZED,
         });
       }
 
-      const director = await this.server.client.db.Score.findOne({ pin: req.body.pin });
+      const users = await this.server.client.db.Score.find();
+      const director = users.filter((user) => user.pin.join('-') === req.headers.authorization)[0];
       const staffGuild = this.server.client.guilds.get(this.server.client.config.guildID) || await this.server.client.getRESTGuild(this.server.client.config.guildID);
 
       if (!director || !staffGuild.members.get(director.userID)?.roles?.includes('662163685439045632')) {
@@ -346,14 +408,15 @@ export default class Root extends Route {
     });
 
     this.router.patch('/eo/:id', async (req, res) => {
-      if (!req.body.pin) {
+      if (!req.headers.authorization) {
         return res.status(401).json({
           code: this.constants.codes.UNAUTHORIZED,
           message: this.constants.messages.UNAUTHORIZED,
         });
       }
 
-      const director = await this.server.client.db.Score.findOne({ pin: req.body.pin });
+      const users = await this.server.client.db.Score.find();
+      const director = users.filter((user) => user.pin.join('-') === req.headers.authorization)[0];
       const staffGuild = this.server.client.guilds.get(this.server.client.config.guildID) || await this.server.client.getRESTGuild(this.server.client.config.guildID);
       const directorDiscord = staffGuild.members.get(director.userID);
 
@@ -398,20 +461,18 @@ export default class Root extends Route {
       });
 
       if (executiveOrder.subject !== req.body.subject || executiveOrder.body !== req.body.body) {
-        const directorStaffProfile = await this.server.client.db.Staff.findOne({ userID: directorDiscord.id });
+        const channel = <TextChannel>this.server.client.getChannel('807444198969835550');
+        const eoMessage = await channel.getMessage(executiveOrder.msg);
 
         const embed = new RichEmbed();
         embed.setTitle('Executive Order');
-        embed.setAuthor(`${directorDiscord.username}#${directorDiscord.discriminator}, ${directorStaffProfile.pn.join(', ')}`, directorDiscord.avatarURL);
+        embed.author = eoMessage.embeds[0].author;
         embed.setColor('#66e1ff');
         embed.addField('Subject', req.body.subject || executiveOrder.subject);
         embed.addField('Body', req.body.body || executiveOrder.body);
-        embed.addField('Director', `<@!${executiveOrder.issuer}>`);
         embed.setDescription(req.params.id);
         embed.setTimestamp(new Date());
 
-        const channel = <TextChannel>this.server.client.getChannel('807444198969835550');
-        const eoMessage = await channel.getMessage(executiveOrder.msg);
         await eoMessage.edit({ embed });
       }
 
@@ -419,14 +480,15 @@ export default class Root extends Route {
     });
 
     this.router.patch('/motion/:id', async (req, res) => {
-      if (!req.body.pin) {
+      if (!req.headers.authorization) {
         return res.status(401).json({
           code: this.constants.codes.UNAUTHORIZED,
           message: this.constants.messages.UNAUTHORIZED,
         });
       }
 
-      const director = await this.server.client.db.Score.findOne({ pin: req.body.pin });
+      const users = await this.server.client.db.Score.find();
+      const director = users.filter((user) => user.pin.join('-') === req.headers.authorization)[0];
       const staffGuild = this.server.client.guilds.get(this.server.client.config.guildID) || await this.server.client.getRESTGuild(this.server.client.config.guildID);
       const directorDiscord = staffGuild.members.get(director.userID);
 
@@ -471,20 +533,18 @@ export default class Root extends Route {
       });
 
       if (motion.subject !== req.body.subject || motion.body !== req.body.body) {
-        const directorStaffProfile = await this.server.client.db.Staff.findOne({ userID: directorDiscord.id });
+        const channel = <TextChannel>this.server.client.getChannel('807444198969835550');
+        const motionMessage = await channel.getMessage(motion.msg);
 
         const embed = new RichEmbed();
         embed.setTitle('Motion');
-        embed.setAuthor(`${directorDiscord.username}#${directorDiscord.discriminator}, ${directorStaffProfile.pn.join(', ')}`, directorDiscord.avatarURL);
+        embed.author = motionMessage.embeds[0].author;
         embed.setColor('#66e1ff');
         embed.addField('Subject', req.body.subject || motion.subject);
         embed.addField('Body', req.body.body || motion.body);
-        embed.addField('Director', `<@!${motion.issuer}>`);
         embed.setDescription(req.params.id);
         embed.setTimestamp(new Date());
 
-        const channel = <TextChannel>this.server.client.getChannel('807444198969835550');
-        const motionMessage = await channel.getMessage(motion.msg);
         await motionMessage.edit({ embed });
       }
 
@@ -492,14 +552,15 @@ export default class Root extends Route {
     });
 
     this.router.patch('/proc/:id', async (req, res) => {
-      if (!req.body.pin) {
+      if (!req.headers.authorization) {
         return res.status(401).json({
           code: this.constants.codes.UNAUTHORIZED,
           message: this.constants.messages.UNAUTHORIZED,
         });
       }
 
-      const director = await this.server.client.db.Score.findOne({ pin: req.body.pin });
+      const users = await this.server.client.db.Score.find();
+      const director = users.filter((user) => user.pin.join('-') === req.headers.authorization)[0];
       const staffGuild = this.server.client.guilds.get(this.server.client.config.guildID) || await this.server.client.getRESTGuild(this.server.client.config.guildID);
       const directorDiscord = staffGuild.members.get(director.userID);
 
@@ -544,20 +605,18 @@ export default class Root extends Route {
       });
 
       if (proclamation.subject !== req.body.subject || proclamation.body !== req.body.body) {
-        const directorStaffProfile = await this.server.client.db.Staff.findOne({ userID: directorDiscord.id });
+        const channel = <TextChannel>this.server.client.getChannel('807444198969835550');
+        const procMessage = await channel.getMessage(proclamation.msg);
 
         const embed = new RichEmbed();
         embed.setTitle('Proclamation');
-        embed.setAuthor(`${directorDiscord.username}#${directorDiscord.discriminator}, ${directorStaffProfile.pn.join(', ')}`, directorDiscord.avatarURL);
+        embed.author = procMessage.embeds[0].author;
         embed.setColor('#66e1ff');
         embed.addField('Subject', req.body.subject || proclamation.subject);
         embed.addField('Body', req.body.body || proclamation.body);
-        embed.addField('Director', `<@!${proclamation.issuer}>`);
         embed.setDescription(req.params.id);
         embed.setTimestamp(new Date());
 
-        const channel = <TextChannel>this.server.client.getChannel('807444198969835550');
-        const procMessage = await channel.getMessage(proclamation.msg);
         await procMessage.edit({ embed });
       }
 
@@ -565,14 +624,15 @@ export default class Root extends Route {
     });
 
     this.router.patch('/resolution/:id', async (req, res) => {
-      if (!req.body.pin) {
+      if (!req.headers.authorization) {
         return res.status(401).json({
           code: this.constants.codes.UNAUTHORIZED,
           message: this.constants.messages.UNAUTHORIZED,
         });
       }
 
-      const director = await this.server.client.db.Score.findOne({ pin: req.body.pin });
+      const users = await this.server.client.db.Score.find();
+      const director = users.filter((user) => user.pin.join('-') === req.headers.authorization)[0];
       const staffGuild = this.server.client.guilds.get(this.server.client.config.guildID) || await this.server.client.getRESTGuild(this.server.client.config.guildID);
       const directorDiscord = staffGuild.members.get(director.userID);
 
@@ -617,21 +677,18 @@ export default class Root extends Route {
       });
 
       if (resolution.subject !== req.body.subject || resolution.body !== req.body.body) {
-        const directorStaffProfile = await this.server.client.db.Staff.findOne({ userID: directorDiscord.id });
+        const channel = <TextChannel>this.server.client.getChannel('807444198969835550');
-        const motion = await this.server.client.db.Motion.findOne({ oID: resolution.oID });
+        const resMessage = await channel.getMessage(resolution.msg);
 
         const embed = new RichEmbed();
         embed.setTitle('Resolution');
-        embed.setAuthor(`${directorDiscord.username}#${directorDiscord.discriminator}, ${directorStaffProfile.pn.join(', ')}`, directorDiscord.avatarURL);
+        embed.author = resMessage.embeds[0].author;
         embed.setColor('#75b0ff');
         embed.addField('Subject', req.body.subject || resolution.subject);
         embed.addField('Body', req.body.body || resolution.body);
-        embed.addField('Director', `<@!${motion.issuer}>`);
         embed.setDescription(req.params.id);
         embed.setTimestamp(new Date());
 
-        const channel = <TextChannel>this.server.client.getChannel('807444198969835550');
-        const resMessage = await channel.getMessage(resolution.msg);
         await resMessage.edit({
           content: `<@!${resolution.issuer}>`,
           embed,
@@ -666,15 +723,16 @@ export default class Root extends Route {
       res.status(200).json(resolutions);
     });
 
-    this.router.patch('/motion/confirm', async (req, res) => {
+    this.router.patch('/motion/confirm/:id', async (req, res) => {
-      if (!req.body.pin) {
+      if (!req.headers.authorization) {
         return res.status(401).json({
           code: this.constants.codes.UNAUTHORIZED,
           message: this.constants.messages.UNAUTHORIZED,
         });
       }
 
-      const director = await this.server.client.db.Score.findOne({ pin: req.body.pin });
+      const users = await this.server.client.db.Score.find();
+      const director = users.filter((user) => user.pin.join('-') === req.headers.authorization)[0];
       const staffGuild = this.server.client.guilds.get(this.server.client.config.guildID) || await this.server.client.getRESTGuild(this.server.client.config.guildID);
       const directorDiscord = staffGuild.members.get(director.userID);
 
@@ -731,9 +789,8 @@ export default class Root extends Route {
       embed.setColor('#27b17a');
       embed.addField('Subject', motion.subject);
       embed.addField('Body', motion.body);
-      embed.addField('Director', `<@!${motion.issuer}>`);
+      embed.addField('Results', `Yea: ${yea}\nNay: ${nay}\nPresent: ${present}\nAbsent: ${absent}`);
       embed.setDescription(motion.oID);
-      embed.setFooter(motion.oID, directorDiscord.avatarURL);
       embed.setTimestamp(new Date());
 
       await channel.createMessage({ embed });

src/class/LocalStorage.ts

@@ -1,6 +1,7 @@
 /* eslint-disable no-constant-condition */
 import { promises as fs, accessSync, constants, writeFileSync } from 'fs';
 import { promisify } from 'util';
+import { join } from 'path';
 import { gzip, gzipSync, unzip } from 'zlib';
 
 type JSONData = [{ key: string, value: any }?];
@@ -18,7 +19,7 @@ export default class LocalStorage {
   private locked: boolean = false;
 
   constructor(dbName: string, dir = `${__dirname}/../../localstorage`) {
-    this.storagePath = `${dir}/${dbName}.json.gz`;
+    this.storagePath = join(__dirname, '../../localstorage') || dir;
     this.init();
   }
 

src/class/Server.ts

@@ -56,6 +56,7 @@ export default class Server {
   public init() {
     if (this.parse) {
       this.app.use(bodyParser.json());
+      this.app.use(bodyParser.urlencoded({ extended: true }));
     }
     this.app.set('trust proxy', 'loopback');
     this.app.use(helmet({

src/commands/profile.ts

@@ -12,42 +12,10 @@ export default class Profile extends Command {
   }
 
   public async run(message: Message, args: string[]) {
-    const profile = await this.client.db.Member.findOne({ userID: message.author.id });
+    if (!await this.client.db.Member.exists({ userID: message.author.id })) {
-    if (!profile) return this.error(message.channel, 'Please try again later. We do not currently have a member profile for you.');
+      await this.client.db.Member.create({ userID: message.author.id });
-    if (!args[1]) return this.error(message.channel, 'No new value was provided.');
+    }
-    const newValue = args.slice(1).join(' ');
-    if (newValue.length >= 512) return this.error(message.channel, 'Please shorten your input.');
 
-    switch (args[0]) {
+    this.error(message.channel, `Please specify a valid option to change. Choose from \`github\`, \`bio\` and \`gitlab\`. You can view your profile with \`${this.client.config.prefix}whois\`.`);
-      case 'github':
-        await profile.updateOne({
-          additional: {
-            ...profile.additional,
-            github: args[1],
-          },
-        });
-        this.success(message.channel, 'Updated GitHub.');
-        break;
-      case 'gitlab':
-        await profile.updateOne({
-          additional: {
-            ...profile.additional,
-            gitlab: args[1],
-          },
-        });
-        this.success(message.channel, 'Updated GitLab.');
-        break;
-      case 'bio':
-        await profile.updateOne({
-          additional: {
-            ...profile.additional,
-            bio: newValue,
-          },
-        });
-        this.success(message.channel, 'Updated bio.');
-        break;
-      default:
-        return this.error(message.channel, 'Please specify a valid option to change.');
-    }
   }
 }

src/commands/profile_bio.ts

@@ -0,0 +1,30 @@
+import { Message } from 'eris';
+import { Client, Command } from '../class';
+
+export default class Profile_Bio extends Command {
+  constructor(client: Client) {
+    super(client);
+    this.name = 'bio';
+    this.description = 'Updates your bio on your profile.';
+    this.usage = `${this.client.config.prefix}bio <new bio>`;
+    this.permissions = 0;
+    this.enabled = true;
+  }
+
+  public async run(message: Message, args: string[]) {
+    if (!await this.client.db.Member.exists({ userID: message.author.id })) {
+      await this.client.db.Member.create({ userID: message.author.id });
+    }
+    if (!args[0]) return this.error(message.channel, 'No new bio content was provided.');
+    const bio = args.join(' ');
+    if (bio.length >= 256) return this.error(message.channel, 'Bio too long. It must be less than or equal to 256 characters.');
+
+    const member = await this.client.db.Member.findOne({ userID: message.author.id });
+    await member.updateOne({
+      additional: {
+        ...member.additional,
+        bio,
+      },
+    });
+  }
+}

src/commands/profile_github.ts

@@ -0,0 +1,38 @@
+import { Message } from 'eris';
+import { Client, Command } from '../class';
+
+export default class Profile_GitHub extends Command {
+  constructor(client: Client) {
+    super(client);
+    this.name = 'github';
+    this.description = 'Updates your GitHub information on your profile.';
+    this.usage = `${this.client.config.prefix}github <GitHub profile URL>`;
+    this.permissions = 0;
+    this.enabled = true;
+  }
+
+  public async run(message: Message, args: string[]) {
+    if (!await this.client.db.Member.exists({ userID: message.author.id })) {
+      await this.client.db.Member.create({ userID: message.author.id });
+    }
+    if (!args[0]) return this.error(message.channel, 'No GitHub profile URL was provided.');
+    const urlRegex = new RegExp(
+      '^(https?:\\/\\/)?'
+      + '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|'
+      + '((\\d{1,3}\\.){3}\\d{1,3}))'
+      + '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*'
+      + '(\\?[;&a-z\\d%_.~+=-]*)?'
+      + '(\\#[-a-z\\d_]*)?$',
+      'i',
+    );
+    if (!urlRegex.test(args[0]) || !args[0].startsWith('https://github.com/')) return this.error(message.channel, 'Invalid GitHub profile URL.');
+
+    const member = await this.client.db.Member.findOne({ userID: message.author.id });
+    await member.updateOne({
+      additional: {
+        ...member.additional,
+        github: args[0],
+      },
+    });
+  }
+}

src/commands/profile_gitlab.ts

@@ -0,0 +1,38 @@
+import { Message } from 'eris';
+import { Client, Command } from '../class';
+
+export default class Profile_GitLab extends Command {
+  constructor(client: Client) {
+    super(client);
+    this.name = 'gitlab';
+    this.description = 'Updates your GitLab information on your profile.';
+    this.usage = `${this.client.config.prefix}gitlab <GitLab profile URL>`;
+    this.permissions = 0;
+    this.enabled = true;
+  }
+
+  public async run(message: Message, args: string[]) {
+    if (!await this.client.db.Member.exists({ userID: message.author.id })) {
+      await this.client.db.Member.create({ userID: message.author.id });
+    }
+    if (!args[0]) return this.error(message.channel, 'No GitLab profile URL was provided.');
+    const urlRegex = new RegExp(
+      '^(https?:\\/\\/)?'
+      + '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|'
+      + '((\\d{1,3}\\.){3}\\d{1,3}))'
+      + '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*'
+      + '(\\?[;&a-z\\d%_.~+=-]*)?'
+      + '(\\#[-a-z\\d_]*)?$',
+      'i',
+    );
+    if (!urlRegex.test(args[0]) || !args[0].startsWith('https://gitlab.com/')) return this.error(message.channel, 'Invalid GitLab profile URL.');
+
+    const member = await this.client.db.Member.findOne({ userID: message.author.id });
+    await member.updateOne({
+      additional: {
+        ...member.additional,
+        gitlab: args[0],
+      },
+    });
+  }
+}

src/commands/whois.ts

@@ -58,9 +58,7 @@ export default class Whois extends Command {
       if (ackResolve?.extension) {
         description += `☎️ ${ackResolve.extension}\n`;
       }
-
       const memberProfile = await this.client.db.Member.findOne({ userID: message.author.id });
-
       if (memberProfile?.additional?.gitlab) {
         description += `${emotes.gitlab} ${memberProfile?.additional.gitlab}\n`;
       }

src/events/messageReactionAdd.ts

@@ -20,15 +20,19 @@ export default class MessageReactionAdd extends Event {
     if (!reactor.roles.includes('662163685439045632')) return;
 
     if ((await this.client.db.Proclamation.exists({ msg: message.id, processed: false }))) {
-      const yea = await message.getReaction(this.client.util.emojis.SUCCESS);
+      let yea = await message.getReaction('modSuccess:578750988907970567');
-      const nay = await message.getReaction(this.client.util.emojis.ERROR);
+      yea = yea.filter((val) => !val.bot);
-      const present = await message.getReaction('🙋');
+      let nay = await message.getReaction('modError:578750737920688128');
+      nay = nay.filter((val) => !val.bot);
+      let present = await message.getReaction('🙋');
+      present = present.filter((val) => !val.bot);
       const totalDirectors = 6;
-      const proclamation = await this.client.db.Proclamation.findOne({ msg: message.id });
+      const proc = await this.client.db.Proclamation.findOne({ msg: message.id });
-      const processed = totalDirectors === (yea.length + nay.length + present.length) || Date.now() - proclamation.at > 604800000;
+      if (proc.votedDirectors?.includes(message.author.id)) return;
+      const processed = totalDirectors === (yea.length + nay.length + present.length) || Date.now() - proc.at > 604800000;
       const absent = totalDirectors - (yea.length + nay.length + present.length);
 
-      await this.client.db.Proclamation.updateOne({ msg: message.id }, {
+      await proc.updateOne({
         results: {
           yea: yea.length,
           nay: nay.length,
@@ -36,22 +40,23 @@ export default class MessageReactionAdd extends Event {
           absent,
         },
         processed,
+        votedDirectors: [...(proc.votedDirectors || []), message.author.id],
       });
       const inTheMajority = yea.length > nay.length + present.length;
 
       if (processed) {
-        const author = this.client.users.get(proclamation.issuer) || await this.client.getRESTUser(proclamation.issuer);
+        const author = this.client.users.get(proc.issuer) || await this.client.getRESTUser(proc.issuer);
 
         if (inTheMajority) {
-          await author.createMessage(`__**Proclamation Majority Vote Received**__\nThe Proclamation you created at Library of Code sp-us, titled **${proclamation.subject}** (\`${proclamation.oID}\`) received the majority vote.`);
+          await author.createMessage(`__**Proclamation Majority Vote Received**__\nThe Proclamation you created at Library of Code sp-us, titled **${proc.subject}** (\`${proc.oID}\`) received the majority vote.`);
-          await message.channel.createMessage(`__**Proclamation Results**__\nProclamation issued by ${author.mention} **received** the majority vote. Proclamation ID: ${proclamation.oID}\n\n__Results:__\n**Yea:** ${yea.length}\n**Nay:** ${nay.length}\n**Present:** ${present.length}\n**Absent:** ${absent}`);
+          await message.channel.createMessage(`__**Proclamation Results**__\nProclamation issued by ${author.mention} **received** the majority vote. Proclamation ID: ${proc.oID}\n\n__Results:__\n**Yea:** ${yea.length}\n**Nay:** ${nay.length}\n**Present:** ${present.length}\n**Absent:** ${absent}`);
         } else {
-          await author.createMessage(`__**Proclamation Majority Vote Lost**__\nThe Proclamation you created at Library of Code sp-us, titled **${proclamation.subject}** (\`${proclamation.oID}\`) lost the majority vote.`);
+          await author.createMessage(`__**Proclamation Majority Vote Lost**__\nThe Proclamation you created at Library of Code sp-us, titled **${proc.subject}** (\`${proc.oID}\`) lost the majority vote.`);
-          await message.channel.createMessage(`__**Proclamation Results**__\nProclamation issued by ${author.mention} **lost** the majority vote. Proclamation ID: ${proclamation.oID}\n\n__Results:__\n**Yea:** ${yea.length}\n**Nay:** ${nay.length}\n**Present:** ${present.length}\n**Absent:** ${absent}`);
+          await message.channel.createMessage(`__**Proclamation Results**__\nProclamation issued by ${author.mention} **lost** the majority vote. Proclamation ID: ${proc.oID}\n\n__Results:__\n**Yea:** ${yea.length}\n**Nay:** ${nay.length}\n**Present:** ${present.length}\n**Absent:** ${absent}`);
         }
       }
 
-      await reactor.user.createMessage(`__**Vote Recorded**\nYour vote on the proclamation with ID \`${proclamation.id}\` at Library of Code sp-us was successfully recorded.`);
+      await reactor.user.createMessage(`__**Vote Recorded**__\nYour vote on the proclamation with ID \`${proc.id}\` at Library of Code sp-us was successfully recorded.`);
     }
   }
 }

src/main.ts

@@ -4,6 +4,7 @@
 import sdNotify from 'sd-notify';
 import { parse } from 'yaml';
 import { promises as fs } from 'fs';
+import { join } from 'path';
 import { Client } from './class';
 import * as eventFiles from './events';
 import * as commandFiles from './commands';
@@ -14,7 +15,7 @@ async function main(): Promise<void> {
     sdNotify.ready();
     sdNotify.startWatchdogMode(2500);
   }
-  const read = await fs.readFile('../config.yaml', 'utf8');
+  const read = await fs.readFile(join(__dirname, '../config.yaml'), 'utf8');
   const config: Config = parse(read);
   const client = new Client(config.token, { defaultImageFormat: 'png', restMode: true, intents: ['guildBans', 'guildEmojis', 'guildInvites', 'guildMembers', 'guildMessageReactions', 'guildMessages', 'guildPresences', 'guildWebhooks', 'guilds', 'directMessages'] });
   client.config = config;

src/models/ExecutiveOrder.ts

@@ -4,7 +4,7 @@ export interface ExecutiveOrderInterface extends Document {
   issuer: string;
   subject: string;
   body: string;
-  at: Date;
+  at: number;
   oID: string;
   msg: string;
 }
@@ -13,7 +13,7 @@ const ExecutiveOrder = new Schema({
   issuer: { type: String, required: true },
   subject: { type: String, required: true },
   body: { type: String, required: true },
-  at: { type: Date, required: true },
+  at: { type: Number, required: true },
   oID: { type: String, required: true, unique: true },
   msg: { type: String, required: true, unique: true },
 });

src/models/Member.ts

@@ -5,9 +5,9 @@ export interface MemberInterface extends Document {
   additional: {
     langs: ['js', 'py', 'rb', 'ts', 'rs', 'go', 'cfam', 'csharp', 'swift', 'java', 'kt', 'asm'],
     operatingSystems: ['arch', 'deb', 'cent', 'fedora', 'manjaro', 'mdarwin', 'redhat', 'ubuntu', 'win'],
-    github: string;
+    github: string,
-    gitlab: string;
+    gitlab: string,
-    bio: string;
+    bio: string,
   },
 }
 

src/models/Motion.ts

@@ -4,7 +4,7 @@ export interface MotionInterface extends Document {
   issuer: string;
   subject: string;
   body: string;
-  at: Date;
+  at: number;
   oID: string;
   results: {
     yea: number;
@@ -20,7 +20,7 @@ const Motion = new Schema({
   issuer: { type: String, required: true },
   subject: { type: String, required: true },
   body: { type: String, required: true },
-  at: { type: Date, required: true },
+  at: { type: Number, required: true },
   oID: { type: String, required: true, unique: true },
   results: {
     yea: Number,

src/models/Proclamation.ts

@@ -15,6 +15,7 @@ export interface ProclamationInterface extends Document {
   acceptedAt: number;
   msg: string;
   processed: boolean;
+  votedDirectors: string[];
 }
 
 const Proclamation = new Schema({
@@ -32,6 +33,7 @@ const Proclamation = new Schema({
   acceptedAt: Number,
   msg: { type: String, required: true, unique: true },
   processed: Boolean,
+  votedDirectors: Array,
 });
 
 export default model<ProclamationInterface>('Proclamations', Proclamation);

src/models/index.ts

@@ -9,7 +9,7 @@ export { default as Motion, MotionInterface } from './Motion';
 export { default as NNTrainingData, NNTrainingDataInterface } from './NNTrainingData';
 export { default as Note, NoteInterface } from './Note';
 export { default as PagerNumber, PagerNumberInterface, PagerNumberRaw } from './PagerNumber';
-export { default as Proclamation, ProclamationInterface } from './Proclamation'
+export { default as Proclamation, ProclamationInterface } from './Proclamation';
 export { default as Promo, PromoInterface } from './Promo';
 export { default as Rank, RankInterface } from './Rank';
 export { default as Redirect, RedirectInterface, RedirectRaw } from './Redirect';