From 4714912df04674b1f1b2eac34abb57de524872ea Mon Sep 17 00:00:00 2001
From: Kieran <kieran@harkin.me>
Date: Thu, 19 Jan 2023 12:59:37 +0000
Subject: [PATCH] Show display name in notification

---
 src/element/ProfileImage.tsx | 19 +++++++++------
 src/feed/LoginFeed.ts        | 46 ++++++++++++++++++++++++++----------
 2 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/src/element/ProfileImage.tsx b/src/element/ProfileImage.tsx
index 39c824e1..9734b51a 100644
--- a/src/element/ProfileImage.tsx
+++ b/src/element/ProfileImage.tsx
@@ -7,6 +7,7 @@ import { hexToBech32, profileLink } from "../Util";
 import Avatar from "./Avatar"
 import Nip05 from "./Nip05";
 import { HexKey } from "../nostr";
+import { MetadataCache } from "../db/User";
 
 export interface ProfileImageProps {
     pubkey: HexKey,
@@ -21,13 +22,7 @@ export default function ProfileImage({ pubkey, subHeader, showUsername = true, c
     const user = useProfile(pubkey)?.get(pubkey);
 
     const name = useMemo(() => {
-        let name = hexToBech32("npub", pubkey).substring(0, 12);
-        if ((user?.display_name?.length ?? 0) > 0) {
-            name = user!.display_name!;
-        } else if ((user?.name?.length ?? 0) > 0) {
-            name = user!.name!;
-        }
-        return name;
+        return getDisplayName(user, pubkey);
     }, [user, pubkey]);
 
     return (
@@ -48,3 +43,13 @@ export default function ProfileImage({ pubkey, subHeader, showUsername = true, c
         </div>
     )
 }
+
+export function getDisplayName(user: MetadataCache | undefined, pubkey: HexKey) {
+    let name = hexToBech32("npub", pubkey).substring(0, 12);
+    if ((user?.display_name?.length ?? 0) > 0) {
+        name = user!.display_name!;
+    } else if ((user?.name?.length ?? 0) > 0) {
+        name = user!.name!;
+    }
+    return name;
+}
diff --git a/src/feed/LoginFeed.ts b/src/feed/LoginFeed.ts
index 1b0b4c4b..45356edf 100644
--- a/src/feed/LoginFeed.ts
+++ b/src/feed/LoginFeed.ts
@@ -1,7 +1,7 @@
 import Nostrich from "../nostrich.jpg";
 import { useEffect, useMemo } from "react";
 import { useDispatch, useSelector } from "react-redux";
-import { HexKey } from "../nostr";
+import { HexKey, TaggedRawEvent } from "../nostr";
 import EventKind from "../nostr/EventKind";
 import { Subscriptions } from "../nostr/Subscriptions";
 import { addDirectMessage, addNotifications, setFollows, setRelays } from "../state/Login";
@@ -9,6 +9,8 @@ import { RootState } from "../state/Store";
 import { db } from "../db";
 import useSubscription from "./Subscription";
 import { mapEventToProfile, MetadataCache } from "../db/User";
+import { hexToBech32 } from "../Util";
+import { getDisplayName } from "../element/ProfileImage";
 
 /**
  * Managed loading data for the current logged in user
@@ -63,18 +65,8 @@ export default function useLoginFeed() {
 
         if ("Notification" in window && Notification.permission === "granted") {
             for (let nx of notifications.filter(a => (a.created_at * 1000) > readNotifications)) {
-                if (Notification.permission === "granted") {
-                    let body = nx.content.substring(0, 50);
-                    let title = "Snort"
-                    navigator.serviceWorker.ready.then(worker => {
-                        worker.showNotification(title, {
-                            body: body,
-                            icon: Nostrich,
-                            tag: "notification",
-                        });
-
-                    })
-                }
+                sendNotification(nx)
+                    .catch(console.warn);
             }
         }
         dispatch(addNotifications(notifications));
@@ -95,4 +87,32 @@ export default function useLoginFeed() {
             }
         })().catch(console.warn);
     }, [main]);
+}
+
+async function makeNotification(ev: TaggedRawEvent) {
+    switch (ev.kind) {
+        case EventKind.TextNote: {
+            let from = await db.users.get(ev.pubkey);
+            let name = getDisplayName(from, ev.pubkey);
+            return {
+                title: `Reply from ${name}`,
+                body: ev.content.substring(0, 50)
+            }
+        }
+    }
+    return null;
+}
+
+async function sendNotification(ev: TaggedRawEvent) {
+    let n = await makeNotification(ev);
+    if (n != null && Notification.permission === "granted") {
+        let worker = await navigator.serviceWorker.ready;
+        worker.showNotification(n.title, {
+            body: n.body,
+            icon: Nostrich,
+            tag: "notification",
+            timestamp: ev.created_at * 1000,
+            vibrate: [500]
+        });
+    }
 }
\ No newline at end of file