dkforest

commit 994fd6e6f0fbe16f00d654200634404e72c73c15
parent da11e65c46031b192a4f602f33e97a0d64e9d02a
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sat,  7 Jan 2023 14:40:25 -0800

cleanup

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

2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -461,6 +461,16 @@ func CreateKickMsg(kickedUser, kickedByUser User) {
 	}
 }
 
+func CreateUnkickMsg(kickedUser, kickedByUser User) {
+	// Display unkick message
+	styledUsername := fmt.Sprintf(`<span %s>%s</span>`, kickedUser.GenerateChatStyle(), kickedUser.Username)
+	rawTxt := fmt.Sprintf("%s has been unkicked. (%s)", kickedUser.Username, kickedByUser.Username)
+	txt := fmt.Sprintf("%s has been unkicked. (%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
@@ -220,12 +220,7 @@ func handleUnkickCmd(c *Command) (handled bool) {
 		_ = user.Save()
 
 		// Display unkick message
-		styledUsername := fmt.Sprintf(`<span %s>%s</span>`, user.GenerateChatStyle(), user.Username)
-		rawTxt := fmt.Sprintf("%s has been unkicked. (%s)", user.Username, c.authUser.Username)
-		txt := fmt.Sprintf("%s has been unkicked. (%s)", styledUsername, c.authUser.Username)
-		if err := database.CreateSysMsg(rawTxt, txt, "", config.GeneralRoomID, c.authUser.ID); err != nil {
-			logrus.Error(err)
-		}
+		database.CreateUnkickMsg(user, *c.authUser)
 
 		c.err = ErrRedirect
 		return true