Skip to content

Commit 05756c9

Browse files
devkralykzts
andcommitted
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>
1 parent 206dfd7 commit 05756c9

2 files changed

Lines changed: 13 additions & 5 deletions

File tree

app/models/status.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,12 @@ def preview_card
194194
def title
195195
if destroyed?
196196
"#{account.acct} deleted status"
197+
elsif reblog?
198+
preview = sensitive ? '<sensitive>' : text.slice(0, 10).split("\n")[0]
199+
"#{account.acct} shared #{reblog.account.acct}'s: #{preview}"
197200
else
198-
reblog? ? "#{account.acct} shared a status by #{reblog.account.acct}" : "New status by #{account.acct}"
201+
preview = sensitive ? '<sensitive>' : text.slice(0, 20).split("\n")[0]
202+
"#{account.acct}: #{preview}"
199203
end
200204
end
201205

spec/models/status_spec.rb

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,20 @@
9696

9797
context 'unless destroyed?' do
9898
context 'if reblog?' do
99-
it 'returns "#{account.acct} shared a status by #{reblog.account.acct}"' do
99+
it 'returns "#{account.acct} shared #{reblog.account.acct}\'s: #{preview}"' do
100100
reblog = subject.reblog = other
101-
expect(subject.title).to eq "#{account.acct} shared a status by #{reblog.account.acct}"
101+
preview = subject.text.slice(0, 10).split("\n")[0]
102+
expect(subject.title).to(
103+
eq "#{account.acct} shared #{reblog.account.acct}'s: #{preview}"
104+
)
102105
end
103106
end
104107

105108
context 'unless reblog?' do
106-
it 'returns "New status by #{account.acct}"' do
109+
it 'returns "#{account.acct}: #{preview}"' do
107110
subject.reblog = nil
108-
expect(subject.title).to eq "New status by #{account.acct}"
111+
preview = subject.text.slice(0, 20).split("\n")[0]
112+
expect(subject.title).to eq "#{account.acct}: #{preview}"
109113
end
110114
end
111115
end

0 commit comments

Comments
 (0)