Fix array checks & add some notes.

matrix-org · Mar 3, 2023 · 35df700 · 35df700
1 parent e67067c
commit 35df700
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/components/views/rooms/EditMessageComposer.tsx b/src/components/views/rooms/EditMessageComposer.tsx
@@ -111,10 +111,11 @@ function createEditContent(model: EditorModel, editedEvent: MatrixEvent): IConte
 
     // Attach the *differential* mentions of any *newly* mentioned users / room.
     const mentions: IMentions = {};
-    const userIds = editedEvent.getContent()["org.matrix.msc3952.mentions"]?.user_ids;
-    let prevUserMentions = [];
-    if (Array.isArray(userIds?.user_ids)) {
-        prevUserMentions = userIds.user_ids;
+    // TODO What if the edit doesn't have the mentions property?
+    const prevMentions = editedEvent.getContent()["org.matrix.msc3952.mentions"];
+    let prevUserMentions = prevMentions?.user_ids;
+    if (!Array.isArray(prevUserMentions)) {
+        prevUserMentions = [];
     }
     const newUserMentions = new Set<string>();
     for (const part of model.parts) {

diff --git a/src/components/views/rooms/SendMessageComposer.tsx b/src/components/views/rooms/SendMessageComposer.tsx
@@ -87,6 +87,8 @@ export function attachMentions(
     // event + any mentioned users in that event.
     if (replyToEvent) {
         userMentions.add(replyToEvent.sender.userId);
+        // TODO What do we do if the prely event *doeesn't* have this property?
+        // Try to fish out replies from the contents?
         const userIds = replyToEvent.getContent()["org.matrix.msc3952.mentions"]?.user_ids;
         if (Array.isArray(userIds)) {
             userIds.forEach((userId) => userMentions.add(userId));