|
|
@ -48,14 +48,14 @@ class ActivityPub::ProcessAccountService < BaseService |
|
|
|
@account.url = url || @uri |
|
|
|
@account.url = url || @uri |
|
|
|
@account.display_name = @json['name'] || '' |
|
|
|
@account.display_name = @json['name'] || '' |
|
|
|
@account.note = @json['summary'] || '' |
|
|
|
@account.note = @json['summary'] || '' |
|
|
|
@account.avatar_remote_url = image_url('icon') |
|
|
|
@account.avatar_remote_url = image_url('icon') unless skip_download? |
|
|
|
@account.header_remote_url = image_url('image') |
|
|
|
@account.header_remote_url = image_url('image') unless skip_download? |
|
|
|
@account.public_key = public_key || '' |
|
|
|
@account.public_key = public_key || '' |
|
|
|
@account.locked = @json['manuallyApprovesFollowers'] || false |
|
|
|
@account.locked = @json['manuallyApprovesFollowers'] || false |
|
|
|
@account.statuses_count = outbox_total_items if outbox_total_items.present? |
|
|
|
@account.statuses_count = outbox_total_items if outbox_total_items.present? |
|
|
|
@account.following_count = following_total_items if following_total_items.present? |
|
|
|
@account.following_count = following_total_items if following_total_items.present? |
|
|
|
@account.followers_count = followers_total_items if followers_total_items.present? |
|
|
|
@account.followers_count = followers_total_items if followers_total_items.present? |
|
|
|
@account.save! |
|
|
|
@account.save_with_optional_media! |
|
|
|
end |
|
|
|
end |
|
|
|
|
|
|
|
|
|
|
|
def upgrade_account |
|
|
|
def upgrade_account |
|
|
@ -115,6 +115,10 @@ class ActivityPub::ProcessAccountService < BaseService |
|
|
|
@collections[type] = nil |
|
|
|
@collections[type] = nil |
|
|
|
end |
|
|
|
end |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def skip_download? |
|
|
|
|
|
|
|
@account.suspended? || domain_block&.reject_media? |
|
|
|
|
|
|
|
end |
|
|
|
|
|
|
|
|
|
|
|
def auto_suspend? |
|
|
|
def auto_suspend? |
|
|
|
domain_block && domain_block.suspend? |
|
|
|
domain_block && domain_block.suspend? |
|
|
|
end |
|
|
|
end |
|
|
|