diff options
| author | Ben Lubar <ben.lubar+github@gmail.com> | 2019-02-13 18:04:43 -0600 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-02-14 01:04:43 +0100 |
| commit | 309043b158f5a4187b6f603f346ed17ee6ddb190 (patch) | |
| tree | 6c2f826f0095e020dc9ff5e4364e51b3327c90bf /app/chewy | |
| parent | 80161f43510ad9316c60c9b50dd5c09c2dae4d54 (diff) | |
Improve image description user experience (#10036)
* Add image descriptions to searchable post content. * Allow multi-line image descriptions. * Request image descriptions in the same query as posts when creating the search index. (see https://github.com/tootsuite/mastodon/pull/10036#discussion_r256551624)
Diffstat (limited to 'app/chewy')
| -rw-r--r-- | app/chewy/statuses_index.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/chewy/statuses_index.rb b/app/chewy/statuses_index.rb index d3104172c..eafc1818b 100644 --- a/app/chewy/statuses_index.rb +++ b/app/chewy/statuses_index.rb @@ -31,7 +31,7 @@ class StatusesIndex < Chewy::Index }, } - define_type ::Status.unscoped.without_reblogs do + define_type ::Status.unscoped.without_reblogs.includes(:media_attachments) do crutch :mentions do |collection| data = ::Mention.where(status_id: collection.map(&:id)).pluck(:status_id, :account_id) data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) } @@ -50,7 +50,7 @@ class StatusesIndex < Chewy::Index root date_detection: false do field :account_id, type: 'long' - field :text, type: 'text', value: ->(status) { [status.spoiler_text, Formatter.instance.plaintext(status)].join("\n\n") } do + field :text, type: 'text', value: ->(status) { [status.spoiler_text, Formatter.instance.plaintext(status)].concat(status.media_attachments.map(&:description)).join("\n\n") } do field :stemmed, type: 'text', analyzer: 'content' end |