From ca5f98aeee074af8699cbafa1616bba4012ebb40 Mon Sep 17 00:00:00 2001
From: itepechi <72330683+itepechi@users.noreply.github.com>
Date: Mon, 6 Nov 2023 03:55:44 +0900
Subject: [PATCH] Search the focused search type first

---
 src/components/search/search.js  | 17 ++++++++++++-----
 src/components/search/search.vue |  4 ++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/components/search/search.js b/src/components/search/search.js
index 62c61a22..1fd16557 100644
--- a/src/components/search/search.js
+++ b/src/components/search/search.js
@@ -116,9 +116,16 @@ const Search = {
         this.lastMediaFetchCount = 0
       }
 
-      const searchTypes = searchType
-        ? [searchType]
-        : ['statuses', 'media', 'accounts', 'hashtags']
+      let searchTypes = ['statuses', 'media', 'accounts', 'hashtags']
+
+      if (searchType) {
+        searchTypes = [searchType]
+      } else if (this.preferredTab !== 'statuses') {
+        searchTypes = [
+          this.preferredTab,
+          ...searchTypes.filter((tab) => tab !== this.preferredTab)
+        ]
+      }
 
       let oldStatusesLength = this.statuses.length
       let oldMediaLength = this.media.length
@@ -210,7 +217,7 @@ const Search = {
       const available = {
         statuses: this.visibleStatuses.length > 0,
         media: this.visibleMedia.length > 0,
-        people: this.users.length > 0,
+        accounts: this.users.length > 0,
         hashtags: this.hashtags.length > 0,
       }
 
@@ -218,7 +225,7 @@ const Search = {
         return this.preferredTab
       }
 
-      const tabOrder = ['statuses', 'media', 'people', 'hashtags']
+      const tabOrder = ['statuses', 'media', 'accounts', 'hashtags']
       for (const tab of tabOrder) {
         if (available[tab]) {
           return tab
diff --git a/src/components/search/search.vue b/src/components/search/search.vue
index 3b0477a1..26fa1779 100644
--- a/src/components/search/search.vue
+++ b/src/components/search/search.vue
@@ -60,7 +60,7 @@
             :label="$t('user_card.media') + resultCount('visibleMedia')"
           />
           <span
-            key="people"
+            key="accounts"
             :label="$t('search.people') + resultCount('users')"
           />
           <span
@@ -143,7 +143,7 @@
           </h4>
         </div>
       </div>
-      <div v-else-if="currentResultTab === 'people'">
+      <div v-else-if="currentResultTab === 'accounts'">
         <div
           v-if="users.length === 0 && !loading && loadedInitially"
           class="search-result-heading"