Make sure nil IDs to not get cast to empty string in REST API (#5068)

2017-09-24 04:09:32 +02:00 · 2017-09-24 04:09:32 +02:00 · adc38078dd
commit adc38078dd
parent dae0af1fd2
2 changed files with 3 additions and 3 deletions
--- a/app/serializers/rest/application_serializer.rb
+++ b/app/serializers/rest/application_serializer.rb
@ -9,7 +9,7 @@ class REST::ApplicationSerializer < ActiveModel::Serializer
  end

  def client_id
-    object.uid.to_s
+    object.uid
  end

  def client_secret
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@ -24,11 +24,11 @@ class REST::StatusSerializer < ActiveModel::Serializer
  end

  def in_reply_to_id
-    object.in_reply_to_id.to_s
+    object.in_reply_to_id&.to_s
  end

  def in_reply_to_account_id
-    object.in_reply_to_account_id.to_s
+    object.in_reply_to_account_id&.to_s
  end

  def current_user?