dkforest

commit 9c82832fc05b6ff9e2d68acf90ec5dd29ea9ad28
parent 18d13bfdb72d05b321f1f71b94f999dc94d6e419
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Tue, 18 Feb 2025 16:13:04 -0800

cleanup duplicated code

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

1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -581,18 +581,17 @@ func (d *DkfDB) CreateSysMsgPM(raw, txt, roomKey string, roomID RoomID, userID U
 }
 
 func (d *DkfDB) 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)
-	utils.LogErr(d.CreateSysMsg(rawTxt, txt, "", config.GeneralRoomID, kickedByUser.ID))
+	d.createKickMsg(kickedUser, kickedByUser, "%s has been kicked. (%s)")
 }
 
 func (d *DkfDB) CreateUnkickMsg(kickedUser, kickedByUser User) {
-	// Display unkick message
+	d.createKickMsg(kickedUser, kickedByUser, "%s has been unkicked. (%s)")
+}
+
+func (d *DkfDB) createKickMsg(kickedUser, kickedByUser User, format string) {
 	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)
+	rawTxt := fmt.Sprintf(format, kickedUser.Username, kickedByUser.Username)
+	txt := fmt.Sprintf(format, styledUsername, kickedByUser.Username)
 	utils.LogErr(d.CreateSysMsg(rawTxt, txt, "", config.GeneralRoomID, kickedByUser.ID))
 }