ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing reject_media check before avatar download via ActivityPub (#4862)

rebase/4.0.0rc2
Eugen Rochko 2017-09-09 13:41:45 +02:00 committed by GitHub
parent 3c45d3963a
commit 9e15eeec63
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/services/activitypub/process_account_service.rb
View File

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