fix time splitter when multiples options occurs

.forgejo/workflows/pr-check.yml

@@ -23,4 +23,4 @@ jobs:
         run: npm run format-check
 
       - name: Run tests
-        run: npm run test
+        run: npm run test -- --ci --onlyChanged

src/utils/reminder.ts

@@ -46,13 +46,23 @@ export type dbReminder = {
  * @returns An object with the time and the option
  */
 export const splitTime = (time: string) => {
-  if (time?.endsWith("@")) {
+  const mapping = {
-    return { time: time.slice(0, -1), option: OptionReminder.Mention };
+    [OptionReminder.DirectMessage]: "p",
-  } else if (time?.toLowerCase().endsWith("p")) {
+    [OptionReminder.Mention]: "@",
-    return { time: time.slice(0, -1), option: OptionReminder.DirectMessage };
+  };
-  }
 
-  return { time: time, option: OptionReminder.Nothing };
+  const lowered = time.toLowerCase();
+  const trimmed = lowered.replaceAll(new RegExp(Object.values(mapping).join("|"), "g"), "");
+
+  // Depending of the last character of the string
+  switch (lowered.slice(-1)) {
+    case mapping[OptionReminder.Mention]:
+      return { time: trimmed, option: OptionReminder.Mention };
+    case mapping[OptionReminder.DirectMessage]:
+      return { time: trimmed, option: OptionReminder.DirectMessage };
+    default:
+      return { time: time, option: OptionReminder.Nothing };
+  }
 };
 
 /**

tests/utils/reminder.test.ts

@@ -10,7 +10,7 @@ describe("Time splitter", () => {
   {
     const name = "2m@p";
     test(name, () => {
-      expect(splitTime(name)).toStrictEqual({ option: OptionReminder.Mention, time: "2m" });
+      expect(splitTime(name)).toStrictEqual({ option: OptionReminder.DirectMessage, time: "2m" });
     });
   }
   {