Clean up generation of account webfinger string (#1477)

* Consolidate webfinger string creation under Account#to_webfinger_s * Introduce Account#local_username_and_domain for consolidation
2017-04-10 16:58:06 -04:00
parent 64dbde0dbf
commit 0687ab8ae3
9 changed files with 39 additions and 7 deletions
--- a/app/controllers/settings/exports_controller.rb
+++ b/app/controllers/settings/exports_controller.rb
@ -39,7 +39,7 @@ class Settings::ExportsController < ApplicationController
  def accounts_list_to_csv(list)
    CSV.generate do |csv|
      list.each do |account|
-        csv << [(account.local? ? "#{account.username}@#{Rails.configuration.x.local_domain}" : account.acct)]
+        csv << [(account.local? ? account.local_username_and_domain : account.acct)]
      end
    end
  end