allow spaces in names of tagged users (#67)

Author: amthorn

.github/dependabot.yml

@@ -3,7 +3,7 @@ updates:
   - package-ecosystem: "npm"
     directory: "/services/bot"
     schedule:
-      interval: "daily"
+      interval: "weekly"
     assignees:
       - "avthorn"
   - package-ecosystem: "github-actions"

docs/administration.md

@@ -32,7 +32,7 @@ You can add individual admins to a project by tagging them using the following c
     ```
 === "Regex"
     ```
-    ^\s*create admin [\S]+\s*$
+    ^\s*create admin \S+?(\s\S+?)?\s*$
     ```
 
 ???+ important
@@ -67,7 +67,7 @@ You can remove individual admins to a project by tagging them using the followin
     ```
 === "Regex"
     ```
-    ^\s*(delete|remove) admin [\S]+\s*$
+    ^\s*(delete|remove) admin \S+?(\s\S+?)?\s*$
     ```
 
 ???+ important

docs/queues.md

@@ -220,7 +220,7 @@ You can add other members within the same space to the current queue using the f
     ```
 === "Regex"
     ```
-    ^\s*add person .+\s*$
+    ^\s*add person \S+?(\s\S+?)?\s*$
     ```
 
 ???+ important
@@ -249,7 +249,7 @@ You can remove other members within the same space from the current queue using
     ```
 === "Regex"
     ```
-    ^\s*remove person .+\s*$
+    ^\s*remove person \S+?(\s\S+?)?\s*$
     ```
 
 ???+ important
@@ -305,7 +305,7 @@ Qutex can give you an estimated time remaining until you are moved to the head o
         f(\gamma, n)=\begin{cases}
                 0 \quad &\text{if} \, n = 0\\
                 \max(g(\gamma, 0) - \alpha,  0)  \quad &\text{if} \, n = 1 \\
-                g(\gamma, n) + f(h(\theta), n-1)) \quad &\text{if} \, n \notin {0,1} \\
+                g(\gamma, n) + f(h(\gamma), n-1)) \quad &\text{if} \, n \notin {0,1} \\
             \end{cases}
         \end{equation*}
         $$

services/bot/src/commands/admins/create.ts

@@ -14,7 +14,7 @@ export class Create extends CommandBase implements ICommand {
     public readonly AUTHORIZATION: Auth = Auth.PROJECT_ADMIN;
     public readonly COMMAND_TYPE: CommandType = CommandType.CREATE;
     public readonly COMMAND_BASE: string = 'admin';
-    public readonly ARGS: string = '{name:\\S+?}';
+    public readonly ARGS: string = '{name:\\S+?(\\s\\S+?)?}';
     public readonly DESCRIPTION: string = 'Adds a target project admin';
     /* eslint-enable jsdoc/require-jsdoc */
 

services/bot/src/commands/admins/remove.ts

@@ -14,7 +14,7 @@ export class Remove extends CommandBase implements ICommand {
     public readonly AUTHORIZATION: Auth = Auth.PROJECT_ADMIN;
     public readonly COMMAND_TYPE: CommandType = CommandType.OPERATION;
     public readonly COMMAND_BASE: string = 'remove admin';
-    public readonly ARGS: string = '{name:\\S+?}';
+    public readonly ARGS: string = '{name:\\S+?(\\s\\S+?)?}';
     public readonly DESCRIPTION: string = 'Removes a user as a project admin';
     /* eslint-enable jsdoc/require-jsdoc */
 

services/bot/src/commands/queue/addPerson.ts

@@ -14,7 +14,7 @@ export class AddPerson extends CommandBase implements ICommand {
     public readonly AUTHORIZATION: Auth = Auth.PROJECT_ADMIN;
     public readonly COMMAND_TYPE: CommandType = CommandType.OPERATION;
     public readonly COMMAND_BASE: string = 'add person';
-    public readonly ARGS: string = '{name:\\S+?}';
+    public readonly ARGS: string = '{name:\\S+?(\\s\\S+?)?}';
     public readonly DESCRIPTION: string = 'Adds a tagged person to the current queue';
     public readonly QUEUE: boolean = true;
     /* eslint-enable jsdoc/require-jsdoc */

services/bot/src/commands/queue/removePerson.ts

@@ -13,7 +13,7 @@ export class RemovePerson extends CommandBase implements ICommand {
     public readonly AUTHORIZATION: Auth = Auth.PROJECT_ADMIN;
     public readonly COMMAND_TYPE: CommandType = CommandType.OPERATION;
     public readonly COMMAND_BASE: string = 'remove person';
-    public readonly ARGS: string = '{name:\\S+?}';
+    public readonly ARGS: string = '{name:\\S+?(\\s\\S+?)?}';
     public readonly QUEUE: boolean = true;
     public readonly DESCRIPTION: string = 'Removes a tagged person from the current queue';
     /* eslint-enable jsdoc/require-jsdoc */

services/bot/tests/parser.test.ts

@@ -144,6 +144,14 @@ describe('Parser is working', () => {
             // Not a real command
             expect(result.action).toEqual(undefined);
         });
+        test('create admin with queue specification with spaces in name', async () => {
+            await CREATE_QUEUE(project as ProjectDocument, 'FOOBAR');
+            BOT.messages.get
+                .mockReturnValue({ text: 'create admin FOO BAR BADOO on queue FOOBAR', mentionedPeople: ['fooId2'] });
+            const result = await new Parser().parse(MOCK_REQUEST);
+            // Not a real command
+            expect(result.action).toEqual(undefined);
+        });
     });
     describe('remove admin', () => {
         test('remove admin no queue specification', async () => {
@@ -163,6 +171,14 @@ describe('Parser is working', () => {
             // Not a real command
             expect(result.action).toEqual(undefined);
         });
+        test('remove admin with queue specification with spaces in name', async () => {
+            await CREATE_QUEUE(project as ProjectDocument, 'FOOBAR');
+            BOT.messages.get
+                .mockReturnValue({ text: 'remove admin FOO BAR BADOOOO on queue FOOBAR', mentionedPeople: ['fooId2'] });
+            const result = await new Parser().parse(MOCK_REQUEST);
+            // Not a real command
+            expect(result.action).toEqual(undefined);
+        });
     });
 
     describe('help', () => {