fixup! fix(federation): remove background jobs when removing trusted servers

Author: kesselb

apps/federation/lib/Listener/TrustedServerRemovedListener.php

@@ -28,6 +28,10 @@ public function handle(Event $event): void {
 			return;
 		}
 
+		if ($event->getUrl() === null) {
+			return; // safe guard
+		}
+
 		$this->removeJobsByUrl(RequestSharedSecret::class, $event->getUrl());
 		$this->removeJobsByUrl(GetSharedSecret::class, $event->getUrl());
 	}

apps/federation/lib/TrustedServers.php

@@ -88,7 +88,7 @@ public function addSharedSecret(string $url, string $sharedSecret): void {
 	public function removeServer(int $id): void {
 		$server = $this->dbHandler->getServerById($id);
 		$this->dbHandler->removeServer($id);
-		$this->dispatcher->dispatchTyped(new TrustedServerRemovedEvent($server['url'], $server['url_hash']));
+		$this->dispatcher->dispatchTyped(new TrustedServerRemovedEvent($server['url_hash'], $server['url']));
 
 	}
 

lib/public/Federation/Events/TrustedServerRemovedEvent.php

@@ -20,23 +20,23 @@ class TrustedServerRemovedEvent extends Event {
 	 * @since 32.0.0 Added $url argument
 	 */
 	public function __construct(
-		private readonly string $url,
 		private readonly string $urlHash,
+		private readonly ?string $url = null,
 	) {
 		parent::__construct();
 	}
 
 	/**
-	 * @since 32.0.0
+	 * @since 25.0.0
 	 */
-	public function getUrl(): string {
-		return $this->url;
+	public function getUrlHash(): string {
+		return $this->urlHash;
 	}
 
 	/**
-	 * @since 25.0.0
+	 * @since 32.0.0
 	 */
-	public function getUrlHash(): string {
-		return $this->urlHash;
+	public function getUrl(): ?string {
+		return $this->url;
 	}
 }