DEV: Add include_all_pms option to TopicQuery (#15742)

This is intended for use by plugins which are building their own
topic lists, and want to include PMs alongside regular topics (e.g.
discourse-assign). It does not get used directly in core.
This commit is contained in:
Bianca Nenciu 2022-02-11 14:46:23 +02:00 committed by GitHub
parent 3acc54c218
commit 694205cc0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 2 deletions

View File

@ -75,6 +75,7 @@ class TopicQuery
guardian
no_definitions
destination_category_id
include_all_pms
include_pms)
end
@ -709,8 +710,12 @@ class TopicQuery
all_listable_topics = @guardian.filter_allowed_categories(Topic.unscoped.listable_topics)
if options[:include_pms]
all_pm_topics = Topic.unscoped.private_messages_for_user(@user)
if options[:include_pms] || options[:include_all_pms]
all_pm_topics = if options[:include_all_pms] && @guardian.is_admin?
Topic.unscoped.private_messages
else
Topic.unscoped.private_messages_for_user(@user)
end
result = result.merge(all_listable_topics.or(all_pm_topics))
else
result = result.merge(all_listable_topics)

View File

@ -249,6 +249,19 @@ describe TopicQuery do
end
end
describe 'include_all_pms option' do
it "includes all pms in regular topic lists for admins" do
topic = Fabricate(:topic)
own_pm = Fabricate(:private_message_topic, user: user)
other_pm = Fabricate(:private_message_topic, user: Fabricate(:user))
expect(TopicQuery.new(user).list_latest.topics).to contain_exactly(topic)
expect(TopicQuery.new(admin).list_latest.topics).to contain_exactly(topic)
expect(TopicQuery.new(user, include_all_pms: true).list_latest.topics).to contain_exactly(topic, own_pm)
expect(TopicQuery.new(admin, include_all_pms: true).list_latest.topics).to contain_exactly(topic, own_pm, other_pm)
end
end
context 'category filter' do
let(:category) { Fabricate(:category_with_definition) }
let(:diff_category) { Fabricate(:category_with_definition, name: "Different Category") }