2 files changed, 46 insertions, 23 deletions
diff --git a/app/controllers/remote_follow_controller.rb b/app/controllers/remote_follow_controller.rb
index 22e376836..625ce1488 100644
--- a/app/controllers/remote_follow_controller.rb
+++ b/app/controllers/remote_follow_controller.rb
@@ -4,34 +4,21 @@ class RemoteFollowController < ApplicationController
   layout 'public'
 
   before_action :set_account
-  before_action :check_account_suspension
+  before_action :gone, if: -> { @account.suspended? }
 
   def new
-    @remote_follow = RemoteFollow.new
-    @remote_follow.acct = session[:remote_follow] if session.key?(:remote_follow)
+    @remote_follow = RemoteFollow.new(session_params)
   end
 
   def create
     @remote_follow = RemoteFollow.new(resource_params)
 
     if @remote_follow.valid?
-      resource          = Goldfinger.finger("acct:#{@remote_follow.acct}")
-      redirect_url_link = resource&.link('http://ostatus.org/schema/1.0/subscribe')
-
-      if redirect_url_link.nil? || redirect_url_link.template.nil?
-        @remote_follow.errors.add(:acct, I18n.t('remote_follow.missing_resource'))
-        render(:new) && return
-      end
-
       session[:remote_follow] = @remote_follow.acct
-
-      redirect_to Addressable::Template.new(redirect_url_link.template).expand(uri: @account.to_webfinger_s).to_s
+      redirect_to @remote_follow.subscribe_address_for(@account)
     else
       render :new
     end
-  rescue Goldfinger::Error
-    @remote_follow.errors.add(:acct, I18n.t('remote_follow.missing_resource'))
-    render :new
   end
 
   private
@@ -40,11 +27,11 @@ class RemoteFollowController < ApplicationController
     params.require(:remote_follow).permit(:acct)
   end
 
-  def set_account
-    @account = Account.find_local!(params[:account_username])
+  def session_params
+    { acct: session[:remote_follow] }
   end
 
-  def check_account_suspension
-    head 410 if @account.suspended?
+  def set_account
+    @account = Account.find_local!(params[:account_username])
   end
 end
diff --git a/app/models/remote_follow.rb b/app/models/remote_follow.rb
index 6c291e22c..c226cdb14 100644
--- a/app/models/remote_follow.rb
+++ b/app/models/remote_follow.rb
@@ -3,11 +3,47 @@
 class RemoteFollow
   include ActiveModel::Validations
 
-  attr_accessor :acct
-
-  validates :acct, presence: true
+  attr_accessor :acct, :addressable_template
 
   def initialize(attrs = {})
     @acct = attrs[:acct].strip unless attrs[:acct].nil?
   end
+
+  def valid?
+    populate_template
+    errors.empty?
+  end
+
+  def subscribe_address_for(account)
+    addressable_template.expand(uri: account.to_webfinger_s).to_s
+  end
+
+  private
+
+  def populate_template
+    if acct.blank? || redirect_url_link.nil? || redirect_url_link.template.nil?
+      missing_resource_error
+    else
+      @addressable_template = Addressable::Template.new(redirect_uri_template)
+    end
+  end
+
+  def redirect_uri_template
+    redirect_url_link.template
+  end
+
+  def redirect_url_link
+    acct_resource&.link('http://ostatus.org/schema/1.0/subscribe')
+  end
+
+  def acct_resource
+    @_acct_resource ||= Goldfinger.finger("acct:#{acct}")
+  rescue Goldfinger::Error
+    missing_resource_error
+    nil
+  end
+
+  def missing_resource_error
+    errors.add(:acct, I18n.t('remote_follow.missing_resource'))
+  end
 end