From d7f3a8d01fffafac0841bcb732bff0d4a7e53f01 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Fri, 10 May 2024 15:40:52 +0000 Subject: [PATCH] [🐴] Clean up after deleting message (#3950) * Clean up after removal * Remove console --- src/state/messages/__tests__/convo.test.ts | 2 ++ src/state/messages/convo/agent.ts | 12 ++++-------- 2 file(s) changed, 6 insertion(s)(+), 8 deletion(s)(-) diff --git a/src/state/messages/__tests__/convo.test.ts b/src/state/messages/__tests__/convo.test.ts --- a/src/state/messages/__tests__/convo.test.ts +++ b/src/state/messages/__tests__/convo.test.ts @@ -35,11 +35,13 @@ it.todo( `successfully sent messages are re-ordered, if needed, by events received from server`, ) + it.todo(`pending messages are cleaned up from state after firehose event`) }) describe(`deleting messages`, () => { it.todo(`messages are optimistically deleted from the chat`) it.todo(`messages are confirmed deleted via events from the server`) + it.todo(`deleted messages are cleaned up from state after firehose event`) }) describe(`log handling`, () => { diff --git a/src/state/messages/convo/agent.ts b/src/state/messages/convo/agent.ts --- a/src/state/messages/convo/agent.ts +++ b/src/state/messages/convo/agent.ts @@ -678,14 +678,10 @@ /* * Update if we have this in state. If we don't, don't worry about it. */ - // TODO check for other storage spots - if (this.pastMessages.has(ev.message.id)) { - /* - * For now, we remove deleted messages from the thread, if we receive one. - * - * To support them, it'd look something like this: - * this.pastMessages.set(ev.message.id, ev.message) - */ + if ( + this.pastMessages.has(ev.message.id) || + this.newMessages.has(ev.message.id) + ) { this.pastMessages.delete(ev.message.id) this.newMessages.delete(ev.message.id) this.deletedMessages.delete(ev.message.id) -- tangled.sh