upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

fix(comments): Correctly treat end of message as end of code block/inline

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2026-03-17 12:49:32 +01:00 committed by Anna
parent f8652506ac
commit e305bab73f
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/private/Comments/Comment.php
View file

@ -198,7 +198,7 @@ class Comment implements IComment {
$message = $this->getMessage();
if ($supportMarkdown) {
// Strip fenced code blocks and inline code so mentions inside them are ignored
$message = preg_replace('/^```.*?^```|^~~~.*?^~~~/sm', '', $message);
$message = preg_replace('/^```.*?(^```|\z)|^~~~.*?(^~~~|\z)/sm', '', $message);
$message = preg_replace('/`[^`\n]*`/', '', $message);
}

12
tests/lib/Comments/CommentTest.php
View file

@ -240,6 +240,18 @@ class CommentTest extends TestCase {
null,
false,
],
[
'Mention @alice and `also @bob as end of text only applies to code blocks',
[['type' => 'user', 'id' => 'alice'], ['type' => 'user', 'id' => 'bob']],
],
[
"Mention @alice but not in unclosed fenced code block\n```\n@bob\n@charlie",
[['type' => 'user', 'id' => 'alice']],
],
[
"Mention @alice but not in unclosed tilde code block\n~~~\n@bob",
[['type' => 'user', 'id' => 'alice']],
],
];
}