Beta15 (#19)

* beta 15 support * Apply fixes from StyleCI * Forgot Co-authored-by: karaok491 <[email protected]>
FriendsOfFlarum · Dec 16, 2020 · 09fabe1 · 09fabe1
1 parent 61f85e1
commit 09fabe1
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 27 deletions.
diff --git a/composer.json b/composer.json
@@ -7,9 +7,21 @@
   "type": "flarum-extension",
   "license": "MIT",
   "require": {
-    "flarum/core": "^0.1.0-beta.14",
+    "flarum/core": "^0.1.0-beta.15",
     "fof/components": ">=0.2.0"
   },
+  "support": {
+    "issues": "https://github.com/FriendsOfFlarum/formatting/issues",
+    "source": "https://github.com/FriendsOfFlarum/formatting",
+    "forum": "https://discuss.flarum.org/d/17770"
+  },
+  "homepage": "https://friendsofflarum.org",
+  "funding": [
+    {
+      "type": "website",
+      "url": "https://opencollective.com/fof/donate"
+    }
+  ],
   "authors": [
     {
       "name": "David Sevilla Martín",
@@ -25,14 +37,15 @@
   "extra": {
     "flarum-extension": {
       "title": "FoF Formatting",
+      "category": "formatting",
       "icon": {
         "name": "fas fa-font",
         "backgroundColor": "#e74c3c",
         "color": "#fff"
       }
     },
     "flagrow": {
-      "discuss": "https://discuss.flarum.org/d/17770-friendsofflarum-formatting"
+      "discuss": "https://discuss.flarum.org/d/17770"
     }
   }
-}
+}
diff --git a/extend.php b/extend.php
@@ -11,7 +11,7 @@
 
 namespace FoF\Formatting;
 
-use Flarum\Api\Event\Serializing;
+use Flarum\Api\Serializer\ForumSerializer;
 use Flarum\Extend;
 use Flarum\Settings\Event\Saved;
 use FoF\Components\Extend\AddFofComponents;
@@ -48,7 +48,9 @@
             }
         }),
 
+    (new Extend\ApiSerializer(ForumSerializer::class))
+        ->mutate(FormatterConfigurator::class),
+
     (new Extend\Event())
-        ->listen(Serializing::class, Listeners\FormatterConfigurator::class)
         ->listen(Saved::class, Listeners\ClearCache::class),
 ];
diff --git a/js/package-lock.json b/js/package-lock.json
diff --git a/src/Listeners/FormatterConfigurator.php b/src/Listeners/FormatterConfigurator.php
@@ -11,9 +11,7 @@
 
 namespace FoF\Formatting\Listeners;
 
-use Flarum\Api\Event\Serializing;
 use Flarum\Api\Serializer\ForumSerializer;
-use Flarum\Settings\SettingsRepositoryInterface;
 
 class FormatterConfigurator
 {
@@ -27,25 +25,14 @@ class FormatterConfigurator
         'TaskLists',
     ];
 
-    /**
-     * @var SettingsRepositoryInterface
-     */
-    private $settings;
-
-    public function __construct(SettingsRepositoryInterface $settings)
+    public function __invoke(ForumSerializer $serializer): array
     {
-        $this->settings = $settings;
-    }
+        $attributes = [];
 
-    /**
-     * Adds settings to admin settings.
-     *
-     * @param Serializing $event
-     */
-    public function handle(Serializing $event)
-    {
-        if ($event->isSerializer(ForumSerializer::class) && $event->actor->isAdmin()) {
-            $event->attributes['fof-formatting.plugins'] = self::PLUGINS;
+        if ($serializer->getActor()->isAdmin()) {
+            $attributes['fof-formatting.plugins'] = self::PLUGINS;
         }
+
+        return $attributes;
     }
 }