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