pleroma-fe

commit: b247a917241cd62f1f5f02c5f8c1fab67421f2a9
parent ca7fa67997de81710f96944ccdbd080dcd3b0bf9
Author: Ekaterina Vaartis <vaartis@kotobank.ch>
Date:   Sun, 22 Aug 2021 16:12:36 +0300

Ensure uniqueness of found statuses & ensure only one loading circle

Diffstat:
M
src/components/search/search.js
11
++++++++---
M
src/components/search/search.vue
2
+-

2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/components/search/search.js b/src/components/search/search.js
@@ -7,6 +7,7 @@ import {
   faCircleNotch,
   faSearch
 } from '@fortawesome/free-solid-svg-icons'
+import { uniqBy } from 'lodash'
 
 library.add(
   faCircleNotch,
@@ -84,16 +85,20 @@ const Search = {
         .then(data => {
           this.loading = false
 
+          let oldLength = this.statuses.length
+
           // Always append to old results. If new results are empty, this doesn't change anything
           this.userIds = this.userIds.concat(map(data.accounts, 'id'))
-          this.statuses = this.statuses.concat(data.statuses)
+          this.statuses = uniqBy(this.statuses.concat(data.statuses), 'id')
           this.hashtags = this.hashtags.concat(data.hashtags)
 
           this.currenResultTab = this.getActiveTab()
           this.loaded = true
 
-          this.statusesOffset += data.statuses.length
-          this.lastStatusFetchCount = data.statuses.length
+          // Offset from whatever we already have
+          this.statusesOffset = this.statuses.length
+          // Because the amount of new statuses can actually be zero, compare to old lenght instead
+          this.lastStatusFetchCount = this.statuses.length - oldLength
           this.lastQuery = query
         })
     },
diff --git a/src/components/search/search.vue b/src/components/search/search.vue
@@ -22,7 +22,7 @@
       </button>
     </div>
     <div
-      v-if="loading"
+      v-if="loading && statusesOffset == 0"
       class="text-center loading-icon"
     >
       <FAIcon