From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 11 Sep 2017 22:57:18 +0000 (+0200)
Subject: Fix nil error for old toots that don't have a conversation (#4900)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=4931eac28003aed8a35ce6c7c499840c92cc3af5;p=mastodon.git

Fix nil error for old toots that don't have a conversation (#4900)
---

diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index d42f54263..7d53537b5 100644
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -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