Merge pull request #1913 from nextcloud/fix-mentions-with-curly-brakets

fix(mentions): Adjust regex
nextcloud · Dec 12, 2024 · e37d01c · e37d01c
2 parents 4893dfe + 34eb678
commit e37d01c
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/NextcloudTalk/NCChatMessage.m b/NextcloudTalk/NCChatMessage.m
@@ -300,7 +300,7 @@ - (NSMutableAttributedString *)parsedMessage
     static NSRegularExpression *parameterRegex;
 
     if (!parameterRegex) {
-        parameterRegex = [NSRegularExpression regularExpressionWithPattern:@"\\{([^}]+)\\}" options:NSRegularExpressionCaseInsensitive error:&error];
+        parameterRegex = [NSRegularExpression regularExpressionWithPattern:@"\\{([a-z\\-_.0-9]+)\\}" options:NSRegularExpressionCaseInsensitive error:&error];
     }
 
     NSArray *matches = [parameterRegex matchesInString:originalMessage

diff --git a/NextcloudTalkTests/Unit/Chat/UnitNCChatMessageTest.swift b/NextcloudTalkTests/Unit/Chat/UnitNCChatMessageTest.swift
@@ -19,4 +19,35 @@ final class UnitNCChatMessageTest: TestBaseRealm {
         XCTAssertFalse(message.containsURL())
     }
 
+    func testMentionRendering() throws {
+        let mentionParameters = """
+        {
+            "mention-user1": {
+                "type": "user",
+                "id": "[email protected]",
+                "name": "Username with space",
+                "server": "https://nextcloud.invalid"
+            }
+        }
+        """
+
+        let mentionMessage = NCChatMessage()
+        mentionMessage.messageParametersJSONString = mentionParameters
+
+        mentionMessage.message = "{mention-user1}"
+        XCTAssertEqual(mentionMessage.parsedMarkdownForChat().string, "@Username with space")
+
+        mentionMessage.message = "{\n{mention-user1}"
+        XCTAssertEqual(mentionMessage.parsedMarkdownForChat().string, "{\n@Username with space")
+
+        mentionMessage.message = "@{mention-user1}"
+        XCTAssertEqual(mentionMessage.parsedMarkdownForChat().string, "@@Username with space")
+
+        mentionMessage.message = " abc{mention-user1}abc "
+        XCTAssertEqual(mentionMessage.parsedMarkdownForChat().string, " abc@Username with spaceabc ")
+
+        mentionMessage.message = "{mention-user1}{mention-user2}"
+        XCTAssertEqual(mentionMessage.parsedMarkdownForChat().string, "@Username with space{mention-user2}")
+    }
+
 }