Skip to content

A platform for community discussion. Free, open, simple.

PERF: Avoid repeated permission work on member topic loads (#44566)

Alan Guo Xiang Tan2c0fdfb96199
diff --git a/app/models/concerns/roleable.rb b/app/models/concerns/roleable.rb
index c2756c7124c..62fd303e040 100644
--- a/app/models/concerns/roleable.rb
+++ b/app/models/concerns/roleable.rb
@@ -28,6 +28,11 @@ module Roleable
end
end
+ def category_group_moderator?
+ SiteSetting.enable_category_group_moderation &&
+ CategoryModerationGroup.where(group_id: group_users.select(:group_id)).exists?
+ end
+
def grant_moderation!
return if moderator
set_permission("moderator", true)
diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index ff7f7746eb5..a6ce86d6375 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -530,6 +530,7 @@ class Reviewable < ActiveRecord::Base
def self.viewable_by(user, order: nil, preload: true)
return none if user.blank?
+ return none if !user.staff? && !user.category_group_moderator?
result = self.order(order || "reviewables.score desc, reviewables.created_at desc")
diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb
index 06071d9aaf5..68b0b22001d 100644
--- a/lib/guardian/post_guardian.rb
+++ b/lib/guardian/post_guardian.rb
@@ -186,7 +186,7 @@ module PostGuardian
return false if !trusted_with_post_edits?
if is_my_own?(post)
- return false if !is_staff? && !Topic.visible_post_types(@user).include?(post.post_type)
+ return false if !is_staff? && !visible_post_types.include?(post.post_type)
return false if @user.silenced?
return can_edit_hidden_post?(post) if post.hidden?
@@ -314,7 +314,7 @@ module PostGuardian
return false if post.blank?
return true if is_admin?
return false unless can_see_post_topic?(post)
- return false if Topic.visible_post_types(@user).exclude?(post.post_type)
+ return false if visible_post_types.exclude?(post.post_type)
return true if is_moderator? || is_category_group_moderator?(post.topic.category)
if (!post.trashed? || can_see_deleted_post?(post)) &&
(!post.hidden? || can_see_hidden_post?(post))
@@ -453,6 +453,10 @@ module PostGuardian
private
+ def visible_post_types
+ @visible_post_types ||= Topic.visible_post_types(@user)
+ end
+
def can_create_post_in_topic?(topic)
if !SiteSetting.enable_system_message_replies? && topic&.subtype == "system_message"
return false
diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb
index a036a0442ed..d9cc68db3c1 100644
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@@ -255,19 +255,18 @@ module UserGuardian
end
def can_see_review_queue?
- is_staff? ||
- (
- SiteSetting.enable_category_group_moderation &&
- Reviewable
- .joins(
- "INNER JOIN category_moderation_groups ON category_moderation_groups.category_id = reviewables.category_id",
- )
- .where(
- category_id: allowed_category_ids,
- "category_moderation_groups.group_id": @user.group_users.pluck(:group_id),
- )
- .exists?
+ return true if is_staff?
+ return false if !category_group_moderation_allowed? || [email protected]_group_moderator?
+
+ Reviewable
+ .joins(
+ "INNER JOIN category_moderation_groups ON category_moderation_groups.category_id = reviewables.category_id",
+ )
+ .where(
+ category_id: allowed_category_ids,
+ "category_moderation_groups.group_id": @user.group_users.pluck(:group_id),
)
+ .exists?
end
def can_see_summary_stats?(target_user)