Support remote follow request providing URL instead of acct

diff --git a/app/assets/stylesheets/accounts.scss b/app/assets/stylesheets/accounts.scss
index 5d0963307a8ca4f548d9f41110523051b2d83fd1..748bb82241a155fb15ed1ee2659e7f658c51e4d0 100644 (file)
--- a/app/assets/stylesheets/accounts.scss
+++ b/app/assets/stylesheets/accounts.scss
@@ -337,6 +337,10 @@
     overflow: hidden;
     margin-bottom: 15px;
 
+    &:last-child {
+      margin-bottom: 0;
+    }
+
     & > div {
       float: left;
       margin-right: 10px;

diff --git a/app/controllers/authorize_follow_controller.rb b/app/controllers/authorize_follow_controller.rb
index a276250a47e13864a09e77b451ac8c61ceb96e68..ca72c9691e95aab16dffd0747ceba9c88950be6b 100644 (file)
--- 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

diff --git a/app/views/authorize_follow/new.html.haml b/app/views/authorize_follow/new.html.haml
index 7368b834a298d9ea636094a3aa29908eade80210..44bf575ff4684679ebf6859df968198cdb3c68eb 100644 (file)
--- a/app/views/authorize_follow/new.html.haml
+++ b/app/views/authorize_follow/new.html.haml
@@ -14,7 +14,8 @@
           %strong= display_name(@account)
           %span= "@#{@account.acct}"
 
-      .account__header__content= Formatter.instance.simplified_format(@account)
+      - unless @account.note.blank?
+        .account__header__content= Formatter.instance.simplified_format(@account)
 
   = form_tag authorize_follow_path, method: :post, class: 'simple_form' do
     = hidden_field_tag :acct, @account.acct