From 8724094ed0e531f4435bf2784c9c1b7176acd764 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 29 Dec 2016 17:23:27 +0100
Subject: Support remote follow request providing URL instead of acct

---
 app/controllers/authorize_follow_controller.rb | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'app/controllers/authorize_follow_controller.rb')

diff --git a/app/controllers/authorize_follow_controller.rb b/app/controllers/authorize_follow_controller.rb
index a276250a4..ca72c9691 100644
--- a/app/controllers/authorize_follow_controller.rb
+++ b/app/controllers/authorize_follow_controller.rb
@@ -6,7 +6,14 @@ class AuthorizeFollowController < ApplicationController
   before_action :authenticate_user!
 
   def new
-    @account = FollowRemoteAccountService.new.call(params[:acct])
+    uri = Addressable::URI.parse(params[:acct])
+
+    if uri.path && %w(http https).include?(uri.scheme)
+      set_account_from_url
+    else
+      set_account_from_acct
+    end
+
     render :error if @account.nil?
   end
 
@@ -21,4 +28,14 @@ class AuthorizeFollowController < ApplicationController
   rescue ActiveRecord::RecordNotFound, Mastodon::NotPermitted
     render :error
   end
+
+  private
+
+  def set_account_from_url
+    @account = FetchRemoteAccountService.new.call(params[:acct])
+  end
+
+  def set_account_from_acct
+    @account = FollowRemoteAccountService.new.call(params[:acct])
+  end
 end
-- 
cgit