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

This reverts commit 05756c9.
julienw · May 3, 2020 · e223fd8 · e223fd8
1 parent 988b049
commit e223fd8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/app/models/status.rb b/app/models/status.rb
@@ -200,12 +200,8 @@ def preview_card
  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
- preview = sensitive ? '<sensitive>' : text.slice(0, 20).split("\n")[0]
- "#{account.acct}: #{preview}"
+ reblog? ? "#{account.acct} shared a status by #{reblog.account.acct}" : "New status by #{account.acct}"
  end
  end
 

diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb
@@ -96,20 +96,16 @@
 
  context 'unless destroyed?' 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
- preview = subject.text.slice(0, 10).split("\n")[0]
- expect(subject.title).to(
- eq "#{account.acct} shared #{reblog.account.acct}'s: #{preview}"
- )
+ expect(subject.title).to eq "#{account.acct} shared a status by #{reblog.account.acct}"
  end
  end
 
  context 'unless reblog?' do
- it 'returns "#{account.acct}: #{preview}"' do
+ it 'returns "New status by #{account.acct}"' do
  subject.reblog = nil
- preview = subject.text.slice(0, 20).split("\n")[0]
- expect(subject.title).to eq "#{account.acct}: #{preview}"
+ expect(subject.title).to eq "New status by #{account.acct}"
  end
  end
  end