diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-13 11:05:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 11:05:02 +0200 |
| commit | b9d241c6f554570e0677d9354b27dad21322e341 (patch) | |
| tree | 3892ec66e10eeadcbc6e21aadeba653b55b2b993 /app | |
| parent | 56af04dbb4663031c3c654b3f16d323cb64f8c7d (diff) | |
Fix #4917 - Add missing suspend checks (#4921)
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/activitypub/fetch_remote_status_service.rb | 2 | ||||
| -rw-r--r-- | app/services/activitypub/process_collection_service.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/services/activitypub/fetch_remote_status_service.rb b/app/services/activitypub/fetch_remote_status_service.rb index 68ca58d62..a95931afe 100644 --- a/app/services/activitypub/fetch_remote_status_service.rb +++ b/app/services/activitypub/fetch_remote_status_service.rb @@ -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 diff --git a/app/services/activitypub/process_collection_service.rb b/app/services/activitypub/process_collection_service.rb index bc04c50ba..0c6736a3f 100644 --- a/app/services/activitypub/process_collection_service.rb +++ b/app/services/activitypub/process_collection_service.rb @@ -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' |