@takaro/modules 0.0.1 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takaro/modules",
-  "version": "0.0.1",
+  "version": "0.0.4",
   "description": "Built-in modules for Takaro",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",
@@ -17,10 +17,6 @@
   "keywords": [],
   "author": "",
   "license": "ISC",
-  "dependencies": {
-    "@takaro/apiclient": "^0.0.1"
-  },
-  "devDependencies": {
-    "@takaro/test": "0.0.1"
-  }
-}
+  "dependencies": {},
+  "devDependencies": {}
+}

package/scripts/buildBuiltinJson.ts

@@ -1,13 +1,33 @@
 import 'reflect-metadata';
 import { getModules } from '@takaro/modules';
 import { writeFile } from 'fs/promises';
+import { readdir, readFile } from 'node:fs/promises';
+import path from 'path';
+
+const __dirname = path.dirname(new URL(import.meta.url).pathname);
 
 async function main() {
+  // Built in modules
+  // TODO: we should probably 'export' them in CI and save it as JSON so it's consistent with the community modules
   const modules = await getModules();
   const modulesJson = JSON.stringify(modules, null, 2);
   await writeFile('dist/modules.json', modulesJson);
   await writeFile('../web-docs/pages/modules.json', modulesJson);
   await writeFile('../e2e/src/web-main/fixtures/modules.json', modulesJson);
+
+  // Community modules
+  const files = await readdir(`${__dirname}/../src/community-modules/modules`);
+  const communityModules: Array<string> = [];
+
+  for (const file of files) {
+    const content = await readFile(`${__dirname}/../src/community-modules/modules/${file}`, 'utf-8');
+    communityModules.push(JSON.parse(content));
+  }
+
+  const communityModulesJson = JSON.stringify(communityModules, null, 2);
+  await writeFile('dist/community-modules.json', communityModulesJson);
+  await writeFile('../web-docs/pages/community-modules.json', communityModulesJson);
+  await writeFile('../e2e/src/web-main/fixtures/community-modules.json', communityModulesJson);
 }
 
 // eslint-disable-next-line no-console

package/src/BuiltinModule.ts

@@ -74,7 +74,7 @@ export class IPermission extends TakaroDTO<IPermission> {
   friendlyName: string;
   @IsOptional()
   @IsBoolean()
-  canHaveCount?: boolean = false;
+  canHaveCount?: boolean;
 }
 
 export class BuiltinModule<T> extends TakaroDTO<T> {

package/src/__tests__/aliases.integration.test.ts

@@ -1,5 +1,4 @@
-import { IntegrationTest, expect } from '@takaro/test';
-import { IModuleTestsSetupData, modulesTestSetup } from '@takaro/test';
+import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup } from '@takaro/test';
 import { GameEvents } from '../dto/index.js';
 
 const group = 'Aliases';
@@ -23,7 +22,7 @@ const tests = [
               },
             },
           }),
-        }
+        },
       );
 
       const setEvents = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);

package/src/__tests__/bugRepros.integration.test.ts

@@ -0,0 +1,72 @@
+import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup } from '@takaro/test';
+import { GameEvents } from '../dto/index.js';
+import { EventChatMessageChannelEnum } from '@takaro/apiclient';
+
+const group = 'Bug repros';
+
+const tests = [
+  new IntegrationTest<IModuleTestsSetupData>({
+    group,
+    snapshot: false,
+    name: 'Bug repro: can trigger 2 hooks for the same event inside a single module',
+    setup: modulesTestSetup,
+    test: async function () {
+      const genFn = (param: string) => {
+        return `import { data, takaro } from '@takaro/helpers';
+        async function main() {
+            const { player } = data;
+            await takaro.gameserver.gameServerControllerSendMessage(data.gameServerId, {
+                message: '${param} hook',
+            });
+        }
+        await main();`;
+      };
+
+      const mod = (
+        await this.client.module.moduleControllerCreate({
+          name: 'Test module',
+        })
+      ).data.data;
+      // Add the buggy hooks
+      await this.client.hook.hookControllerCreate({
+        name: 'Test hook 1',
+        moduleId: mod.id,
+        regex: 'test msg',
+        eventType: 'chat-message',
+        function: genFn('First'),
+      });
+
+      await this.client.hook.hookControllerCreate({
+        name: 'Test hook 2',
+        moduleId: mod.id,
+        regex: 'test msg',
+        eventType: 'chat-message',
+        function: genFn('Second'),
+      });
+
+      await this.client.gameserver.gameServerControllerInstallModule(this.setupData.gameserver.id, mod.id);
+
+      const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 2);
+
+      await this.client.hook.hookControllerTrigger({
+        eventType: 'chat-message',
+        gameServerId: this.setupData.gameserver.id,
+        moduleId: mod.id,
+        playerId: this.setupData.players[0].id,
+        eventMeta: {
+          msg: 'test msg',
+          channel: EventChatMessageChannelEnum.Global,
+        },
+      });
+
+      expect((await events).length).to.be.eq(2);
+      expect((await events).map((e) => e.data.msg)).to.include.members(['First hook', 'Second hook']);
+    },
+  }),
+];
+
+describe(group, function () {
+  tests.forEach((test) => {
+    test.run();
+  });
+});

