From d2c0569b490235ae6d01087a676b2f2075a1dcb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Wed, 5 Aug 2020 17:56:01 +0200
Subject: [PATCH] Fix search providers order and IDs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 apps/dav/lib/Search/ContactsSearchProvider.php            | 4 ++--
 apps/dav/lib/Search/EventsSearchProvider.php              | 4 ++--
 apps/dav/lib/Search/TasksSearchProvider.php               | 4 ++--
 apps/dav/tests/unit/Search/ContactsSearchProviderTest.php | 2 +-
 apps/dav/tests/unit/Search/EventsSearchProviderTest.php   | 2 +-
 apps/dav/tests/unit/Search/TasksSearchProviderTest.php    | 2 +-
 apps/settings/lib/Search/SectionSearch.php                | 5 +++--
 7 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/apps/dav/lib/Search/ContactsSearchProvider.php b/apps/dav/lib/Search/ContactsSearchProvider.php
index f97ba2cf63..78747ebd70 100644
--- a/apps/dav/lib/Search/ContactsSearchProvider.php
+++ b/apps/dav/lib/Search/ContactsSearchProvider.php
@@ -83,7 +83,7 @@ class ContactsSearchProvider implements IProvider {
 	 * @inheritDoc
 	 */
 	public function getId(): string {
-		return 'contacts-dav';
+		return 'contacts';
 	}
 
 	/**
@@ -100,7 +100,7 @@ class ContactsSearchProvider implements IProvider {
 		if ($route === 'contacts.Page.index') {
 			return -1;
 		}
-		return 20;
+		return 25;
 	}
 
 	/**
diff --git a/apps/dav/lib/Search/EventsSearchProvider.php b/apps/dav/lib/Search/EventsSearchProvider.php
index 619775aa19..c27996f96e 100644
--- a/apps/dav/lib/Search/EventsSearchProvider.php
+++ b/apps/dav/lib/Search/EventsSearchProvider.php
@@ -69,7 +69,7 @@ class EventsSearchProvider extends ACalendarSearchProvider {
 	 * @inheritDoc
 	 */
 	public function getId(): string {
-		return 'calendar-dav';
+		return 'calendar';
 	}
 
 	/**
@@ -86,7 +86,7 @@ class EventsSearchProvider extends ACalendarSearchProvider {
 		if ($route === 'calendar.View.index') {
 			return -1;
 		}
-		return 10;
+		return 30;
 	}
 
 	/**
diff --git a/apps/dav/lib/Search/TasksSearchProvider.php b/apps/dav/lib/Search/TasksSearchProvider.php
index adc1197aa1..5af694bb85 100644
--- a/apps/dav/lib/Search/TasksSearchProvider.php
+++ b/apps/dav/lib/Search/TasksSearchProvider.php
@@ -61,7 +61,7 @@ class TasksSearchProvider extends ACalendarSearchProvider {
 	 * @inheritDoc
 	 */
 	public function getId(): string {
-		return 'tasks-dav';
+		return 'tasks';
 	}
 
 	/**
@@ -78,7 +78,7 @@ class TasksSearchProvider extends ACalendarSearchProvider {
 		if ($route === 'tasks.Page.index') {
 			return -1;
 		}
-		return 10;
+		return 35;
 	}
 
 	/**
diff --git a/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php b/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php
index 858e79d442..1ca0457adb 100644
--- a/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php
+++ b/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php
@@ -88,7 +88,7 @@ class ContactsSearchProviderTest extends TestCase {
 	}
 
 	public function testGetId(): void {
-		$this->assertEquals('contacts-dav', $this->provider->getId());
+		$this->assertEquals('contacts', $this->provider->getId());
 	}
 
 	public function testGetName(): void {
diff --git a/apps/dav/tests/unit/Search/EventsSearchProviderTest.php b/apps/dav/tests/unit/Search/EventsSearchProviderTest.php
index eedbe39f12..cd905760fa 100644
--- a/apps/dav/tests/unit/Search/EventsSearchProviderTest.php
+++ b/apps/dav/tests/unit/Search/EventsSearchProviderTest.php
@@ -250,7 +250,7 @@ class EventsSearchProviderTest extends TestCase {
 	}
 
 	public function testGetId(): void {
-		$this->assertEquals('calendar-dav', $this->provider->getId());
+		$this->assertEquals('calendar', $this->provider->getId());
 	}
 
 	public function testGetName(): void {
diff --git a/apps/dav/tests/unit/Search/TasksSearchProviderTest.php b/apps/dav/tests/unit/Search/TasksSearchProviderTest.php
index 7220ff4ef4..732625980e 100644
--- a/apps/dav/tests/unit/Search/TasksSearchProviderTest.php
+++ b/apps/dav/tests/unit/Search/TasksSearchProviderTest.php
@@ -134,7 +134,7 @@ class TasksSearchProviderTest extends TestCase {
 	}
 
 	public function testGetId(): void {
-		$this->assertEquals('tasks-dav', $this->provider->getId());
+		$this->assertEquals('tasks', $this->provider->getId());
 	}
 
 	public function testGetName(): void {
diff --git a/apps/settings/lib/Search/SectionSearch.php b/apps/settings/lib/Search/SectionSearch.php
index 795b9f7e9f..b90eda42bb 100644
--- a/apps/settings/lib/Search/SectionSearch.php
+++ b/apps/settings/lib/Search/SectionSearch.php
@@ -62,7 +62,7 @@ class SectionSearch implements IProvider {
 	 * @inheritDoc
 	 */
 	public function getId(): string {
-		return 'settings_sections';
+		return 'settings';
 	}
 
 	/**
@@ -79,7 +79,8 @@ class SectionSearch implements IProvider {
 		if ($route === 'settings.PersonalSettings.index' || $route === 'settings.AdminSettings.index') {
 			return -1;
 		}
-		return 20;
+		// At the very bottom
+		return 500;
 	}
 
 	/**