diff options
| author | ThibG <thib@sitedethib.com> | 2020-07-01 00:18:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 00:18:49 +0200 |
| commit | 814d3f343f8caae3366410900eec0b90b9bbbb7b (patch) | |
| tree | 5d0b779a144afd2bff33503804cd5dcc58012ff6 /app/serializers/rest/media_attachment_serializer.rb | |
| parent | 10ede3eb27c5de5d4e3a283e333af2a54da6177d (diff) | |
| parent | 3d7ce178dd7be9ef02d34bf6734365d0aefa3120 (diff) | |
Merge pull request #1366 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers/rest/media_attachment_serializer.rb')
| -rw-r--r-- | app/serializers/rest/media_attachment_serializer.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/serializers/rest/media_attachment_serializer.rb b/app/serializers/rest/media_attachment_serializer.rb index cc10e3001..e65f7acf1 100644 --- a/app/serializers/rest/media_attachment_serializer.rb +++ b/app/serializers/rest/media_attachment_serializer.rb @@ -28,7 +28,9 @@ class REST::MediaAttachmentSerializer < ActiveModel::Serializer def preview_url if object.needs_redownload? media_proxy_url(object.id, :small) - else + elsif object.thumbnail.present? + full_asset_url(object.thumbnail.url(:original)) + elsif object.file.styles.key?(:small) full_asset_url(object.file.url(:small)) end end |