Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-04 23:17:11 +00:00
parent fc884d015a d872902997
commit c69a23ae46
29 changed files with 246 additions and 159 deletions
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@ -27,7 +27,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
  end

  def thumbnail
-    full_asset_url(instance_presenter.thumbnail.file.url) if instance_presenter.thumbnail
+    instance_presenter.thumbnail ? full_asset_url(instance_presenter.thumbnail.file.url) : full_pack_url('preview.jpg')
  end

  def max_toot_chars