@takaro/modules 0.4.8 → 0.4.10

package/dist/modules/economyUtils/commands/claim.js

@@ -1,13 +1,18 @@
 import { takaro, data, TakaroUserError } from '@takaro/helpers';
 async function main() {
-    const { user, player, arguments: args, _gameServerId } = data;
+    const { user, player, arguments: args, gameServerId } = data;
     if (!user)
         throw new TakaroUserError('You must link your account to Takaro to use this command.');
+    const filters = {
+        userId: [user.id],
+        status: ['PAID'],
+    };
+    // Only filter by gameServerId if it's available (should always be present in command context)
+    if (gameServerId) {
+        filters.gameServerId = [gameServerId];
+    }
     const pendingOrdersRes = await takaro.shopOrder.shopOrderControllerSearch({
-        filters: {
-            userId: [user.id],
-            status: ['PAID'],
-        },
+        filters,
         sortBy: 'createdAt',
         sortDirection: 'asc',
     });

package/dist/modules/economyUtils/commands/claim.js.map

@@ -1 +1 @@
-{"version":3,"file":"claim.js","sourceRoot":"","sources":["../../../../src/modules/economyUtils/commands/claim.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEhE,KAAK,UAAU,IAAI;IACjB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;IAE9D,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,eAAe,CAAC,2DAA2D,CAAC,CAAC;IAElG,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,yBAAyB,CAAC;QACxE,OAAO,EAAE;YACP,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YACjB,MAAM,EAAE,CAAC,MAAM,CAAC;SACjB;QACD,MAAM,EAAE,WAAW;QACnB,aAAa,EAAE,KAAK;KACrB,CAAC,CAAC;IAEH,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5C,MAAM,MAAM,CAAC,EAAE,CAAC,6BAA6B,CAAC,CAAC;QAC/C,OAAO;IACT,CAAC;IAED,IAAI,aAAa,GAAG,EAAE,CAAC;IAEvB,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QACb,aAAa,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC;IAC7C,CAAC;SAAM,CAAC;QACN,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE,CAAC;QAClC,MAAM,MAAM,CAAC,SAAS,CAAC,wBAAwB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC;AAED,MAAM,IAAI,EAAE,CAAC"}
+{"version":3,"file":"claim.js","sourceRoot":"","sources":["../../../../src/modules/economyUtils/commands/claim.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEhE,KAAK,UAAU,IAAI;IACjB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAE7D,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,eAAe,CAAC,2DAA2D,CAAC,CAAC;IAElG,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACjB,MAAM,EAAE,CAAC,MAAM,CAAC;KACjB,CAAC;IAEF,8FAA8F;IAC9F,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,CAAC,YAAY,GAAG,CAAC,YAAY,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,yBAAyB,CAAC;QACxE,OAAO;QACP,MAAM,EAAE,WAAW;QACnB,aAAa,EAAE,KAAK;KACrB,CAAC,CAAC;IAEH,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5C,MAAM,MAAM,CAAC,EAAE,CAAC,6BAA6B,CAAC,CAAC;QAC/C,OAAO;IACT,CAAC;IAED,IAAI,aAAa,GAAG,EAAE,CAAC;IAEvB,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QACb,aAAa,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC;IAC7C,CAAC;SAAM,CAAC;QACN,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE,CAAC;QAClC,MAAM,MAAM,CAAC,SAAS,CAAC,wBAAwB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC;AAED,MAAM,IAAI,EAAE,CAAC"}

package/dist/modules/economyUtils/index.js

@@ -7,7 +7,7 @@ export class EconomyUtils extends ModuleTransferDTO {
         this.supportedGames = ['all'];
         this.versions = [
             new ModuleTransferVersionDTO({
-                tag: '0.0.2',
+                tag: '0.0.3',
                 description: 'A set of commands to allow players to manage their currency.',
                 configSchema: JSON.stringify({
                     $schema: 'http://json-schema.org/draft-07/schema#',

package/dist/modules.json

@@ -385,7 +385,7 @@
     ],
     "versions": [
       {
-        "tag": "0.0.2",
+        "tag": "0.0.3",
         "description": "A set of commands to allow players to manage their currency.",
         "configSchema": "{\"$schema\":\"http://json-schema.org/draft-07/schema#\",\"type\":\"object\",\"properties\":{\"pendingAmount\":{\"title\":\"Pending amount\",\"type\":\"number\",\"description\":\"When a player transfers money, they must confirm the transfer when the amount is equal or above this value. Set to 0 to disable.\",\"default\":0},\"zombieKillReward\":{\"title\":\"Zombie kill reward\",\"type\":\"number\",\"description\":\"The default amount of currency a player receives for killing a zombie. This can be overridden by roles.\",\"default\":1}},\"required\":[],\"additionalProperties\":false}",
         "permissions": [
@@ -504,7 +504,7 @@
             ]
           },
           {
-            "function": "import { takaro, data, TakaroUserError } from '@takaro/helpers';\nasync function main() {\n    const { user, player, arguments: args, _gameServerId } = data;\n    if (!user)\n        throw new TakaroUserError('You must link your account to Takaro to use this command.');\n    const pendingOrdersRes = await takaro.shopOrder.shopOrderControllerSearch({\n        filters: {\n            userId: [user.id],\n            status: ['PAID'],\n        },\n        sortBy: 'createdAt',\n        sortDirection: 'asc',\n    });\n    if (pendingOrdersRes.data.data.length === 0) {\n        await player.pm('You have no pending orders.');\n        return;\n    }\n    let ordersToClaim = [];\n    if (args.all) {\n        ordersToClaim = pendingOrdersRes.data.data;\n    }\n    else {\n        ordersToClaim.push(pendingOrdersRes.data.data[0]);\n    }\n    for (const order of ordersToClaim) {\n        await takaro.shopOrder.shopOrderControllerClaim(order.id);\n    }\n}\nawait main();\n//# sourceMappingURL=claim.js.map",
+            "function": "import { takaro, data, TakaroUserError } from '@takaro/helpers';\nasync function main() {\n    const { user, player, arguments: args, gameServerId } = data;\n    if (!user)\n        throw new TakaroUserError('You must link your account to Takaro to use this command.');\n    const filters = {\n        userId: [user.id],\n        status: ['PAID'],\n    };\n    // Only filter by gameServerId if it's available (should always be present in command context)\n    if (gameServerId) {\n        filters.gameServerId = [gameServerId];\n    }\n    const pendingOrdersRes = await takaro.shopOrder.shopOrderControllerSearch({\n        filters,\n        sortBy: 'createdAt',\n        sortDirection: 'asc',\n    });\n    if (pendingOrdersRes.data.data.length === 0) {\n        await player.pm('You have no pending orders.');\n        return;\n    }\n    let ordersToClaim = [];\n    if (args.all) {\n        ordersToClaim = pendingOrdersRes.data.data;\n    }\n    else {\n        ordersToClaim.push(pendingOrdersRes.data.data[0]);\n    }\n    for (const order of ordersToClaim) {\n        await takaro.shopOrder.shopOrderControllerClaim(order.id);\n    }\n}\nawait main();\n//# sourceMappingURL=claim.js.map",
             "name": "claim",
             "trigger": "claim",
             "helpText": "Claim your pending shop orders.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takaro/modules",
-  "version": "0.4.8",
+  "version": "0.4.10",
   "description": "Built-in modules for Takaro",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",

package/src/__tests__/economy/claim.integration.test.ts

@@ -133,6 +133,114 @@ const tests = [
       expect((await events)[3].data.meta.msg).to.equal('1x Wood');
     },
   }),
+  new IntegrationTest<IShopSetup>({
+    group,
+    snapshot: false,
+    setup: shopSetup,
+    name: 'Should only claim orders from the current game server when player has orders on multiple servers',
+    test: async function () {
+      // Test scenario: Player has pending orders on two servers but is only online on one.
+      // The /claim command should only claim orders from the server where they're currently online.
+
+      // Install economyUtils on gameserver2
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver2.id,
+        versionId: this.setupData.economyUtilsModule.latestVersion.id,
+      });
+
+      await this.client.settings.settingsControllerSet('economyEnabled', {
+        value: 'true',
+        gameServerId: this.setupData.gameserver2.id,
+      });
+
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+
+      // Create player on gameserver2 as online, then disconnect to set offline
+      // (Must create as online to trigger POG creation via PLAYER_CONNECTED event)
+      await this.client.gameserver.gameServerControllerExecuteCommand(this.setupData.gameserver2.id, {
+        command: `createPlayer player2_${this.setupData.players[0].steamId} {"name": "${this.setupData.players[0].name}", "steamId": "${this.setupData.players[0].steamId}", "online": true}`,
+      });
+
+      await new Promise((resolve) => setTimeout(resolve, 2000));
+
+      const pogsOnServer2 = await this.client.playerOnGameserver.playerOnGameServerControllerSearch({
+        filters: {
+          gameServerId: [this.setupData.gameserver2.id],
+          playerId: [this.setupData.players[0].id],
+        },
+      });
+
+      if (pogsOnServer2.data.data.length === 0) {
+        throw new Error(`Player POG was not created on gameserver2. Player ID: ${this.setupData.players[0].id}`);
+      }
+
+      await this.client.gameserver.gameServerControllerExecuteCommand(this.setupData.gameserver2.id, {
+        command: `disconnectPlayer ${this.setupData.players[0].steamId}`,
+      });
+
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+
+      await this.client.playerOnGameserver.playerOnGameServerControllerAddCurrency(
+        this.setupData.gameserver2.id,
+        this.setupData.players[0].id,
+        { currency: 250 },
+      );
+
+      // Create listings on both servers
+      const listingServer1 = await this.client.shopListing.shopListingControllerCreate({
+        gameServerId: this.setupData.gameserver.id,
+        items: [{ itemId: this.setupData.items[0].id, amount: 1 }],
+        price: 50,
+        name: 'Server 1 Item',
+      });
+
+      const listingServer2 = await this.client.shopListing.shopListingControllerCreate({
+        gameServerId: this.setupData.gameserver2.id,
+        items: [{ itemId: this.setupData.items2[0].id, amount: 1 }],
+        price: 75,
+        name: 'Server 2 Item',
+      });
+
+      // Create order on server 2 first (older), then server 1 (newer)
+      const orderServer2 = await this.setupData.client1.shopOrder.shopOrderControllerCreate({
+        listingId: listingServer2.data.data.id,
+        amount: 1,
+      });
+
+      const orderServer1 = await this.setupData.client1.shopOrder.shopOrderControllerCreate({
+        listingId: listingServer1.data.data.id,
+        amount: 1,
+      });
+
+      // Verify both orders start as PAID
+      const orderServer1Status = await this.client.shopOrder.shopOrderControllerGetOne(orderServer1.data.data.id);
+      const orderServer2Status = await this.client.shopOrder.shopOrderControllerGetOne(orderServer2.data.data.id);
+      expect(orderServer1Status.data.data.status).to.equal('PAID');
+      expect(orderServer2Status.data.data.status).to.equal('PAID');
+
+      // Claim on gameserver where player is online
+      const claimEvents = (await new EventsAwaiter().connect(this.client)).waitForEvents(HookEvents.CHAT_MESSAGE, 2);
+
+      await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
+        msg: '/claim',
+        playerId: this.setupData.players[0].id,
+      });
+
+      const messages = await claimEvents;
+
+      expect(messages).to.have.length(2);
+      expect(messages[0].data.meta.msg).to.equal('You have received items from a shop order.');
+      expect(messages[1].data.meta.msg).to.match(/1x/);
+
+      // Verify only the server 1 order was claimed
+      const claimedOrderServer1 = await this.client.shopOrder.shopOrderControllerGetOne(orderServer1.data.data.id);
+      expect(claimedOrderServer1.data.data.status).to.equal('COMPLETED');
+
+      // Server 2 order should remain unclaimed
+      const unclaimedOrderServer2 = await this.client.shopOrder.shopOrderControllerGetOne(orderServer2.data.data.id);
+      expect(unclaimedOrderServer2.data.data.status).to.equal('PAID');
+    },
+  }),
 ];
 
 describe(group, function () {

package/src/modules/economyUtils/commands/claim.js

@@ -1,15 +1,22 @@
 import { takaro, data, TakaroUserError } from '@takaro/helpers';
 
 async function main() {
-  const { user, player, arguments: args, _gameServerId } = data;
+  const { user, player, arguments: args, gameServerId } = data;
 
   if (!user) throw new TakaroUserError('You must link your account to Takaro to use this command.');
 
+  const filters = {
+    userId: [user.id],
+    status: ['PAID'],
+  };
+
+  // Only filter by gameServerId if it's available (should always be present in command context)
+  if (gameServerId) {
+    filters.gameServerId = [gameServerId];
+  }
+
   const pendingOrdersRes = await takaro.shopOrder.shopOrderControllerSearch({
-    filters: {
-      userId: [user.id],
-      status: ['PAID'],
-    },
+    filters,
     sortBy: 'createdAt',
     sortDirection: 'asc',
   });

package/src/modules/economyUtils/index.ts

@@ -9,7 +9,7 @@ export class EconomyUtils extends ModuleTransferDTO<EconomyUtils> {
     this.supportedGames = ['all'];
     this.versions = [
       new ModuleTransferVersionDTO({
-        tag: '0.0.2',
+        tag: '0.0.3',
         description: 'A set of commands to allow players to manage their currency.',
         configSchema: JSON.stringify({
           $schema: 'http://json-schema.org/draft-07/schema#',