From a4859446abea166ae55806169425646c1bd42f85 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Mon, 1 May 2017 18:44:23 -0400 Subject: Coverage for remote follows (#2694) * 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 --- app/models/remote_follow.rb | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) (limited to 'app/models/remote_follow.rb') 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 -- cgit