diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-09 20:55:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-09 20:55:54 +0200 |
| commit | c1729197458588a25e8f884db22360780e43d5c7 (patch) | |
| tree | d880b8003f6c8c76e3c452cde4cabcfb38742ba4 | |
| parent | 15d442cf9dcd0ba5958be54c285dfeb32276190e (diff) | |
Fix #1339 - better Atom titles (#1343)
| -rw-r--r-- | app/lib/atom_serializer.rb | 2 | ||||
| -rw-r--r-- | app/models/status.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/atom_serializer.rb b/app/lib/atom_serializer.rb index b9dcee6b3..845d38c92 100644 --- a/app/lib/atom_serializer.rb +++ b/app/lib/atom_serializer.rb @@ -67,7 +67,7 @@ class AtomSerializer append_element(entry, 'id', TagManager.instance.unique_tag(stream_entry.created_at, stream_entry.activity_id, stream_entry.activity_type)) append_element(entry, 'published', stream_entry.created_at.iso8601) append_element(entry, 'updated', stream_entry.updated_at.iso8601) - append_element(entry, 'title', stream_entry&.status&.title) + append_element(entry, 'title', stream_entry&.status&.title || 'Delete') entry << author(stream_entry.account) if root diff --git a/app/models/status.rb b/app/models/status.rb index 7e3dd3e28..16cd4383f 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -75,7 +75,7 @@ class Status < ApplicationRecord end def title - content + reblog? ? "#{account.acct} shared a status by #{reblog.account.acct}" : "New status by #{account.acct}" end def hidden? |