@takaro/modules 0.0.1 → 0.0.4

package/src/community-modules/modules/vote.json

@@ -0,0 +1,19 @@
+{
+  "commands": [
+    {
+      "function": "\nimport { takaro, data, axios } from '@takaro/helpers';\nasync function main() {\n  const { pog } = data;\n  const playerRes = await takaro.player.playerControllerGetOne(data.player.id);\n  const steamId = playerRes.data.data.steamId;\n  const xboxLiveId = playerRes.data.data.xboxLiveId;\n  const name = playerRes.data.data.name;\n  const key = data.module.userConfig.votekey;\n\n  let voteId = `username=${name}`;\n  if (steamId.startsWith(\"7656\")) { voteId = `steamid=${steamId}`; }\n\n\n  const res = await axios.get(`https://7daystodie-servers.com/api/?object=votes&element=claim&key=${key}&${voteId}`);\n  if (res.data == 0) { data.player.pm(data.module.userConfig.didntvote); }\n  if (res.data == 2) { data.player.pm(data.module.userConfig.alreadyvoted); }\n  if (res.data == 1) {\n\n    const claimresponse = await axios.post(`https://7daystodie-servers.com/api/?action=post&object=votes&element=claim&key=${key}&${voteId}`);\n    if (claimresponse.data == 1) {\n      if (data.module.userConfig.votednow.toLowerCase() !== 'none' && data.module.userConfig.votednow.toLowerCase() !== '\"none\"') { data.player.pm(data.module.userConfig.votednow); }\n      if (data.module.userConfig.publicMessage.toLowerCase() !== 'none' && data.module.userConfig.publicMessage.toLowerCase() !== '\"none\"') {\n        const originalMessage = data.module.userConfig.publicMessage;\n        const modifiedMessage = originalMessage.replace(/\\{name\\}/g, name);\n        await takaro.gameserver.gameServerControllerExecuteCommand(data.gameServerId, { command: `say \"${modifiedMessage}\"` });\n      }\n      await takaro.playerOnGameserver.playerOnGameServerControllerAddCurrency(data.gameServerId, pog.playerId, { currency: data.module.userConfig.currency });\n      for (const stuff of data.module.userConfig.giveStuff) {\n        if (voteId.startsWith(`steamid`)) {\n          await takaro.gameserver.gameServerControllerExecuteCommand(data.gameServerId, { command: `giveplus Steam_${steamId} ${stuff}` });\n        } else {\n          await takaro.gameserver.gameServerControllerExecuteCommand(data.gameServerId, { command: `giveplus ${xboxLiveId} ${stuff}` });\n        }\n      }\n    }\n  }\n}\n\n\n\nawait main();",
+      "name": "vote",
+      "trigger": "vote",
+      "helpText": "Vote for the server and give players rewards.",
+      "arguments": []
+    }
+  ],
+  "hooks": [],
+  "cronJobs": [],
+  "functions": [],
+  "permissions": [],
+  "name": "Vote",
+  "description": "Takaro Vote Module",
+  "configSchema": "{\"$schema\":\"http://json-schema.org/draft-07/schema#\",\"type\":\"object\",\"required\":[\"votekey\",\"didntvote\",\"alreadyvoted\"],\"additionalProperties\":false,\"properties\":{\"votekey\":{\"title\":\"votekey\",\"description\":\"Votekey from website\",\"default\":\"\",\"type\":\"string\"},\"didntvote\":{\"title\":\"didntvote\",\"description\":\"Message to send to the player when voting site reports no vote was cast.\",\"default\":\"You haven't voted yet.\",\"type\":\"string\"},\"alreadyvoted\":{\"title\":\"alreadyvoted\",\"description\":\"Message to send to the player when voting site reports the vote was already claimed.\",\"default\":\"You have already claimed your last vote.\",\"type\":\"string\"},\"votednow\":{\"title\":\"votednow\",\"description\":\"Optional message to send to the player when vote is successful. \\nUse \\\"none\\\" as the message if you want nothing to be sent instead.\",\"default\":\"Thanks for voting.\",\"type\":\"string\"},\"publicMessage\":{\"title\":\"publicMessage\",\"description\":\"Optional message to broadcast to all players online when vote is successful. Use {name} in the message to refer to the player name.\\nUse \\\"none\\\" as the message if you want nothing to be sent instead.\",\"default\":\"[FF0000]{name}[-] voted at 7daystodie-servers.com and was rewarded Takaro Coins!\",\"type\":\"string\"},\"giveStuff\":{\"title\":\"giveStuff\",\"description\":\"Items to give to the player thru giveplus command. Must indicate quantities and, if applies, quality:\\n<item name> <amount> [<quality> <usedTimes>]\\n\\nItem name has to be the exact name of an item as listed by \\\"listitems\\\".\\n\\nQuality is the quality of the dropped items for items that have a quality.\\n\\nusedTimes is the % that the item was used.\\n\\nThe default value is giving 2 waters and a tier 6 stone axe with no use. If you are going to copy/paste, include the arguments. \",\"default\":[\"drinkJarBoiledWater 2\",\"meleeToolRepairT0StoneAxe 1 6 0\"],\"type\":\"array\",\"items\":{\"type\":\"string\"}},\"currency\":{\"title\":\"currency\",\"description\":\"How much currency to add to the player in Takaro\",\"default\":0,\"type\":\"number\"}}}",
+  "uiSchema": "{}"
+}