package/src/__tests__/commandArgs.integration.test.ts

@@ -1,5 +1,4 @@
-import { IntegrationTest, expect } from '@takaro/test';
-import { IModuleTestsSetupData, modulesTestSetup } from '@takaro/test';
+import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup } from '@takaro/test';
 import { GameEvents } from '../dto/gameEvents.js';
 import { CommandArgumentCreateDTO } from '@takaro/apiclient';
 
@@ -86,7 +85,7 @@ const tests = [
 
       expect((await events).length).to.be.eq(1);
       expect((await events)[0].data.msg).to.be.eq(
-        'The value for "test" should be a number. Please correct it and try again.'
+        'The value for "test" should be a number. Please correct it and try again.',
       );
     },
   }),

package/src/__tests__/economyUtils.integration.test.ts

@@ -1,5 +1,4 @@
-import { IntegrationTest, expect } from '@takaro/test';
-import { IModuleTestsSetupData, modulesTestSetup, chatMessageSorter } from '@takaro/test';
+import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup, chatMessageSorter } from '@takaro/test';
 import { GameEvents } from '../dto/index.js';
 
 const group = 'Economy utils suite';
@@ -31,7 +30,7 @@ const tests = [
     test: async function () {
       await this.client.gameserver.gameServerControllerInstallModule(
         this.setupData.gameserver.id,
-        this.setupData.economyUtilsModule.id
+        this.setupData.economyUtilsModule.id,
       );
 
       const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 2);
@@ -52,7 +51,7 @@ const tests = [
         playerOnGameServer[0].playerId,
         {
           currency: 1000,
-        }
+        },
       );
 
       // trigger balance command
@@ -75,7 +74,7 @@ const tests = [
       // install module
       await this.client.gameserver.gameServerControllerInstallModule(
         this.setupData.gameserver.id,
-        this.setupData.economyUtilsModule.id
+        this.setupData.economyUtilsModule.id,
       );
 
       const giveCurrencies = this.setupData.players.map(async (player, index) => {
@@ -90,7 +89,7 @@ const tests = [
           playerOnGameServer[0].playerId,
           {
             currency: 1000 * index,
-          }
+          },
         );
       });
       await Promise.all(giveCurrencies);
@@ -107,7 +106,7 @@ const tests = [
       expect((await events).length).to.be.eq(6);
       for (const message of messages) {
         expect(message).to.match(
-          /(Richest players\:|1\. .+ - 4000 test coin|2\. .+ - 3000 test coin|3\. .+ - 2000 test coin|4\. .+ - 1000 test coin|5\. .+ - 0 test coin)/
+          /(Richest players\:|1\. .+ - 4000 test coin|2\. .+ - 3000 test coin|3\. .+ - 2000 test coin|4\. .+ - 1000 test coin|5\. .+ - 0 test coin)/,
         );
       }
     },
