about summary refs log tree commit diff
path: root/app/lib/activitypub/activity/announce.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-08-20 16:53:47 +0200
committerGitHub <noreply@github.com>2017-08-20 16:53:47 +0200
commitfe5b66aa0870212e27a6632fb9c83a2d16bd99ab (patch)
tree4a5b53f21f2c29462d5c58afa2f2a03b30f702c4 /app/lib/activitypub/activity/announce.rb
parent93d4192a67fde9aaf0c4e420cb5ecb5fe921e97c (diff)
Handle duplicate ActivityPub activities (#4639)
* Handle duplicate ActivityPub activities

Only perform side-effects when record processed for the first time

* Fast-forward repeat follow requests
Diffstat (limited to 'app/lib/activitypub/activity/announce.rb')
-rw-r--r--app/lib/activitypub/activity/announce.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb
index 09fec28a0..c4da405c7 100644
--- a/app/lib/activitypub/activity/announce.rb
+++ b/app/lib/activitypub/activity/announce.rb
@@ -7,6 +7,10 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
 
     return if original_status.nil? || delete_arrived_first?(@json['id'])
 
+    status = Status.find_by(account: @account, reblog: original_status)
+
+    return status unless status.nil?
+
     status = Status.create!(account: @account, reblog: original_status, uri: @json['id'])
     distribute(status)
     status