package/src/dto/gameEvents.ts

@@ -61,7 +61,7 @@ export class BaseGameEvent<T> extends BaseEvent<T> {
   msg: string;
 }
 
-export interface IPosition {
+export interface IPositionInterface {
   x: number;
   y: number;
   z: number;
@@ -105,7 +105,7 @@ export class EventChatMessage extends BaseGameEvent<EventChatMessage> {
   declare msg: string;
 }
 
-export class IPosition {
+export class IPosition implements IPositionInterface {
   @IsNumber()
   x: number;
   @IsNumber()

package/src/dto/takaroEvents.ts

@@ -9,6 +9,7 @@ import {
   IsObject,
   IsOptional,
   IsString,
+  IsUUID,
   ValidateNested,
 } from 'class-validator';
 import { BaseEvent } from './base.js';
@@ -36,6 +37,12 @@ export const TakaroEvents = {
   MODULE_INSTALLED: 'module-installed',
   MODULE_UNINSTALLED: 'module-uninstalled',
   PLAYER_CREATED: 'player-created',
+  SHOP_LISTING_CREATED: 'shop-listing-created',
+  SHOP_LISTING_UPDATED: 'shop-listing-updated',
+  SHOP_LISTING_DELETED: 'shop-listing-deleted',
+  SHOP_ORDER_CREATED: 'shop-order-created',
+  SHOP_ORDER_STATUS_CHANGED: 'shop-order-status-changed',
+  PLAYER_LINKED: 'player-linked',
 } as const;
 
 export class BaseTakaroEvent<T> extends BaseEvent<T> {
@@ -116,6 +123,20 @@ export class TakaroEventCommandDetails extends TakaroDTO<TakaroEventCommandDetai
   arguments: Record<string, unknown>;
 }
 
+export class TakaroEventHookDetails extends TakaroDTO<TakaroEventHookDetails> {
+  @IsString()
+  id: string;
+  @IsString()
+  name: string;
+}
+
+export class TakaroEventCronjobDetails extends TakaroDTO<TakaroEventCronjobDetails> {
+  @IsString()
+  id: string;
+  @IsString()
+  name: string;
+}
+
 export class TakaroEventCommandExecuted extends BaseEvent<TakaroEventCommandExecuted> {
   @IsString()
   type = TakaroEvents.COMMAND_EXECUTED;
@@ -143,6 +164,11 @@ export class TakaroEventHookExecuted extends BaseEvent<TakaroEventHookExecuted>
   @ValidateNested({ each: true })
   @Type(() => TakaroEventFunctionResult)
   result: TakaroEventFunctionResult;
+
+  @IsOptional()
+  @ValidateNested()
+  @Type(() => TakaroEventHookDetails)
+  hook: TakaroEventHookDetails;
 }
 
 export class TakaroEventCronjobExecuted extends BaseEvent<TakaroEventCronjobExecuted> {
@@ -155,6 +181,11 @@ export class TakaroEventCronjobExecuted extends BaseEvent<TakaroEventCronjobExec
   @ValidateNested({ each: true })
   @Type(() => TakaroEventFunctionResult)
   result: TakaroEventFunctionResult;
+
+  @IsOptional()
+  @ValidateNested()
+  @Type(() => TakaroEventCronjobDetails)
+  cronjob: TakaroEventCronjobDetails;
 }
 
 export class TakaroEventRoleMeta extends TakaroDTO<TakaroEventRoleMeta> {
@@ -267,6 +298,48 @@ export class TakaroEventPlayerCreated extends BaseEvent<TakaroEventPlayerCreated
   type = TakaroEvents.PLAYER_CREATED;
 }
 
+export class TakaroEventShopListingCreated extends BaseEvent<TakaroEventShopListingCreated> {
+  @IsString()
+  type = TakaroEvents.SHOP_LISTING_CREATED;
+  @IsUUID()
+  id: string;
+}
+
+export class TakaroEventShopListingUpdated extends BaseEvent<TakaroEventShopListingUpdated> {
+  @IsString()
+  type = TakaroEvents.SHOP_LISTING_UPDATED;
+  @IsUUID()
+  id: string;
+}
+
+export class TakaroEventShopListingDeleted extends BaseEvent<TakaroEventShopListingDeleted> {
+  @IsString()
+  type = TakaroEvents.SHOP_LISTING_DELETED;
+  @IsUUID()
+  id: string;
+}
+
+export class TakaroEventShopOrderCreated extends BaseEvent<TakaroEventShopOrderCreated> {
+  @IsString()
+  type = TakaroEvents.SHOP_ORDER_CREATED;
+  @IsUUID()
+  id: string;
+}
+
+export class TakaroEventShopOrderStatusChanged extends BaseEvent<TakaroEventShopOrderStatusChanged> {
+  @IsString()
+  type = TakaroEvents.SHOP_ORDER_STATUS_CHANGED;
+  @IsUUID()
+  id: string;
+  @IsString()
+  status: string;
+}
+
+export class TakaroEventPlayerLinked extends BaseEvent<TakaroEventPlayerLinked> {
+  @IsString()
+  type = TakaroEvents.PLAYER_LINKED;
+}
+
 export const TakaroEventsMapping = {
   [TakaroEvents.ROLE_ASSIGNED]: TakaroEventRoleAssigned,
   [TakaroEvents.PLAYER_NEW_IP_DETECTED]: TakaroEventPlayerNewIpDetected,
@@ -287,4 +360,10 @@ export const TakaroEventsMapping = {
   [TakaroEvents.MODULE_INSTALLED]: TakaroEventModuleInstalled,
   [TakaroEvents.MODULE_UNINSTALLED]: TakaroEventModuleUninstalled,
   [TakaroEvents.PLAYER_CREATED]: TakaroEventPlayerCreated,
+  [TakaroEvents.SHOP_LISTING_CREATED]: TakaroEventShopListingCreated,
+  [TakaroEvents.SHOP_LISTING_UPDATED]: TakaroEventShopListingUpdated,
+  [TakaroEvents.SHOP_LISTING_DELETED]: TakaroEventShopListingDeleted,
+  [TakaroEvents.SHOP_ORDER_CREATED]: TakaroEventShopOrderCreated,
+  [TakaroEvents.SHOP_ORDER_STATUS_CHANGED]: TakaroEventShopOrderStatusChanged,
+  [TakaroEvents.PLAYER_LINKED]: TakaroEventPlayerLinked,
 } as const;

package/src/main.ts

@@ -8,12 +8,11 @@ import { Lottery } from './modules/lottery/index.js';
 import { PlayerOnboarding } from './modules/playerOnboarding/index.js';
 import { ServerMessages } from './modules/serverMessages/index.js';
 import { Teleports } from './modules/teleports/index.js';
-export { BuiltinModule, ICommand, ICommandArgument, ICronJob, IHook, IFunction } from './BuiltinModule.js';
+import { Utils } from './modules/utils/index.js';
 
+export { BuiltinModule, ICommand, ICommandArgument, ICronJob, IHook, IFunction } from './BuiltinModule.js';
 export * from './dto/index.js';
 
-import { Utils } from './modules/utils/index.js';
-
 let cached: Array<BuiltinModule<unknown>> | null = null;
 
 export function getModules(): Array<BuiltinModule<unknown>> {

package/src/modules/chatBridge/hooks/GameToDiscord.js

@@ -5,7 +5,7 @@ async function main() {
 
   if (onlyGlobal && data.eventData.channel !== 'global') return;
 
-  const discordChannel = data.module.systemConfig.hooks['DiscordToGame Discord channel ID'];
+  const discordChannel = data.module.systemConfig.hooks['DiscordToGame'].discordChannelId;
 
   const sender = data.player ? data.player.name : 'Non-player';
   const message = `**${sender}**: ${data.eventData.msg}`;

package/src/modules/chatBridge/hooks/PlayerConnected.js

@@ -1,10 +1,10 @@
 import { takaro, data } from '@takaro/helpers';
 
 async function main() {
-  const discordChannel = data.module.systemConfig.hooks['DiscordToGame Discord channel ID'];
+  const discordChannel = data.module.systemConfig.hooks['DiscordToGame'].discordChannelId;
 
   await takaro.discord.discordControllerSendMessage(discordChannel, {
-    message: `[🔌 Connected]: ${data.player.name}`,
+    message: `[⚡ Connected]: ${data.player.name}`,
   });
 }
 

package/src/modules/chatBridge/hooks/PlayerDisconnected.js

@@ -1,7 +1,7 @@
 import { takaro, data } from '@takaro/helpers';
 
 async function main() {
-  const discordChannel = data.module.systemConfig.hooks['DiscordToGame Discord channel ID'];
+  const discordChannel = data.module.systemConfig.hooks['DiscordToGame'].discordChannelId;
 
   await takaro.discord.discordControllerSendMessage(discordChannel, {
     message: `[👋 Disconnected]: ${data.player.name}`,

package/src/modules/chatBridge/index.ts

@@ -30,7 +30,7 @@ export class ChatBridge extends BuiltinModule<ChatBridge> {
           },
         },
         additionalProperties: false,
-      })
+      }),
     );
 
     this.hooks = [

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

@@ -33,7 +33,7 @@ async function main() {
 
     // NOTE: we should maybe check if the player has enough balance to send the amount since this is only checked when the transaction is executed.
     await sender.pm(
-      `You are about to send ${args.amount} ${currencyName} to ${receiverName}. (Please confirm by typing ${prefix}confirmtransfer)`
+      `You are about to send ${args.amount} ${currencyName} to ${receiverName}. (Please confirm by typing ${prefix}confirmtransfer)`,
     );
     return;
   }
@@ -45,11 +45,11 @@ async function main() {
       receiver.id,
       {
         currency: args.amount,
-      }
+      },
     );
-  } catch (e) {
+  } catch (_e) {
     throw new TakaroUserError(
-      `Failed to transfer ${args.amount} ${currencyName} to ${receiverName}. Are you sure you have enough balance?`
+      `Failed to transfer ${args.amount} ${currencyName} to ${receiverName}. Are you sure you have enough balance?`,
     );
   }
 

package/src/modules/economyUtils/index.ts

@@ -19,7 +19,7 @@ export class EconomyUtils extends BuiltinModule<EconomyUtils> {
         },
         required: [],
         additionalProperties: false,
-      })
+      }),
     );
 
     this.permissions = [

package/src/modules/geoBlock/hooks/IPDetected.js

@@ -30,22 +30,21 @@ async function main() {
     if (countries.includes(country)) {
       console.log('Allowed country detected, no action');
       return;
-    } else {
-      console.log('Blocked country detected, performing actions');
-      await handleAction();
-      return;
     }
+    console.log('Blocked country detected, performing actions');
+    await handleAction();
+    return;
   }
+}
 
