From 1372c266c652e3761ae063376e8e792f7adbd81c Mon Sep 17 00:00:00 2001
From: Kieran <kieran@harkin.me>
Date: Tue, 17 Jan 2023 11:30:42 +0000
Subject: [PATCH] bug: ordering chats

---
 src/pages/ChatPage.tsx     | 14 ++++----------
 src/pages/MessagesPage.tsx | 15 +++++++++++----
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/pages/ChatPage.tsx b/src/pages/ChatPage.tsx
index ba255b731..658fddf7c 100644
--- a/src/pages/ChatPage.tsx
+++ b/src/pages/ChatPage.tsx
@@ -10,6 +10,7 @@ import useEventPublisher from "../feed/EventPublisher";
 
 import DM from "../element/DM";
 import { RawEvent } from "../nostr";
+import { dmsInChat } from "./MessagesPage";
 
 type RouterParams = {
     id: string
@@ -19,20 +20,13 @@ export default function ChatPage() {
     const params = useParams<RouterParams>();
     const publisher = useEventPublisher();
     const id = bech32ToHex(params.id ?? "");
-    const dms = useSelector<any, RawEvent[]>(s => filterDms(s.login.dms, s.login.publicKey));
+    const dms = useSelector<any, RawEvent[]>(s => filterDms(s.login.dms));
     const [content, setContent] = useState<string>();
     const { ref, inView, entry } = useInView();
     const dmListRef = useRef<HTMLDivElement>(null);
 
-    function filterDms(dms: RawEvent[], myPubkey: string) {
-        return dms.filter(a => {
-            if (a.pubkey === myPubkey && a.tags.some(b => b[0] === "p" && b[1] === id)) {
-                return true;
-            } else if (a.pubkey === id && a.tags.some(b => b[0] === "p" && b[1] === myPubkey)) {
-                return true;
-            }
-            return false;
-        });
+    function filterDms(dms: RawEvent[]) {
+        return dmsInChat(dms, id);
     }
 
     const sortedDms = useMemo<any[]>(() => {
diff --git a/src/pages/MessagesPage.tsx b/src/pages/MessagesPage.tsx
index 6681e7049..fd7a64f72 100644
--- a/src/pages/MessagesPage.tsx
+++ b/src/pages/MessagesPage.tsx
@@ -7,7 +7,6 @@ import { hexToBech32 } from "../Util";
 
 type DmChat = {
     pubkey: HexKey,
-    lastRead: number,
     unreadMessages: number,
     newestMessage: number
 }
@@ -55,17 +54,26 @@ export function setLastReadDm(pk: HexKey) {
     window.localStorage.setItem(k, now.toString());
 }
 
+export function isToSelf(e: RawEvent, pk: HexKey) {
+    return e.pubkey === pk && e.tags.some(a => a[0] === "p" && a[1] === 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));
+}
+
 export function totalUnread(dms: RawEvent[], myPubKey: HexKey) {
     return extractChats(dms, myPubKey).reduce((acc, v) => acc += v.unreadMessages, 0);
 }
 
 function unreadDms(dms: RawEvent[], myPubKey: HexKey, pk: HexKey) {
+    if (pk === myPubKey) return 0;
     let lastRead = lastReadDm(pk);
-    return dms?.filter(a => a.pubkey === pk && a.pubkey !== myPubKey && a.created_at >= lastRead).length;
+    return dmsInChat(dms, pk).filter(a => a.created_at >= lastRead && a.pubkey !== myPubKey).length;
 }
 
 function newestMessage(dms: RawEvent[], myPubKey: HexKey, pk: HexKey) {
-    return dms.filter(a => a.pubkey === pk && a.pubkey !== myPubKey).reduce((acc, v) => acc = v.created_at > acc ? v.created_at : acc, 0);
+    return dmsInChat(dms, pk).reduce((acc, v) => acc = v.created_at > acc ? v.created_at : acc, 0);
 }
 
 
@@ -75,7 +83,6 @@ export function extractChats(dms: RawEvent[], myPubKey: HexKey) {
     return filteredKeys.map(a => {
         return {
             pubkey: a,
-            lastRead: lastReadDm(a),
             unreadMessages: unreadDms(dms, myPubKey, a),
             newestMessage: newestMessage(dms, myPubKey, a)
         } as DmChat;