diff options
| author | Starfall <us@starfall.systems> | 2020-07-07 10:08:13 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-07-07 10:10:33 -0500 |
| commit | 147b4e7713cf5555fc4b515c7d88da49bf597f46 (patch) | |
| tree | 67e33c2838eea691088e77ec4e19afb23104e77d /app/serializers | |
| parent | cfd52a032aa4ee545d479b65a295e6a9e77c4f4f (diff) | |
| parent | c4e1b82caf5c932a3c19bc77726c9e3ab3d2c46a (diff) | |
Mastodon 3.1.5 / Merge branch 'glitch' into main
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/rest/relationship_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/rest/relationship_serializer.rb b/app/serializers/rest/relationship_serializer.rb index e295fb847..c2f3c9a11 100644 --- a/app/serializers/rest/relationship_serializer.rb +++ b/app/serializers/rest/relationship_serializer.rb @@ -52,6 +52,6 @@ class REST::RelationshipSerializer < ActiveModel::Serializer end def note - (instance_options[:relationships].account_note[object.id] || {})[:comment] + (instance_options[:relationships].account_note[object.id] || {})[:comment] || '' end end |