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/services/import_service.rb | |
| parent | 941ff04b03a8a3e3f03e95c108f0cfa621226fb1 (diff) | |
Fix follow limit preventing re-following of a moved account (#14207)
Diffstat (limited to 'app/services/import_service.rb')
| -rw-r--r-- | app/services/import_service.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/services/import_service.rb b/app/services/import_service.rb index 288e47f1e..0c6ef2238 100644 --- a/app/services/import_service.rb +++ b/app/services/import_service.rb @@ -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: {}, |