Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Export and import show_reblogs together with following list (#10495)

Browse source 
* Refactor imports

* Export show_reblogs when exporting list of followed users

* Add support for importing show_reblogs with following collection

* Fix tests
This commit is contained in:
ThibG 2019-04-08 07:28:27 +02:00 • committed by Eugen Rochko
parent 619bbc23ef
commit cb71c95e22
7 changed files with 112 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/services/import_service.rb
View file

@ -25,7 +25,7 @@ class ImportService < BaseService
def import_follows!
parse_import_data!(['Account address'])
import_relationships!('follow', 'unfollow', @account.following, follow_limit)
import_relationships!('follow', 'unfollow', @account.following, follow_limit, reblogs: 'Show boosts')
end
def import_blocks!
@ -35,7 +35,7 @@ class ImportService < BaseService
def import_mutes!
parse_import_data!(['Account address'])
import_relationships!('mute', 'unmute', @account.muting, ROWS_PROCESSING_LIMIT)
import_relationships!('mute', 'unmute', @account.muting, ROWS_PROCESSING_LIMIT, notifications: 'Hide notifications')
end
def import_domain_blocks!
@ -63,8 +63,8 @@ class ImportService < BaseService
end
end
def import_relationships!(action, undo_action, overwrite_scope, limit)
items = @data.take(limit).map { |row| [row['Account address']&.strip, row['Hide notifications']&.strip] }.reject { |(id, _)| id.blank? }
def import_relationships!(action, undo_action, overwrite_scope, limit, extra_fields = {})
items = @data.take(limit).map { |row| [row['Account address']&.strip, Hash[extra_fields.map { |key, header| [key, row[header]&.strip] }]] }.reject { |(id, _)| id.blank? }
if @import.overwrite?
presence_hash = items.each_with_object({}) { |(id, extra), mapping| mapping[id] = [true, extra] }
@ -73,7 +73,7 @@ class ImportService < BaseService
if presence_hash[target_account.acct]
items.delete(target_account.acct)
extra = presence_hash[target_account.acct][1]
Import::RelationshipWorker.perform_async(@account.id, target_account.acct, action, ActiveModel::Type::Boolean.new.cast(extra))
Import::RelationshipWorker.perform_async(@account.id, target_account.acct, action, extra)
else
Import::RelationshipWorker.perform_async(@account.id, target_account.acct, undo_action)
end
@ -81,7 +81,7 @@ class ImportService < BaseService
end
Import::RelationshipWorker.push_bulk(items) do |acct, extra|
[@account.id, acct, action, ActiveModel::Type::Boolean.new.cast(extra)]
[@account.id, acct, action, extra]
end
end