mirror of https://github.com/tootsuite/mastodon
parent
56af04dbb4
commit
b9d241c6f5
|
@ -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
|
||||
|
||||
|
|
|
@ -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…
Reference in New Issue