specter/mastodon
1
0
Fork 0
forked from fedi/mastodon
Code Pull requests Activity

Revert "improve status title (#8596)" (#13591)

Browse source 
This reverts commit 05756c9a14.
This commit is contained in:
Yamagishi Kazutoshi 2020-05-04 01:48:13 +09:00 committed by GitHub
parent 988b0493fe
commit e223fd8c61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/status.rb
View file

@ -200,12 +200,8 @@ class Status < ApplicationRecord
def title def title
if destroyed? if destroyed?
"#{account.acct} deleted status" "#{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 else
preview = sensitive ? '<sensitive>' : text.slice(0, 20).split("\n")[0] reblog? ? "#{account.acct} shared a status by #{reblog.account.acct}" : "New status by #{account.acct}"
"#{account.acct}: #{preview}"
end end
end end

12
spec/models/status_spec.rb
View file

@ -96,20 +96,16 @@ RSpec.describe Status, type: :model do
context 'unless destroyed?' do context 'unless destroyed?' do
context 'if reblog?' do context 'if reblog?' do
it 'returns "#{account.acct} shared #{reblog.account.acct}\'s: #{preview}"' do it 'returns "#{account.acct} shared a status by #{reblog.account.acct}"' do
reblog = subject.reblog = other reblog = subject.reblog = other
preview = subject.text.slice(0, 10).split("\n")[0] expect(subject.title).to eq "#{account.acct} shared a status by #{reblog.account.acct}"
expect(subject.title).to(
eq "#{account.acct} shared #{reblog.account.acct}'s: #{preview}"
)
end end
end end
context 'unless reblog?' do context 'unless reblog?' do
it 'returns "#{account.acct}: #{preview}"' do it 'returns "New status by #{account.acct}"' do
subject.reblog = nil subject.reblog = nil
preview = subject.text.slice(0, 20).split("\n")[0] expect(subject.title).to eq "New status by #{account.acct}"
expect(subject.title).to eq "#{account.acct}: #{preview}"
end end
end end
end end