zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Fix #1339 - better Atom titles (#1343)

This commit is contained in:
Eugen 2017-04-09 20:55:54 +02:00 committed by GitHub
parent 15d442cf9d
commit c172919745
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/atom_serializer.rb
View File

@ -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

2
app/models/status.rb
View File

@ -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?