dkforest

commit 566a2cd950d49e4e143e7608bb5fb0ab679cb94d
parent 221eaa4664d7367a94d3c3ce01c2cf803aadf6e1
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun, 15 Jan 2023 18:04:49 -0800

cleanup

Diffstat:
M
pkg/web/handlers/api/v1/handlers.go
 | 
6
++++--

1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkg/web/handlers/api/v1/handlers.go b/pkg/web/handlers/api/v1/handlers.go
@@ -106,7 +106,8 @@ func ChatMessagesHandler(c echo.Context) error {
 	}
 
 	membersInRoom, membersInChat := managers.ActiveUsers.GetRoomUsers(room, ignoredSet)
-	msgs, _ := database.GetChatMessages(room.ID, authUser.Username, authUser.ID, pmOnlyQuery, mentionsOnlyQuery, authUser.DisplayHellbanned || authUser.IsHellbanned, authUser.DisplayIgnored, authUser.DisplayModerators)
+	displayHellbanned := authUser.DisplayHellbanned || authUser.IsHellbanned
+	msgs, _ := database.GetChatMessages(room.ID, authUser.Username, authUser.ID, pmOnlyQuery, mentionsOnlyQuery, displayHellbanned, authUser.DisplayIgnored, authUser.DisplayModerators)
 	if room.IsProtected() {
 		key, err := hutils.GetRoomKeyCookie(c, int64(room.ID))
 		if err != nil {
@@ -445,7 +446,8 @@ func RoomNotifierHandler(c echo.Context) error {
 
 	managers.ActiveUsers.UpdateUserInRoom(room, managers.NewUserInfo(*authUser, nil))
 
-	msgs, _ := database.GetChatMessages(roomID, authUser.Username, authUser.ID, 0, false, authUser.DisplayHellbanned || authUser.IsHellbanned, authUser.DisplayIgnored, authUser.DisplayModerators)
+	displayHellbanned := authUser.DisplayHellbanned || authUser.IsHellbanned
+	msgs, _ := database.GetChatMessages(roomID, authUser.Username, authUser.ID, 0, false, displayHellbanned, authUser.DisplayIgnored, authUser.DisplayModerators)
 	if room.IsProtected() {
 		key, err := hutils.GetRoomKeyCookie(c, int64(room.ID))
 		if err != nil {