dkforest

commit 4053747ce7070a8c291be22c3189cfdd07ca7636
parent d297c0bd6776235fe9bf0cfb3b9a18e55ad8bb96
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sat, 10 Jun 2023 04:18:01 -0700

always delete inboxes when deleting chat message

Diffstat:
M
pkg/database/tableChatMessages.go
 | 
2
++
M
pkg/web/handlers/api/v1/handlers.go
 | 
2
--

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -259,6 +259,8 @@ func (m *ChatMessage) MsgToDisplay() string {
 }
 
 func (m *ChatMessage) Delete(db *DkfDB) error {
+	// If we delete message manually, also delete linked inbox if any
+	_ = db.DeleteChatInboxMessageByChatMessageID(m.ID)
 	err := db.DeleteChatMessageByUUID(m.UUID)
 	MsgPubSub.Pub("room_"+m.RoomID.String(), ChatMessageType{Typ: DeleteMsg, Msg: *m})
 	return err
diff --git a/pkg/web/handlers/api/v1/handlers.go b/pkg/web/handlers/api/v1/handlers.go
@@ -412,8 +412,6 @@ func ChatDeleteMessageHandler(c echo.Context) error {
 		authUser.DoSave(db)
 	}
 
-	// If we delete message manually, also delete linked inbox if any
-	_ = db.DeleteChatInboxMessageByChatMessageID(msg.ID)
 	if err := msg.Delete(db); err != nil {
 		logrus.Error(err)
 	}