Fix #1339 - better Atom titles (#1343)

8 years ago · c172919745
parent 15d442cf9d
commit c172919745
2 changed files with 2 additions and 2 deletions
--- 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

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