Unfloyded/Legamunt
0
0
Fork 0
Code Activity

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

7
app/services/import_service.rb
View file

@ -27,7 +27,7 @@ class ImportService < BaseService
def import_follows!
parse_import_data!(['Account address'])
import_relationships!('follow', 'unfollow', @account.following, follow_limit, reblogs: { header: 'Show boosts', default: true })
import_relationships!('follow', 'unfollow', @account.following, ROWS_PROCESSING_LIMIT, reblogs: { header: 'Show boosts', default: true })
end
def import_blocks!
@ -85,6 +85,7 @@ class ImportService < BaseService
head_items = items.uniq { |acct, _| acct.split('@')[1] }
tail_items = items - head_items
Import::RelationshipWorker.push_bulk(head_items + tail_items) do |acct, extra|
[@account.id, acct, action, extra]
end
@ -133,10 +134,6 @@ class ImportService < BaseService
Paperclip.io_adapters.for(@import.data).read
end
def follow_limit
FollowLimitValidator.limit_for_account(@account)
end
def relations_map_for_account(account, account_ids)
{
blocking: {},