From da887449e2db5e02603efe9560c0b49c2c6eb3b3 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Sat, 25 Oct 2025 20:20:03 -0700 Subject: fix(commands:characterClaimUsage): Improve request matching --- .../gateway/src/commands/characterClaimUsage.ts | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/packages/gateway/src/commands/characterClaimUsage.ts b/packages/gateway/src/commands/characterClaimUsage.ts index 1334c4d..8f5a9b4 100644 --- a/packages/gateway/src/commands/characterClaimUsage.ts +++ b/packages/gateway/src/commands/characterClaimUsage.ts @@ -487,15 +487,21 @@ export const handleCharacterClaimUsageCommand = async ( return false; } - const content = message.content.trim().toLowerCase(); - const claimUsageMatch = content.match(/claim\s+usage\s+(\d+)/); - const claimsMatch = content.match(/claims\s+(\d+)/); - const claimMatch = content.match(/\bclaim\s+(\d+)\b/); - const hasClaim = content.includes("claim"); - const hasClaims = content.includes("claims"); - const hasUsage = content.includes("usage"); + const botMentionRegex = new RegExp(`<@!?${message.client.user!.id}>`); + const contentAfterMention = message.content + .replace(botMentionRegex, "") + .trim(); + const content = contentAfterMention.toLowerCase(); + const claimUsageMatch = content.match(/^claim\s+usage\s+(\d+)/); + const claimsMatch = content.match(/^claims\s+(\d+)/); + const claimMatch = content.match(/^claim\s+(\d+)/); const matchedPattern = - (hasClaim && hasUsage) || hasClaims || (hasClaim && !hasUsage); + claimUsageMatch || + claimsMatch || + claimMatch || + content === "claim usage" || + content === "claims" || + content === "claim"; if (!matchedPattern) return false; -- cgit v1.2.3