-  if (mode === 'deny') {
-    if (countries.includes(country)) {
-      console.log('Blocked country detected, performing actions');
-      await handleAction();
-      return;
-    } else {
-      console.log('Allowed country detected, no action');
-      return;
-    }
+if (mode === 'deny') {
+  if (countries.includes(country)) {
+    console.log('Blocked country detected, performing actions');
+    await handleAction();
+    return;
+  } else {
+    console.log('Allowed country detected, no action');
+    return;
   }
 }
 

package/src/modules/geoBlock/index.ts

@@ -271,7 +271,7 @@ export class GeoBlock extends BuiltinModule<GeoBlock> {
           },
           countries: {
             title: 'Countries',
-            description: 'List of country',
+            description: 'List of countries',
             type: 'array',
             uniqueItems: true,
             'x-component': 'country',
@@ -307,7 +307,7 @@ export class GeoBlock extends BuiltinModule<GeoBlock> {
       }),
       JSON.stringify({
         banDuration: { 'ui:widget': 'duration' },
-      })
+      }),
     );
 
     this.permissions = [

package/src/modules/gimme/index.ts

@@ -33,7 +33,7 @@ export class Gimme extends BuiltinModule<Gimme> {
       }),
       JSON.stringify({
         items: { 'ui:widget': 'item' },
-      })
+      }),
     );
 
     this.commands = [

package/src/modules/highPingKicker/index.ts

@@ -25,7 +25,7 @@ export class HighPingKicker extends BuiltinModule<HighPingKicker> {
           },
         },
         required: [],
