DM messages fix

This commit is contained in:
2025-12-22 20:55:22 +01:00
parent f780a8eb3e
commit ac7fb25e47
6 changed files with 17 additions and 18 deletions
+13 -4
View File
@@ -22,13 +22,17 @@ export default function DMs() {
auth({ auth({
id: target.node_address, id: target.node_address,
wsRef: targetNode, wsRef: targetNode,
addMessage: app.addMessage, messageStore: app.privateMessages,
deleteMessage: app.deleteMessage,
editMessage: app.editMessage,
}); });
} }
connectTargetNode(); connectTargetNode();
app.setCurrentChannel({
id: id,
name: target?.display_name || id,
kind: "text",
});
}, [target]); }, [target]);
return loading || target ? ( return loading || target ? (
@@ -37,16 +41,21 @@ export default function DMs() {
app={app} app={app}
channelName={target?.display_name || id} channelName={target?.display_name || id}
channelIcon={target?.avatar_url || "_"} channelIcon={target?.avatar_url || "_"}
messages={app.privateMessages.filter( messages={app.privateMessages.messages.filter(
(m) => (m) =>
(m.channel_id === id && m.from === app.profile?.id) || (m.channel_id === id && m.from === app.profile?.id) ||
(m.from === id && m.channel_id === app.profile?.id) (m.from === id && m.channel_id === app.profile?.id)
)} )}
sendRequest={(req) => { sendRequest={(req) => {
console.log("Sending request: ", req);
switch (req.type) { switch (req.type) {
case "send_message": case "send_message":
targetNode.current?.send(JSON.stringify(req)); targetNode.current?.send(JSON.stringify(req));
break; break;
case "load_chunk":
targetNode.current?.send(JSON.stringify(req));
app.node.current?.send(JSON.stringify(req));
break;
default: default:
app.node.current?.send(JSON.stringify(req)); app.node.current?.send(JSON.stringify(req));
break; break;
+1 -1
View File
@@ -52,7 +52,7 @@ export default function ChatHub() {
channels: [], channels: [],
}, },
]; ];
const recentActivity = app.privateMessages.slice(0, 3); const recentActivity = app.privateMessages.messages.slice(0, 3);
return ( return (
<AppLayout app={app}> <AppLayout app={app}>
+1 -5
View File
@@ -50,11 +50,7 @@ export default function AppLayout({
if (onNewMessage) onNewMessage(m); if (onNewMessage) onNewMessage(m);
}, },
lastMessage: app.privateMessages?.[app.privateMessages.length - 1]?.id, messageStore: app.privateMessages,
addMessage: app.addMessage,
deleteMessage: app.deleteMessage,
editMessage: app.editMessage,
}); });
app.setProfiles((prev) => { app.setProfiles((prev) => {
+1 -1
View File
@@ -44,7 +44,7 @@ export default function SidebarDMs({ app }: { app: App }) {
); );
}; };
load(); load();
}, [query, app.privateMessages, app.profile]); }, [query, app.privateMessages.messages, app.profile]);
return ( return (
<div className="w-full flex flex-col bg-sidebar"> <div className="w-full flex flex-col bg-sidebar">
+1 -6
View File
@@ -402,12 +402,7 @@ export default function MessageBox({
</DropdownMenuContent> </DropdownMenuContent>
</DropdownMenu> </DropdownMenu>
<Button <Button variant="secondary" onClick={sendMessage}>
variant="secondary"
onClick={() => {
sendMessage();
}}
>
<SendIcon /> <SendIcon />
</Button> </Button>
</footer> </footer>
-1
View File
@@ -60,7 +60,6 @@ export default function useApp(): App {
const onResponse = (res: Response<UserProfile>) => { const onResponse = (res: Response<UserProfile>) => {
setProfiles((prev) => { setProfiles((prev) => {
console.log("test");
prev[id] = res.data as UserProfile; prev[id] = res.data as UserProfile;
return prev; return prev;
}); });