vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Eugen Rochko 2017-09-13 11:05:02 +02:00 committed by GitHub
parent 56af04dbb4
commit b9d241c6f5
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/services/activitypub/fetch_remote_status_service.rb
View file

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

4
app/services/activitypub/process_collection_service.rb
View file

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