Merge pull request #11054 from nextcloud/bugfix/noid/hide-current-con…

…versation-search-when-not-on-talk fix(search): Hide "Messages in current conversation" when not on talk
nextcloud · Nov 30, 2023 · 23cbf28 · 23cbf28
2 parents 45bd819 + f2fddb6
commit 23cbf28
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/Search/CurrentMessageSearch.php b/lib/Search/CurrentMessageSearch.php
@@ -47,14 +47,14 @@ public function getName(): string {
 	/**
 	 * @inheritDoc
 	 */
-	public function getOrder(string $route, array $routeParameters): int {
+	public function getOrder(string $route, array $routeParameters): ?int {
 		if ($route === 'spreed.Page.showCall') {
 			// In conversation, prefer this search results
 			return -3;
 		}
 
 		// We are not returning something anyway.
-		return 999;
+		return null;
 	}
 
 	protected function getSublineTemplate(): string {

diff --git a/lib/Search/MessageSearch.php b/lib/Search/MessageSearch.php
@@ -75,7 +75,7 @@ public function getName(): string {
 	/**
 	 * @inheritDoc
 	 */
-	public function getOrder(string $route, array $routeParameters): int {
+	public function getOrder(string $route, array $routeParameters): ?int {
 		if (strpos($route, Application::APP_ID . '.') === 0) {
 			// Active app, prefer Talk results
 			return -2;