@@ -120,7 +119,7 @@ const tests = [
     test: async function () {
       await this.client.gameserver.gameServerControllerInstallModule(
         this.setupData.gameserver.id,
-        this.setupData.economyUtilsModule.id
+        this.setupData.economyUtilsModule.id,
       );
 
       const transferAmount = 500;
@@ -133,12 +132,12 @@ const tests = [
         senderPog.playerId,
         {
           currency: transferAmount,
-        }
+        },
       );
 
       const receiver = this.setupData.players[1];
       const receiverPog = receiver.playerOnGameServers?.find(
-        (pog) => pog.gameServerId === this.setupData.gameserver.id
+        (pog) => pog.gameServerId === this.setupData.gameserver.id,
       );
       if (!receiverPog) throw new Error('Receiver playerOnGameServer does not exist');
       expect(receiverPog.currency).to.be.eq(0);
@@ -156,13 +155,13 @@ const tests = [
       // check if balances are correct
       const updatedSender = await this.client.playerOnGameserver.playerOnGameServerControllerGetOne(
         senderPog.gameServerId,
-        senderPog.playerId
+        senderPog.playerId,
       );
       expect(updatedSender.data.data.currency).to.be.eq(0);
 
       const updatedReceiver = await this.client.playerOnGameserver.playerOnGameServerControllerGetOne(
         receiverPog.gameServerId,
-        receiverPog.playerId
+        receiverPog.playerId,
       );
       expect(updatedReceiver.data.data.currency).to.be.eq(transferAmount);
 
@@ -178,7 +177,7 @@ const tests = [
     test: async function () {
       await this.client.gameserver.gameServerControllerInstallModule(
         this.setupData.gameserver.id,
-        this.setupData.economyUtilsModule.id
+        this.setupData.economyUtilsModule.id,
       );
 
       const sender = this.setupData.players[0];
@@ -195,7 +194,7 @@ const tests = [
       const messages = (await events).sort(chatMessageSorter).map((e) => e.data.msg as string);
       expect((await events).length).to.be.eq(1);
       expect(messages[0]).to.be.eq(
-        `Failed to transfer ${transferAmount} test coin to ${receiver.name}. Are you sure you have enough balance?`
+        `Failed to transfer ${transferAmount} test coin to ${receiver.name}. Are you sure you have enough balance?`,
       );
     },
   }),
@@ -212,7 +211,7 @@ const tests = [
           userConfig: JSON.stringify({
             pendingAmount: 100,
           }),
-        }
+        },
       );
 
       const transferAmount = 500;
@@ -228,12 +227,12 @@ const tests = [
         senderPog.playerId,
         {
           currency: transferAmount,
-        }
+        },
       );
 
       const receiver = this.setupData.players[1];
       const receiverPog = receiver.playerOnGameServers?.find(
-        (pog) => pog.gameServerId === this.setupData.gameserver.id
+        (pog) => pog.gameServerId === this.setupData.gameserver.id,
       );
       if (!receiverPog) throw new Error('Receiver playerOnGameServer does not exist');
       expect(receiverPog.currency).to.be.eq(0);
@@ -252,21 +251,21 @@ const tests = [
         (
           await this.client.playerOnGameserver.playerOnGameServerControllerGetOne(
             senderPog.gameServerId,
-            senderPog.playerId
+            senderPog.playerId,
           )
-        ).data.data.currency
+        ).data.data.currency,
       ).to.be.eq(transferAmount);
       expect(
         (
           await this.client.playerOnGameserver.playerOnGameServerControllerGetOne(
             receiverPog.gameServerId,
-            receiverPog.playerId
+            receiverPog.playerId,
           )
-        ).data.data.currency
+        ).data.data.currency,
       ).to.be.eq(0);
       expect(messages.length).to.be.eq(1);
       expect(messages[0]).to.be.eq(
-        `You are about to send ${transferAmount} test coin to ${receiver.name}. (Please confirm by typing ${prefix}confirmtransfer)`
+        `You are about to send ${transferAmount} test coin to ${receiver.name}. (Please confirm by typing ${prefix}confirmtransfer)`,
       );
 
       // =================================================
@@ -284,17 +283,17 @@ const tests = [
         (
           await this.client.playerOnGameserver.playerOnGameServerControllerGetOne(
             senderPog.gameServerId,
-            senderPog.playerId
+            senderPog.playerId,
           )
-        ).data.data.currency
+        ).data.data.currency,
       ).to.be.eq(0);
       expect(
         (
           await this.client.playerOnGameserver.playerOnGameServerControllerGetOne(
             receiverPog.gameServerId,
-            receiverPog.playerId
+            receiverPog.playerId,
           )
-        ).data.data.currency
+        ).data.data.currency,
       ).to.be.eq(transferAmount);
 
       expect(messages[0]).to.be.eq(`You received ${transferAmount} test coin from ${sender.name}`);
