diff --git a/apps/comments/composer/composer/autoload_classmap.php b/apps/comments/composer/composer/autoload_classmap.php
index 22f95a934d7..6db5c6a232b 100644
--- a/apps/comments/composer/composer/autoload_classmap.php
+++ b/apps/comments/composer/composer/autoload_classmap.php
@@ -23,6 +23,4 @@ return array(
'OCA\\Comments\\Notification\\Listener' => $baseDir . '/../lib/Notification/Listener.php',
'OCA\\Comments\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php',
'OCA\\Comments\\Search\\CommentsSearchProvider' => $baseDir . '/../lib/Search/CommentsSearchProvider.php',
- 'OCA\\Comments\\Search\\LegacyProvider' => $baseDir . '/../lib/Search/LegacyProvider.php',
- 'OCA\\Comments\\Search\\Result' => $baseDir . '/../lib/Search/Result.php',
);
diff --git a/apps/comments/composer/composer/autoload_static.php b/apps/comments/composer/composer/autoload_static.php
index 7e553f8e2e2..28496e792d4 100644
--- a/apps/comments/composer/composer/autoload_static.php
+++ b/apps/comments/composer/composer/autoload_static.php
@@ -38,8 +38,6 @@ class ComposerStaticInitComments
'OCA\\Comments\\Notification\\Listener' => __DIR__ . '/..' . '/../lib/Notification/Listener.php',
'OCA\\Comments\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php',
'OCA\\Comments\\Search\\CommentsSearchProvider' => __DIR__ . '/..' . '/../lib/Search/CommentsSearchProvider.php',
- 'OCA\\Comments\\Search\\LegacyProvider' => __DIR__ . '/..' . '/../lib/Search/LegacyProvider.php',
- 'OCA\\Comments\\Search\\Result' => __DIR__ . '/..' . '/../lib/Search/Result.php',
);
public static function getInitializer(ClassLoader $loader)
diff --git a/apps/comments/lib/Search/CommentsSearchProvider.php b/apps/comments/lib/Search/CommentsSearchProvider.php
index 25117de9e8b..3ce6abf306c 100644
--- a/apps/comments/lib/Search/CommentsSearchProvider.php
+++ b/apps/comments/lib/Search/CommentsSearchProvider.php
@@ -8,6 +8,13 @@ declare(strict_types=1);
*/
namespace OCA\Comments\Search;
+use OCP\Comments\IComment;
+use OCP\Comments\ICommentsManager;
+use OCP\Files\Folder;
+use OCP\Files\InvalidPathException;
+use OCP\Files\IRootFolder;
+use OCP\Files\Node;
+use OCP\Files\NotFoundException;
use OCP\IL10N;
use OCP\IURLGenerator;
use OCP\IUser;
@@ -16,14 +23,14 @@ use OCP\Search\IProvider;
use OCP\Search\ISearchQuery;
use OCP\Search\SearchResult;
use OCP\Search\SearchResultEntry;
-use function array_map;
class CommentsSearchProvider implements IProvider {
public function __construct(
private IUserManager $userManager,
private IL10N $l10n,
private IURLGenerator $urlGenerator,
- private LegacyProvider $legacyProvider,
+ private ICommentsManager $commentsManager,
+ private IRootFolder $rootFolder,
) {
}
@@ -44,30 +51,76 @@ class CommentsSearchProvider implements IProvider {
}
public function search(IUser $user, ISearchQuery $query): SearchResult {
+ $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+
+ if ($userFolder === null) {
+ return SearchResult::complete($this->l10n->t('Comments'), []);
+ }
+
+ $result = [];
+ $numComments = 50;
+ $offset = 0;
+
+ while (count($result) < $numComments) {
+ $comments = $this->commentsManager->search($query->getTerm(), 'files', '', 'comment', $offset, $numComments);
+
+ foreach ($comments as $comment) {
+ if ($comment->getActorType() !== 'users') {
+ continue;
+ }
+
+ $displayName = $this->commentsManager->resolveDisplayName('user', $comment->getActorId());
+
+ try {
+ $file = $this->getFileForComment($userFolder, $comment);
+
+ $isUser = $this->userManager->userExists($comment->getActorId());
+ $avatarUrl = $isUser
+ ? $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $comment->getActorId(), 'size' => 42])
+ : $this->urlGenerator->linkToRouteAbsolute('core.GuestAvatar.getAvatar', ['guestName' => $comment->getActorId(), 'size' => 42]);
+ $link = $this->urlGenerator->linkToRoute(
+ 'files.View.showFile',
+ ['fileid' => $file->getId()]
+ );
+
+ $result[] = new SearchResultEntry(
+ $avatarUrl,
+ $displayName,
+ $file->getPath(),
+ $link,
+ '',
+ true
+ );
+ } catch (NotFoundException|InvalidPathException $e) {
+ continue;
+ }
+ }
+
+ if (count($comments) < $numComments) {
+ // Didn't find more comments when we tried to get, so there are no more comments.
+ break;
+ }
+
+ $offset += $numComments;
+ $numComments = 50 - count($result);
+ }
+
+
return SearchResult::complete(
$this->l10n->t('Comments'),
- array_map(function (Result $result) {
- $path = $result->path;
- $isUser = $this->userManager->userExists($result->authorId);
- $avatarUrl = $isUser
- ? $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $result->authorId, 'size' => 42])
- : $this->urlGenerator->linkToRouteAbsolute('core.GuestAvatar.getAvatar', ['guestName' => $result->authorId, 'size' => 42]);
- $link = $this->urlGenerator->linkToRoute(
- 'files.View.showFile',
- ['fileid' => $result->fileId]
- );
- $searchResultEntry = new SearchResultEntry(
- $avatarUrl,
- $result->name,
- $path,
- $link,
- '',
- true
- );
- $searchResultEntry->addAttribute('fileId', (string)$result->fileId);
- $searchResultEntry->addAttribute('path', $path);
- return $searchResultEntry;
- }, $this->legacyProvider->search($query->getTerm()))
+ $result,
);
}
+
+ /**
+ * @throws NotFoundException
+ */
+ protected function getFileForComment(Folder $userFolder, IComment $comment): Node {
+ $nodes = $userFolder->getById((int)$comment->getObjectId());
+ if (empty($nodes)) {
+ throw new NotFoundException('File not found');
+ }
+
+ return array_shift($nodes);
+ }
}
diff --git a/apps/comments/lib/Search/LegacyProvider.php b/apps/comments/lib/Search/LegacyProvider.php
deleted file mode 100644
index 4e71c202bb0..00000000000
--- a/apps/comments/lib/Search/LegacyProvider.php
+++ /dev/null
@@ -1,99 +0,0 @@
-getUser();
- if (!$user instanceof IUser) {
- return [];
- }
- $uf = \OC::$server->getUserFolder($user->getUID());
-
- if ($uf === null) {
- return [];
- }
-
- $result = [];
- $numComments = 50;
- $offset = 0;
-
- while (count($result) < $numComments) {
- /** @var IComment[] $comments */
- $comments = $cm->search($query, 'files', '', 'comment', $offset, $numComments);
-
- foreach ($comments as $comment) {
- if ($comment->getActorType() !== 'users') {
- continue;
- }
-
- $displayName = $cm->resolveDisplayName('user', $comment->getActorId());
-
- try {
- $file = $this->getFileForComment($uf, $comment);
- $result[] = new Result($query,
- $comment,
- $displayName,
- $file->getPath(),
- $file->getId(),
- );
- } catch (NotFoundException|InvalidPathException $e) {
- continue;
- }
- }
-
- if (count($comments) < $numComments) {
- // Didn't find more comments when we tried to get, so there are no more comments.
- return $result;
- }
-
- $offset += $numComments;
- $numComments = 50 - count($result);
- }
-
- return $result;
- }
-
- /**
- * @param Folder $userFolder
- * @param IComment $comment
- * @return Node
- * @throws NotFoundException
- */
- protected function getFileForComment(Folder $userFolder, IComment $comment): Node {
- $nodes = $userFolder->getById((int)$comment->getObjectId());
- if (empty($nodes)) {
- throw new NotFoundException('File not found');
- }
-
- return array_shift($nodes);
- }
-}
diff --git a/apps/comments/lib/Search/Result.php b/apps/comments/lib/Search/Result.php
deleted file mode 100644
index 2931ff4113b..00000000000
--- a/apps/comments/lib/Search/Result.php
+++ /dev/null
@@ -1,109 +0,0 @@
-getId(),
- $comment->getMessage()
- /* @todo , [link to file] */
- );
-
- $this->comment = $this->getRelevantMessagePart($comment->getMessage(), $search);
- $this->authorId = $comment->getActorId();
- $this->fileName = basename($path);
- $this->path = $this->getVisiblePath($path);
- }
-
- /**
- * @throws NotFoundException
- */
- protected function getVisiblePath(string $path): string {
- $segments = explode('/', trim($path, '/'), 3);
-
- if (!isset($segments[2])) {
- throw new NotFoundException('Path not inside visible section');
- }
-
- return $segments[2];
- }
-
- /**
- * @throws NotFoundException
- */
- protected function getRelevantMessagePart(string $message, string $search): string {
- $start = mb_stripos($message, $search);
- if ($start === false) {
- throw new NotFoundException('Comment section not found');
- }
-
- $end = $start + mb_strlen($search);
-
- if ($start <= 25) {
- $start = 0;
- $prefix = '';
- } else {
- $start -= 25;
- $prefix = '…';
- }
-
- if ((mb_strlen($message) - $end) <= 25) {
- $end = mb_strlen($message);
- $suffix = '';
- } else {
- $end += 25;
- $suffix = '…';
- }
-
- return $prefix . mb_substr($message, $start, $end - $start) . $suffix;
- }
-}
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index a103e38c2bb..ed291c25d6e 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -63,56 +63,6 @@
authorId]]>
- authorId]]>
- authorId]]>
- name]]>
- path]]>
-
-
-
-
- getPath(),
- $file->getId(),
- )]]>
-
-
- getId(),
- $comment->getMessage()
- /* @todo , [link to file] */
- )]]>
-
-
- getId(),
- $comment->getMessage()
- /* @todo , [link to file] */
- )]]>
-
-
- authorId]]>
- comment]]>
- fileName]]>
- path]]>
-
-