From dae8e6ac29c29d8b703f94151a69a3c8755a1de8 Mon Sep 17 00:00:00 2001
From: Rye <git@itsrye.dev>
Date: Sun, 29 Mar 2026 03:29:56 +0200
Subject: [PATCH] fix(PMP, ID): changed pmp id handling and generation

---
 .changeset/fix_pmp_id_handling.md                            | 5 +++++
 .../features/settings/Persona/PerMessageProfileOverview.tsx  | 3 ++-
 src/app/hooks/useCommands.ts                                 | 4 ++--
 .../plugins/pluralkit-handler/PKitCommandMessageHandler.ts   | 3 ++-
 src/app/utils/shortIdGen.ts                                  | 4 ++++
 5 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/fix_pmp_id_handling.md
 create mode 100644 src/app/utils/shortIdGen.ts

diff --git a/.changeset/fix_pmp_id_handling.md b/.changeset/fix_pmp_id_handling.md
new file mode 100644
index 000000000..77dac71f5
--- /dev/null
+++ b/.changeset/fix_pmp_id_handling.md
@@ -0,0 +1,5 @@
+---
+default: patch
+---
+
+fix id handling and id generation for Personas
diff --git a/src/app/features/settings/Persona/PerMessageProfileOverview.tsx b/src/app/features/settings/Persona/PerMessageProfileOverview.tsx
index 6ed0dcef0..7a3ba574a 100644
--- a/src/app/features/settings/Persona/PerMessageProfileOverview.tsx
+++ b/src/app/features/settings/Persona/PerMessageProfileOverview.tsx
@@ -6,6 +6,7 @@ import {
 } from '$hooks/usePerMessageProfile';
 import { useEffect, useState } from 'react';
 import { Box, Button, Text } from 'folds';
+import { generateShortId } from '$utils/shortIdGen';
 import { PerMessageProfileEditor } from './PerMessageProfileEditor';
 
 /**
@@ -36,7 +37,7 @@ export function PerMessageProfileOverview() {
         <Button
           onClick={() => {
             const newProfile: PerMessageProfile = {
-              id: crypto.randomUUID(),
+              id: generateShortId(5),
               name: 'New Profile',
             };
             addOrUpdatePerMessageProfile(mx, newProfile).then(() => {
diff --git a/src/app/hooks/useCommands.ts b/src/app/hooks/useCommands.ts
index b9a6d0e11..8d803d4f7 100644
--- a/src/app/hooks/useCommands.ts
+++ b/src/app/hooks/useCommands.ts
@@ -51,8 +51,8 @@ const FLAG_PAT = String.raw`(?:^|\s)-(\w+)\b`;
 const FLAG_REG = new RegExp(FLAG_PAT);
 const FLAG_REG_G = new RegExp(FLAG_PAT, 'g');
 
-const ADDPMP_REGEX = /(\w+) (name=)?"?([\w\s]*)"? (avatar=)?([\w.:/]+)/;
-const USEPMP_REGEX = /^(\w+)\s*(-g)?(-o)?(-u)?\s*(\d+)?$/;
+const ADDPMP_REGEX = /(\S+) (name=)?"?([\w\s]*)"? (avatar=)?([\w.:/]+)/;
+const USEPMP_REGEX = /^(\S+)\s*(-g)?(-o)?(-u)?\s*(\d+)?$/;
 
 export const splitPayloadContentAndFlags = (payload: string): [string, string | undefined] => {
   const flagMatch = new RegExp(FLAG_REG).exec(payload);
diff --git a/src/app/plugins/pluralkit-handler/PKitCommandMessageHandler.ts b/src/app/plugins/pluralkit-handler/PKitCommandMessageHandler.ts
index 01aaf0d0b..2bbd74359 100644
--- a/src/app/plugins/pluralkit-handler/PKitCommandMessageHandler.ts
+++ b/src/app/plugins/pluralkit-handler/PKitCommandMessageHandler.ts
@@ -8,6 +8,7 @@ import {
 } from '$hooks/usePerMessageProfile';
 import { sendFeedback } from '$utils/sendFeedbackToUser';
 import { MatrixClient, Room } from 'matrix-js-sdk';
+import { generateShortId } from '$utils/shortIdGen';
 
 const pkMemberRenameRegex = /^(pk;member)\s+"?([\w\s]+)"?\s*rename\s+"?([\w\s]+)"?$/;
 const pkMemberNewRegex = /^(pk;member)\s+new\s+"?([\w\s]+)"?$/;
@@ -90,7 +91,7 @@ export class PKitCommandMessageHandler {
         return;
       }
       const memberName = cmdParts[2];
-      const generatedID = crypto.randomUUID();
+      const generatedID = generateShortId(5);
       sendFeedback(
         `adding new member has been created with id: ${generatedID} and name ${memberName}`,
         this.room,
diff --git a/src/app/utils/shortIdGen.ts b/src/app/utils/shortIdGen.ts
new file mode 100644
index 000000000..c9e108f71
--- /dev/null
+++ b/src/app/utils/shortIdGen.ts
@@ -0,0 +1,4 @@
+export function generateShortId(length: number): string {
+  const uuid = crypto.randomUUID();
+  return uuid.replaceAll('-', '').substring(0, length);
+}