diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-11 15:28:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-11 15:28:06 +0200 |
| commit | d787bcdeb1570e4d8d67f326dadaf321a6854e06 (patch) | |
| tree | fa23a187b16bf07635312a7791013aacfc2c4474 /app/lib/ostatus | |
| parent | 03afc365d530e6d57754ae9dbbdbd0c56431ee02 (diff) | |
| parent | 7067b64de33f9cd491e97329df266fde5fb49e42 (diff) | |
Merge pull request #630 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/ostatus')
| -rw-r--r-- | app/lib/ostatus/atom_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/ostatus/atom_serializer.rb b/app/lib/ostatus/atom_serializer.rb index 5c6ff4f9b..1a0a635b3 100644 --- a/app/lib/ostatus/atom_serializer.rb +++ b/app/lib/ostatus/atom_serializer.rb @@ -352,7 +352,7 @@ class OStatus::AtomSerializer append_element(entry, 'link', nil, rel: :alternate, type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(status)) if status.account.local? append_element(entry, 'summary', status.spoiler_text, 'xml:lang': status.language) if status.spoiler_text? - append_element(entry, 'content', Formatter.instance.format(status).to_str, type: 'html', 'xml:lang': status.language) + append_element(entry, 'content', Formatter.instance.format(status).to_str || '.', type: 'html', 'xml:lang': status.language) status.mentions.sort_by(&:id).each do |mentioned| append_element(entry, 'link', nil, rel: :mentioned, 'ostatus:object-type': OStatus::TagManager::TYPES[:person], href: OStatus::TagManager.instance.uri_for(mentioned.account)) |