gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge branch 'kb_development' into kb_migration

Browse source
This commit is contained in:
KMY 2023-04-05 18:55:45 +09:00
commit 86915f0cdb
9 changed files with 72 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/services/search_service.rb
View file

@ -35,7 +35,8 @@ class SearchService < BaseService
end
def perform_statuses_search!
definition = parsed_query.apply(StatusesIndex.filter(term: { searchable_by: @account.id }))
# definition = parsed_query.apply(StatusesIndex.filter(term: { searchable_by: @account.id })).order(id: :desc)
definition = parsed_query.apply(StatusesIndex).order(id: :desc)
definition = definition.filter(term: { account_id: @options[:account_id] }) if @options[:account_id].present?
@ -51,7 +52,7 @@ class SearchService < BaseService
account_domains = results.map(&:account_domain)
preloaded_relations = @account.relations_map(account_ids, account_domains)
results.reject { |status| StatusFilter.new(status, @account, preloaded_relations).filtered? }
results.reject { |status| StatusFilter.new(status, @account, preloaded_relations).search_filtered? }
rescue Faraday::ConnectionFailed, Parslet::ParseFailed
[]
end