From f791a77d165755ae89917bf313b535b86ec1e244 Mon Sep 17 00:00:00 2001
From: Leo dev <klesti.selimay@icloud.com>
Date: Mon, 13 Oct 2025 12:31:20 +0200
Subject: [PATCH] DM filter fix

---
 src/app/chat/[id]/page.tsx | 8 +++++++-
 src/components/Sidebar.tsx | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/app/chat/[id]/page.tsx b/src/app/chat/[id]/page.tsx
index 5a8e6b4..1fc0bb8 100644
--- a/src/app/chat/[id]/page.tsx
+++ b/src/app/chat/[id]/page.tsx
@@ -17,6 +17,7 @@ export default function DMs() {
   const wsRef = useRef<WebSocket | null>(null);
   const [messages, setMessages] = useState<Message[]>([]);
   const [userList, setUserList] = useState<StringMap<User>>({});
+  const [user, setUser] = useState<User | undefined>();
 
   return (
     <AppSidebar
@@ -25,13 +26,18 @@ export default function DMs() {
       userList={userList}
       setUserList={setUserList}
       chatWith={id}
+      setUser={setUser}
     >
       <MessageBox
         channelName={userList[id]?.display_name || id}
         userList={userList}
         setUserList={setUserList}
         messages={messages
-          .filter((m) => m.channel_id === id || m.from === id)
+          .filter(
+            (m) =>
+              (m.channel_id === id && m.from === user?.id) ||
+              (m.from === id && m.channel_id === user?.id)
+          )
           .toReversed()}
         sendMessage={(message) => {
           wsRef.current?.send(
diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
index d412cbc..e495ad3 100644
--- a/src/components/Sidebar.tsx
+++ b/src/components/Sidebar.tsx
@@ -40,6 +40,7 @@ export default function AppSidebar({
   wsRef,
   setMessages,
   onNewMessage,
+  setUser,
 }: Readonly<{
   wsRef: React.RefObject<WebSocket | null>;
   setMessages: React.Dispatch<React.SetStateAction<Message[]>>;
@@ -48,6 +49,7 @@ export default function AppSidebar({
   setUserList: React.Dispatch<React.SetStateAction<StringMap<User>>>;
   chatWith?: string;
   children?: React.ReactNode;
+  setUser?: React.Dispatch<React.SetStateAction<User | undefined>>;
 }>) {
   const [servers, setServers] = useState<[string, string][]>([]);
   const [newServer, setNewServer] = useState({ name: "", ip: "" });
@@ -64,6 +66,7 @@ export default function AppSidebar({
 
   useEffect(() => {
     if (!ip || !user) return;
+    if (setUser) setUser(user);
     auth(
       makeAddress(ip, 7090),
       wsRef,