Feat: make some events webhook compatible

lib/Events/MessageDeletedEvent.php

@@ -12,8 +12,9 @@
 use OCA\Mail\Account;
 use OCA\Mail\Db\Mailbox;
 use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IWebhookCompatibleEvent;
 
-class MessageDeletedEvent extends Event {
+class MessageDeletedEvent extends Event implements IWebhookCompatibleEvent {
 	/** @var Account */
 	private $account;
 
@@ -43,4 +44,12 @@ public function getMailbox(): Mailbox {
 	public function getMessageId(): int {
 		return $this->messageId;
 	}
+
+	public function getWebhookSerializable(): array {
+		return [
+			'accountId' => $this->account->getId(),
+			'mailboxId' => $this->mailbox->getId(),
+			'messageId' => $this->messageId,
+		];
+	}
 }

lib/Events/MessageFlaggedEvent.php

@@ -12,8 +12,9 @@
 use OCA\Mail\Account;
 use OCA\Mail\Db\Mailbox;
 use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IWebhookCompatibleEvent;
 
-class MessageFlaggedEvent extends Event {
+class MessageFlaggedEvent extends Event implements IWebhookCompatibleEvent {
 	/** @var Account */
 	private $account;
 
@@ -61,4 +62,14 @@ public function getFlag(): string {
 	public function isSet(): bool {
 		return $this->set;
 	}
+
+	public function getWebhookSerializable(): array {
+		return [
+			'accountId' => $this->account->getId(),
+			'mailboxId' => $this->mailbox->getId(),
+			'messageId' => $this->uid,
+			'flag' => $this->flag,
+			'set' => $this->set,
+		];
+	}
 }

lib/Events/MessageSentEvent.php

@@ -12,11 +12,12 @@
 use OCA\Mail\Account;
 use OCA\Mail\Db\LocalMessage;
 use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IWebhookCompatibleEvent;
 
 /**
  * @psalm-immutable
  */
-class MessageSentEvent extends Event {
+class MessageSentEvent extends Event implements IWebhookCompatibleEvent {
 	/** @var Account */
 	private $account;
 
@@ -35,4 +36,10 @@ public function getAccount(): Account {
 	public function getLocalMessage(): LocalMessage {
 		return $this->localMessage;
 	}
+
+	public function getWebhookSerializable(): array {
+		return [
+			'message' => $this->localMessage,
+		];
+	}
 }

lib/Events/NewMessageReceivedEvent.php

@@ -8,16 +8,26 @@
 
 namespace OCA\Mail\Events;
 
+use OCA\Mail\Db\Message;
 use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IWebhookCompatibleEvent;
 
-class NewMessageReceivedEvent extends Event {
+class NewMessageReceivedEvent extends Event implements IWebhookCompatibleEvent {
 	public function __construct(
 		private string $uri,
+		private Message $message,
 	) {
 		parent::__construct();
 	}
 
 	public function getUri(): string {
 		return $this->uri;
 	}
+
+	public function getWebhookSerializable(): array {
+		return [
+			'messageUri' => $this->uri,
+			'message' => $this->message,
+		];
+	}
 }

lib/Listener/NewMessagesNotifier.php

@@ -36,7 +36,7 @@ public function handle(Event $event): void {
 
 		foreach ($event->getMessages() as $message) {
 			$uri = $this->urlGenerator->linkToOCSRouteAbsolute('mail.messageApi.get', ['id' => $message->getId()]);
-			$this->eventDispatcher->dispatchTyped(new NewMessageReceivedEvent($uri));
+			$this->eventDispatcher->dispatchTyped(new NewMessageReceivedEvent($uri, $message));
 		}
 	}
 }

tests/Unit/Events/NewMessageReceivedEventTest.php

@@ -10,13 +10,15 @@
 namespace OCA\Mail\Tests\Unit\Events;
 
 use ChristophWurst\Nextcloud\Testing\TestCase;
+use OCA\Mail\Db\Message;
 use OCA\Mail\Events\NewMessageReceivedEvent;
 
 class NewMessageReceivedEventTest extends TestCase {
 	public function testConstructorAndGetter(): void {
 		$uri = 'imap://user@example.com/INBOX;UID=123';
+		$message = new Message();
 
-		$event = new NewMessageReceivedEvent($uri);
+		$event = new NewMessageReceivedEvent($uri, $message);
 
 		$this->assertSame($uri, $event->getUri());
 	}