From 1f5b0cf5ef984375ec0f955602b6a708a1c1a915 Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Wed, 14 Dec 2022 00:06:53 +0100
Subject: [PATCH] feat: reduce amount of big cards for follow notifications

---
 .../NotificationGroupedFollow.vue             | 36 ++++++++++++-------
 .../notification/NotificationPaginator.vue    | 22 ++++++++----
 2 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/components/notification/NotificationGroupedFollow.vue b/components/notification/NotificationGroupedFollow.vue
index 8f217b4a..3dd63c6b 100644
--- a/components/notification/NotificationGroupedFollow.vue
+++ b/components/notification/NotificationGroupedFollow.vue
@@ -16,21 +16,33 @@ const isExpanded = ref(false)
   <article flex flex-col relative>
     <div flex items-center top-0 left-2 pt-2 px-3>
       <div i-ri:user-follow-fill mr-3 color-primary aria-hidden="true" />
-      <template v-if="addSR">
-        <span
-          aria-hidden="true"
-        >
-          {{ $t('notification.followed_you_count', count, { named: { followers: formatHumanReadableNumber(count) } }) }}
-        </span>
-        <span sr-only>
+      <template v-if="count > 1">
+        <template v-if="addSR">
+          <span
+            aria-hidden="true"
+          >
+            {{ $t('notification.followed_you_count', count, { named: { followers: formatHumanReadableNumber(count) } }) }}
+          </span>
+          <span sr-only>
+            {{ $t('notification.followed_you_count', count, { named: { followers: count } }) }}
+          </span>
+        </template>
+        <span v-else>
           {{ $t('notification.followed_you_count', count, { named: { followers: count } }) }}
         </span>
       </template>
-      <span v-else>
-        {{ $t('notification.followed_you_count', count, { named: { followers: count } }) }}
-      </span>
+      <template v-else>
+        <ContentRich
+          text-primary mr-1 font-bold line-clamp-1 ws-pre-wrap break-all
+          :content="getDisplayName(items.items[0]?.account, { rich: true })"
+          :emojis="items.items[0]?.account.emojis"
+        />
+        <span mr-1 ws-nowrap>
+          {{ $t('notification.followed_you') }}
+        </span>
+      </template>
     </div>
-    <div pt-1 pb-2>
+    <div pb-2>
       <div v-if="isExpanded">
         <AccountCard
           v-for="item in items.items"
@@ -39,7 +51,7 @@ const isExpanded = ref(false)
           p3
         />
       </div>
-      <div v-else flex="~ wrap gap-1" p4>
+      <div v-else flex="~ wrap gap-2" p4>
         <AccountHoverWrapper
           v-for="item in items.items"
           :key="item.id"
diff --git a/components/notification/NotificationPaginator.vue b/components/notification/NotificationPaginator.vue
index d8defb3d..14906152 100644
--- a/components/notification/NotificationPaginator.vue
+++ b/components/notification/NotificationPaginator.vue
@@ -40,12 +40,22 @@ function groupItems(items: Notification[]): NotificationSlot[] {
     // Only group follow notifications when there are too many in a row
     // This normally happens when you transfer an account, if not, show
     // a big profile card for each follow
-    if (group[0].type === 'follow' && group.length > minFollowGroupSize) {
-      results.push({
-        id: `grouped-${id++}`,
-        type: `grouped-${group[0].type}`,
-        items: group,
-      })
+    if (group[0].type === 'follow') {
+      const toGroup = []
+      for (const item of group) {
+        const hasHeader = !item.account.header.endsWith('/original/missing.png')
+        if (hasHeader && (item.account.followersCount > 250 || (group.length === 1 && item.account.followersCount > 25)))
+          results.push(item)
+        else
+          toGroup.push(item)
+      }
+      if (toGroup.length > 0) {
+        results.push({
+          id: `grouped-${id++}`,
+          type: `grouped-${group[0].type}`,
+          items: toGroup,
+        })
+      }
       return
     }