summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-04-23 22:51:21 +0200
committerGitHub <noreply@github.com>2021-04-23 22:51:21 +0200
commita6564d56d6af0467eb8cfa96444b4503f437e0a6 (patch)
tree72c47386ec1dc5b1a823acd2db574dbe687bceac /app
parent23601914345d201b8f06ceea637c70e0a23674db (diff)
Fix edge case where accepted follow cannot be processed because of follow limit (#16098)
Diffstat (limited to 'app')
-rw-r--r--app/models/follow_request.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
index 59fefcdf64e..0b6f7629af9 100644
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@ -29,7 +29,7 @@ class FollowRequest < ApplicationRecord
validates :account_id, uniqueness: { scope: :target_account_id }
def authorize!
- account.follow!(target_account, reblogs: show_reblogs, notify: notify, uri: uri)
+ account.follow!(target_account, reblogs: show_reblogs, notify: notify, uri: uri, bypass_limit: true)
MergeWorker.perform_async(target_account.id, account.id) if account.local?
destroy!
end