feat: add check for leading @. closes #426

WFCD · Dec 23, 2020 · aa498d6 · aa498d6
1 parent e5a926a
commit aa498d6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/commands/Roles/JoinRole.js b/src/commands/Roles/JoinRole.js
@@ -9,7 +9,9 @@ const Command = require('../../models/Command.js');
  * @returns {Role|null}         Role
  */
 const getRoleForString = (string, message) => {
-  const trimmedString = string.trim();
+  const trimmedString = string.trim()
+    .replace(/^@(.*)/, '$1')
+    .replace(/<@&(.*)>/, '$1');
   const roleFromId = message.guild.roles.cache.get(trimmedString);
   let roleFromName;
   if (typeof roleFromId === 'undefined') {

diff --git a/src/commands/Roles/LeaveRole.js b/src/commands/Roles/LeaveRole.js
@@ -9,7 +9,9 @@ const Command = require('../../models/Command.js');
  * @returns {Role|null}         Role
  */
 const getRoleForString = (string, message) => {
-  const trimmedString = string.trim();
+  const trimmedString = string.trim()
+    .replace(/^@(.*)/, '$1')
+    .replace(/<@&(.*)>/, '$1');
   const roleFromId = message.guild.roles.cache.get(trimmedString);
   let roleFromName;
   if (typeof roleFromId === 'undefined') {

diff --git a/src/settings/DatabaseQueries/PrivateRoomQueries.js b/src/settings/DatabaseQueries/PrivateRoomQueries.js
@@ -37,7 +37,10 @@ class PrivateRoomQueries {
       WHERE guild_id=${guild.id}`;
     const [rows] = await this.query(query);
     if (rows.length) {
-      const validList = rows[0].id_list
+      const rawList = typeof rows[0].id_list === 'string'
+        ? JSON.parse(rows[0].id_list)
+        : rows[0].id_list;
+      const validList = rawList
         .filter((role) => {
           if (!role) {
             return undefined;