diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-09-28 21:48:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 21:48:28 -0400 |
| commit | c027a7bd4d7b5af21f4b201d656f7251fa3606a1 (patch) | |
| tree | ce2c2327b26358c26cb899ea918988af373ca6d6 /app/services/activitypub/process_collection_service.rb | |
| parent | 210e6776fce016666ecfd248b2208c487f3440f9 (diff) | |
| parent | 53f829dfa8bc376041a442dc84c22aa1cbfcb9d0 (diff) | |
Merge pull request #157 from glitch-soc/merging-upstream
ABRACA-HRRRRRRRRRRRNGGGGGGGHHH!!!!!!!!!!!!!!!!!!!
Diffstat (limited to 'app/services/activitypub/process_collection_service.rb')
| -rw-r--r-- | app/services/activitypub/process_collection_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/activitypub/process_collection_service.rb b/app/services/activitypub/process_collection_service.rb index bc04c50ba..59cb65c65 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? || @account.local? case @json['type'] when 'Collection', 'CollectionPage' |