Fix follow limit preventing re-following of a moved account (#14207)

2020-12-18 09:18:31 +01:00
parent 941ff04b03
commit eb35be0431
8 changed files with 62 additions and 8 deletions
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@ -26,7 +26,7 @@ class FollowRequest < ApplicationRecord
  has_one :notification, as: :activity, dependent: :destroy

  validates :account_id, uniqueness: { scope: :target_account_id }
-  validates_with FollowLimitValidator, on: :create
+  validates_with FollowLimitValidator, on: :create, if: :rate_limit?

  def authorize!
    account.follow!(target_account, reblogs: show_reblogs, notify: notify, uri: uri)