dkforest

commit 81273efb3d93ed1370f61875ec581155297ffb30
parent 0bbff11e7106f33e5d23f89cac88eadda3363c65
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon, 22 May 2023 21:48:33 -0700

cleanup

Diffstat:
M
pkg/database/tableChatMessages.go
 | 
2
++
M
pkg/database/tableUsers.go
 | 
4
++--
M
pkg/database/utils/utils.go
 | 
2
+-
M
pkg/web/handlers/api/v1/slashInterceptor.go
 | 
2
+-

4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -541,6 +541,8 @@ const (
 	CreateMsg PubSubMessageType = iota
 	EditMsg
 	ForceRefresh
+
+	RefreshTopic string = "refresh"
 )
 
 type ChatMessageType struct {
diff --git a/pkg/database/tableUsers.go b/pkg/database/tableUsers.go
@@ -272,7 +272,7 @@ func (u *User) HellBan(db *DkfDB) {
 	if err := db.db.Model(&ChatMessage{}).Where("user_id = ?", u.ID).Update("is_hellbanned", true).Error; err != nil {
 		logrus.Error(err)
 	}
-	MsgPubSub.Pub("refresh", ChatMessageType{Typ: ForceRefresh})
+	MsgPubSub.Pub(RefreshTopic, ChatMessageType{Typ: ForceRefresh})
 }
 
 func (u *User) UnHellBan(db *DkfDB) {
@@ -281,7 +281,7 @@ func (u *User) UnHellBan(db *DkfDB) {
 	if err := db.db.Model(&ChatMessage{}).Where("user_id = ?", u.ID).Update("is_hellbanned", false).Error; err != nil {
 		logrus.Error(err)
 	}
-	MsgPubSub.Pub("refresh", ChatMessageType{Typ: ForceRefresh})
+	MsgPubSub.Pub(RefreshTopic, ChatMessageType{Typ: ForceRefresh})
 }
 
 // GetUserBySessionKey ...
diff --git a/pkg/database/utils/utils.go b/pkg/database/utils/utils.go
@@ -142,7 +142,7 @@ func kick(db *database.DkfDB, kicked, kickedBy database.User, silent, purge bool
 		if err := db.DeleteUserChatMessages(kicked.ID); err != nil {
 			logrus.Error(err)
 		}
-		database.MsgPubSub.Pub("refresh", database.ChatMessageType{Typ: database.ForceRefresh})
+		database.MsgPubSub.Pub(database.RefreshTopic, database.ChatMessageType{Typ: database.ForceRefresh})
 	}
 
 	// If user is HB, do not display system message
diff --git a/pkg/web/handlers/api/v1/slashInterceptor.go b/pkg/web/handlers/api/v1/slashInterceptor.go
@@ -1569,7 +1569,7 @@ func handlePurge(c *Command) (handled bool) {
 		}
 		c.db.NewAudit(*c.authUser, fmt.Sprintf("purge %s #%d", user.Username, user.ID))
 		_ = c.db.DeleteUserChatMessages(user.ID)
-		database.MsgPubSub.Pub("refresh", database.ChatMessageType{Typ: database.ForceRefresh})
+		database.MsgPubSub.Pub(database.RefreshTopic, database.ChatMessageType{Typ: database.ForceRefresh})
 		c.err = ErrRedirect
 		return true
 	}