diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:47:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:47:42 -0400 |
| commit | d6827e38a6cc7f4639991384f097f37254de15be (patch) | |
| tree | de5e1e93826fe049e0690e3ccb4ccdb3c1d20152 /app/lib | |
| parent | 0c4e9fdda051d0322608c9abdaa158529c8feacd (diff) | |
| parent | 29ed4484458fc62b423eeaef772ca0d67b27c4e4 (diff) | |
Merge branch 'master' into patch-4
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/atom_serializer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/atom_serializer.rb b/app/lib/atom_serializer.rb index 4ce0f4513..b9dcee6b3 100644 --- a/app/lib/atom_serializer.rb +++ b/app/lib/atom_serializer.rb @@ -101,7 +101,7 @@ class AtomSerializer serialize_status_attributes(object, status) append_element(object, 'link', nil, rel: :alternate, type: 'text/html', href: TagManager.instance.url_for(status)) - append_element(object, 'thr:in-reply-to', nil, ref: TagManager.instance.uri_for(status.thread), href: TagManager.instance.url_for(status.thread)) if status.reply? + append_element(object, 'thr:in-reply-to', nil, ref: TagManager.instance.uri_for(status.thread), href: TagManager.instance.url_for(status.thread)) if status.reply? && !status.thread.nil? object end @@ -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)) |