Merge pull request #3979 from pixelfed/staging
Update FederationController, improve inbox/sharedInbox delete handling
This commit is contained in:
commit
1076668ca3
|
@ -63,6 +63,7 @@
|
|||
- Update MediaS3GarbageCollector command, handle thumbnail deletion ([95bbcc38](https://github.com/pixelfed/pixelfed/commit/95bbcc38))
|
||||
- Update StatusReplyPipeline, remove expensive reply count re-calculation query ([a2f8aad1](https://github.com/pixelfed/pixelfed/commit/a2f8aad1))
|
||||
- Update CommentPipeline, remove expensive reply count re-calculation query ([b457a446](https://github.com/pixelfed/pixelfed/commit/b457a446))
|
||||
- Update FederationController, improve inbox/sharedInbox delete handling ([2180a2de](https://github.com/pixelfed/pixelfed/commit/2180a2de))
|
||||
- ([](https://github.com/pixelfed/pixelfed/commit/))
|
||||
|
||||
## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)
|
||||
|
|
|
@ -154,23 +154,27 @@ class FederationController extends Controller
|
|||
}
|
||||
|
||||
if(isset($obj['type']) && $obj['type'] === 'Delete') {
|
||||
$lockKey = 'pf:ap:del-lock:' . hash('sha256', $obj['id']);
|
||||
if( isset($obj['actor']) &&
|
||||
isset($obj['object']) &&
|
||||
isset($obj['id']) &&
|
||||
is_string($obj['id']) &&
|
||||
is_string($obj['actor']) &&
|
||||
is_string($obj['object']) &&
|
||||
$obj['actor'] == $obj['object']
|
||||
) {
|
||||
if(Cache::get($lockKey) !== null) {
|
||||
return;
|
||||
} else {
|
||||
Cache::put($lockKey, 1, 43200);
|
||||
usleep(5000);
|
||||
}
|
||||
}
|
||||
if(isset($obj['object']) && isset($obj['object']['type']) && isset($obj['object']['id'])) {
|
||||
if($obj['object']['type'] === 'Person') {
|
||||
if(Profile::whereRemoteUrl($obj['object']['id'])->exists()) {
|
||||
dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if($obj['object']['type'] === 'Tombstone') {
|
||||
if(Status::whereObjectUrl($obj['object']['id'])->exists()) {
|
||||
dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if($obj['object']['type'] === 'Story') {
|
||||
dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
|
||||
return;
|
||||
}
|
||||
}
|
||||
return;
|
||||
} else if( isset($obj['type']) && in_array($obj['type'], ['Follow', 'Accept'])) {
|
||||
dispatch(new InboxValidator($username, $headers, $payload))->onQueue('follow');
|
||||
} else {
|
||||
|
@ -208,21 +212,27 @@ class FederationController extends Controller
|
|||
}
|
||||
|
||||
if(isset($obj['type']) && $obj['type'] === 'Delete') {
|
||||
$lockKey = 'pf:ap:del-lock:' . hash('sha256', $obj['id']);
|
||||
if( isset($obj['actor']) &&
|
||||
isset($obj['object']) &&
|
||||
isset($obj['id']) &&
|
||||
is_string($obj['id']) &&
|
||||
is_string($obj['actor']) &&
|
||||
is_string($obj['object']) &&
|
||||
$obj['actor'] == $obj['object']
|
||||
) {
|
||||
if(Cache::get($lockKey) !== null) {
|
||||
if(isset($obj['object']) && isset($obj['object']['type']) && isset($obj['object']['id'])) {
|
||||
if($obj['object']['type'] === 'Person') {
|
||||
if(Profile::whereRemoteUrl($obj['object']['id'])->exists()) {
|
||||
dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
|
||||
return;
|
||||
}
|
||||
}
|
||||
Cache::put($lockKey, 1, 43200);
|
||||
|
||||
if($obj['object']['type'] === 'Tombstone') {
|
||||
if(Status::whereObjectUrl($obj['object']['id'])->exists()) {
|
||||
dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if($obj['object']['type'] === 'Story') {
|
||||
dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
|
||||
return;
|
||||
}
|
||||
}
|
||||
return;
|
||||
} else if( isset($obj['type']) && in_array($obj['type'], ['Follow', 'Accept'])) {
|
||||
dispatch(new InboxWorker($headers, $payload))->onQueue('follow');
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue