dkforest

commit cf9cb4cae3a44edf7e55dcd17d1b79df0e9d31ff
parent 5e8e1dc4bb07655cba6ccfa2038ae3187b8520fa
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon, 22 May 2023 19:15:09 -0700

move code

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

1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -453,25 +453,6 @@ func (d *DkfDB) CreateSysMsg(raw, txt, roomKey string, roomID RoomID, userID Use
 	return err
 }
 
-func (d *DkfDB) createMsg(raw, txt, roomKey string, roomID RoomID, userID UserID, toUserID *UserID, system bool) (out ChatMessage, err error) {
-	if roomKey != "" {
-		var err error
-		txt, raw, err = encryptMessages(txt, raw, roomKey)
-		if err != nil {
-			return out, err
-		}
-	}
-
-	out = makeMsg(raw, txt, roomID, userID)
-	if toUserID != nil {
-		out.ToUserID = toUserID
-	}
-	out.System = system
-	err = d.db.Create(&out).Error
-	MsgPubSub.Pub("room_"+roomID.String(), ChatMessageType{Typ: 0, Msg: &out})
-	return
-}
-
 func (d *DkfDB) CreateKickMsg(kickedUser, kickedByUser User) {
 	// Display kick message
 	styledUsername := fmt.Sprintf(`<span %s>%s</span>`, kickedUser.GenerateChatStyle(), kickedUser.Username)
@@ -492,6 +473,25 @@ func (d *DkfDB) CreateUnkickMsg(kickedUser, kickedByUser User) {
 	}
 }
 
+func (d *DkfDB) createMsg(raw, txt, roomKey string, roomID RoomID, userID UserID, toUserID *UserID, system bool) (out ChatMessage, err error) {
+	if roomKey != "" {
+		var err error
+		txt, raw, err = encryptMessages(txt, raw, roomKey)
+		if err != nil {
+			return out, err
+		}
+	}
+
+	out = makeMsg(raw, txt, roomID, userID)
+	if toUserID != nil {
+		out.ToUserID = toUserID
+	}
+	out.System = system
+	err = d.db.Create(&out).Error
+	MsgPubSub.Pub("room_"+roomID.String(), ChatMessageType{Typ: 0, Msg: &out})
+	return
+}
+
 func (d *DkfDB) CreateOrEditMessage(
 	editMsg *ChatMessage,
 	message, raw, roomKey string,