diff --git a/CHANGELOG.md b/CHANGELOG.md index 9733f751f..9d5efbea1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -72,6 +72,7 @@ - Update ReplyPipelines, use more efficent reply count calculation ([d4dfa95c](https://github.com/pixelfed/pixelfed/commit/d4dfa95c)) - Update StatusDelete pipeline, dispatch async ([257c0949](https://github.com/pixelfed/pixelfed/commit/257c0949)) - Update lexer/extractor to handle banned hashtags ([909a8a5a](https://github.com/pixelfed/pixelfed/commit/909a8a5a)) +- Update FederationController, fix double lock bug ([9fcccca9](https://github.com/pixelfed/pixelfed/commit/9fcccca9)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4) diff --git a/app/Http/Controllers/FederationController.php b/app/Http/Controllers/FederationController.php index 358f3093f..c4b5e86bf 100644 --- a/app/Http/Controllers/FederationController.php +++ b/app/Http/Controllers/FederationController.php @@ -178,12 +178,6 @@ class FederationController extends Controller } else if( isset($obj['type']) && in_array($obj['type'], ['Follow', 'Accept'])) { dispatch(new InboxValidator($username, $headers, $payload))->onQueue('follow'); } else { - $lockKey = 'pf:ap:user-inbox:activity:' . hash('sha256', $obj['id']); - if(Cache::get($lockKey) !== null) { - return; - } - Cache::put($lockKey, 1, 43200); - usleep(5000); dispatch(new InboxValidator($username, $headers, $payload))->onQueue('high'); } return;