Merge branch 'master' into mailcare-driver

Author: eXorus

README.md

@@ -16,6 +16,11 @@ Mailbox::from('{username}@gmail.com', function (InboundEmail $email, $username)
 });
 ```
 
+[![https://phppackagedevelopment.com](https://beyondco.de/courses/phppd.jpg)](https://phppackagedevelopment.com)
+
+If you want to learn how to create reusable PHP packages yourself, take a look at my upcoming [PHP Package Development](https://phppackagedevelopment.com) video course.
+
+
 ## Installation
 
 You can install the package via composer:

composer.json

@@ -22,6 +22,7 @@
         "illuminate/log": "5.7.*",
         "illuminate/routing": "5.7.*",
         "illuminate/support": "5.7.*",
+        "willdurand/email-reply-parser": "^2.8",
         "zbateson/mail-mime-parser": "^1.1"
     },
     "require-dev": {

config/mailbox.php

@@ -6,10 +6,16 @@
      * The driver to use when listening for incoming emails.
      * It defaults to the mail driver that you are using.
      *
-     * Supported drivers: "log", "mailgun", "sendgrid"
+     * Supported drivers: "log", "mailgun", "sendgrid", "postmark"
      */
     'driver' => env('MAILBOX_DRIVER', 'log'),
 
+    /*
+     * The model class to use when converting an incoming email to a message.
+     * It must extend the default model class
+     */
+    'model' => \BeyondCode\Mailbox\InboundEmail::class,
+
     /*
      * The path for driver specific routes. This is where
      * you need to point your driver specific callbacks

src/Console/CleanEmails.php

@@ -20,7 +20,14 @@ public function handle()
 
         $cutOffDate = Carbon::now()->subDay($maxAgeInDays)->format('Y-m-d H:i:s');
 
-        $amountDeleted = InboundEmail::where('created_at', '<', $cutOffDate)->delete();
+        /** @var InboundEmail $modelClass */
+        $modelClass = config('mailbox.model');
+
+        $models = $modelClass::where('created_at', '<', $cutOffDate)->get();
+
+        $models->each->delete();
+
+        $amountDeleted = $models->count();
 
         $this->info("Deleted {$amountDeleted} record(s) from the Mailbox logs.");
 

src/Drivers/Log.php

@@ -4,18 +4,24 @@
 
 use BeyondCode\Mailbox\InboundEmail;
 use BeyondCode\Mailbox\Facades\Mailbox;
-use Illuminate\Log\Events\MessageLogged;
+use Illuminate\Mail\Events\MessageSent;
 
 class Log implements DriverInterface
 {
     public function register()
     {
-        app('events')->listen(MessageLogged::class, [$this, 'processLog']);
+        app('events')->listen(MessageSent::class, [$this, 'processLog']);
     }
 
-    public function processLog(MessageLogged $log)
+    public function processLog(MessageSent $event)
     {
-        $email = InboundEmail::fromMessage($log->message);
+        if (config('mail.driver') !== 'log') {
+            return;
+        }
+
+        /** @var InboundEmail $modelClass */
+        $modelClass = config('mailbox.model');
+        $email = $modelClass::fromMessage($event->message);
 
         Mailbox::callMailboxes($email);
     }

src/Drivers/Postmark.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace BeyondCode\Mailbox\Drivers;
+
+use Illuminate\Support\Facades\Route;
+use BeyondCode\Mailbox\Http\Controllers\PostmarkController;
+
+class Postmark implements DriverInterface
+{
+    public function register()
+    {
+        Route::prefix(config('mailbox.path'))->group(function () {
+            Route::post('/postmark', PostmarkController::class);
+        });
+    }
+}

src/Http/Controllers/PostmarkController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace BeyondCode\Mailbox\Http\Controllers;
+
+use Illuminate\Routing\Controller;
+use BeyondCode\Mailbox\Facades\Mailbox;
+use BeyondCode\Mailbox\Http\Requests\PostmarkRequest;
+
+class PostmarkController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('laravel-mailbox');
+    }
+
+    public function __invoke(PostmarkRequest $request)
+    {
+        Mailbox::callMailboxes($request->email());
+    }
+}

src/Http/Requests/MailgunRequest.php

@@ -27,7 +27,10 @@ public function validator()
 
     public function email()
     {
-        return InboundEmail::fromMessage($this->get('body-mime'));
+        /** @var InboundEmail $modelClass */
+        $modelClass = config('mailbox.model');
+
+        return $modelClass::fromMessage($this->get('body-mime'));
     }
 
     protected function verifySignature()

src/Http/Requests/PostmarkRequest.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace BeyondCode\Mailbox\Http\Requests;
+
+use BeyondCode\Mailbox\InboundEmail;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Foundation\Http\FormRequest;
+
+class PostmarkRequest extends FormRequest
+{
+    public function validator()
+    {
+        return Validator::make($this->all(), [
+            'RawEmail' => 'required',
+        ]);
+    }
+
+    public function email()
+    {
+        /** @var InboundEmail $modelClass */
+        $modelClass = config('mailbox.model');
+
+        return $modelClass::fromMessage($this->get('RawEmail'));
+    }
+}

src/Http/Requests/SendGridRequest.php

@@ -17,6 +17,9 @@ public function validator()
 
     public function email()
     {
-        return InboundEmail::fromMessage($this->get('email'));
+        /** @var InboundEmail $modelClass */
+        $modelClass = config('mailbox.model');
+
+        return $modelClass::fromMessage($this->get('email'));
     }
 }