diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-07 22:28:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:28:15 +0200 |
| commit | 32748c0f718b44bcdb4d19526bc9931c325acb63 (patch) | |
| tree | 3568cd8b5283cc1e0fd994354a002eda04044d45 /app/lib | |
| parent | 37a36b0bec1f27508926a420de05e6aa3c96fd10 (diff) | |
| parent | d4c94fa004117fdb7226b1b846a12d12dc0542d9 (diff) | |
Merge pull request #1184 from thoughtbot/extract-proper-status
DRY up reblog vs original status check
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/atom_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/atom_serializer.rb b/app/lib/atom_serializer.rb index be1cced8b..b9dcee6b3 100644 --- a/app/lib/atom_serializer.rb +++ b/app/lib/atom_serializer.rb @@ -328,7 +328,7 @@ class AtomSerializer def serialize_status_attributes(entry, status) append_element(entry, 'summary', status.spoiler_text) unless status.spoiler_text.blank? - append_element(entry, 'content', Formatter.instance.format(status.reblog? ? status.reblog : status).to_str, type: 'html') + append_element(entry, 'content', Formatter.instance.format(status.proper).to_str, type: 'html') status.mentions.each do |mentioned| append_element(entry, 'link', nil, rel: :mentioned, 'ostatus:object-type': TagManager::TYPES[:person], href: TagManager.instance.uri_for(mentioned.account)) |