From b26f3c0cc65874a3de4e6bd3b612fc515950b4be Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Thu, 27 Apr 2017 08:03:15 +0200
Subject: [PATCH] User registration is now a Mailable. See #636

---
 app/Handlers/Events/UserEventHandler.php | 10 +++----
 app/Mail/RegisteredUser.php              | 37 ++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 app/Mail/RegisteredUser.php

diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php
index a3a7e9d84f..fd802a0fd2 100644
--- a/app/Handlers/Events/UserEventHandler.php
+++ b/app/Handlers/Events/UserEventHandler.php
@@ -15,6 +15,7 @@ namespace FireflyIII\Handlers\Events;
 
 use FireflyIII\Events\RegisteredUser;
 use FireflyIII\Events\RequestedNewPassword;
+use FireflyIII\Mail\RegisteredUser as RegisteredUserMail;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Mail\Message;
 use Log;
@@ -99,13 +100,12 @@ class UserEventHandler
         $email     = $event->user->email;
         $address   = route('index');
         $ipAddress = $event->ipAddress;
+
         // send email.
         try {
-            Mail::send(
-                ['emails.registered-html', 'emails.registered-text'], ['address' => $address, 'ip' => $ipAddress], function (Message $message) use ($email) {
-                $message->to($email, $email)->subject('Welcome to Firefly III!');
-            }
-            );
+
+            Mail::to($email)
+                ->send(new RegisteredUserMail($address, $ipAddress));
         } catch (Swift_TransportException $e) {
             Log::error($e->getMessage());
         }
diff --git a/app/Mail/RegisteredUser.php b/app/Mail/RegisteredUser.php
new file mode 100644
index 0000000000..f48ddfe6d5
--- /dev/null
+++ b/app/Mail/RegisteredUser.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace FireflyIII\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+
+class RegisteredUser extends Mailable
+{
+    use Queueable, SerializesModels;
+    /** @var  string */
+    public $address;
+    /** @var  string */
+    public $ip;
+
+    /**
+     * Create a new message instance.
+     *
+     * @return void
+     */
+    public function __construct(string $address, string $ip)
+    {
+        $this->address = $address;
+        $this->ip      = $ip;
+    }
+
+    /**
+     * Build the message.
+     *
+     * @return $this
+     */
+    public function build()
+    {
+        return $this->view('emails.registered-html')->text('emails.registered-text')->subject('Welcome to Firefly III!');
+    }
+}