wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #11836 from nextcloud/bugfix/2443/comment-mentions-with-spaces

Browse source 
Comment mentions with spaces
This commit is contained in:
Morris Jobke 2018-11-07 16:27:36 +01:00 committed by GitHub
commit ab3543380c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
apps/comments/js/commentstabview.js
View file

Binary file not shown.

7
apps/comments/lib/Activity/Provider.php
View file

@ -213,8 +213,13 @@ class Provider implements IProvider {
continue;
}
$pattern = '/(^|\s)(' . '@' . $mention['id'] . ')(\b)/';
if (strpos($mention['id'], ' ') !== false) {
$pattern = '/(^|\s)(' . '@"' . $mention['id'] . '"' . ')(\b)?/';
}
$message = preg_replace(
'/(^|\s)(' . '@' . $mention['id'] . ')(\b)/',
$pattern,
//'${1}' . $this->regexSafeUser($mention['id'], $displayName) . '${3}',
'${1}' . '{mention' . $mentionCount . '}' . '${3}',
$message

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

@ -225,14 +225,14 @@ class Comment implements IComment {
*
*/
public function getMentions() {
$ok = preg_match_all("/\B(?<![^a-z0-9_\-@\.\'\s])@[a-z0-9_\-@\.\']+/i", $this->getMessage(), $mentions);
$ok = preg_match_all("/\B(?<![^a-z0-9_\-@\.\'\s])@(\"[a-z0-9_\-@\.\' ]+\"|[a-z0-9_\-@\.\']+)/i", $this->getMessage(), $mentions);
if(!$ok || !isset($mentions[0]) || !is_array($mentions[0])) {
return [];
}
$uids = array_unique($mentions[0]);
$result = [];
foreach ($uids as $uid) {
$result[] = ['type' => 'user', 'id' => substr($uid, 1)];
$result[] = ['type' => 'user', 'id' => trim(substr($uid, 1), '"')];
}
return $result;
}

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

@ -150,8 +150,11 @@ class CommentTest extends TestCase {
['foobar', 'barfoo', 'foo@bar.com', 'bar@foo.org@foobar.io', '23452-4333-54353-2342', 'yolo']
],
[
'@@chef is also a valid mention, no matter how strange it looks', ['@chef']
]
'@@chef is also a valid mention, no matter how strange it looks', ['@chef']
],
[
'Also @"user with spaces" are now supported', ['user with spaces']
],
];
}