From 015f799cf7c2bcd2cd2810f0240c364c449e66c7 Mon Sep 17 00:00:00 2001
From: Kieran <kieran@harkin.me>
Date: Tue, 7 Feb 2023 16:10:31 +0000
Subject: [PATCH] bug: fix notifications

---
 src/Feed/LoginFeed.ts | 10 ++++++----
 src/Pages/Layout.tsx  | 11 ++++++-----
 src/State/Login.ts    | 12 ++++++++----
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/Feed/LoginFeed.ts b/src/Feed/LoginFeed.ts
index 027c47a6..89c76356 100644
--- a/src/Feed/LoginFeed.ts
+++ b/src/Feed/LoginFeed.ts
@@ -6,7 +6,7 @@ import { TaggedRawEvent, HexKey, Lists } from "Nostr";
 import EventKind from "Nostr/EventKind";
 import Event from "Nostr/Event";
 import { Subscriptions } from "Nostr/Subscriptions";
-import { addDirectMessage, setFollows, setRelays, setMuted, setBlocked, sendNotification } from "State/Login";
+import { addDirectMessage, setFollows, setRelays, setMuted, setBlocked, sendNotification, setLatestNotifications } from "State/Login";
 import { RootState } from "State/Store";
 import { mapEventToProfile, MetadataCache } from "State/Users";
 import { useDb } from "State/Users/Db";
@@ -20,7 +20,7 @@ import useModeration from "Hooks/useModeration";
  */
 export default function useLoginFeed() {
   const dispatch = useDispatch();
-  const { publicKey: pubKey, privateKey: privKey, latestMuted } = useSelector((s: RootState) => s.login);
+  const { publicKey: pubKey, privateKey: privKey, latestMuted, readNotifications } = useSelector((s: RootState) => s.login);
   const { isMuted } = useModeration();
   const db = useDb();
 
@@ -116,8 +116,10 @@ export default function useLoginFeed() {
   }, [dispatch, metadataFeed.store, db]);
 
   useEffect(() => {
-    const replies = notificationFeed.store.notes.filter(a => a.kind === EventKind.TextNote && !isMuted(a.pubkey))
+    const replies = notificationFeed.store.notes.
+      filter(a => a.kind === EventKind.TextNote && !isMuted(a.pubkey) && a.created_at > readNotifications)
     replies.forEach(nx => {
+      dispatch(setLatestNotifications(nx.created_at));
       makeNotification(db, nx).then(notification => {
         if (notification) {
           // @ts-ignore
@@ -125,7 +127,7 @@ export default function useLoginFeed() {
         }
       })
     })
-  }, [dispatch, notificationFeed.store, db]);
+  }, [dispatch, notificationFeed.store, db, readNotifications]);
 
   useEffect(() => {
     const muted = getMutedKeys(mutedFeed.store.notes)
diff --git a/src/Pages/Layout.tsx b/src/Pages/Layout.tsx
index da6c410a..b3bb28c0 100644
--- a/src/Pages/Layout.tsx
+++ b/src/Pages/Layout.tsx
@@ -27,9 +27,9 @@ export default function Layout() {
     const [show, setShow] = useState(false)
     const dispatch = useDispatch();
     const navigate = useNavigate();
-    const { loggedOut, publicKey, relays, notifications, readNotifications, dms, preferences, newUserKey } = useSelector((s: RootState) => s.login);
+    const { loggedOut, publicKey, relays, latestNotification, readNotifications, dms, preferences, newUserKey } = useSelector((s: RootState) => s.login);
     const { isMuted } = useModeration();
-    const filteredDms = dms.filter(a => !isMuted(a.pubkey))
+
     const usingDb = useDb();
     const pub = useEventPublisher();
     useLoginFeed();
@@ -39,6 +39,9 @@ export default function Layout() {
         return hideNoteCreator.some(a => location.pathname.startsWith(a));
     }, [location]);
 
+    const hasNotifications = useMemo(() => latestNotification > readNotifications, [latestNotification, readNotifications]);
+    const unreadDms = useMemo(() => publicKey ? totalUnread(dms.filter(a => !isMuted(a.pubkey)), publicKey) : 0, [dms, publicKey]);
+
     useEffect(() => {
         System.nip42Auth = pub.nip42Auth
     }, [pub])
@@ -153,8 +156,6 @@ export default function Layout() {
     }
 
     function accountHeader() {
-        const unreadNotifications = notifications?.filter(a => (a.created_at * 1000) > readNotifications).length;
-        const unreadDms = publicKey ? totalUnread(filteredDms, publicKey) : 0;
         return (
             <div className="header-actions">
                 <div className="btn btn-rnd" onClick={(e) => navigate("/search")}>
@@ -166,7 +167,7 @@ export default function Layout() {
                 </div>
                 <div className="btn btn-rnd" onClick={(e) => goToNotifications(e)}>
                     <Bell />
-                    {unreadNotifications > 0 && (<span className="has-unread"></span>)}
+                    {hasNotifications && (<span className="has-unread"></span>)}
                 </div>
                 <ProfileImage pubkey={publicKey || ""} showUsername={false} />
             </div>
diff --git a/src/State/Login.ts b/src/State/Login.ts
index 13c1535a..4cb8c7ac 100644
--- a/src/State/Login.ts
+++ b/src/State/Login.ts
@@ -126,9 +126,9 @@ export interface LoginStore {
     blocked: HexKey[],
 
     /**
-     * Notifications for this login session
+     * Latest notification
      */
-    notifications: TaggedRawEvent[],
+    latestNotification: number,
 
     /**
     * Timestamp of last read notification
@@ -170,7 +170,7 @@ export const InitState = {
     muted: [],
     blocked: [],
     latestMuted: 0,
-    notifications: [],
+    latestNotification: 0,
     readNotifications: new Date().getTime(),
     dms: [],
     dmInteraction: 0,
@@ -362,9 +362,12 @@ const LoginSlice = createSlice({
             window.localStorage.setItem(RelayListKey, JSON.stringify(relays));
         },
         markNotificationsRead: (state) => {
-            state.readNotifications = new Date().getTime();
+            state.readNotifications = Math.ceil(new Date().getTime() / 1000);
             window.localStorage.setItem(NotificationsReadItem, state.readNotifications.toString());
         },
+        setLatestNotifications: (state, action: PayloadAction<number>) => {
+            state.latestNotification = action.payload;
+        },
         setPreferences: (state, action: PayloadAction<UserPreferences>) => {
             state.preferences = action.payload;
             window.localStorage.setItem(UserPreferencesKey, JSON.stringify(state.preferences));
@@ -386,6 +389,7 @@ export const {
     incDmInteraction,
     logout,
     markNotificationsRead,
+    setLatestNotifications,
     setPreferences,
 } = LoginSlice.actions;