fix: add fix the capture for default role

WFCD · May 1, 2020 · df743c6 · df743c6
1 parent eca16af
commit df743c6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/commands/DefaultRoles/AddDefaultRole.js b/src/commands/DefaultRoles/AddDefaultRole.js
@@ -9,12 +9,12 @@ class AddDefaultRole extends Command {
     this.usages = [
       { description: 'Add a new default role for persons joining the server.', parameters: ['role id'] },
     ];
-    this.regex = new RegExp(`^${this.call}\\s?${captures.roles}?$`, 'i');
+    this.regex = new RegExp(`^${this.call}\\s?${captures.role}?$`, 'i');
     this.requiresAuth = true;
     this.allowDM = false;
   }
 
-  async run(message) {
+  async run(message, ctx) {
     const roleId = message.strippedContent.match(this.regex)[1];
     if (roleId && message.guild.roles.cache.has(roleId.trim())) {
       const roles = JSON.parse(await this.settings.getGuildSetting(message.guild, 'defaultRoles') || '[]');

diff --git a/src/commands/DefaultRoles/DeleteDefaultRole.js b/src/commands/DefaultRoles/DeleteDefaultRole.js
@@ -9,7 +9,7 @@ class DeleteDefaultRole extends Command {
     this.usages = [
       { description: 'Delete a default role for persons joining the server.', parameters: ['role mention'] },
     ];
-    this.regex = new RegExp(`^${this.call}\\s?${captures.roles}?$`, 'i');
+    this.regex = new RegExp(`^${this.call}\\s?${captures.role}?$`, 'i');
     this.requiresAuth = true;
     this.allowDM = false;
   }

diff --git a/src/eventHandlers/Ready.js b/src/eventHandlers/Ready.js
@@ -125,9 +125,10 @@ class OnReadyHandle extends Handler {
         cetusState.isDay = !cetusState.isDay;
       }
 
+      const ousRemaining = (((new Date(outpost.expiry).getTime() - Date.now()) / 1000) % 60).toFixed(0);
       const vs = vallisState ? `${timeDeltaToMinutesString(vsFromNow) || '0m'}: ${vallisState.isWarm ? '❄' : '🔥'} • ` : '';
       const cs = cetusState ? `${timeDeltaToMinutesString(csFromNow) || '0m'}: ${cetusState.isDay ? '🌙' : '☀'} • ` : '';
-      const ous = outpost.active ? `${outpost.mission.node.split('(')[0]} • ` : '';
+      const ous = outpost.active ? `${outpost.mission.node.split('(')[0]}: ${ousRemaining}m • ` : '';
       return `${ous}${vs}${cs}${base}`;
     }
     return base;