mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25573 from nextcloud/backport/25378/stable21 

[stable21] Improve mention matches
This commit is contained in:
Roeland Jago Douma 2021-03-05 09:55:44 +01:00 committed by GitHub
parent b4b55616c2 5164f43bd3
commit 3aba094d86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/comments/lib/Activity/Provider.php
View File

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

6
apps/comments/lib/Notification/Notifier.php
View File

@ -195,7 +195,11 @@ class Notifier implements INotifier {
// could contain characters like '@' for user IDs) but a one-based // could contain characters like '@' for user IDs) but a one-based
// index of the mentions of that type. // index of the mentions of that type.
$mentionParameterId = 'mention-' . $mention['type'] . $mentionTypeCount[$mention['type']]; $mentionParameterId = 'mention-' . $mention['type'] . $mentionTypeCount[$mention['type']];
$message = str_replace('@' . $mention['id'], '{' . $mentionParameterId . '}', $message); $message = str_replace('@"' . $mention['id'] . '"', '{' . $mentionParameterId . '}', $message);
if (strpos($mention['id'], ' ') === false && strpos($mention['id'], 'guest/') !== 0) {
$message = str_replace('@' . $mention['id'], '{' . $mentionParameterId . '}', $message);
}
try { try {
$displayName = $this->commentsManager->resolveDisplayName($mention['type'], $mention['id']); $displayName = $this->commentsManager->resolveDisplayName($mention['type'], $mention['id']);
} catch (\OutOfBoundsException $e) { } catch (\OutOfBoundsException $e) {

3
lib/private/Comments/Comment.php
View File

@ -233,6 +233,9 @@ class Comment implements IComment {
return []; return [];
} }
$uids = array_unique($mentions[0]); $uids = array_unique($mentions[0]);
usort($uids, static function ($uid1, $uid2) {
return mb_strlen($uid2) <=> mb_strlen($uid1);
});
$result = []; $result = [];
foreach ($uids as $uid) { foreach ($uids as $uid) {
$cleanUid = trim(substr($uid, 1), '"'); $cleanUid = trim(substr($uid, 1), '"');

6
tests/lib/Comments/CommentTest.php
View File

@ -51,7 +51,7 @@ class CommentTest extends TestCase {
$this->assertSame($object['id'], $comment->getObjectId()); $this->assertSame($object['id'], $comment->getObjectId());
} }
public function testSetIdIllegalInput() { public function testSetIdIllegalInput() {
$this->expectException(\OCP\Comments\IllegalIDChangeException::class); $this->expectException(\OCP\Comments\IllegalIDChangeException::class);
@ -120,7 +120,7 @@ class CommentTest extends TestCase {
$comment->$setter($type, $id); $comment->$setter($type, $id);
} }
public function testSetUberlongMessage() { public function testSetUberlongMessage() {
$this->expectException(\OCP\Comments\MessageTooLongException::class); $this->expectException(\OCP\Comments\MessageTooLongException::class);
@ -149,7 +149,7 @@ class CommentTest extends TestCase {
' cc @23452-4333-54353-2342 @yolo!' . ' cc @23452-4333-54353-2342 @yolo!' .
' however the most important thing to know is that www.croissant.com/@oil is not valid' . ' however the most important thing to know is that www.croissant.com/@oil is not valid' .
' and won\'t match anything at all', ' and won\'t match anything at all',
['foobar', 'barfoo', 'foo@bar.com', 'bar@foo.org@foobar.io', '23452-4333-54353-2342', 'yolo'] ['bar@foo.org@foobar.io', '23452-4333-54353-2342', 'foo@bar.com', 'foobar', 'barfoo', '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']