Fix misleading error when attempting to re-send a pending follow request (#13133)

Fixes #13131

diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index dc47804c05bc4b1e6dd385356aa8d43ad807a8ed..4d19002c40ed9a1f7b14cd113bddcf63449c7c03 100644 (file)
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -18,14 +18,13 @@ class FollowService < BaseService
     if source_account.following?(target_account)
       # We're already following this account, but we'll call follow! again to
       # make sure the reblogs status is set correctly.
-      source_account.follow!(target_account, reblogs: reblogs)
-      return
+      return source_account.follow!(target_account, reblogs: reblogs)
     elsif source_account.requested?(target_account)
       # This isn't managed by a method in AccountInteractions, so we modify it
       # ourselves if necessary.
       req = source_account.follow_requests.find_by(target_account: target_account)
       req.update!(show_reblogs: reblogs)
-      return
+      return req
     end
 
     ActivityTracker.increment('activity:interactions')

diff --git a/app/views/authorize_interactions/show.html.haml b/app/views/authorize_interactions/show.html.haml
index 7ca9b98c1b8cc2a65bd622b0d35a2fb29260eabc..42c874134de933e5ec7eff48dc52ac741cebe2d0 100644 (file)
--- a/app/views/authorize_interactions/show.html.haml
+++ b/app/views/authorize_interactions/show.html.haml
@@ -10,6 +10,12 @@
       %strong
         = t('authorize_follow.already_following')
 
+    = render 'post_follow_actions'
+  - elsif current_account.requested?(@resource)
+    .flash-message
+      %strong
+        = t('authorize_follow.already_requested')
+
     = render 'post_follow_actions'
   - else
     = form_tag authorize_interaction_path, method: :post, class: 'simple_form' do

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 027b73d9df908c1d9b44b28d549d1e4c7f101c3e..1d258010178871bcb216f8bd6056174293becbe7 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -661,6 +661,7 @@ en:
     trouble_logging_in: Trouble logging in?
   authorize_follow:
     already_following: You are already following this account
+    already_requested: You have already sent a follow request to that account
     error: Unfortunately, there was an error looking up the remote account
     follow: Follow
     follow_request: 'You have sent a follow request to:'