@@ -314,7 +313,7 @@ const tests = [
           userConfig: JSON.stringify({
             pendingAmount: 100,
           }),
-        }
+        },
       );
       const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
@@ -338,7 +337,7 @@ const tests = [
 
       await this.client.gameserver.gameServerControllerInstallModule(
         this.setupData.gameserver.id,
-        this.setupData.economyUtilsModule.id
+        this.setupData.economyUtilsModule.id,
       );
 
       // Change permissions of role to only have manageCurrency permission
@@ -352,7 +351,7 @@ const tests = [
       });
 
       const receiverPog = receiver.playerOnGameServers?.find(
-        (pog) => pog.gameServerId === this.setupData.gameserver.id
+        (pog) => pog.gameServerId === this.setupData.gameserver.id,
       );
       if (!receiverPog) throw new Error('Receiver playerOnGameServer does not exist');
       expect(receiverPog.currency).to.be.eq(0);
@@ -368,9 +367,9 @@ const tests = [
         (
           await this.client.playerOnGameserver.playerOnGameServerControllerGetOne(
             receiverPog.gameServerId,
-            receiverPog.playerId
+            receiverPog.playerId,
           )
-        ).data.data.currency
+        ).data.data.currency,
       ).to.be.eq(grantAmount);
       expect(messages[0]).to.be.eq(`Granted ${grantAmount} test coin by ${granter.name}`);
       expect(messages[1]).to.be.eq(`You successfully granted ${grantAmount} test coin to ${receiver.name}`);
@@ -388,7 +387,7 @@ const tests = [
 
       // make sure receiver has enough currency
       const receiverPog = receiver.playerOnGameServers?.find(
-        (pog) => pog.gameServerId === this.setupData.gameserver.id
+        (pog) => pog.gameServerId === this.setupData.gameserver.id,
       );
       if (!receiverPog) throw new Error('Receiver playerOnGameServer does not exist');
       await this.client.playerOnGameserver.playerOnGameServerControllerSetCurrency(
@@ -396,12 +395,12 @@ const tests = [
         receiverPog.playerId,
         {
           currency: revokeAmount,
-        }
+        },
       );
 
       await this.client.gameserver.gameServerControllerInstallModule(
         this.setupData.gameserver.id,
-        this.setupData.economyUtilsModule.id
+        this.setupData.economyUtilsModule.id,
       );
 
       // Change permissions of role to only have manageCurrency permission
@@ -416,7 +415,7 @@ const tests = [
 
       // currency before revoke
       expect(
-        receiver.playerOnGameServers?.find((pog) => pog.gameServerId === this.setupData.gameserver.id)?.currency
+        receiver.playerOnGameServers?.find((pog) => pog.gameServerId === this.setupData.gameserver.id)?.currency,
       ).to.be.eq(0);
 
       const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 2);
@@ -430,9 +429,9 @@ const tests = [
         (
           await this.client.playerOnGameserver.playerOnGameServerControllerGetOne(
             receiverPog.gameServerId,
-            receiverPog.playerId
+            receiverPog.playerId,
           )
-        ).data.data.currency
+        ).data.data.currency,
       ).to.be.eq(0);
       expect(messages[0]).to.be.eq(`${revokeAmount} test coin were revoked by ${revoker.name}`);
       expect(messages[1]).to.be.eq(`You successfully revoked ${revokeAmount} test coin of ${receiver.name}'s balance`);
@@ -455,12 +454,12 @@ const tests = [
 
       await this.client.gameserver.gameServerControllerInstallModule(
         this.setupData.gameserver.id,
-        this.setupData.economyUtilsModule.id
+        this.setupData.economyUtilsModule.id,
       );
 
       // currency before revoke
       expect(
-        receiver.playerOnGameServers?.find((pog) => pog.gameServerId === this.setupData.gameserver.id)?.currency
+        receiver.playerOnGameServers?.find((pog) => pog.gameServerId === this.setupData.gameserver.id)?.currency,
       ).to.be.eq(0);
 
       const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 2);

package/src/__tests__/geoblock.integration.test.ts

