Rework the routing

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

3 files changed, 21 insertions, 18 deletions

diff --git a/lib/Events/DraftSavedEvent.php b/lib/Events/DraftSavedEvent.php
index f8b6368da..677b4556c 100644
--- a/lib/Events/DraftSavedEvent.php
+++ b/lib/Events/DraftSavedEvent.php
@@ -26,6 +26,7 @@ declare(strict_types=1);
 namespace OCA\Mail\Events;
 
 use OCA\Mail\Account;
+use OCA\Mail\Db\Message;
 use OCA\Mail\Model\NewMessageData;
 use OCP\EventDispatcher\Event;
 
@@ -37,16 +38,16 @@ class DraftSavedEvent extends Event {
 	/** @var NewMessageData */
 	private $newMessageData;
 
-	/** @var int|null */
-	private $draftUid;
+	/** @var Message|null */
+	private $draft;
 
 	public function __construct(Account $account,
 								NewMessageData $newMessageData,
-								?int $draftUid) {
+								?Message $draft) {
 		parent::__construct();
 		$this->account = $account;
 		$this->newMessageData = $newMessageData;
-		$this->draftUid = $draftUid;
+		$this->draft = $draft;
 	}
 
 	public function getAccount(): Account {
@@ -57,7 +58,7 @@ class DraftSavedEvent extends Event {
 		return $this->newMessageData;
 	}
 
-	public function getDraftUid(): ?int {
-		return $this->draftUid;
+	public function getDraft(): ?Message {
+		return $this->draft;
 	}
 }
diff --git a/lib/Events/MessageSentEvent.php b/lib/Events/MessageSentEvent.php
index 563467c4c..a2973cb8c 100644
--- a/lib/Events/MessageSentEvent.php
+++ b/lib/Events/MessageSentEvent.php
@@ -27,6 +27,7 @@ namespace OCA\Mail\Events;
 
 use Horde_Mime_Mail;
 use OCA\Mail\Account;
+use OCA\Mail\Db\Message;
 use OCA\Mail\Model\IMessage;
 use OCA\Mail\Model\NewMessageData;
 use OCA\Mail\Model\RepliedMessageData;
@@ -43,8 +44,8 @@ class MessageSentEvent extends Event {
 	/** @var null|RepliedMessageData */
 	private $repliedMessageData;
 
-	/** @var int|null */
-	private $draftUid;
+	/** @var Message|null */
+	private $draft;
 
 	/** @var IMessage */
 	private $message;
@@ -55,14 +56,14 @@ class MessageSentEvent extends Event {
 	public function __construct(Account $account,
 								NewMessageData $newMessageData,
 								?RepliedMessageData $repliedMessageData,
-								?int $draftUid,
+								?Message $draft,
 								IMessage $message,
 								Horde_Mime_Mail $mail) {
 		parent::__construct();
 		$this->account = $account;
 		$this->newMessageData = $newMessageData;
 		$this->repliedMessageData = $repliedMessageData;
-		$this->draftUid = $draftUid;
+		$this->draft = $draft;
 		$this->message = $message;
 		$this->mail = $mail;
 	}
@@ -79,8 +80,8 @@ class MessageSentEvent extends Event {
 		return $this->repliedMessageData;
 	}
 
-	public function getDraftUid(): ?int {
-		return $this->draftUid;
+	public function getDraft(): ?Message {
+		return $this->draft;
 	}
 
 	public function getMessage(): IMessage {
diff --git a/lib/Events/SaveDraftEvent.php b/lib/Events/SaveDraftEvent.php
index 1f5590281..830bfe976 100644
--- a/lib/Events/SaveDraftEvent.php
+++ b/lib/Events/SaveDraftEvent.php
@@ -26,6 +26,7 @@ declare(strict_types=1);
 namespace OCA\Mail\Events;
 
 use OCA\Mail\Account;
+use OCA\Mail\Db\Message;
 use OCA\Mail\Model\NewMessageData;
 use OCP\EventDispatcher\Event;
 
@@ -37,16 +38,16 @@ class SaveDraftEvent extends Event {
 	/** @var NewMessageData */
 	private $newMessageData;
 
-	/** @var int|null */
-	private $draftUid;
+	/** @var Message|null */
+	private $draft;
 
 	public function __construct(Account $account,
 								NewMessageData $newMessageData,
-								?int $draftUid) {
+								?Message $draft) {
 		parent::__construct();
 		$this->account = $account;
 		$this->newMessageData = $newMessageData;
-		$this->draftUid = $draftUid;
+		$this->draft = $draft;
 	}
 
 	public function getAccount(): Account {
@@ -57,7 +58,7 @@ class SaveDraftEvent extends Event {
 		return $this->newMessageData;
 	}
 
-	public function getDraftUid(): ?int {
-		return $this->draftUid;
+	public function getDraft(): ?Message {
+		return $this->draft;
 	}
 }