@takaro/modules 0.2.0 → 0.3.0

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

@@ -29,7 +29,9 @@ const tests = [
       });
 
       expect((await eventsBeforeRole).length).to.be.eq(1);
-      expect((await eventsBeforeRole)[0].data.meta.msg).to.match(/You do not have permission to use teleports/);
+      expect((await eventsBeforeRole)[0].data.meta.msg).to.match(
+        /⚠️ You need the 'Teleports Use' permission to use this command. Please contact an admin if you need access/,
+      );
 
       // Assign the role with expiry 10 minutes from now
       await this.client.player.playerControllerAssignRole(this.setupData.players[0].id, this.setupData.role.id, {
@@ -62,7 +64,9 @@ const tests = [
       });
 
       expect((await eventsAfterExpire).length).to.be.eq(1);
-      expect((await eventsAfterExpire)[0].data.meta.msg).to.match(/You do not have permission to use teleports/);
+      expect((await eventsAfterExpire)[0].data.meta.msg).to.match(
+        /⚠️ You need the 'Teleports Use' permission to use this command. Please contact an admin if you need access/,
+      );
     },
   }),
 ];

package/src/__tests__/teleports/publicteleports.integration.test.ts

@@ -251,7 +251,7 @@ const tests = [
 
       expect((await setPublicEvent).length).to.be.eq(1);
       expect((await setPublicEvent)[0].data.meta.msg).to.be.eq(
-        'You do not have permission to create public teleports.',
+        "⚠️ You need the 'Teleports Create Public' permission to use this command. Please contact an admin if you need access.",
       );
     },
   }),

package/src/__tests__/teleports/waypoints.integration.test.ts

@@ -171,7 +171,9 @@ const tests = [
       });
 
       expect((await firstEvents).length).to.be.eq(1);
-      expect((await firstEvents)[0].data.meta.msg).to.be.eq('You do not have permission to manage waypoints.');
+      expect((await firstEvents)[0].data.meta.msg).to.be.eq(
+        "⚠️ You need the 'Teleports Manage Waypoints' permission to use this command. Please contact an admin if you need access.",
+      );
 
       await this.client.player.playerControllerAssignRole(
         this.setupData.player.id,
@@ -278,7 +280,9 @@ const tests = [
       });
 
       expect((await secondEvents).length).to.be.eq(1);
-      expect((await secondEvents)[0].data.meta.msg).to.be.eq('You do not have permission to manage waypoints.');
+      expect((await secondEvents)[0].data.meta.msg).to.be.eq(
+        "⚠️ You need the 'Teleports Manage Waypoints' permission to use this command. Please contact an admin if you need access.",
+      );
 
       const thirdEvents = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 

package/src/dto/takaroEvents.ts

