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/xrd_controller.rb
+++ b/app/controllers/xrd_controller.rb
@@ -14,7 +14,7 @@ class XrdController < ApplicationController

  def webfinger
    @account = Account.find_local!(username_from_resource)
-    @canonical_account_uri = "acct:#{@account.username}@#{Rails.configuration.x.local_domain}"
+    @canonical_account_uri = @account.to_webfinger_s
    @magic_key = pem_to_magic_key(@account.keypair.public_key)

    respond_to do |format|