Delete cached messages when deleting them on IMAP

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

2 files changed, 65 insertions, 2 deletions

diff --git a/lib/Events/BeforeMessageDeletedEvent.php b/lib/Events/BeforeMessageDeletedEvent.php
index 928ee8abb..be2b107e9 100644
--- a/lib/Events/BeforeMessageDeletedEvent.php
+++ b/lib/Events/BeforeMessageDeletedEvent.php
@@ -37,10 +37,10 @@ class BeforeMessageDeletedEvent extends Event {
 	/** @var int */
 	private $messageId;
 
-	public function __construct(Account $account, string $folderId, int $messageId) {
+	public function __construct(Account $account, string $mailbox, int $messageId) {
 		parent::__construct();
 		$this->account = $account;
-		$this->folderId = $folderId;
+		$this->folderId = $mailbox;
 		$this->messageId = $messageId;
 	}
 
diff --git a/lib/Events/MessageDeletedEvent.php b/lib/Events/MessageDeletedEvent.php
new file mode 100644
index 000000000..46d9b0367
--- /dev/null
+++ b/lib/Events/MessageDeletedEvent.php
@@ -0,0 +1,63 @@
+<?php declare(strict_types=1);
+
+/**
+ * @copyright 2020 Christoph Wurst <christoph@winzerhof-wurst.at>
+ *
+ * @author 2020 Christoph Wurst <christoph@winzerhof-wurst.at>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace OCA\Mail\Events;
+
+use OCA\Mail\Account;
+use OCA\Mail\Db\Mailbox;
+use OCP\EventDispatcher\Event;
+
+class MessageDeletedEvent extends Event {
+
+	/** @var Account */
+	private $account;
+
+	/** @var Mailbox */
+	private $mailbox;
+
+	/** @var int */
+	private $messageId;
+
+	public function __construct(Account $account,
+								Mailbox $mailbox,
+								int $messageId) {
+		parent::__construct();
+		$this->account = $account;
+		$this->mailbox = $mailbox;
+		$this->messageId = $messageId;
+	}
+
+	public function getAccount(): Account {
+		return $this->account;
+	}
+
+	public function getMailbox(): Mailbox {
+		return $this->mailbox;
+	}
+
+	public function getMessageId(): int {
+		return $this->messageId;
+	}
+
+
+}