@@ -1,4 +1,5 @@
 import {
+  IsArray,
   IsBoolean,
   IsEnum,
   IsIP,
@@ -23,6 +24,7 @@ export const TakaroEvents = {
   ROLE_UPDATED: 'role-updated',
   ROLE_DELETED: 'role-deleted',
   COMMAND_EXECUTED: 'command-executed',
+  COMMAND_EXECUTION_DENIED: 'command-execution-denied',
   HOOK_EXECUTED: 'hook-executed',
   CRONJOB_EXECUTED: 'cronjob-executed',
   CURRENCY_ADDED: 'currency-added',
@@ -156,6 +158,19 @@ export class TakaroEventCommandExecuted extends BaseEvent<TakaroEventCommandExec
   command: TakaroEventCommandDetails;
 }
 
+export class TakaroEventCommandExecutionDenied extends BaseEvent<TakaroEventCommandExecutionDenied> {
+  @IsString()
+  type = TakaroEvents.COMMAND_EXECUTION_DENIED;
+
+  @ValidateNested()
+  @Type(() => TakaroEventCommandDetails)
+  command: TakaroEventCommandDetails;
+
+  @IsArray()
+  @IsString({ each: true })
+  missingPermissions: string[];
+}
+
 export class TakaroEventHookExecuted extends BaseEvent<TakaroEventHookExecuted> {
   @IsString()
   type = TakaroEvents.HOOK_EXECUTED;
@@ -423,6 +438,7 @@ export const TakaroEventsMapping = {
   [TakaroEvents.CURRENCY_DEDUCTED]: TakaroEventCurrencyDeducted,
   [TakaroEvents.CURRENCY_ADDED]: TakaroEventCurrencyAdded,
   [TakaroEvents.COMMAND_EXECUTED]: TakaroEventCommandExecuted,
+  [TakaroEvents.COMMAND_EXECUTION_DENIED]: TakaroEventCommandExecutionDenied,
   [TakaroEvents.ROLE_REMOVED]: TakaroEventRoleRemoved,
   [TakaroEvents.ROLE_CREATED]: TakaroEventRoleCreated,
   [TakaroEvents.ROLE_UPDATED]: TakaroEventRoleUpdated,

package/src/modules/chatBridge/index.ts

@@ -5,6 +5,8 @@ export class ChatBridge extends ModuleTransferDTO<ChatBridge> {
   constructor() {
     super();
     this.name = 'chatBridge';
+    this.author = 'Takaro';
+    this.supportedGames = ['all'];
     this.versions = [
       new ModuleTransferVersionDTO({
         tag: '0.0.1',

package/src/modules/dailyRewards/commands/daily.js

@@ -1,13 +1,9 @@
-import { takaro, data, TakaroUserError, checkPermission } from '@takaro/helpers';
+import { takaro, data, TakaroUserError } from '@takaro/helpers';
 import { DAILY_KEY, STREAK_KEY, getMultiplier } from './utils.js';
 
 async function main() {
   const { pog, gameServerId, module: mod } = data;
 
-  if (!checkPermission(pog, 'DAILY_CLAIM')) {
-    throw new TakaroUserError('You do not have permission to claim daily rewards.');
-  }
-
   // Get last claim time
   const lastClaimRes = await takaro.variable.variableControllerSearch({
     filters: {

package/src/modules/dailyRewards/index.ts

@@ -11,10 +11,12 @@ export class DailyRewards extends ModuleTransferDTO<DailyRewards> {
   constructor() {
     super();
     this.name = 'dailyRewards';
+    this.author = 'Takaro';
+    this.supportedGames = ['all'];
     this.versions = [
       new ModuleTransferVersionDTO({
         description: 'Provides daily login rewards with streak tracking',
-        tag: '0.0.1',
+        tag: '0.0.2',
         configSchema: JSON.stringify({
           $schema: 'http://json-schema.org/draft-07/schema#',
           type: 'object',
@@ -96,6 +98,7 @@ export class DailyRewards extends ModuleTransferDTO<DailyRewards> {
             name: 'daily',
             trigger: 'daily',
             helpText: 'Claim your daily reward',
+            requiredPermissions: ['DAILY_CLAIM'],
             arguments: [],
           }),
           new ICommand({

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

@@ -7,10 +7,10 @@ async function main() {
   const variables = (
     await takaro.variable.variableControllerSearch({
       filters: {
-        key: 'confirmTransfer',
-        gameServerId,
-        moduleId: mod.moduleId,
-        playerId: sender.playerId,
+        key: ['confirmTransfer'],
+        gameServerId: [gameServerId],
+        moduleId: [mod.moduleId],
+        playerId: [sender.playerId],
       },
     })
   ).data.data;
@@ -29,7 +29,7 @@ async function main() {
     pendingTransfer.receiver.id,
     {
       currency: pendingTransfer.amount,
-    }
+    },
   );
 
   const receiverName = (await takaro.player.playerControllerGetOne(pendingTransfer.receiver.playerId)).data.data.name;
@@ -37,7 +37,7 @@ async function main() {
   const currencyName = (await takaro.settings.settingsControllerGetOne('currencyName', gameServerId)).data.data.value;
 
   const messageToSender = sender.pm(
-    `You successfully transferred ${pendingTransfer.amount} ${currencyName} to ${receiverName}`
+    `You successfully transferred ${pendingTransfer.amount} ${currencyName} to ${receiverName}`,
   );
 
   const messageToReceiver = takaro.gameserver.gameServerControllerSendMessage(gameServerId, {

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

@@ -1,4 +1,4 @@
-import { takaro, data, checkPermission, TakaroUserError } from '@takaro/helpers';
+import { takaro, data } from '@takaro/helpers';
 
 async function main() {
   const { pog: granter, arguments: args, gameServerId } = data;
@@ -7,10 +7,6 @@ async function main() {
   // If the player doesn't exist or multiple players with the same name where found, it will have thrown an error before this command is executed.
   const receiver = args.receiver;
 
-  if (!checkPermission(granter, 'ECONOMY_UTILS_MANAGE_CURRENCY')) {
-    throw new TakaroUserError('You do not have permission to use grant currency command.');
-  }
-
   const currencyName = (await takaro.settings.settingsControllerGetOne('currencyName', gameServerId)).data.data.value;
   const granterName = (await takaro.player.playerControllerGetOne(granter.playerId)).data.data.name;
   const receiverName = (await takaro.player.playerControllerGetOne(receiver.playerId)).data.data.name;

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

@@ -1,4 +1,4 @@
-import { takaro, data, checkPermission, TakaroUserError } from '@takaro/helpers';
+import { takaro, data } from '@takaro/helpers';
 
 async function main() {
   const { pog: revoker, arguments: args, gameServerId } = data;
@@ -7,10 +7,6 @@ async function main() {
   // If the player doesn't exist or multiple players with the same name where found, it will have thrown an error before this command is executed.
   const receiver = args.receiver;
 
-  if (!checkPermission(revoker, 'ECONOMY_UTILS_MANAGE_CURRENCY')) {
-    throw new TakaroUserError('You do not have permission to use revoke currency command.');
-  }
-
   const currencyName = (await takaro.settings.settingsControllerGetOne('currencyName', gameServerId)).data.data.value;
   const revokerName = (await takaro.player.playerControllerGetOne(revoker.playerId)).data.data.name;
   const receiverName = (await takaro.player.playerControllerGetOne(receiver.playerId)).data.data.name;

package/src/modules/economyUtils/index.ts

@@ -5,9 +5,11 @@ export class EconomyUtils extends ModuleTransferDTO<EconomyUtils> {
     super();
 
     this.name = 'economyUtils';
+    this.author = 'Takaro';
+    this.supportedGames = ['all'];
     this.versions = [
       new ModuleTransferVersionDTO({
-        tag: '0.0.1',
+        tag: '0.0.2',
         description: 'A set of commands to allow players to manage their currency.',
         configSchema: JSON.stringify({
           $schema: 'http://json-schema.org/draft-07/schema#',
@@ -74,6 +76,7 @@ export class EconomyUtils extends ModuleTransferDTO<EconomyUtils> {
             name: 'grantCurrency',
             trigger: 'grantcurrency',
             helpText: 'Grant money to a player. The money is not taken from your own balance but is new currency.',
+            requiredPermissions: ['ECONOMY_UTILS_MANAGE_CURRENCY'],
             arguments: [
               {
                 name: 'receiver',
@@ -96,6 +99,7 @@ export class EconomyUtils extends ModuleTransferDTO<EconomyUtils> {
             name: 'revokeCurrency',
             trigger: 'revokecurrency',
             helpText: 'Revokes money from a player. The money disappears.',
+            requiredPermissions: ['ECONOMY_UTILS_MANAGE_CURRENCY'],
             arguments: [
               {
                 name: 'receiver',

package/src/modules/geoBlock/index.ts

@@ -255,6 +255,8 @@ export class GeoBlock extends ModuleTransferDTO<GeoBlock> {
     super();
 
     this.name = 'geoBlock';
+    this.author = 'Takaro';
+    this.supportedGames = ['all'];
     this.versions = [
       new ModuleTransferVersionDTO({
         tag: '0.0.1',

package/src/modules/gimme/index.ts

@@ -5,6 +5,8 @@ export class Gimme extends ModuleTransferDTO<Gimme> {
     super();
 
     this.name = 'gimme';
+    this.author = 'Takaro';
+    this.supportedGames = ['7 days to die', 'rust', 'minecraft'];
     this.versions = [
       new ModuleTransferVersionDTO({
         tag: '0.0.3',

package/src/modules/highPingKicker/index.ts

@@ -4,6 +4,8 @@ export class HighPingKicker extends ModuleTransferDTO<HighPingKicker> {
   constructor() {
     super();
     this.name = 'highPingKicker';
+    this.author = 'Takaro';
+    this.supportedGames = ['7 days to die', 'rust', 'minecraft'];
     this.versions = [
       new ModuleTransferVersionDTO({
         tag: '0.0.2',

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

@@ -1,14 +1,10 @@
-import { takaro, data, checkPermission, TakaroUserError } from '@takaro/helpers';
+import { takaro, data, TakaroUserError } from '@takaro/helpers';
 
 async function main() {
   const { pog, gameServerId, arguments: args, module: mod } = data;
 
   const varKey = 'lottery_tickets_bought';
 
-  if (!checkPermission(pog, 'LOTTERY_BUY')) {
-    throw new TakaroUserError('You do not have permission to buy lottery tickets.');
-  }
-
   if (args.amount < 1) {
     throw new TakaroUserError('You must buy at least 1 ticket.');
   }

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

@@ -1,21 +1,17 @@
-import { takaro, data, checkPermission, TakaroUserError } from '@takaro/helpers';
+import { takaro, data } from '@takaro/helpers';
 
 async function main() {
   const { pog, gameServerId, module: mod } = data;
 
   const varKey = 'lottery_tickets_bought';
 
-  if (!checkPermission(pog, 'LOTTERY_VIEW_TICKETS')) {
-    throw new TakaroUserError('You do not have permission to view lottery tickets.');
-  }
-
   const tickets = (
     await takaro.variable.variableControllerSearch({
       filters: {
-        gameServerId,
-        key: varKey,
-        moduleId: mod.id,
-        playerId: pog.playerId,
+        gameServerId: [gameServerId],
+        key: [varKey],
+        moduleId: [mod.moduleId],
+        playerId: [pog.playerId],
       },
     })
   ).data.data;

package/src/modules/lottery/index.ts

@@ -5,9 +5,11 @@ export class Lottery extends ModuleTransferDTO<Lottery> {
     super();
 
     this.name = 'lottery';
+    this.author = 'Takaro';
+    this.supportedGames = ['all'];
     this.versions = [
       new ModuleTransferVersionDTO({
-        tag: '0.0.1',
+        tag: '0.0.2',
         description: 'Players can buy tickets for a lottery, and the winner is chosen at random.',
         configSchema: JSON.stringify({
           $schema: 'http://json-schema.org/draft-07/schema#',
@@ -51,6 +53,7 @@ export class Lottery extends ModuleTransferDTO<Lottery> {
             name: 'buyTicket',
             trigger: 'buyTicket',
             helpText: 'Buy a lottery ticket.',
+            requiredPermissions: ['LOTTERY_BUY'],
             arguments: [
               {
                 name: 'amount',
@@ -66,6 +69,7 @@ export class Lottery extends ModuleTransferDTO<Lottery> {
             name: 'viewTickets',
             trigger: 'viewTickets',
             helpText: 'View your lottery tickets.',
+            requiredPermissions: ['LOTTERY_VIEW_TICKETS'],
             arguments: [],
           }),
           new ICommand({

package/src/modules/playerOnboarding/index.ts

@@ -6,6 +6,8 @@ export class PlayerOnboarding extends ModuleTransferDTO<PlayerOnboarding> {
     super();
 
     this.name = 'playerOnboarding';
+    this.author = 'Takaro';
+    this.supportedGames = ['all'];
     this.versions = [
       new ModuleTransferVersionDTO({
         tag: '0.0.3',

package/src/modules/serverMessages/index.ts

@@ -5,6 +5,8 @@ export class ServerMessages extends ModuleTransferDTO<ServerMessages> {
     super();
 
     this.name = 'serverMessages';
+    this.author = 'Takaro';
+    this.supportedGames = ['all'];
     this.versions = [
       new ModuleTransferVersionDTO({
         tag: '0.0.1',

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

@@ -1,13 +1,9 @@
-import { takaro, data, checkPermission, TakaroUserError } from '@takaro/helpers';
+import { takaro, data, TakaroUserError } from '@takaro/helpers';
 import { getWaypointName, waypointReconciler } from './utils.js';
 
 async function main() {
   const { pog, gameServerId, arguments: args, module: mod } = data;
 
-  if (!checkPermission(pog, 'TELEPORTS_MANAGE_WAYPOINTS')) {
-    throw new TakaroUserError('You do not have permission to manage waypoints.');
-  }
-
   const variable = await takaro.variable.variableControllerSearch({
     filters: {
       key: [getWaypointName(args.waypoint)],

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

@@ -12,10 +12,6 @@ async function main() {
 
   const hasPermission = checkPermission(pog, 'TELEPORTS_CREATE_PUBLIC');
 
-  if (!hasPermission) {
-    throw new TakaroUserError('You do not have permission to create public teleports.');
-  }
-
   const existingPublicTeleportsForPlayerRes = await takaro.variable.variableControllerSearch({
     search: {
       key: ['pubtp_'],
@@ -29,7 +25,7 @@ async function main() {
 
   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}`
+      `You have reached the maximum number of public teleports for your role, maximum allowed is ${hasPermission.count}`,
     );
   }
 

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

@@ -4,12 +4,6 @@ import { getVariableKey, findTp } from './utils.js';
 async function main() {
   const { pog, gameServerId, module: mod, arguments: args } = data;
 
-  const hasPermission = checkPermission(pog, 'TELEPORTS_USE');
-
-  if (!hasPermission) {
-    throw new TakaroUserError('You do not have permission to use teleports.');
-  }
-
   const prefix = (await takaro.settings.settingsControllerGetOne('commandPrefix', gameServerId)).data.data.value;
 
   const existingVariable = await findTp(args.tp, pog.playerId);
@@ -18,6 +12,7 @@ async function main() {
     throw new TakaroUserError(`Teleport ${args.tp} already exists, use ${prefix}deletetp ${args.tp} to delete it.`);
   }
 
+  const hasPermission = checkPermission(pog, 'TELEPORTS_USE');
   const allPlayerTeleports = await takaro.variable.variableControllerSearch({
     search: {
       key: [getVariableKey(undefined), getVariableKey(undefined, true)],

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

@@ -1,13 +1,9 @@
-import { takaro, data, checkPermission, TakaroUserError } from '@takaro/helpers';
+import { takaro, data, TakaroUserError } from '@takaro/helpers';
 import { getWaypointName, waypointReconciler } from './utils.js';
 
 async function main() {
   const { pog, gameServerId, arguments: args, module: mod } = data;
 
-  if (!checkPermission(pog, 'TELEPORTS_MANAGE_WAYPOINTS')) {
-    throw new TakaroUserError('You do not have permission to manage waypoints.');
-  }
-
   try {
     await takaro.variable.variableControllerCreate({
       moduleId: mod.moduleId,

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

@@ -1,13 +1,9 @@
-import { takaro, data, checkPermission, TakaroUserError } from '@takaro/helpers';
+import { takaro, data, TakaroUserError } from '@takaro/helpers';
 import { findTp } from './utils.js';
 
 async function main() {
   const { pog, gameServerId, arguments: args, module: mod } = data;
 
-  if (!checkPermission(pog, 'TELEPORTS_USE')) {
-    throw new TakaroUserError('You do not have permission to use teleports.');
-  }
-
   const ownedTeleportRes = await findTp(args.tp, pog.playerId);
 
   let teleports = ownedTeleportRes.data.data;

package/src/modules/teleports/index.ts

@@ -13,9 +13,11 @@ export class Teleports extends ModuleTransferDTO<Teleports> {
     super();
 
     this.name = 'teleports';
+    this.author = 'Takaro';
+    this.supportedGames = ['7 days to die', 'rust', 'minecraft'];
     this.versions = [
       new ModuleTransferVersionDTO({
-        tag: '0.0.3',
+        tag: '0.0.4',
         description: 'A set of commands to allow players to set their own teleport points and teleport to them.',
         configSchema: JSON.stringify({
           $schema: 'http://json-schema.org/draft-07/schema#',
@@ -73,6 +75,7 @@ export class Teleports extends ModuleTransferDTO<Teleports> {
             name: 'teleport',
             trigger: 'tp',
             helpText: 'Teleports to one of your set locations.',
+            requiredPermissions: ['TELEPORTS_USE'],
             arguments: [
               {
                 name: 'tp',
@@ -88,6 +91,7 @@ export class Teleports extends ModuleTransferDTO<Teleports> {
             name: 'tplist',
             trigger: 'tplist',
             helpText: 'Lists all your set locations.',
+            requiredPermissions: ['TELEPORTS_USE'],
             arguments: [],
           }),
           new ICommand({
@@ -95,6 +99,7 @@ export class Teleports extends ModuleTransferDTO<Teleports> {
             name: 'settp',
             trigger: 'settp',
             helpText: 'Sets a location to teleport to.',
+            requiredPermissions: ['TELEPORTS_USE'],
             arguments: [
               {
                 name: 'tp',
@@ -125,6 +130,7 @@ export class Teleports extends ModuleTransferDTO<Teleports> {
             name: 'setpublic',
             trigger: 'setpublic',
             helpText: 'Sets a teleport to be public, allowing other players to teleport to it.',
+            requiredPermissions: ['TELEPORTS_CREATE_PUBLIC'],
             arguments: [
               {
                 name: 'tp',
@@ -155,6 +161,7 @@ export class Teleports extends ModuleTransferDTO<Teleports> {
             name: 'setwaypoint',
             trigger: 'setwaypoint',
             helpText: 'Creates a new waypoint.',
+            requiredPermissions: ['TELEPORTS_MANAGE_WAYPOINTS'],
             arguments: [
               {
                 name: 'waypoint',
@@ -170,6 +177,7 @@ export class Teleports extends ModuleTransferDTO<Teleports> {
             name: 'deletewaypoint',
             trigger: 'deletewaypoint',
             helpText: 'Deletes a waypoint.',
+            requiredPermissions: ['TELEPORTS_MANAGE_WAYPOINTS'],
             arguments: [
               {
                 name: 'waypoint',

package/src/modules/timedShutdown/index.ts

@@ -5,6 +5,8 @@ export class TimedShutdown extends ModuleTransferDTO<TimedShutdown> {
     super();
 
     this.name = 'timedShutdown';
+    this.author = 'Takaro';
+    this.supportedGames = ['all'];
     this.versions = [
       new ModuleTransferVersionDTO({
         tag: '0.0.1',

package/src/modules/utils/commands/help.js

@@ -1,4 +1,4 @@
-import { data, takaro, TakaroUserError } from '@takaro/helpers';
+import { data, takaro, TakaroUserError, checkPermission } from '@takaro/helpers';
 async function main() {
   const enabledModules = await takaro.module.moduleInstallationsControllerGetInstalledModules({
     filters: { gameserverId: [data.gameServerId] },
@@ -6,20 +6,72 @@ async function main() {
 
   const moduleCommands = await Promise.all(
     enabledModules.data.data.map(async (mod) => {
+      // Check if the module itself is enabled
+      if (!mod.systemConfig.enabled) {
+        return [];
+      }
+
       const installedVersion = await takaro.module.moduleVersionControllerGetModuleVersion(mod.versionId);
-      return installedVersion.data.data.commands;
+      const commands = installedVersion.data.data.commands;
+
+      // Filter out disabled commands
+      return commands.filter((command) => {
+        const commandConfig = mod.systemConfig.commands && mod.systemConfig.commands[command.name];
+        return commandConfig && commandConfig.enabled;
+      });
     }),
   );
   const allCommandsFlat = moduleCommands.flat();
 
-  if (data.arguments.command === 'all') {
+  // Filter commands based on player permissions
+  const accessibleCommands = allCommandsFlat.filter((command) => {
+    // If command has no required permissions, it's accessible to all
+    if (!command.requiredPermissions || command.requiredPermissions.length === 0) {
+      return true;
+    }
+
+    // Check if player has all required permissions
+    return command.requiredPermissions.every((permission) => checkPermission(data.pog, permission));
+  });
+
+  if (data.arguments.command === 'search') {
+    // Check if a search term was actually provided (not the default 'none')
+    if (data.arguments.searchTerm === 'none') {
+      throw new TakaroUserError('Please provide a search term. Usage: /help search <term>');
+    }
+
+    // Search functionality
+    const searchTerm = data.arguments.searchTerm.toLowerCase();
+    const matchingCommands = accessibleCommands.filter((command) => {
+      // Check if command name contains search term
+      const nameMatch = command.name.toLowerCase().includes(searchTerm);
+      // Check if help text contains search term
+      const helpTextMatch = command.helpText.toLowerCase().includes(searchTerm);
+      return nameMatch || helpTextMatch;
+    });
+
+    if (matchingCommands.length === 0) {
+      await data.player.pm(`No commands found matching "${data.arguments.searchTerm}".`);
+    } else {
+      await data.player.pm(`Commands matching "${data.arguments.searchTerm}":`);
+      await Promise.all(
+        matchingCommands.map(async (command) => {
+          await data.player.pm(`${command.name}: ${command.helpText}`);
+        }),
+      );
+    }
+  } else if (data.arguments.command === 'all') {
     await data.player.pm('Available commands:');
 
-    await Promise.all(
-      allCommandsFlat.map(async (command) => {
-        await data.player.pm(`${command.name}: ${command.helpText}`);
-      }),
-    );
+    if (accessibleCommands.length === 0) {
+      await data.player.pm('No commands available to you.');
+    } else {
+      await Promise.all(
+        accessibleCommands.map(async (command) => {
+          await data.player.pm(`${command.name}: ${command.helpText}`);
+        }),
+      );
+    }
   } else {
     const requestedCommand = allCommandsFlat.find((c) => {
       return c.name === data.arguments.command;
@@ -30,6 +82,16 @@ async function main() {
         `Unknown command "${data.arguments.command}", use this command without arguments to see all available commands.`,
       );
     } else {
+      // Check if player has permission to use this command
+      const hasAccess =
+        !requestedCommand.requiredPermissions ||
+        requestedCommand.requiredPermissions.length === 0 ||
+        requestedCommand.requiredPermissions.every((permission) => checkPermission(data.pog, permission));
+
+      if (!hasAccess) {
+        throw new TakaroUserError(`You don't have permission to use the "${data.arguments.command}" command.`);
+      }
+
       await data.player.pm(`${requestedCommand.name}: ${requestedCommand.helpText}`);
     }
   }