@@ -1,5 +1,4 @@
-import { IntegrationTest, expect } from '@takaro/test';
-import { IModuleTestsSetupData, modulesTestSetup } from '@takaro/test';
+import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup } from '@takaro/test';
 import { HookEvents } from '../dto/index.js';
 import { TakaroEventPlayerNewIpDetected } from '@takaro/modules';
 import { faker } from '@faker-js/faker';
@@ -12,7 +11,7 @@ const customSetup = async function (this: IntegrationTest<IModuleTestsSetupData>
   await Promise.all(
     setupData.players.map(async (player) => {
       await this.client.player.playerControllerRemoveRole(player.id, setupData.role.id);
-    })
+    }),
   );
 
   return setupData;
@@ -34,7 +33,7 @@ const tests = [
             countries: ['RU'],
             ban: false,
           }),
-        }
+        },
       );
       const events = this.setupData.eventAwaiter.waitForEvents(HookEvents.PLAYER_DISCONNECTED);
       await this.client.hook.hookControllerTrigger({
@@ -70,7 +69,7 @@ const tests = [
             countries: ['RU'],
             ban: false,
           }),
-        }
+        },
       );
       const events = this.setupData.eventAwaiter.waitForEvents(HookEvents.HOOK_EXECUTED);
 
@@ -109,7 +108,7 @@ const tests = [
             countries: ['RU'],
             ban: false,
           }),
-        }
+        },
       );
       const events = this.setupData.eventAwaiter.waitForEvents(HookEvents.HOOK_EXECUTED);
 
@@ -148,7 +147,7 @@ const tests = [
             countries: ['RU'],
             ban: false,
           }),
-        }
+        },
       );
       const events = this.setupData.eventAwaiter.waitForEvents(HookEvents.PLAYER_DISCONNECTED);
 
@@ -185,7 +184,7 @@ const tests = [
             countries: ['RU'],
             ban: true,
           }),
-        }
+        },
       );
       const events = this.setupData.eventAwaiter.waitForEvents(HookEvents.PLAYER_DISCONNECTED);
 
@@ -223,7 +222,7 @@ const tests = [
             ban: true,
             message: 'Custom message',
           }),
-        }
+        },
       );
       const events = this.setupData.eventAwaiter.waitForEvents(HookEvents.PLAYER_DISCONNECTED);
 
@@ -261,7 +260,7 @@ const tests = [
             ban: true,
             message: 'Custom message',
           }),
-        }
+        },
       );
       const events = this.setupData.eventAwaiter.waitForEvents(HookEvents.PLAYER_DISCONNECTED);
 
@@ -299,7 +298,7 @@ const tests = [
             ban: true,
             message: 'Custom message',
           }),
-        }
+        },
       );
       const permissions = await this.client.permissionCodesToInputs(['GEOBLOCK_IMMUNITY']);
       const roleRes = await this.client.role.roleControllerCreate({
@@ -347,7 +346,7 @@ const tests = [
             ban: true,
             message: 'Custom message',
           }),
-        }
+        },
       );
       const events = this.setupData.eventAwaiter.waitForEvents(HookEvents.HOOK_EXECUTED);
 

package/src/__tests__/gimme.integration.test.ts

@@ -1,5 +1,4 @@
-import { IntegrationTest, expect } from '@takaro/test';
-import { IModuleTestsSetupData, modulesTestSetup } from '@takaro/test';
+import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup } from '@takaro/test';
 import { GameEvents } from '../dto/index.js';
 
 const group = 'gimme suite';
@@ -19,7 +18,7 @@ const tests = [
             items: ['apple', 'banana', 'orange'],
             commands: [],
           }),
-        }
+        },
       );
       const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE);
 
@@ -46,7 +45,7 @@ const tests = [
             items: [],
             commands: ['say hello from test'],
           }),
-        }
+        },
       );
 
       const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE);
@@ -74,7 +73,7 @@ const tests = [
             items: [],
             commands: [],
           }),
-        }
+        },
       );
 
       const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE);

package/src/__tests__/help.integration.test.ts

