Merge branch 'main' into glitch-soc/merge-upstream

2021-09-14 13:50:30 +02:00
parent 7aa4d481db 121c7a7847
commit f1e6884d6b
13 changed files with 376 additions and 388 deletions
--- a/app/serializers/rest/media_attachment_serializer.rb
+++ b/app/serializers/rest/media_attachment_serializer.rb
@ -40,7 +40,7 @@ class REST::MediaAttachmentSerializer < ActiveModel::Serializer
  end

  def text_url
-    object.local? ? medium_url(object) : nil
+    object.local? && object.shortcode.present? ? medium_url(object) : nil
  end

  def meta