From 048d8ac1fd4f09103ba2027092ee33359013c004 Mon Sep 17 00:00:00 2001
From: Ian Morland <ian@morland.me>
Date: Mon, 14 Dec 2020 13:48:35 +0000
Subject: [PATCH] Add composer meta, use events extender (#3)

* Update composer meta, use Event extender

* Reduce core constraint back to 14 as we don't need to require 15 here
---
 composer.json | 13 +++++++++++++
 extend.php    |  9 ++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 204566c..51005c1 100644
--- a/composer.json
+++ b/composer.json
@@ -6,6 +6,18 @@
   ],
   "type": "flarum-extension",
   "license": "MIT",
+  "support": {
+    "issues": "https://github.com/FriendsOfFlarum/disposabile-emails/issues",
+    "source": "https://github.com/FriendsOfFlarum/disposable-emails",
+    "forum": "https://discuss.flarum.org/d/21894"
+  },
+  "homepage": "https://friendsofflarum.org",
+  "funding": [
+    {
+      "type": "website",
+      "url": "https://opencollective.com/fof/donate"
+    }
+  ],
   "require": {
     "flarum/core": "^0.1.0-beta.14",
     "fgribreau/mailchecker": "^3.3.17"
@@ -25,6 +37,7 @@
   "extra": {
     "flarum-extension": {
       "title": "FoF Disposable Emails",
+      "category": "moderation",
       "icon": {
         "name": "fas fa-user-times",
         "backgroundColor": "#e74c3c",
diff --git a/extend.php b/extend.php
index 095e0c1..3af6da1 100644
--- a/extend.php
+++ b/extend.php
@@ -14,14 +14,14 @@
 use Flarum\Extend;
 use Flarum\Foundation\ValidationException;
 use Flarum\User\Event\Saving;
-use Illuminate\Events\Dispatcher;
 use Illuminate\Support\Arr;
 use MailChecker;
 
 return [
     new Extend\Locales(__DIR__.'/locale'),
-    function (Dispatcher $events) {
-        $events->listen(Saving::class, function (Saving $event) {
+
+    (new Extend\Event())
+        ->listen(Saving::class, function (Saving $event) {
             $email = Arr::get($event->data, 'attributes.email');
 
             if ($email !== null && !MailChecker::isValid($email)) {
@@ -29,6 +29,5 @@ function (Dispatcher $events) {
                     app('translator')->trans('fof-email-checker.error.disposable_email_message'),
                 ]);
             }
-        });
-    },
+        }),
 ];