@@ -1,5 +1,4 @@
-import { IntegrationTest, expect } from '@takaro/test';
-import { IModuleTestsSetupData, modulesTestSetup, chatMessageSorter } from '@takaro/test';
+import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup, chatMessageSorter } from '@takaro/test';
 import { GameEvents } from '../dto/gameEvents.js';
 
 const group = 'Help command';
@@ -13,7 +12,7 @@ const tests = [
     test: async function () {
       await this.client.gameserver.gameServerControllerInstallModule(
         this.setupData.gameserver.id,
-        this.setupData.utilsModule.id
+        this.setupData.utilsModule.id,
       );
       const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 3);
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
@@ -26,7 +25,7 @@ const tests = [
 
       expect(sortedEvents[0].data.msg).to.be.eq('Available commands:');
       expect(sortedEvents[1].data.msg).to.be.eq(
-        'help: The text you are reading right now, displays information about commands.'
+        'help: The text you are reading right now, displays information about commands.',
       );
       expect(sortedEvents[2].data.msg).to.be.eq('ping: Replies with pong, useful for testing if the connection works.');
     },
@@ -39,11 +38,11 @@ const tests = [
     test: async function () {
       await this.client.gameserver.gameServerControllerInstallModule(
         this.setupData.gameserver.id,
-        this.setupData.utilsModule.id
+        this.setupData.utilsModule.id,
       );
       await this.client.gameserver.gameServerControllerInstallModule(
         this.setupData.gameserver.id,
-        this.setupData.teleportsModule.id
+        this.setupData.teleportsModule.id,
       );
       const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 13);
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
@@ -57,21 +56,21 @@ const tests = [
       expect(sortedEvents[1].data.msg).to.be.eq('deletetp: Deletes a location.');
       expect(sortedEvents[2].data.msg).to.be.eq('deletewaypoint: Deletes a waypoint.');
       expect(sortedEvents[3].data.msg).to.be.eq(
-        'help: The text you are reading right now, displays information about commands.'
+        'help: The text you are reading right now, displays information about commands.',
       );
       expect(sortedEvents[4].data.msg).to.be.eq('listwaypoints: Lists all waypoints.');
       expect(sortedEvents[5].data.msg).to.be.eq('ping: Replies with pong, useful for testing if the connection works.');
       expect(sortedEvents[6].data.msg).to.be.eq(
-        'setprivate: Sets a teleport to be private, only the teleport owner can teleport to it.'
+        'setprivate: Sets a teleport to be private, only the teleport owner can teleport to it.',
       );
       expect(sortedEvents[7].data.msg).to.be.eq(
-        'setpublic: Sets a teleport to be public, allowing other players to teleport to it.'
+        'setpublic: Sets a teleport to be public, allowing other players to teleport to it.',
       );
       expect(sortedEvents[8].data.msg).to.be.eq('settp: Sets a location to teleport to.');
       expect(sortedEvents[9].data.msg).to.be.eq('setwaypoint: Creates a new waypoint.');
       expect(sortedEvents[10].data.msg).to.be.eq('teleport: Teleports to one of your set locations.');
       expect(sortedEvents[11].data.msg).to.be.eq(
-        'teleportwaypoint: Placeholder command, this will not be used directly. The module will install aliases for this command corresponding to the waypoint '
+        'teleportwaypoint: Placeholder command, this will not be used directly. The module will install aliases for this command corresponding to the waypoint names.',
       );
       expect(sortedEvents[12].data.msg).to.be.eq('tplist: Lists all your set locations.');
     },
@@ -84,7 +83,7 @@ const tests = [
     test: async function () {
       await this.client.gameserver.gameServerControllerInstallModule(
         this.setupData.gameserver.id,
-        this.setupData.utilsModule.id
+        this.setupData.utilsModule.id,
       );
 
       const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
@@ -108,7 +107,7 @@ const tests = [
     test: async function () {
       await this.client.gameserver.gameServerControllerInstallModule(
         this.setupData.gameserver.id,
-        this.setupData.utilsModule.id
+        this.setupData.utilsModule.id,
       );
 
       const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
@@ -120,7 +119,7 @@ const tests = [
 
       expect((await events).length).to.be.eq(1);
       expect((await events)[0].data.msg).to.be.eq(
-        'Unknown command "foobar", use this command without arguments to see all available commands.'
+        'Unknown command "foobar", use this command without arguments to see all available commands.',
       );
     },
   }),