]> cat aescling's git repositories - mastodon.git/commitdiff
In REST API, when URL can be missing, cast it to nil (#5259)
authorEugen Rochko <eugen@zeonfederated.com>
Sat, 7 Oct 2017 16:55:48 +0000 (18:55 +0200)
committerGitHub <noreply@github.com>
Sat, 7 Oct 2017 16:55:48 +0000 (18:55 +0200)
app/serializers/rest/application_serializer.rb
app/serializers/rest/media_attachment_serializer.rb

index a8945f66ea5aaf25f1d13af3e6581ed04907e2bd..a9316cd4b75a748814693b8219a77b5aa895dba3 100644 (file)
@@ -15,4 +15,8 @@ class REST::ApplicationSerializer < ActiveModel::Serializer
   def client_secret
     object.secret
   end
+
+  def website
+    object.website.presence
+  end
 end
index e6e9c8e8228ce2e735117e8cd524f98f2e57701b..51011788bae1a772dcd5919979ea772d255a6ec2 100644 (file)
@@ -19,6 +19,10 @@ class REST::MediaAttachmentSerializer < ActiveModel::Serializer
     end
   end
 
+  def remote_url
+    object.remote_url.presence
+  end
+
   def preview_url
     if object.needs_redownload?
       media_proxy_url(object.id, :small)