dkforest

commit a4010f5af75f4f9fbb4a635cacef4f9e0c6b941f
parent 9c82832fc05b6ff9e2d68acf90ec5dd29ea9ad28
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Tue, 18 Feb 2025 16:17:28 -0800

cleanup

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

1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -667,14 +667,10 @@ func addFullscreenLinkToCodeBlocks(editMsg *ChatMessage) {
 }
 
 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
-		}
+	if roomKey == "" {
+		return txt, raw, nil
 	}
-	return txt, raw, nil
+	return encryptMessages(txt, raw, roomKey)
 }
 
 type PubSubMessageType int
@@ -714,7 +710,7 @@ func encryptMessages(html, origMessage, roomKey string) (string, string, error) 
 	if err != nil {
 		return "", "", err
 	}
-	return html, origMessage, err
+	return html, origMessage, nil
 }
 
 func encryptMessage(roomKey, msg string) (string, error) {