From 8f5dd8d29d2f13a33a2a40622b42f1ee78854fb9 Mon Sep 17 00:00:00 2001
From: Kieran <kieran@harkin.me>
Date: Wed, 18 Jan 2023 18:53:34 +0000
Subject: [PATCH] bug: filter dms

---
 src/feed/LoginFeed.ts      |  7 ++++++-
 src/pages/MessagesPage.tsx | 11 ++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/feed/LoginFeed.ts b/src/feed/LoginFeed.ts
index d9373cd2..46051d90 100644
--- a/src/feed/LoginFeed.ts
+++ b/src/feed/LoginFeed.ts
@@ -27,11 +27,16 @@ export default function useLoginFeed() {
         sub.Kinds = new Set([EventKind.ContactList, EventKind.SetMetadata, EventKind.DirectMessage]);
 
         let notifications = new Subscriptions();
-        notifications.Kinds = new Set([EventKind.TextNote, EventKind.DirectMessage]);
+        notifications.Kinds = new Set([EventKind.TextNote]);
         notifications.PTags = new Set([pubKey]);
         notifications.Limit = 100;
         sub.AddSubscription(notifications);
 
+        let dms = new Subscriptions();
+        dms.Kinds = new Set([EventKind.DirectMessage]);
+        dms.PTags = new Set([pubKey]);
+        sub.AddSubscription(dms);
+
         return sub;
     }, [pubKey]);
 
diff --git a/src/pages/MessagesPage.tsx b/src/pages/MessagesPage.tsx
index fd7a64f7..39608e00 100644
--- a/src/pages/MessagesPage.tsx
+++ b/src/pages/MessagesPage.tsx
@@ -54,12 +54,17 @@ export function setLastReadDm(pk: HexKey) {
     window.localStorage.setItem(k, now.toString());
 }
 
+export function dmTo(e: RawEvent) {
+    let firstP = e.tags.find(b => b[0] === "p");
+    return firstP ? firstP[1] : "";
+}
+
 export function isToSelf(e: RawEvent, pk: HexKey) {
-    return e.pubkey === pk && e.tags.some(a => a[0] === "p" && a[1] === pk);
+    return e.pubkey === pk && dmTo(e) === pk;
 }
 
 export function dmsInChat(dms: RawEvent[], pk: HexKey) {
-    return dms.filter(a => a.pubkey === pk || a.tags.some(b => b[0] === "p" && b[1] === pk));
+    return dms.filter(a => a.pubkey === pk || dmTo(a) == pk);
 }
 
 export function totalUnread(dms: RawEvent[], myPubKey: HexKey) {
@@ -78,7 +83,7 @@ function newestMessage(dms: RawEvent[], myPubKey: HexKey, pk: HexKey) {
 
 
 export function extractChats(dms: RawEvent[], myPubKey: HexKey) {
-    const keys = dms.map(a => [a.pubkey, ...a.tags.filter(b => b[0] === "p").map(b => b[1])]).flat();
+    const keys = dms.map(a => [a.pubkey, dmTo(a)]).flat();
     const filteredKeys = Array.from(new Set<string>(keys));
     return filteredKeys.map(a => {
         return {