]> cat aescling's git repositories - mastodon.git/commitdiff
Fix nil error for old toots that don't have a conversation (#4900)
authorEugen Rochko <eugen@zeonfederated.com>
Mon, 11 Sep 2017 22:57:18 +0000 (00:57 +0200)
committerGitHub <noreply@github.com>
Mon, 11 Sep 2017 22:57:18 +0000 (00:57 +0200)
app/serializers/activitypub/note_serializer.rb

index d42f5426395bf42bcd31e045cb43a4ab9f8aa954..7d53537b50a5a0619162f44c9ec6741c7b949c18 100644 (file)
@@ -73,6 +73,8 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer
   end
 
   def conversation
+    return if object.conversation.nil?
+
     if object.conversation.uri?
       object.conversation.uri
     else