Beta 16

composer.json

@@ -20,8 +20,8 @@
         }
     ],
     "require": {
-        "flarum/core": ">=0.1.0-beta.15",
-        "guzzlehttp/guzzle": "6.* || 7.*"
+        "flarum/core": "^0.1.0-beta.16",
+        "guzzlehttp/guzzle": "^7.2"
     },
     "replace": {
         "reflar/stopforumspam": "*"
@@ -46,7 +46,7 @@
     "extra": {
         "flarum-extension": {
             "title": "FoF Stop Forum Spam",
-            "category": "moderation",
+            "category": "feature",
             "icon": {
                 "name": "fas fa-stop",
                 "backgroundColor": "#e74c3c",

extend.php

@@ -24,5 +24,6 @@
     (new Extend\Event())
         ->listen(MarkedUserAsSpammer::class, Listeners\ReportSpammer::class),
 
-    (new Extend\Middleware('forum'))->add(RegisterMiddleware::class),
+    (new Extend\Middleware('forum'))
+        ->add(RegisterMiddleware::class),
 ];

js/package.json

@@ -9,9 +9,10 @@
   "scripts": {
     "build": "webpack --mode production",
     "dev": "webpack --mode development --watch",
-    "lint": "prettier --single-quote --trailing-comma es5 --print-width 150 --tab-width 4 --write src/**/* src/**/**/*"
+    "lint": "prettier --single-quote --trailing-comma es5 --print-width 150 --tab-width 4 --write src"
   },
   "devDependencies": {
-    "prettier": "^1.19.1"
+    "flarum": "0.1.0-beta.16",
+    "prettier": "^2.2.1"
   }
 }

migrations/2019_09_15_000000_migrate_extension_settings.php

@@ -17,7 +17,7 @@
         /**
          * @var SettingsRepositoryInterface
          */
-        $settings = app('flarum.settings');
+        $settings = resolve('flarum.settings');
         $keys = ['username', 'email', 'ip', 'frequency', 'api_key'];
 
         foreach ($keys as $key) {

src/Listeners/ReportSpammer.php

@@ -15,6 +15,7 @@
 use FoF\Spamblock\Event\MarkedUserAsSpammer;
 use FoF\StopForumSpam\StopForumSpam;
 use GuzzleHttp\Exception\RequestException;
+use GuzzleHttp\Psr7\Message;
 
 class ReportSpammer
 {
@@ -51,11 +52,11 @@ public function handle(MarkedUserAsSpammer $event)
             ]);
         } catch (RequestException $e) {
             throw new ValidationException([
-                'sfs' => strip_tags(RequestException::getResponseBodySummary($e->getResponse())),
+                'sfs' => strip_tags(Message::bodySummary($e->getResponse())),
             ]);
         } catch (\Throwable $e) {
             throw new ValidationException([
-                'sfs' => app('translator')->trans('fof-stopforumspam.api.error.unknown'),
+                'sfs' => resolve('translator')->trans('fof-stopforumspam.api.error.unknown'),
             ]);
         }
     }

src/Middleware/RegisterMiddleware.php

@@ -70,7 +70,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 ]);
             } catch (\Throwable $e) {
                 return (new JsonApiFormatter())->format(
-                    app(Registry::class)->handle($e),
+                    resolve(Registry::class)->handle($e),
                     $request
                 );
             }
@@ -88,9 +88,9 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 if ($frequency !== 0 && $frequency >= (int) $this->settings->get('fof-stopforumspam.frequency')) {
                     return (new JsonApiFormatter())
                         ->format(
-                            app(Registry::class)
+                            resolve(Registry::class)
                                 ->handle(new ValidationException([
-                                    'username' => app('translator')->trans('fof-stopforumspam.forum.message.spam'),
+                                    'username' => resolve('translator')->trans('fof-stopforumspam.forum.message.spam'),
                                 ])),
                             $request
                         );