nextcloud / server

apps/comments/lib/Search/Result.php

Indentation +84 added lines, -84 removed lines

@@ -14,98 +14,98 @@
  * @deprecated 20.0.0
  */
 class Result extends BaseResult {
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $type = 'comment';
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $comment;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $authorId;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $path;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $fileName;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public int $fileId;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $type = 'comment';
+    /**
+     * @deprecated 20.0.0
+     */
+    public $comment;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $authorId;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $path;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $fileName;
+    /**
+     * @deprecated 20.0.0
+     */
+    public int $fileId;
 
-	/**
-	 * @throws NotFoundException
-	 * @deprecated 20.0.0
-	 */
-	public function __construct(
-		string $search,
-		IComment $comment,
-		/**
-		 * @deprecated 20.0.0
-		 */
-		public string $authorName,
-		string $path,
-		int $fileId,
-	) {
-		parent::__construct(
-			$comment->getId(),
-			$comment->getMessage()
-			/* @todo , [link to file] */
-		);
+    /**
+     * @throws NotFoundException
+     * @deprecated 20.0.0
+     */
+    public function __construct(
+        string $search,
+        IComment $comment,
+        /**
+         * @deprecated 20.0.0
+         */
+        public string $authorName,
+        string $path,
+        int $fileId,
+    ) {
+        parent::__construct(
+            $comment->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);
-		$this->fileId = $fileId;
-	}
+        $this->comment = $this->getRelevantMessagePart($comment->getMessage(), $search);
+        $this->authorId = $comment->getActorId();
+        $this->fileName = basename($path);
+        $this->path = $this->getVisiblePath($path);
+        $this->fileId = $fileId;
+    }
 
-	/**
-	 * @throws NotFoundException
-	 */
-	protected function getVisiblePath(string $path): string {
-		$segments = explode('/', trim($path, '/'), 3);
+    /**
+     * @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');
-		}
+        if (!isset($segments[2])) {
+            throw new NotFoundException('Path not inside visible section');
+        }
 
-		return $segments[2];
-	}
+        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');
-		}
+    /**
+     * @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);
+        $end = $start + mb_strlen($search);
 
-		if ($start <= 25) {
-			$start = 0;
-			$prefix = '';
-		} else {
-			$start -= 25;
-			$prefix = '…';
-		}
+        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 = '…';
-		}
+        if ((mb_strlen($message) - $end) <= 25) {
+            $end = mb_strlen($message);
+            $suffix = '';
+        } else {
+            $end += 25;
+            $suffix = '…';
+        }
 
-		return $prefix . mb_substr($message, $start, $end - $start) . $suffix;
-	}
+        return $prefix . mb_substr($message, $start, $end - $start) . $suffix;
+    }
 }

apps/comments/lib/Search/CommentsSearchProvider.php

Indentation +47 added lines, -47 removed lines

@@ -20,55 +20,55 @@
 use function pathinfo;
 
 class CommentsSearchProvider implements IProvider {
-	public function __construct(
-		private IUserManager $userManager,
-		private IL10N $l10n,
-		private IURLGenerator $urlGenerator,
-		private LegacyProvider $legacyProvider,
-	) {
-	}
+    public function __construct(
+        private IUserManager $userManager,
+        private IL10N $l10n,
+        private IURLGenerator $urlGenerator,
+        private LegacyProvider $legacyProvider,
+    ) {
+    }
 
-	public function getId(): string {
-		return 'comments';
-	}
+    public function getId(): string {
+        return 'comments';
+    }
 
-	public function getName(): string {
-		return $this->l10n->t('Comments');
-	}
+    public function getName(): string {
+        return $this->l10n->t('Comments');
+    }
 
-	public function getOrder(string $route, array $routeParameters): int {
-		if ($route === 'files.View.index') {
-			// Files first
-			return 0;
-		}
-		return 10;
-	}
+    public function getOrder(string $route, array $routeParameters): int {
+        if ($route === 'files.View.index') {
+            // Files first
+            return 0;
+        }
+        return 10;
+    }
 
-	public function search(IUser $user, ISearchQuery $query): SearchResult {
-		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()))
-		);
-	}
+    public function search(IUser $user, ISearchQuery $query): SearchResult {
+        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()))
+        );
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
 	public function search(IUser $user, ISearchQuery $query): SearchResult {
 		return SearchResult::complete(
 			$this->l10n->t('Comments'),
-			array_map(function (Result $result) {
+			array_map(function(Result $result) {
 				$path = $result->path;
 				$isUser = $this->userManager->userExists($result->authorId);
 				$avatarUrl = $isUser
@@ -65,7 +65,7 @@ 
 					'',
 					true
 				);
-				$searchResultEntry->addAttribute('fileId', (string)$result->fileId);
+				$searchResultEntry->addAttribute('fileId', (string) $result->fileId);
 				$searchResultEntry->addAttribute('path', $path);
 				return $searchResultEntry;
 			}, $this->legacyProvider->search($query->getTerm()))

apps/comments/lib/Search/LegacyProvider.php

Indentation +75 added lines, -75 removed lines

@@ -21,79 +21,79 @@
 use function count;
 
 class LegacyProvider extends Provider {
-	/**
-	 * Search for $query
-	 *
-	 * @param string $query
-	 * @return array An array of OCP\Search\Result's
-	 * @since 7.0.0
-	 */
-	public function search($query): array {
-		$cm = Server::get(ICommentsManager::class);
-		$us = Server::get(IUserSession::class);
-
-		$user = $us->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);
-	}
+    /**
+     * Search for $query
+     *
+     * @param string $query
+     * @return array An array of OCP\Search\Result's
+     * @since 7.0.0
+     */
+    public function search($query): array {
+        $cm = Server::get(ICommentsManager::class);
+        $us = Server::get(IUserSession::class);
+
+        $user = $us->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);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
 						$file->getPath(),
 						$file->getId(),
 					);
-				} catch (NotFoundException|InvalidPathException $e) {
+				} catch (NotFoundException | InvalidPathException $e) {
 					continue;
 				}
 			}
@@ -89,7 +89,7 @@ 
 	 * @throws NotFoundException
 	 */
 	protected function getFileForComment(Folder $userFolder, IComment $comment): Node {
-		$nodes = $userFolder->getById((int)$comment->getObjectId());
+		$nodes = $userFolder->getById((int) $comment->getObjectId());
 		if (empty($nodes)) {
 			throw new NotFoundException('File not found');
 		}