fix: improve counting.

Author: purifetchi

PinkSea.Frontend/src/views/SearchView.vue

@@ -64,26 +64,44 @@ const loadMore = async () => {
 
   applyNew(data);
 };
+
+const setTab = (tab: SearchType) => {
+  currentTab.value = tab;
+
+  if (currentTab.value == SearchType.Tags) {
+    tags.value = [];
+  } else if (currentTab.value == SearchType.Profiles) {
+    profiles.value = [];
+  }
+};
 </script>
 
 <template>
   <PanelLayout>
     <div id="tabs">
-      <a v-for="tab in tabs" :class="tab.id == currentTab ? 'selected' : ''" v-on:click.prevent="currentTab = tab.id" v-bind:key="tab.id">{{ $t(tab.i18n) }}</a>
+      <a v-for="tab in tabs" :class="tab.id == currentTab ? 'selected' : ''" v-on:click.prevent="setTab(tab.id)"
+        v-bind:key="tab.id">{{ $t(tab.i18n) }}</a>
     </div>
     <div v-if="currentTab == SearchType.Posts">
-      <TimeLine endpoint="com.shinolabs.pinksea.getSearchResults" :xrpc-params="{ query: $route.params.value, type: SearchType.Posts }" />
+      <TimeLine endpoint="com.shinolabs.pinksea.getSearchResults"
+        :xrpc-params="{ query: $route.params.value, type: SearchType.Posts }" />
     </div>
     <div v-else-if="currentTab == SearchType.Tags" class="search-result-list">
-      <div v-for="tag of tags" :key="tag.tag">
+      <div v-if="tags.length > 0" v-for="tag of tags" :key="tag.tag">
         <SearchTag :tag="tag" v-on:click.prevent="open(tag.tag)" />
       </div>
+      <div v-else class="search-centered">
+        {{ $t("timeline.nothing_here") }}
+      </div>
       <Intersector @intersected="loadMore" />
     </div>
     <div v-else-if="currentTab == SearchType.Profiles" class="search-result-list">
-      <div v-for="profile of profiles" :key="profile.did">
+      <div v-if="profiles.length > 0" v-for="profile of profiles" :key="profile.did">
         <SearchProfileCard :profile="profile" v-on:click.prevent="open(profile.did)" />
       </div>
+      <div v-else class="search-centered">
+        {{ $t("timeline.nothing_here") }}
+      </div>
       <Intersector @intersected="loadMore" />
     </div>
   </PanelLayout>
@@ -112,7 +130,8 @@ const loadMore = async () => {
 }
 
 #tabs a.selected {
-  background: #ffb6c1; color: #263b48;
+  background: #ffb6c1;
+  color: #263b48;
   font-weight: bold;
 }
 
@@ -124,7 +143,11 @@ const loadMore = async () => {
   padding: 10px;
 }
 
-.search-result-list > div {
+.search-result-list>div {
   cursor: pointer;
 }
+
+.search-centered {
+  text-align: center;
+}
 </style>

PinkSea/Services/SearchService.cs

@@ -16,12 +16,14 @@ public class SearchService(
 {
     public async Task<List<OekakiModel>> SearchPosts(string query, int limit, DateTimeOffset since)
     {
+        var lowerQuery = query.ToLower();
         var list = await dbContext.Oekaki
             .Include(o => o.TagOekakiRelations)
             .Include(o => o.Author)
-            .Where(o => !o.Tombstone)
-            .Where(o => o.AltText!.ToLower().Contains(query.ToLower()) ||
-                        o.TagOekakiRelations!.Any(to => to.TagId.ToLower().Contains(query.ToLower()))) // TODO: Author
+            .Where(o => !o.Tombstone && o.ParentId == null)
+            .Where(o => o.AltText!.ToLower().Contains(lowerQuery) ||
+                        o.TagOekakiRelations!.Any(to => to.TagId.ToLower().Contains(lowerQuery)) ||
+                        o.Author.Handle!.ToLower().Contains(lowerQuery))
             .Distinct()
             .OrderByDescending(o => o.IndexedAt)
             .Where(o => o.IndexedAt < since)
@@ -37,14 +39,14 @@ public async Task<List<TagSearchResult>> SearchTags(string query, int limit, Dat
             .Where(t => t.Name.ToLower().Contains(query.ToLower()))
             .Join(dbContext.TagOekakiRelations, t => t.Name, to => to.TagId, (t, to) => new { t, to })
             .Join(dbContext.Oekaki, c => c.to.OekakiId, o => o.Key, (c, o) => new { c.t, c.to, o })
-            .Distinct()
+            .Where(c => !c.o.Tombstone && c.o.ParentId == null)
             .GroupBy(c => c.t.Name)
             .Take(limit)
             .Select(c => new
             {
                 Tag = c.Key,
                 Oekaki = c.First().o,
-                Count = c.Count()
+                Count = c.Select(p => p.o.Key).Distinct().Count()
             })
             .ToListAsync();