gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Eugen Rochko 2020-12-18 09:18:31 +01:00 • committed by GitHub
parent 941ff04b03
commit eb35be0431
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 62 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/follow.rb
View file

@ -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) }

2
app/models/follow_request.rb
View file

@ -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)

1
app/models/import.rb
View file

@ -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