-      })
+      }),
     );
 
     this.cronJobs = [

package/src/modules/lottery/commands/nextDraw.js

@@ -39,7 +39,9 @@ function formatTimeToReach(cronJob) {
 
 async function main() {
   const { player, module: mod } = data;
-  await player.pm(`The next lottery draw is in about ${formatTimeToReach(mod.systemConfig.cronJobs.drawLottery)}`);
+  await player.pm(
+    `The next lottery draw is in about ${formatTimeToReach(mod.systemConfig.cronJobs.drawLottery.temporalValue)}`
+  );
 }
 
 await main();

package/src/modules/lottery/index.ts

@@ -19,7 +19,7 @@ export class Lottery extends BuiltinModule<Lottery> {
         },
         required: [],
         additionalProperties: false,
-      })
+      }),
     );
 
     this.permissions = [

package/src/modules/playerOnboarding/index.ts

@@ -1,5 +1,6 @@
 import { BuiltinModule, ICommand, IHook } from '../../BuiltinModule.js';
 import { HookEvents } from '../../dto/index.js';
+
 export class PlayerOnboarding extends BuiltinModule<PlayerOnboarding> {
   constructor() {
     super(
@@ -34,7 +35,7 @@ export class PlayerOnboarding extends BuiltinModule<PlayerOnboarding> {
       }),
       JSON.stringify({
         starterKitItems: { 'ui:widget': 'item' },
-      })
+      }),
     );
 
     this.hooks = [

package/src/modules/serverMessages/index.ts

@@ -26,7 +26,7 @@ export class ServerMessages extends BuiltinModule<ServerMessages> {
           },
         },
         required: ['messages'],
