From 2a176514be23398f7e784270ee5a23f814b0fa99 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 14 Jul 2018 04:07:47 +0200 Subject: [PATCH] Display full acct on public status pages, always (#8011) --- app/helpers/stream_entries_helper.rb | 2 +- spec/helpers/stream_entries_helper_spec.rb | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index a91a28935..05cea73d7 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -67,7 +67,7 @@ module StreamEntriesHelper end def acct(account) - if embedded_view? && account.local? + if account.local? "@#{account.acct}@#{Rails.configuration.x.local_domain}" else "@#{account.acct}" diff --git a/spec/helpers/stream_entries_helper_spec.rb b/spec/helpers/stream_entries_helper_spec.rb index 1de6691ba..845b9974e 100644 --- a/spec/helpers/stream_entries_helper_spec.rb +++ b/spec/helpers/stream_entries_helper_spec.rb @@ -58,13 +58,14 @@ RSpec.describe StreamEntriesHelper, type: :helper do expect(acct).to eq '@user@foreign_server.com' 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 account = Account.new(domain: nil, username: 'user') acct = helper.acct(account) - expect(acct).to eq '@user' + expect(acct).to eq '@user@local_domain' end end