Merge commit '71db616fed
' into kb_migration
This commit is contained in:
commit
f18fa97f0c
607 changed files with 3491 additions and 2677 deletions
|
@ -38,7 +38,8 @@ class SearchService < BaseService
|
|||
resolve: @resolve,
|
||||
offset: @offset,
|
||||
use_searchable_text: true,
|
||||
following: @following
|
||||
following: @following,
|
||||
start_with_hashtag: @query.start_with?('#')
|
||||
)
|
||||
end
|
||||
|
||||
|
@ -102,7 +103,7 @@ class SearchService < BaseService
|
|||
end
|
||||
|
||||
def url_resource
|
||||
@_url_resource ||= ResolveURLService.new.call(@query, on_behalf_of: @account)
|
||||
@url_resource ||= ResolveURLService.new.call(@query, on_behalf_of: @account)
|
||||
end
|
||||
|
||||
def url_resource_symbol
|
||||
|
@ -112,11 +113,11 @@ class SearchService < BaseService
|
|||
def full_text_searchable?
|
||||
return false unless Chewy.enabled?
|
||||
|
||||
statuses_search? && !@account.nil? && !((@query.start_with?('#') || @query.include?('@')) && !@query.include?(' '))
|
||||
statuses_search? && !@account.nil? && !(@query.include?('@') && !@query.include?(' '))
|
||||
end
|
||||
|
||||
def account_searchable?
|
||||
account_search? && !(@query.start_with?('#') || (@query.include?('@') && @query.include?(' ')))
|
||||
account_search? && !(@query.include?('@') && @query.include?(' '))
|
||||
end
|
||||
|
||||
def hashtag_searchable?
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue