github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-03 19:39:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Correct personal_messages:<username> advanced search filter.

Browse Source 
Renamed from `private_messages` to `personal_messages` without
deprecation because the `private_messages` advanced search filter never
worked in the first place when it was implemented.
This commit is contained in:
Guo Xiang Tan
2020-08-24 11:53:07 +08:00
parent 9022e4516f
commit 4b30799054
3 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/search.rb
View File

@ -185,9 +185,8 @@ class Search
@original_term = PG::Connection.escape_string(@term)
end
if @search_pms && @guardian.user
if @search_pms
@opts[:type_filter] = "private_messages"
@search_context = @guardian.user
end
if @search_all_topics && @guardian.user
@ -690,13 +689,20 @@ class Search
nil
elsif word == 'in:personal'
@search_pms = true
@search_context = @guardian.user
nil
elsif word == "in:personal-direct"
@search_pms = true
@direct_pms_only = true
@search_context = @guardian.user
nil
elsif word =~ /^personal_messages:(.+)$/
elsif word =~ /^personal_messages:(.+)$/
@search_pms = true
if user = User.find_by_username($1)
@search_context = user
end
nil
else
found ? nil : word