From cf4fe6caefc45e18c82d619933a9b5f662503aa4 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Mon, 24 Feb 2020 21:19:19 +0100
Subject: [PATCH] Fix misleading error when attempting to re-send a pending
follow request (#13133)
Fixes #13131
---
app/services/follow_service.rb | 5 ++---
app/views/authorize_interactions/show.html.haml | 6 ++++++
config/locales/en.yml | 1 +
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index dc47804c0..4d19002c4 100644
--- 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 7ca9b98c1..42c874134 100644
--- 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 027b73d9d..1d2580101 100644
--- 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:'