logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 4931eac28003aed8a35ce6c7c499840c92cc3af5
parent: 881856553e0c2ba96cbe20ed7bbbbd02b4c60ef4
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue, 12 Sep 2017 00:57:18 +0200

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


Diffstat:

Mapp/serializers/activitypub/note_serializer.rb2++
1 file changed, 2 insertions(+), 0 deletions(-)

diff --git 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