Merge branch 'main' into glitch-soc/merge-upstream

2021-05-12 11:03:05 +02:00
parent ffc3f8eebe 70f6f2e9b7
commit dc58d02192
23 changed files with 135 additions and 35 deletions
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@ -46,7 +46,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
    return reject_payload! if unsupported_object_type? || invalid_origin?(object_uri) || tombstone_exists? || !related_to_local_activity?

    lock_or_fail("create:#{object_uri}") do
-      return if delete_arrived_first?(object_uri) || poll_vote? # rubocop:disable Lint/NonLocalExitFromIterator
+      return if delete_arrived_first?(object_uri) || poll_vote?

      @status = find_existing_status