about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-03-03 20:36:18 +0100
committerGitHub <noreply@github.com>2023-03-03 20:36:18 +0100
commitf8bb4d0d6b1050de481187e9f034b8bbb649d931 (patch)
tree7723b62879fc13fe2f7e0e95d2afd84e0305ac92 /app/controllers
parentb55fc883b6181fb8080fbafd53bc7a9f1896b295 (diff)
Fix server error when failing to follow back followers from `/relationships` (#23787)
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/relationships_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/relationships_controller.rb b/app/controllers/relationships_controller.rb
index baa34da22..de5dc5879 100644
--- a/app/controllers/relationships_controller.rb
+++ b/app/controllers/relationships_controller.rb
@@ -19,6 +19,8 @@ class RelationshipsController < ApplicationController
     @form.save
   rescue ActionController::ParameterMissing
     # Do nothing
+  rescue Mastodon::NotPermittedError, ActiveRecord::RecordNotFound
+    flash[:alert] = I18n.t('relationships.follow_failure') if action_from_button == 'follow'
   ensure
     redirect_to relationships_path(filter_params)
   end