github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-27 03:00:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Search: Skip subreddit results for advanced search

Browse Source 
For combined search, don't request subreddits results if the search
query *might* contain a fielded search, or if the search syntax is
cloudsearch structured syntax.

Also, use rel1 for the subreddit search request.
This commit is contained in:
Florence Yeun
2015-05-07 12:18:54 -07:00
parent 37967b327a
commit 91dc935b4c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
r2/r2/controllers/front.py
View File

@@ -1009,6 +1009,10 @@ class FrontController(RedditController):
else:
result_types = {'link'}
# no subreddit results if fielded search or structured syntax
if syntax == 'cloudsearch' or (query and ':' in query):
result_types = result_types - {'sr'}
# combined results on first page only
if not after and not restrict_sr and result_types == {'link', 'sr'}:
# hardcoded to 5 subreddits (or fewer)
@@ -1069,7 +1073,7 @@ class FrontController(RedditController):
# extra search request for subreddit results
if sr_num > 0 and has_query:
sr_q = SubredditSearchQuery(query, sort='relevance', faceting={},
sr_q = SubredditSearchQuery(query, sort='rel1', faceting={},
include_over18=include_over18)
subreddits = self._search(sr_q, num=sr_num, reverse=reverse,
after=after, count=count, type='sr',