Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Coverage for remote follows (#2694)

Browse source 
* Add coverage for create with empty acct value

* Add coverage for create with webfinger failure

* Add coverage for create with webfinger providing bad values

* Add coverage for create when webfinger is good

* Add coverage for session[:remote_follow] having data

* Simplify how remote follow pulls acct from session

* Remote follow behaves more like model

* Move the discovery portions of remote follow out of controller

* Check for suspended accounts
This commit is contained in:
Matt Jankowski 2017-05-01 18:44:23 -04:00 • committed by Eugen Rochko
parent 7bffd16024
commit a4859446ab
3 changed files with 141 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app/controllers/remote_follow_controller.rb
View file

@ -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 session_params
{ acct: session[:remote_follow] }
end
def set_account
@account = Account.find_local!(params[:account_username])
end
def check_account_suspension
head 410 if @account.suspended?
end
end