Browse Source

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

This reverts commit 05756c9a14.
master^2
Yamagishi Kazutoshi GitHub 11 months ago
parent
commit
e223fd8c61
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 13 deletions
  1. +1
    -5
      app/models/status.rb
  2. +4
    -8
      spec/models/status_spec.rb

+ 1
- 5
app/models/status.rb View File

@@ -200,12 +200,8 @@ 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
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



+ 4
- 8
spec/models/status_spec.rb View File

@@ -96,20 +96,16 @@ RSpec.describe Status, type: :model do

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


Loading…
Cancel
Save