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/remote_follow_controller.rb
+++ b/app/controllers/remote_follow_controller.rb
@ -25,7 +25,7 @@ class RemoteFollowController < ApplicationController

      session[:remote_follow] = @remote_follow.acct

-      redirect_to Addressable::Template.new(redirect_url_link.template).expand(uri: "#{@account.username}@#{Rails.configuration.x.local_domain}").to_s
+      redirect_to Addressable::Template.new(redirect_url_link.template).expand(uri: @account.to_webfinger_s).to_s
    else
      render :new
    end