diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-08-20 16:53:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-20 16:53:47 +0200 |
| commit | fe5b66aa0870212e27a6632fb9c83a2d16bd99ab (patch) | |
| tree | 4a5b53f21f2c29462d5c58afa2f2a03b30f702c4 /app/lib/activitypub/activity/block.rb | |
| parent | 93d4192a67fde9aaf0c4e420cb5ecb5fe921e97c (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/block.rb')
| -rw-r--r-- | app/lib/activitypub/activity/block.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/block.rb b/app/lib/activitypub/activity/block.rb index e6b6c837b..f630d5db2 100644 --- a/app/lib/activitypub/activity/block.rb +++ b/app/lib/activitypub/activity/block.rb @@ -4,7 +4,7 @@ class ActivityPub::Activity::Block < ActivityPub::Activity def perform target_account = account_from_uri(object_uri) - return if target_account.nil? || !target_account.local? || delete_arrived_first?(@json['id']) + return if target_account.nil? || !target_account.local? || delete_arrived_first?(@json['id']) || @account.blocking?(target_account) UnfollowService.new.call(target_account, @account) if target_account.following?(@account) @account.block!(target_account) |