dkforest

commit fedaa3695cabaca6cb87e3beca8ba5698752d915
parent d2cbe0c8c27df94d6958bd2e2c2ff80ea09e64f2
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sat, 10 Jun 2023 05:19:12 -0700

add IsPM helper

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

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -235,6 +235,10 @@ func (m *ChatMessage) OwnMessage(user User) bool {
 	return m.UserID == user.ID
 }
 
+func (m *ChatMessage) IsPm() bool {
+	return m.ToUserID != nil
+}
+
 func (m *ChatMessage) IsPmRecipient(user User) bool {
 	return m.ToUserID != nil && *m.ToUserID == user.ID
 }
diff --git a/pkg/web/handlers/api/v1/handlers.go b/pkg/web/handlers/api/v1/handlers.go
@@ -408,7 +408,7 @@ func ChatDeleteMessageHandler(c echo.Context) error {
 		db.NewAudit(*authUser, auditMsg)
 	}
 
-	if msg.OwnMessage(*authUser) && msg.RoomID == config.GeneralRoomID && msg.ToUserID == nil {
+	if msg.OwnMessage(*authUser) && msg.RoomID == config.GeneralRoomID && !msg.IsPm() {
 		authUser.GeneralMessagesCount--
 		authUser.DoSave(db)
 	}