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

Change private statuses index to index without crutches (#26713)

Browse source
This commit is contained in:
Claire 2023-08-29 17:51:13 +02:00 • committed by GitHub
parent 74eb7dbf2d
commit 9e77ab7db2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app/models/concerns/status_search_concern.rb
View file

@ -7,26 +7,20 @@ module StatusSearchConcern
scope :indexable, -> { without_reblogs.where(visibility: :public).joins(:account).where(account: { indexable: true }) }
end
def searchable_by(preloaded = nil)
ids = []
def searchable_by
@searchable_by ||= begin
ids = []
ids << account_id if local?
ids << account_id if local?
if preloaded.nil?
ids += mentions.joins(:account).merge(Account.local).active.pluck(:account_id)
ids += favourites.joins(:account).merge(Account.local).pluck(:account_id)
ids += reblogs.joins(:account).merge(Account.local).pluck(:account_id)
ids += bookmarks.joins(:account).merge(Account.local).pluck(:account_id)
ids += poll.votes.joins(:account).merge(Account.local).pluck(:account_id) if poll.present?
else
ids += preloaded.mentions[id] || []
ids += preloaded.favourites[id] || []
ids += preloaded.reblogs[id] || []
ids += preloaded.bookmarks[id] || []
ids += preloaded.votes[id] || []
ids += local_mentioned.pluck(:id)
ids += local_favorited.pluck(:id)
ids += local_reblogged.pluck(:id)
ids += local_bookmarked.pluck(:id)
ids += preloadable_poll.local_voters.pluck(:id) if preloadable_poll.present?
ids.uniq
end
ids.uniq
end
def searchable_text