dkforest

commit 052fadd56b283fdb6581e96b685e808befb65392
parent 9ffa4d5ba3fb30f400575a7e2a6246df5e8e25c9
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Thu, 10 Nov 2022 14:09:56 -0800

simplify code

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

2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -369,10 +369,6 @@ func DeleteChatRoomMessages(roomID int64) error {
 	return DB.Delete(&ChatMessage{}, "room_id = ?", roomID).Error
 }
 
-func DeleteChatMessageByID(messageID int64) error {
-	return DB.Where("id = ?", messageID).Delete(&ChatMessage{}).Error
-}
-
 func DeleteChatMessageByUUID(messageUUID string) error {
 	return DB.Where("uuid = ?", messageUUID).Delete(&ChatMessage{}).Error
 }
@@ -423,21 +419,21 @@ func makeMsg(raw, txt string, roomID, userID int64) ChatMessage {
 	return msg
 }
 
-func CreateMsg(raw, txt, roomKey string, roomID, userID int64, toUserID *int64) (int64, error) {
+func CreateMsg(raw, txt, roomKey string, roomID, userID int64, toUserID *int64) (out ChatMessage, err error) {
 	if roomKey != "" {
 		var err error
 		txt, raw, err = encryptMessages(txt, raw, roomKey)
 		if err != nil {
-			return 0, err
+			return out, err
 		}
 	}
 
-	msg := makeMsg(raw, txt, roomID, userID)
+	out = makeMsg(raw, txt, roomID, userID)
 	if toUserID != nil {
-		msg.ToUserID = toUserID
+		out.ToUserID = toUserID
 	}
-	err := DB.Create(&msg).Error
-	return msg.ID, err
+	err = DB.Create(&out).Error
+	return
 }
 
 func CreateSysMsg(raw, txt, roomKey string, roomID, userID int64) error {
diff --git a/pkg/web/handlers/api/v1/chess.go b/pkg/web/handlers/api/v1/chess.go
@@ -455,10 +455,10 @@ func (b *Chess) SendMove(gameKey string, userID int64, g *ChessGame, c echo.Cont
 	if opponent.NotifyChessMove {
 		msg := fmt.Sprintf("@%s played %s", you.Username, moveStr)
 		msg, _ = colorifyTaggedUsers(msg, database.GetUsersByUsername)
-		msgID, _ := database.CreateMsg(msg, msg, "", config.GeneralRoomID, b.zeroID, &opponent.ID)
+		chatMsg, _ := database.CreateMsg(msg, msg, "", config.GeneralRoomID, b.zeroID, &opponent.ID)
 		go func() {
 			time.Sleep(30 * time.Second)
-			_ = database.DeleteChatMessageByID(msgID)
+			_ = database.DeleteChatMessageByUUID(chatMsg.UUID)
 		}()
 	}