dkforest

commit 9608837e299a0234c3c04ed6f7f183cf40b18826
parent 8b481f3966c3ada6d1e0addababda0d2ecbdcb45
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Wed, 24 May 2023 23:48:59 -0700

simplify code

Diffstat:
M
pkg/database/tableIgnoredUsers.go
 | 
9
+++++++++
M
pkg/web/handlers/handlers.go
 | 
8
++++----

2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/pkg/database/tableIgnoredUsers.go b/pkg/database/tableIgnoredUsers.go
@@ -28,6 +28,15 @@ func (d *DkfDB) GetIgnoredUsersUsernames(userID UserID) (out []string, err error
 	return
 }
 
+func (d *DkfDB) GetIgnoredUsersIDs(userID UserID) (out []UserID, err error) {
+	err = d.db.Model(&IgnoredUser{}).
+		Joins("INNER JOIN users ON users.id = ignored_users.ignored_user_id").
+		Where("ignored_users.user_id = ?", userID).
+		Pluck("users.id", &out).
+		Error
+	return
+}
+
 // GetIgnoredByUsers get a list of people who ignore userID
 func (d *DkfDB) GetIgnoredByUsers(userID UserID) (out []IgnoredUser, err error) {
 	err = d.db.Where("ignored_user_id = ?", userID).Find(&out).Error
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -5006,8 +5006,8 @@ func applyUserFilters(db *database.DkfDB, authUser *database.User, msg *database
 	}
 
 	if !authUser.DisplayIgnored {
-		ignoredUsers, _ := db.GetIgnoredUsersUsernames(authUser.ID)
-		if utils.InArr(msg.User.Username, ignoredUsers) {
+		ignoredUsersIDs, _ := db.GetIgnoredUsersIDs(authUser.ID)
+		if utils.InArr(msg.UserID, ignoredUsersIDs) {
 			return false
 		}
 	}
@@ -5131,12 +5131,12 @@ Loop:
 			continue
 		}
 
-		manualPreload(db, msg)
-
 		if !applyUserFilters(db, authUser, msg, pmOnlyQuery, displayHellbanned, mentionsOnlyQuery) {
 			continue
 		}
 
+		manualPreload(db, msg)
+
 		baseTopBarURL := "/api/v1/chat/top-bar/" + room.Name
 		readMarkerRendered := true
 		isFirstMsg := false