Skip to content

[stable33] fix(federated-event-service): broadcast CircleDestroy event before executing it's manage() method #2792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cristianscheid merged 1 commit into from
Aug 21, 2026
Merged

[stable33] fix(federated-event-service): broadcast CircleDestroy event before executing it's manage() method #2792

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions lib/Service/FederatedEventService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
use OCA\Circles\Exceptions\RequestBuilderException;
use OCA\Circles\Exceptions\UnknownRemoteException;
use OCA\Circles\FederatedItems\CircleCreate;
use OCA\Circles\FederatedItems\CircleDestroy;
use OCA\Circles\IFederatedItem;
use OCA\Circles\IFederatedItemAsyncProcess;
use OCA\Circles\IFederatedItemCircleCheckNotRequired;
Expand Down Expand Up @@ -119,12 +120,23 @@ public function newEvent(FederatedEvent $event): array {
return $event->getOutcome();
}

$broadcasted = false;
if (OC::$CLI || !$event->isAsync()) {
// CircleDestroy needs to be broadcast before manage() runs.
// initBroadcast() > getInstances() > RemoteRequest::getOutgoingRecipient()
// finds remote instances via the circle's members, and if manage() already
// deleted them, no instance is found, thus the event is not broadcast.
if ($event->getClass() === CircleDestroy::class) {
$broadcasted = $this->initBroadcast($event);
}
$federatedItem->manage($event);
}

if (!$this->initBroadcast($event)
&& $event->getClass() === CircleCreate::class) {
if (!$broadcasted) {
$broadcasted = $this->initBroadcast($event);
}

if (!$broadcasted && $event->getClass() === CircleCreate::class) {
// Circle Creation is done in a different way as there is no Circle nor Members yet to
// base the broadcast to other instances, unless in GlobalScale. And the fact that we do
// not want to async the process.
Expand Down
Loading