-      })
+      }),
     );
 
     this.cronJobs = [

package/src/modules/teleports/commands/deletetp.js

@@ -6,7 +6,7 @@ async function main() {
 
   const existingVariable = await takaro.variable.variableControllerSearch({
     filters: {
-      key: [getVariableKey(args.tp)],
+      key: [getVariableKey(args.tp), getVariableKey(args.tp, true)],
       gameServerId: [gameServerId],
       playerId: [pog.playerId],
       moduleId: [mod.moduleId],

package/src/modules/teleports/commands/setprivate.js

@@ -10,7 +10,7 @@ async function main() {
     filters: {
       gameServerId: [gameServerId],
       playerId: [pog.playerId],
-      key: [getVariableKey(args.tp)],
+      key: [getVariableKey(args.tp, true)],
       moduleId: [mod.moduleId],
     },
     sortBy: 'key',
@@ -20,17 +20,17 @@ async function main() {
   const teleports = teleportRes.data.data;
 
   if (teleports.length === 0) {
-    throw new TakaroUserError(`No teleport with name ${args.tp} found, use ${prefix}settp <name> to set one first.`);
+    throw new TakaroUserError(
+      `No public teleport with name ${args.tp} found, use ${prefix}settp <name> to set one first.`
+    );
   }
 
   const teleportRecord = teleports[0];
   const teleport = JSON.parse(teleportRecord.value);
 
   await takaro.variable.variableControllerUpdate(teleportRecord.id, {
-    value: JSON.stringify({
-      ...teleport,
-      public: false,
-    }),
+    key: getVariableKey(args.tp),
+    value: JSON.stringify(teleport),
   });
 
   await data.player.pm(`Teleport ${args.tp} is now private.`);

package/src/modules/teleports/commands/setpublic.js

@@ -4,7 +4,7 @@ import { getVariableKey } from './utils.js';
 async function main() {
   const { pog, gameServerId, module: mod, arguments: args } = data;
 
-  const prefix = (await takaro.settings.settingsControllerGetOne('commandPrefix', gameServerId)).data.data;
+  const prefix = (await takaro.settings.settingsControllerGetOne('commandPrefix', gameServerId)).data.data.value;
 
   if (!mod.userConfig.allowPublicTeleports) {
     throw new TakaroUserError('Public teleports are disabled.');
@@ -16,9 +16,9 @@ async function main() {
     throw new TakaroUserError('You do not have permission to create public teleports.');
   }
 
-  const existingTeleportsForPlayerRes = await takaro.variable.variableControllerSearch({
+  const existingPublicTeleportsForPlayerRes = await takaro.variable.variableControllerSearch({
     search: {
-      key: 'tp_',
+      key: ['pubtp_'],
     },
     filters: {
       gameServerId: [gameServerId],
@@ -27,29 +27,24 @@ async function main() {
     },
   });
 
-  const existingPublicTeleportsForPlayer = existingTeleportsForPlayerRes.data.data.filter((tp) => {
-    const teleport = JSON.parse(tp.value);
-    return teleport.public;
-  });
-
-  if (existingPublicTeleportsForPlayer.length >= hasPermission.count) {
+  if (existingPublicTeleportsForPlayerRes.data.data.length >= hasPermission.count) {
     throw new TakaroUserError(
       `You have reached the maximum number of public teleports for your role, maximum allowed is ${hasPermission.count}`
     );
   }
 
-  const teleportRes = await takaro.variable.variableControllerSearch({
-    filters: {
-      gameServerId: [gameServerId],
-      playerId: [pog.playerId],
-      moduleId: [mod.moduleId],
-      key: [getVariableKey(args.tp)],
-    },
-    sortBy: 'key',
-    sortDirection: 'asc',
-  });
-
-  const teleports = teleportRes.data.data;
+  const teleports = (
+    await takaro.variable.variableControllerSearch({
+      filters: {
+        gameServerId: [gameServerId],
+        playerId: [pog.playerId],
+        moduleId: [mod.moduleId],
+        key: [getVariableKey(args.tp)],
+      },
+      sortBy: 'key',
+      sortDirection: 'asc',
+    })
+  ).data.data;
 
   if (teleports.length === 0) {
     throw new TakaroUserError(`No teleport with name ${args.tp} found, use ${prefix}settp <name> to set one first.`);
@@ -59,10 +54,8 @@ async function main() {
   const teleport = JSON.parse(teleportRecord.value);
 
   await takaro.variable.variableControllerUpdate(teleportRecord.id, {
-    value: JSON.stringify({
-      ...teleport,
-      public: true,
-    }),
+    key: getVariableKey(args.tp, true),
+    value: JSON.stringify(teleport),
   });
 
   await data.player.pm(`Teleport ${args.tp} is now public.`);

package/src/modules/teleports/commands/settp.js

@@ -12,7 +12,7 @@ async function main() {
 
   const prefix = (await takaro.settings.settingsControllerGetOne('commandPrefix', gameServerId)).data.data.value;
 
-  const existingVariable = await findTp(args.tp);
+  const existingVariable = await findTp(args.tp, pog.playerId);
 
   if (existingVariable.data.data.length > 0) {
     throw new TakaroUserError(`Teleport ${args.tp} already exists, use ${prefix}deletetp ${args.tp} to delete it.`);
@@ -20,7 +20,7 @@ async function main() {
 
   const allPlayerTeleports = await takaro.variable.variableControllerSearch({
     search: {
-      key: getVariableKey(''),
+      key: [getVariableKey(undefined), getVariableKey(undefined, true)],
     },
     filters: {
       gameServerId: [gameServerId],

package/src/modules/teleports/commands/teleport.js

@@ -13,14 +13,8 @@ async function main() {
   let teleports = ownedTeleportRes.data.data;
 
   if (mod.userConfig.allowPublicTeleports) {
-    const maybePublicTeleportRes = await findTp(args.tp);
-
-    const publicTeleports = maybePublicTeleportRes.data.data.filter((tele) => {
-      const teleport = JSON.parse(tele.value);
-      return teleport.public;
-    });
-
-    teleports = teleports.concat(publicTeleports);
+    const publicTeleportRes = await findTp(args.tp, null, true);
+    teleports = teleports.concat(publicTeleportRes.data.data);
   }
 
   if (teleports.length === 0) {
@@ -29,7 +23,7 @@ async function main() {
 
   const timeout = mod.userConfig.timeout;
 
-  if (timeout !== 0) {
+  if (timeout > 0) {
     const lastExecuted = await takaro.variable.variableControllerSearch({
       filters: {
         key: ['lastExecuted'],
@@ -48,7 +42,6 @@ async function main() {
         moduleId: mod.moduleId,
         value: new Date().toISOString(),
       });
-      console.log(createRes);
       lastExecutedRecord = createRes.data.data;
     } else {
       const lastExecutedTime = new Date(lastExecutedRecord.value);

package/src/modules/teleports/commands/teleportwaypoint.js

@@ -5,7 +5,18 @@ function getWaypointName(name) {
 }
 
 async function main() {
-  const { pog, gameServerId, trigger } = data;
+  const { pog, gameServerId, trigger, module, itemId } = data;
+
+  const triggeredCommand = module.module.commands.find((command) => command.id === itemId);
+
+  if (!triggeredCommand) {
+    throw new Error('Waypoint not found.');
+  }
+
+  if (!triggeredCommand.name.includes(`server ${gameServerId}`)) {
+    console.log(`Waypoint ${trigger} is not for this server.`);
+    return;
+  }
 
   if (!checkPermission(pog, `WAYPOINTS_USE_${trigger.toUpperCase()}_${gameServerId}`)) {
     throw new TakaroUserError(`You are not allowed to use the waypoint ${trigger}.`);

package/src/modules/teleports/commands/tplist.js

@@ -1,9 +1,10 @@
 import { takaro, data } from '@takaro/helpers';
+import { getVariableKey } from './utils.js';
 
 async function main() {
   const { pog, gameServerId, module: mod } = data;
 
-  const prefix = (await takaro.settings.settingsControllerGetOne('commandPrefix', gameServerId)).data.data;
+  const prefix = (await takaro.settings.settingsControllerGetOne('commandPrefix', gameServerId)).data.data.value;
 
   const ownedTeleports = (
     await takaro.variable.variableControllerSearch({
@@ -13,38 +14,36 @@ async function main() {
         moduleId: [mod.moduleId],
       },
       search: {
-        key: 'tp',
+        key: [getVariableKey(undefined, false)],
       },
       sortBy: 'key',
       sortDirection: 'asc',
     })
   ).data.data;
 
-  const maybePublicTeleports = (
+  const publicTeleports = (
     await takaro.variable.variableControllerSearch({
       filters: {
         gameServerId: [gameServerId],
         moduleId: [mod.moduleId],
       },
       search: {
-        key: ['tp'],
+        key: [getVariableKey(undefined, true)],
       },
       sortBy: 'key',
       sortDirection: 'asc',
     })
-  ).data.data;
-
-  const teleports = maybePublicTeleports.filter((tele) => {
-    const teleport = JSON.parse(tele.value);
-
-    const isPublic = teleport.public && teleport.playerId !== pog.playerId;
-    const isOwned = ownedTeleports.find((t) => t.playerId === pog.playerId);
+  ).data.data
+    // Filter out public teleports that are owned by the player
+    // Since we'll be showing them in the owned teleports list
+    .filter((teleport) => {
+      return teleport.playerId !== pog.playerId;
+    });
 
-    return isPublic || isOwned;
-  });
+  const teleports = [...ownedTeleports, ...publicTeleports];
 
   if (teleports.length === 0) {
-    await data.player.pm(`You have no teleports set, use ${prefix}settp <name> to set one.`);
+    await data.player.pm(`You have no teleports available, use ${prefix}settp <name> to set one.`);
     return;
   }
 
@@ -53,7 +52,9 @@ async function main() {
   for (const rawTeleport of teleports) {
     const teleport = JSON.parse(rawTeleport.value);
     await data.player.pm(
-      ` - ${teleport.name}: ${teleport.x}, ${teleport.y}, ${teleport.z} ${teleport.public ? '(public)' : ''}`
+      `${teleport.name}: (${teleport.x},${teleport.y},${teleport.z}) ${
+        rawTeleport.key.startsWith('pub') ? '(public)' : ''
+      }`
     );
   }
 }