Browse Source

Fix #4917 - Add missing suspend checks (#4921)

theme_witches
Eugen Rochko 5 years ago committed by GitHub
parent
commit
b9d241c6f5
  1. 2
      app/services/activitypub/fetch_remote_status_service.rb
  2. 4
      app/services/activitypub/process_collection_service.rb

2
app/services/activitypub/fetch_remote_status_service.rb

@ -17,6 +17,8 @@ class ActivityPub::FetchRemoteStatusService < BaseService @@ -17,6 +17,8 @@ class ActivityPub::FetchRemoteStatusService < BaseService
actor = ActivityPub::TagManager.instance.uri_to_resource(actor_id, Account)
actor = ActivityPub::FetchRemoteAccountService.new.call(actor_id) if actor.nil?
return if actor.suspended?
ActivityPub::Activity.factory(activity, actor).perform
end

4
app/services/activitypub/process_collection_service.rb

@ -7,9 +7,9 @@ class ActivityPub::ProcessCollectionService < BaseService @@ -7,9 +7,9 @@ class ActivityPub::ProcessCollectionService < BaseService
@account = account
@json = Oj.load(body, mode: :strict)
return if @account.suspended? || !supported_context?
return unless supported_context?
return if different_actor? && verify_account!.nil?
return if @account.suspended?
case @json['type']
when 'Collection', 'CollectionPage'

Loading…
Cancel
Save