github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 06:41:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Add include_all_pms option to TopicQuery (#15742)

Browse Source 
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
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/topic_query.rb
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)