sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Comment mentions with spaces
pull/12316/head
Morris Jobke 2018-11-07 16:27:36 +07:00 committed by GitHub
parent 11f8dcb59c 375589b274
commit ab3543380c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/comments/js/commentstabview.js
Unescape Escape View File

@ -416,15 +416,22 @@
return;
}
var mention = '@' + mentions[i].mentionId;
if (mentions[i].mentionId.indexOf(' ') !== -1) {
mention = _.escape('@"' + mentions[i].mentionId + '"');
}
// escape possible regex characters in the name
mention = mention.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
var regex = new RegExp("(^|\\s)(" + mention + ")\\b", 'g');
if (mentions[i].mentionId.indexOf(' ') !== -1) {
regex = new RegExp("(^|\\s)(" + mention + ")", 'g');
}
var displayName = this._composeHTMLMention(mentions[i].mentionId, mentions[i].mentionDisplayName);
// replace every mention either at the start of the input or after a whitespace
// followed by a non-word character.
message = message.replace(new RegExp("(^|\\s)(" + mention + ")\\b", 'g'),
message = message.replace(regex,
function(match, p1) {
// to get number of whitespaces (0 vs 1) right
return p1+displayName;
@ -602,9 +609,14 @@
var $comment = $el.clone();
$comment.find('.avatar-name-wrapper').each(function () {
var $this = $(this);
var $inserted = $this.parent();
$inserted.html('@' + $this.find('.avatar').data('username'));
var $this = $(this),
$inserted = $this.parent(),
userId = $this.find('.avatar').data('username');
if (userId.indexOf(' ') !== -1) {
$inserted.html('@"' + userId + '"');
} else {
$inserted.html('@' + userId);
}
});
$comment.html(OCP.Comments.richToPlain($comment.html()));

7
apps/comments/lib/Activity/Provider.php
Unescape Escape 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
Unescape Escape 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
Unescape Escape 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']
],
];
}