diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-12 00:57:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-12 00:57:18 +0200 |
| commit | 4931eac28003aed8a35ce6c7c499840c92cc3af5 (patch) | |
| tree | 640fb00abc3bf7ae6a7381a82c0fb3743d6aebb5 /app/serializers/activitypub | |
| parent | 881856553e0c2ba96cbe20ed7bbbbd02b4c60ef4 (diff) | |
Fix nil error for old toots that don't have a conversation (#4900)
Diffstat (limited to 'app/serializers/activitypub')
| -rw-r--r-- | app/serializers/activitypub/note_serializer.rb | 2 |
1 files changed, 2 insertions, 0 deletions
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 |