A platform for community discussion. Free, open, simple.
PERF: Check review queue visibility per topic for moderators (#44497)
Régis Hanol9d940d12414d
diff --git a/app/models/reviewable.rb b/app/models/reviewable.rbindex 7653c614bf0..ff7f7746eb5 100644--- a/app/models/reviewable.rb+++ b/app/models/reviewable.rb@@ -582,7 +582,7 @@ class Reviewable < ActiveRecord::Baseresult = exclude_private_messages_hidden_from(result, user)visible_target =- user.guardian.reviewable_post_scope.where("posts.id = reviewable_target.id").select(:id)+ user.guardian.reviewable_post_scope.where("posts.id = reviewable_target.id").select(1)result.where(<<~SQL)NOT EXISTS (@@ -595,8 +595,11 @@ class Reviewable < ActiveRecord::Baseenddef self.exclude_private_messages_hidden_from(result, user)- visible_private_message_ids =- user.guardian.private_message_topic_scope(Topic.unscoped).select(:id)+ visible_private_message =+ user+ .guardian+ .private_message_topic_scope(Topic.unscoped.where("topics.id = private_message.id"))+ .select(1)result.where(<<~SQL, private_message: Archetype.private_message)NOT EXISTS (@@ -604,7 +607,7 @@ class Reviewable < ActiveRecord::BaseFROM topics private_messageWHERE private_message.id = reviewables.topic_idAND private_message.archetype = :private_message- AND private_message.id NOT IN (#{visible_private_message_ids.to_sql})+ AND NOT EXISTS (#{visible_private_message.to_sql}))SQLenddiff --git a/app/models/topic.rb b/app/models/topic.rbindex bda8c03e43c..86886e9bb2c 100644--- a/app/models/topic.rb+++ b/app/models/topic.rb@@ -352,6 +352,20 @@ class Topic < ActiveRecord::Base)end+ scope :allowed_to_user, ->(user) { where(<<~SQL, user_id: user.id) }+ EXISTS (+ SELECT 1+ FROM topic_allowed_users tau+ WHERE tau.topic_id = topics.id AND tau.user_id = :user_id+ )+ OR EXISTS (+ SELECT 1+ FROM topic_allowed_groups tg+ JOIN group_users gu ON gu.group_id = tg.group_id AND gu.user_id = :user_id+ WHERE tg.topic_id = topics.id+ )+ SQL+scope :listable_topics, -> { where.not(topics: { archetype: Archetype.private_message }) }scope :by_newest, -> { order("topics.created_at desc, topics.id desc") }diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rbindex b6f0642b94f..06071d9aaf5 100644--- a/lib/guardian/post_guardian.rb+++ b/lib/guardian/post_guardian.rb@@ -327,10 +327,10 @@ module PostGuardianreturn Post.with_deleted if is_admin?return Post.none if !is_staff? && !category_group_moderation_allowed?- topics = visible_topic_scope(Topic.with_deleted)+ topics = visible_topic_scope(Topic.with_deleted.where("topics.id = posts.topic_id"))topics = topics.where(category_id: category_group_moderator_scope.select(:id)) if !is_staff?- Post.with_deleted.secured(self).where(topic_id: topics.select(:id))+ Post.with_deleted.secured(self).where("EXISTS (#{topics.select(1).to_sql})")enddef can_review_post?(post)diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rbindex 4e3cc2fef23..37055cf02ba 100644--- a/lib/guardian/topic_guardian.rb+++ b/lib/guardian/topic_guardian.rb@@ -243,7 +243,7 @@ module TopicGuardianregular_topics = secured_regular_topic_scope(scope)return regular_topics if !authenticated?- regular_topics.or(private_message_topic_scope(scope.private_messages))+ regular_topics.or(private_message_topic_scope(scope))enddef can_see_topic?(topic, hide_deleted = true)@@ -354,14 +354,14 @@ module TopicGuardianenddef private_message_topic_scope(scope)- pm_scope = scope.private_messages_for_user(user)-- pm_scope = pm_scope.or(scope.where(<<~SQL)) if is_moderator?- topics.subtype = '#{TopicSubtype.moderator_warning}'- OR topics.id IN (#{Topic.has_flag_scope.select(:topic_id).to_sql})- SQL-- pm_scope+ scope = scope.private_messages+ allowed = scope.allowed_to_user(user)+ return allowed if !is_moderator?++ flagged = Topic.has_flag_scope.where("reviewables.topic_id = topics.id").select(1)+ allowed.or(scope.where(<<~SQL))+ topics.subtype = '#{TopicSubtype.moderator_warning}' OR EXISTS (#{flagged.to_sql})+ SQLendprivatediff --git a/spec/lib/guardian/topic_guardian_spec.rb b/spec/lib/guardian/topic_guardian_spec.rbindex e28bf3cd60d..e2db1fd4c6e 100644--- a/spec/lib/guardian/topic_guardian_spec.rb+++ b/spec/lib/guardian/topic_guardian_spec.rb@@ -448,6 +448,38 @@ RSpec.describe TopicGuardian do).to contain_exactly(topic.id, private_message_topic.id)end+ it "returns private messages a moderator participates in, was warned in, or must review" do+ direct_pm = Fabricate(:private_message_topic, recipient: moderator)+ group_pm =+ Fabricate(+ :group_private_message_topic,+ recipient_group: Fabricate(:group, users: [moderator]),+ )+ warning_pm = Fabricate(:private_message_topic, subtype: TopicSubtype.moderator_warning)+ flagged_pm = Fabricate(:private_message_topic)+ Fabricate(:reviewable_flagged_post, topic: flagged_pm, category: nil)+ resolved_flag_pm = Fabricate(:private_message_topic)+ Fabricate(:reviewable_flagged_post, topic: resolved_flag_pm, status: :rejected)+ ignored_flag_pm = Fabricate(:private_message_topic)+ Fabricate(:reviewable_flagged_post, topic: ignored_flag_pm, score: -1)+ ids = [+ private_message_topic,+ direct_pm,+ group_pm,+ warning_pm,+ flagged_pm,+ resolved_flag_pm,+ ignored_flag_pm,+ ].map(&:id)++ expect(moderator.guardian.can_see_topic_ids(topic_ids: ids)).to contain_exactly(+ direct_pm.id,+ group_pm.id,+ warning_pm.id,+ flagged_pm.id,+ )+ end+it "returns the topic ids for topics which are deleted but user is a category moderator of" doSiteSetting.enable_category_group_moderation = truediff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rbindex 8174f87ecbc..404ee1061ca 100644--- a/spec/models/reviewable_spec.rb+++ b/spec/models/reviewable_spec.rb@@ -142,28 +142,30 @@ RSpec.describe Reviewable, type: :model doexpect(described_class.viewable_by(admin)).to exist(id: reviewable.id)end- it "includes flagged private messages for moderators outside the conversation" do+ it "includes every reviewable on a flagged private message for moderators outside the conversation" doflagged_reviewable =Fabricate(:reviewable_flagged_post, target: pm_post, topic: pm_topic, category: nil)expect(described_class.viewable_by(outsider_moderator)).to exist(id: flagged_reviewable.id)+ expect(described_class.viewable_by(outsider_moderator)).to exist(id: reviewable.id)end- it "includes private-message reviewables for participating moderators" do- participant_moderator = Fabricate(:moderator)- participant_topic =- Fabricate(:private_message_topic, user: pm_author, recipient: participant_moderator)- participant_post = Fabricate(:post, topic: participant_topic, user: pm_author)- participant_reviewable =- ReviewablePost.needs_review!(- target: participant_post,- created_by: Discourse.system_user,- reviewable_by_moderator: true,- )+ it "includes private-message reviewables for moderators allowed in the conversation" do+ pm_topic.topic_allowed_users.create!(user: outsider_moderator)- expect(described_class.viewable_by(participant_moderator)).to exist(- id: participant_reviewable.id,- )+ expect(described_class.viewable_by(outsider_moderator)).to exist(id: reviewable.id)+ end++ it "excludes queued replies to private messages from moderators outside the conversation" do+ queued_reply = Fabricate(:reviewable_queued_post, topic: pm_topic, category: nil)++ expect(described_class.viewable_by(outsider_moderator)).not_to exist(id: queued_reply.id)+ end++ it "excludes hidden private-message targets when the reviewable has no topic" do+ reviewable.update_columns(topic_id: nil)++ expect(described_class.viewable_by(outsider_moderator)).not_to exist(id: reviewable.id)endenddiff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rbindex e6dd0e3fcb4..0897b942c61 100644--- a/spec/models/topic_spec.rb+++ b/spec/models/topic_spec.rb@@ -2368,6 +2368,20 @@ RSpec.describe Topic doenddescribe "scopes" do+ describe "private message access" do+ it "keeps participant access consistent across scopes" do+ direct_pm = Fabricate(:private_message_topic, recipient: user)+ group = Fabricate(:group, users: [user])+ group_pm = Fabricate(:group_private_message_topic, recipient_group: group)+ Fabricate(:private_message_topic)++ expected_ids = [direct_pm.id, group_pm.id]++ expect(Topic.private_messages_for_user(user).pluck(:id)).to match_array(expected_ids)+ expect(Topic.private_messages.allowed_to_user(user).pluck(:id)).to match_array(expected_ids)+ end+ end+describe "#by_most_recently_created" doit "returns topics ordered by created_at desc, id desc" donow = Time.now