tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

Display full acct on public status pages, always (#8011)

Browse Source
This commit is contained in:
Eugen Rochko 2018-07-14 04:07:47 +02:00 committed by GitHub
parent 38e9662d78
commit 2a176514be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/stream_entries_helper.rb
View File

@ -67,7 +67,7 @@ module StreamEntriesHelper
end end
def acct(account) def acct(account)
if embedded_view? && account.local? if account.local?
"@#{account.acct}@#{Rails.configuration.x.local_domain}" "@#{account.acct}@#{Rails.configuration.x.local_domain}"
else else
"@#{account.acct}" "@#{account.acct}"

5
spec/helpers/stream_entries_helper_spec.rb
View File

@ -58,13 +58,14 @@ RSpec.describe StreamEntriesHelper, type: :helper do
expect(acct).to eq '@user@foreign_server.com' expect(acct).to eq '@user@foreign_server.com'
end end
it 'is the shortname for non embedded local accounts' do it 'is fully qualified for non embedded local accounts' do
allow(Rails.configuration.x).to receive(:local_domain).and_return('local_domain')
set_not_embedded_view set_not_embedded_view
account = Account.new(domain: nil, username: 'user') account = Account.new(domain: nil, username: 'user')
acct = helper.acct(account) acct = helper.acct(account)
expect(acct).to eq '@user' expect(acct).to eq '@user@local_domain'
end end
end end