fix(game-client): allow empty party command payload

Author: kamilwronka

apps/game-client/src/features/command/command-state.test.ts

@@ -36,4 +36,39 @@ describe("getCommandState", () => {
       submissionMessage: "szukam tanca",
     });
   });
+
+  it("allows !grp without a description", () => {
+    expect(getCommandState("!grp", { selectedGuildCount: 1 })).toMatchObject({
+      mode: "party",
+      isNotification: true,
+      isPartyCommand: true,
+      hasContent: true,
+      canSubmit: true,
+      submissionMessage: "",
+    });
+  });
+
+  it("allows !grp with only trailing whitespace", () => {
+    expect(getCommandState("!grp ", { selectedGuildCount: 1 })).toMatchObject({
+      mode: "party",
+      isNotification: true,
+      isPartyCommand: true,
+      hasContent: true,
+      canSubmit: true,
+      submissionMessage: "",
+    });
+  });
+
+  it("treats !grpfoo as a notification, not a party command", () => {
+    expect(getCommandState("!grpfoo", { selectedGuildCount: 1 })).toMatchObject(
+      {
+        mode: "notification",
+        isNotification: true,
+        isPartyCommand: false,
+        hasContent: true,
+        canSubmit: true,
+        submissionMessage: "grpfoo",
+      },
+    );
+  });
 });

apps/game-client/src/features/command/command-state.ts

@@ -2,6 +2,15 @@ export const PARTY_COMMAND_PREFIX = "!grp";
 export const NOTIFICATION_COMMAND_PREFIX = "!";
 const MAX_MESSAGE_LENGTH = 120;
 
+const hasCommandBoundary = (inputValue: string, prefix: string) => {
+  if (!inputValue.startsWith(prefix)) {
+    return false;
+  }
+
+  const nextCharacter = inputValue.charAt(prefix.length);
+  return nextCharacter === "" || /\s/.test(nextCharacter);
+};
+
 export type CommandMode = "normal" | "notification" | "party";
 
 type CommandStateOptions = {
@@ -28,29 +37,35 @@ export const getCommandState = (
   options?: CommandStateOptions,
 ): CommandState => {
   const hasRecipients = (options?.selectedGuildCount ?? 0) > 0;
-  const isPartyCommand = inputValue.startsWith(PARTY_COMMAND_PREFIX);
+  const isPartyCommand = hasCommandBoundary(inputValue, PARTY_COMMAND_PREFIX);
   const isNotification = inputValue.startsWith(NOTIFICATION_COMMAND_PREFIX);
   const isCommand = isNotification;
-  const mode: CommandMode = isPartyCommand
-    ? "party"
-    : isNotification
-      ? "notification"
-      : "normal";
+  let mode: CommandMode = "normal";
+  let commandQuery = "";
+  let showSuggestions = false;
+  let commandPayload = inputValue;
 
-  const commandQuery = isCommand ? (inputValue.split(/\s/, 1)[0] ?? "") : "";
-  const showSuggestions =
-    commandQuery.startsWith(NOTIFICATION_COMMAND_PREFIX) &&
-    !/\s/.test(inputValue);
+  if (isPartyCommand) {
+    mode = "party";
+    commandQuery = PARTY_COMMAND_PREFIX;
+    commandPayload = inputValue.slice(PARTY_COMMAND_PREFIX.length).trim();
+    showSuggestions = !/\s/.test(inputValue);
+  } else if (isNotification) {
+    mode = "notification";
+    commandQuery = inputValue.split(/\s/, 1)[0] ?? "";
+    commandPayload = inputValue
+      .slice(NOTIFICATION_COMMAND_PREFIX.length)
+      .trim();
+    showSuggestions = !/\s/.test(inputValue);
+  }
 
-  const commandPayload = isPartyCommand
-    ? inputValue.slice(PARTY_COMMAND_PREFIX.length).trim()
-    : isNotification
-      ? inputValue.slice(NOTIFICATION_COMMAND_PREFIX.length).trim()
-      : inputValue;
+  let hasContent = inputValue.trim().length > 0;
+  if (isPartyCommand) {
+    hasContent = true;
+  } else if (isNotification) {
+    hasContent = commandPayload.length > 0;
+  }
 
-  const hasContent = isCommand
-    ? commandPayload.length > 0
-    : inputValue.trim().length > 0;
   const exceedsMaxLength = inputValue.length > MAX_MESSAGE_LENGTH;
 
   return {

apps/game-client/src/features/command/command.tsx

@@ -56,6 +56,18 @@ export const CommandWindow = () => {
     selectedGuildCount: selectedInputGuildIds.length,
   });
 
+  const getHintKey = () => {
+    if (!commandState.hasRecipients) {
+      return "settings.command.hints.selectGuild";
+    }
+
+    if (commandState.hasContent) {
+      return "settings.command.hints.submitReady";
+    }
+
+    return `settings.command.modes.${commandState.mode}.emptyHint`;
+  };
+
   const suggestions = useCommandSuggestions({
     inputValue: messageValue,
     onSelect: (prefix) => {
@@ -234,13 +246,7 @@ export const CommandWindow = () => {
                       : "ll:text-red-200",
                   )}
                 >
-                  {t(
-                    commandState.hasRecipients
-                      ? commandState.hasContent
-                        ? "settings.command.hints.submitReady"
-                        : `settings.command.modes.${commandState.mode}.emptyHint`
-                      : "settings.command.hints.selectGuild",
-                  )}
+                  {t(getHintKey())}
                 </span>
                 <span className="ll:text-[10px] ll:text-gray-500">
                   {t("settings.command.hints.keyboard")}

apps/game-client/src/i18n/translations/settings/command.json

@@ -29,8 +29,8 @@
       "label": "Szukaj grupy",
       "composerLabel": "Szukanie grupy z !grp",
       "description": "Komenda !grp uruchamia szukanie grupy i publikuje je na wybranych gildiach.",
-      "placeholder": "Dodaj opis po !grp",
-      "emptyHint": "Dodaj opis po !grp, aby uruchomić szukanie grupy."
+      "placeholder": "Opcjonalnie dodaj opis po !grp",
+      "emptyHint": "Naciśnij Enter, aby uruchomić szukanie grupy bez opisu."
     }
   },
   "suggestions": {