about summary refs log tree commit diff
path: root/app/models/status.rb
diff options
context:
space:
mode:
authorAlexander <devkral@web.de>2020-01-10 22:58:16 +0100
committerYamagishi Kazutoshi <ykzts@desire.sh>2020-01-11 06:58:16 +0900
commit05756c9a14864655ae6777505a4ee5cfa9b0ee93 (patch)
tree72d3961d949f379244c0cfa006719e5321dc6ed8 /app/models/status.rb
parent206dfd7daddb888a8115804f2c88794b4230592a (diff)
improve status title (#8596)
* improve shown status title, useful for atom/rss

* use single quotes to satisfy codeclimate

* fix tests, make message more pretty

* fix tests

* fix codestyle

* fix codestyle

* remove atom_serializer_spec

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Diffstat (limited to 'app/models/status.rb')
-rw-r--r--app/models/status.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index 1cb381400..670109762 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -194,8 +194,12 @@ class Status < ApplicationRecord
   def title
     if destroyed?
       "#{account.acct} deleted status"
+    elsif reblog?
+      preview = sensitive ? '<sensitive>' : text.slice(0, 10).split("\n")[0]
+      "#{account.acct} shared #{reblog.account.acct}'s: #{preview}"
     else
-      reblog? ? "#{account.acct} shared a status by #{reblog.account.acct}" : "New status by #{account.acct}"
+      preview = sensitive ? '<sensitive>' : text.slice(0, 20).split("\n")[0]
+      "#{account.acct}: #{preview}"
     end
   end