dkforest

commit 7d80bccd20097a6b98ada8b9df0075cf2d2beb28
parent 63d7e9a37dfd70b39195398f6b10f19aafb5b451
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Tue, 18 Feb 2025 14:54:28 -0800

cleanup duplicated code

Diffstat:
M
pkg/database/tableChatMessages.go
 | 
30
++++++++++++++++++------------

1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -598,12 +598,9 @@ func (d *DkfDB) CreateUnkickMsg(kickedUser, kickedByUser User) {
 }
 
 func (d *DkfDB) createMsg(raw, txt, roomKey string, roomID RoomID, userID UserID, toUserID *UserID, hellbanMsg, system, skipNotify bool) (out ChatMessage, err error) {
-	if roomKey != "" {
-		var err error
-		txt, raw, err = encryptMessages(txt, raw, roomKey)
-		if err != nil {
-			return out, err
-		}
+	txt, raw, err = encryptWithRoomKey(txt, raw, roomKey)
+	if err != nil {
+		return
 	}
 
 	out = makeMsg(raw, txt, roomID, userID)
@@ -628,12 +625,10 @@ func (d *DkfDB) CreateOrEditMessage(
 	groupID *GroupID,
 	hellbanMsg, modMsg, systemMsg bool) (int64, error) {
 
-	if roomKey != "" {
-		var err error
-		message, raw, err = encryptMessages(message, raw, roomKey)
-		if err != nil {
-			return 0, err
-		}
+	var err error
+	message, raw, err = encryptWithRoomKey(message, raw, roomKey)
+	if err != nil {
+		return 0, err
 	}
 
 	typ := CreateMsg
@@ -674,6 +669,17 @@ func (d *DkfDB) CreateOrEditMessage(
 	return editMsg.ID, nil
 }
 
+func encryptWithRoomKey(txt, raw string, roomKey string) (string, string, error) {
+	if roomKey != "" {
+		var err error
+		txt, raw, err = encryptMessages(txt, raw, roomKey)
+		if err != nil {
+			return "", "", err
+		}
+	}
+	return txt, raw, nil
+}
+
 type PubSubMessageType int
 
 const (