diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-02-17 11:58:17 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-02-17 12:26:55 +0100 |
| commit | 369a475a7001677493b452b9aaea1141de442c53 (patch) | |
| tree | a0c81f0876c68827cfa0e856844054e53cb2e741 /app/lib/activitypub/activity/create.rb | |
| parent | ab9082b3325dfd193d7130d6c880e85ab2781bc0 (diff) | |
| parent | 147b4c2c3afacd6ad9d5c1353c072861eaca5fd2 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/serializers/rest/instance_serializer.rb - app/views/layouts/error.html.haml - public/oops.png Took our version (same as upstream but without the things that only make sense in an animation). Additional changes: - app/javascript/flavours/vanilla/theme.yml Include upstream's javascript in error pages.
Diffstat (limited to 'app/lib/activitypub/activity/create.rb')
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 1b31768d9..d7bd65c80 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -2,7 +2,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity def perform - return if unsupported_object_type? || invalid_origin?(@object['id']) || Tombstone.exists?(uri: @object['id']) || !related_to_local_activity? + return reject_payload! if unsupported_object_type? || invalid_origin?(@object['id']) || Tombstone.exists?(uri: @object['id']) || !related_to_local_activity? RedisLock.acquire(lock_options) do |lock| if lock.acquired? @@ -341,18 +341,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity responds_to_followed_account? || addresses_local_accounts? end - def fetch? - !@options[:delivery] - end - - def followed_by_local_accounts? - @account.passive_relationships.exists? - end - - def requested_through_relay? - @options[:relayed_through_account] && Relay.find_by(inbox_url: @options[:relayed_through_account].inbox_url)&.enabled? - end - def responds_to_followed_account? !replied_to_status.nil? && (replied_to_status.account.local? || replied_to_status.account.passive_relationships.exists?) end |