forked from treehouse/mastodon
Let votes statuses are also searchable (#18070)
parent
4884e0ca41
commit
ea38327816
|
@ -55,6 +55,11 @@ class StatusesIndex < Chewy::Index
|
||||||
data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
|
data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
crutch :votes do |collection|
|
||||||
|
data = ::PollVote.joins(:poll).where(poll: { status_id: collection.map(&:id) }).where(account: Account.local).pluck(:status_id, :account_id)
|
||||||
|
data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
|
||||||
|
end
|
||||||
|
|
||||||
root date_detection: false do
|
root date_detection: false do
|
||||||
field :id, type: 'long'
|
field :id, type: 'long'
|
||||||
field :account_id, type: 'long'
|
field :account_id, type: 'long'
|
||||||
|
|
|
@ -145,11 +145,13 @@ class Status < ApplicationRecord
|
||||||
ids += favourites.where(account: Account.local).pluck(:account_id)
|
ids += favourites.where(account: Account.local).pluck(:account_id)
|
||||||
ids += reblogs.where(account: Account.local).pluck(:account_id)
|
ids += reblogs.where(account: Account.local).pluck(:account_id)
|
||||||
ids += bookmarks.where(account: Account.local).pluck(:account_id)
|
ids += bookmarks.where(account: Account.local).pluck(:account_id)
|
||||||
|
ids += poll.votes.where(account: Account.local).pluck(:account_id) if poll.present?
|
||||||
else
|
else
|
||||||
ids += preloaded.mentions[id] || []
|
ids += preloaded.mentions[id] || []
|
||||||
ids += preloaded.favourites[id] || []
|
ids += preloaded.favourites[id] || []
|
||||||
ids += preloaded.reblogs[id] || []
|
ids += preloaded.reblogs[id] || []
|
||||||
ids += preloaded.bookmarks[id] || []
|
ids += preloaded.bookmarks[id] || []
|
||||||
|
ids += preloaded.votes[id] || []
|
||||||
end
|
end
|
||||||
|
|
||||||
ids.uniq
|
ids.uniq
|
||||||
|
|
Loading…
Reference in New Issue