dkforest

commit 5e8e1dc4bb07655cba6ccfa2038ae3187b8520fa
parent 5e8cddd2841c3c4552821f0b4568bdfe832a910e
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon, 22 May 2023 18:52:29 -0700

simplify code

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

1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -445,6 +445,15 @@ func makeMsg(raw, txt string, roomID RoomID, userID UserID) ChatMessage {
 }
 
 func (d *DkfDB) CreateMsg(raw, txt, roomKey string, roomID RoomID, userID UserID, toUserID *UserID) (out ChatMessage, err error) {
+	return d.createMsg(raw, txt, roomKey, roomID, userID, toUserID, false)
+}
+
+func (d *DkfDB) CreateSysMsg(raw, txt, roomKey string, roomID RoomID, userID UserID) error {
+	_, err := d.createMsg(raw, txt, roomKey, roomID, userID, nil, true)
+	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)
@@ -457,26 +466,12 @@ func (d *DkfDB) CreateMsg(raw, txt, roomKey string, roomID RoomID, userID 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) CreateSysMsg(raw, txt, roomKey string, roomID RoomID, userID UserID) error {
-	if roomKey != "" {
-		var err error
-		txt, raw, err = encryptMessages(txt, raw, roomKey)
-		if err != nil {
-			return err
-		}
-	}
-	msg := makeMsg(raw, txt, roomID, userID)
-	msg.System = true
-	err := d.db.Create(&msg).Error
-	MsgPubSub.Pub("room_"+roomID.String(), ChatMessageType{Typ: 0, Msg: &msg})
-	return err
-}
-
 func (d *DkfDB) CreateKickMsg(kickedUser, kickedByUser User) {
 	// Display kick message
 	styledUsername := fmt.Sprintf(`<span %s>%s</span>`, kickedUser.GenerateChatStyle(), kickedUser.Username)