dkforest

commit e983e1ccb1000a84b874aa4ebb7a792c577144a2
parent 9057f0608a13d29c2da52b27b5233f854fe96f46
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun,  4 Dec 2022 19:44:47 -0500

code cleanup

Diffstat:
M
pkg/database/tableChatMessages.go
 | 
11
+++++++++++
M
pkg/web/handlers/api/v1/slashInterceptor.go
 | 
7
+------

2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -7,6 +7,7 @@ import (
 	"dkforest/pkg/utils"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io"
 	"strings"
 	"time"
@@ -449,6 +450,16 @@ func CreateSysMsg(raw, txt, roomKey string, roomID int64, userID UserID) error {
 	return DB.Create(&msg).Error
 }
 
+func CreateKickMsg(kickedUser, kickedByUser User) {
+	// Display kick message
+	styledUsername := fmt.Sprintf(`<span %s>%s</span>`, kickedUser.GenerateChatStyle(), kickedUser.Username)
+	rawTxt := fmt.Sprintf("%s has been kicked. (%s)", kickedUser.Username, kickedByUser.Username)
+	txt := fmt.Sprintf("%s has been kicked. (%s)", styledUsername, kickedByUser.Username)
+	if err := CreateSysMsg(rawTxt, txt, "", config.GeneralRoomID, kickedByUser.ID); err != nil {
+		logrus.Error(err)
+	}
+}
+
 func CreateOrEditMessage(
 	editMsg *ChatMessage,
 	message, raw, roomKey string,
diff --git a/pkg/web/handlers/api/v1/slashInterceptor.go b/pkg/web/handlers/api/v1/slashInterceptor.go
@@ -192,12 +192,7 @@ func handleKickCmd(c *Command) (handled bool) {
 		// If user is HB, do not display system message
 		if !user.IsHellbanned {
 			// Display kick message
-			styledUsername := fmt.Sprintf(`<span %s>%s</span>`, user.GenerateChatStyle(), user.Username)
-			rawTxt := fmt.Sprintf("%s has been kicked. (%s)", user.Username, c.authUser.Username)
-			txt := fmt.Sprintf("%s has been kicked. (%s)", styledUsername, c.authUser.Username)
-			if err := database.CreateSysMsg(rawTxt, txt, "", config.GeneralRoomID, c.authUser.ID); err != nil {
-				logrus.Error(err)
-			}
+			database.CreateKickMsg(user, *c.authUser)
 		}
 
 		c.err = ErrRedirect