diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2020-12-18 09:18:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-18 09:18:31 +0100 |
| commit | eb35be0431b2cdd2bbf3339beb9c5a0839e1088b (patch) | |
| tree | 6e95bf9c68f7ce9b18c4a5ae404b484ef670655c /app/models | |
| parent | 941ff04b03a8a3e3f03e95c108f0cfa621226fb1 (diff) | |
Fix follow limit preventing re-following of a moved account (#14207)
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/follow.rb | 2 | ||||
| -rw-r--r-- | app/models/follow_request.rb | 2 | ||||
| -rw-r--r-- | app/models/import.rb | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/app/models/follow.rb b/app/models/follow.rb index 55a9da7928b..69a1722b303 100644 --- a/app/models/follow.rb +++ b/app/models/follow.rb @@ -26,7 +26,7 @@ class Follow < 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? scope :recent, -> { reorder(id: :desc) } diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb index c1f19149b1f..2d2a77b59c6 100644 --- 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) diff --git a/app/models/import.rb b/app/models/import.rb index 70245328959..00a54892ef2 100644 --- a/app/models/import.rb +++ b/app/models/import.rb @@ -27,6 +27,7 @@ class Import < ApplicationRecord enum type: [:following, :blocking, :muting, :domain_blocking, :bookmarks] validates :type, presence: true + validates_with ImportValidator, on: :create has_attached_file :data validates_attachment_content_type :data, content_type: FILE_TYPES |