diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-26 01:06:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-26 01:06:13 +0200 |
| commit | cf7fbf2c569473e9a984bd3042930f9c5a060a23 (patch) | |
| tree | 706d5604c56be77ae03dae6318d15b52c8e397e2 /app | |
| parent | 91e5b0dfdbfbf9415e6bff14cbc3a80bc6e53f5c (diff) | |
Fix #5059 - Stop processing payload if it's from local account (#5100)
Diffstat (limited to 'app')
| -rw-r--r-- | app/lib/activitypub/activity/announce.rb | 2 | ||||
| -rw-r--r-- | app/services/activitypub/process_collection_service.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb index 556f91235..4516454e1 100644 --- a/app/lib/activitypub/activity/announce.rb +++ b/app/lib/activitypub/activity/announce.rb @@ -25,6 +25,8 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity def fetch_remote_original_status if object_uri.start_with?('http') + return if ActivityPub::TagManager.instance.local_uri?(object_uri) + ActivityPub::FetchRemoteStatusService.new.call(object_uri) elsif @object['url'].present? ::FetchRemoteStatusService.new.call(@object['url']) diff --git a/app/services/activitypub/process_collection_service.rb b/app/services/activitypub/process_collection_service.rb index 0c6736a3f..59cb65c65 100644 --- a/app/services/activitypub/process_collection_service.rb +++ b/app/services/activitypub/process_collection_service.rb @@ -9,7 +9,7 @@ class ActivityPub::ProcessCollectionService < BaseService return unless supported_context? return if different_actor? && verify_account!.nil? - return if @account.suspended? + return if @account.suspended? || @account.local? case @json['type'] when 'Collection', 'CollectionPage' |