Remove groups tab from notifications

coracle-social · Nov 4, 2024 · 147987c · 147987c
1 parent b7f5c2e
commit 147987c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 134 deletions.
diff --git a/src/app/views/NotificationSectionGroups.svelte b/src/app/views/NotificationSectionGroups.svelte
diff --git a/src/app/views/Notifications.svelte b/src/app/views/Notifications.svelte
@@ -5,7 +5,6 @@
   import OnboardingTasks from "src/app/shared/OnboardingTasks.svelte"
   import NotificationSectionMain from "src/app/views/NotificationSectionMain.svelte"
   import NotificationSectionReactions from "src/app/views/NotificationSectionReactions.svelte"
-  import NotificationSectionGroups from "src/app/views/NotificationSectionGroups.svelte"
   import {router} from "src/app/util/router"
   import {
     sessionWithMeta,
@@ -14,10 +13,9 @@
     loadCircleMessages,
     unreadMainNotifications,
     unreadReactionNotifications,
-    unreadGroupNotifications,
   } from "src/engine"
 
-  const allTabs = ["Mentions & Replies", "Reactions", "Groups"]
+  const allTabs = ["Mentions & Replies", "Reactions"]
 
   const setActiveTab = tab => router.at("notifications").at(tab).push()
 
@@ -31,11 +29,6 @@
   let innerWidth = 0
   let element = null
 
-  $: displayTabs =
-    innerWidth <= 640 || !$userSettings.note_actions.includes("reactions")
-      ? [allTabs[0], allTabs[2]]
-      : allTabs
-
   document.title = "Notifications"
 
   onMount(() => {
@@ -52,7 +45,7 @@
 
 <svelte:window bind:innerWidth />
 
-<Tabs tabs={displayTabs} {activeTab} {setActiveTab}>
+<Tabs tabs={allTabs} {activeTab} {setActiveTab}>
   <div slot="tab" let:tab class="flex gap-2">
     <div>{tab}</div>
     {#if activeTab !== tab}
@@ -64,10 +57,6 @@
         <div class="h-6 rounded-full bg-neutral-700 px-2">
           {$unreadReactionNotifications.length}
         </div>
-      {:else if tab === allTabs[2] && $unreadGroupNotifications.length > 0}
-        <div class="h-6 rounded-full bg-neutral-700 px-2">
-          {$unreadGroupNotifications.length}
-        </div>
       {/if}
     {/if}
   </div>
@@ -82,7 +71,5 @@
     <NotificationSectionMain {limit} />
   {:else if activeTab === allTabs[1]}
     <NotificationSectionReactions {limit} />
-  {:else if activeTab === allTabs[2]}
-    <NotificationSectionGroups {limit} />
   {/if}
 </div>
diff --git a/src/engine/state.ts b/src/engine/state.ts
@@ -693,64 +693,6 @@ export const unreadReactionNotifications = derived(
   ([$isSeen, events]) => events.filter(e => !$isSeen("reactions", e) && !$isSeen("zaps", e)),
 )
 
-// -- Group Notifications
-
-export const groupNotifications = derived(
-  [
-    sessionWithMeta,
-    isEventMuted,
-    groupRequests,
-    groupAlerts,
-    groupAdminKeys,
-    throttled(3000, repositoryStore),
-  ],
-  ([$session, $isMuted, $requests, $alerts, $adminKeys, $repository]) => {
-    const admins = new Set($adminKeys.map(k => k.pubkey))
-    const addresses = getUserCircles($session)
-    const kinds = [...noteKinds, ...repostKinds]
-    const events = $repository.query([{"#a": addresses, kinds}])
-
-    return sortBy(
-      e => -e.created_at,
-      [
-        ...$requests.filter(r => !r.resolved && !$repository.deletes.has(r.group)),
-        ...$alerts.filter(a => !admins.has(a.pubkey) && !$repository.deletes.has(a.group)),
-        ...events
-          .map(e => {
-            // Unwrap reposts, add community tags so we know where stuff was posted to
-            if (repostKinds.includes(e.kind)) {
-              const contextTags = getAddressTags(e.tags)
-
-              e = unwrapRepost(e)
-
-              for (const tag of contextTags) {
-                if (isContextAddress(tag[1])) {
-                  e?.tags.push(tag)
-                }
-              }
-            }
-
-            return e
-          })
-          .filter(
-            e =>
-              e &&
-              e.pubkey !== $session.pubkey &&
-              // Skip mentions since they're covered in normal notifications
-              !e.tags.some(t => t[0] === "p" && t[1] === $session.pubkey) &&
-              !$isMuted(e),
-          ),
-      ],
-    ) as (TrustedEvent | GroupRequest | GroupAlert)[]
-  },
-)
-
-export const unreadGroupNotifications = derived(
-  [isSeen, groupNotifications],
-  ([$isSeen, $groupNotifications]) =>
-    $groupNotifications.filter(e => !getContextTagValues(e.tags).every(a => $isSeen(a, e))),
-)
-
 // Channels
 
 export const getChannelId = (pubkeys: string[]) => sort(uniq(pubkeys)).join(",")