Use new extenders (#22)

extensions/sticky/extend.php

@@ -7,8 +7,11 @@
  * LICENSE file that was distributed with this source code.
  */
 
+use Flarum\Api\Controller\ListDiscussionsController;
+use Flarum\Api\Serializer\DiscussionSerializer;
 use Flarum\Extend;
 use Flarum\Sticky\Listener;
+use Flarum\Sticky\Post\DiscussionStickiedPost;
 use Illuminate\Contracts\Events\Dispatcher;
 
 return [
@@ -16,13 +19,26 @@ return [
         ->js(__DIR__.'/js/dist/forum.js')
         ->css(__DIR__.'/less/forum.less'),
 
+    (new Extend\Post())
+        ->type(DiscussionStickiedPost::class),
+
+    (new Extend\ApiSerializer(DiscussionSerializer::class))
+        ->attribute('isSticky', function (DiscussionSerializer $serializer, $discussion) {
+            return (bool) $discussion->is_sticky;
+        })
+        ->attribute('canSticky', function (DiscussionSerializer $serializer, $discussion) {
+            return (bool) $serializer->getActor()->can('sticky', $discussion);
+        }),
+
+    (new Extend\ApiController(ListDiscussionsController::class))
+        ->addInclude('firstPost'),
+
     (new Extend\Frontend('admin'))
         ->js(__DIR__.'/js/dist/admin.js'),
 
     new Extend\Locales(__DIR__.'/locale'),
 
     function (Dispatcher $events) {
-        $events->subscribe(Listener\AddApiAttributes::class);
         $events->subscribe(Listener\CreatePostWhenDiscussionIsStickied::class);
         $events->subscribe(Listener\PinStickiedDiscussionsToTop::class);
         $events->subscribe(Listener\SaveStickyToDatabase::class);

extensions/sticky/src/Listener/AddApiAttributes.php

@@ -1,49 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
- */
-
-namespace Flarum\Sticky\Listener;
-
-use Flarum\Api\Controller\ListDiscussionsController;
-use Flarum\Api\Event\Serializing;
-use Flarum\Api\Event\WillGetData;
-use Flarum\Api\Serializer\DiscussionSerializer;
-use Illuminate\Contracts\Events\Dispatcher;
-
-class AddApiAttributes
-{
-    /**
-     * @param Dispatcher $events
-     */
-    public function subscribe(Dispatcher $events)
-    {
-        $events->listen(Serializing::class, [$this, 'prepareApiAttributes']);
-        $events->listen(WillGetData::class, [$this, 'includeFirstPost']);
-    }
-
-    /**
-     * @param Serializing $event
-     */
-    public function prepareApiAttributes(Serializing $event)
-    {
-        if ($event->isSerializer(DiscussionSerializer::class)) {
-            $event->attributes['isSticky'] = (bool) $event->model->is_sticky;
-            $event->attributes['canSticky'] = (bool) $event->actor->can('sticky', $event->model);
-        }
-    }
-
-    /**
-     * @param WillGetData $event
-     */
-    public function includeFirstPost(WillGetData $event)
-    {
-        if ($event->isController(ListDiscussionsController::class)) {
-            $event->addInclude('firstPost');
-        }
-    }
-}

extensions/sticky/src/Listener/CreatePostWhenDiscussionIsStickied.php

@@ -10,7 +10,6 @@
 namespace Flarum\Sticky\Listener;
 
 use Flarum\Discussion\Discussion;
-use Flarum\Event\ConfigurePostTypes;
 use Flarum\Sticky\Event\DiscussionWasStickied;
 use Flarum\Sticky\Event\DiscussionWasUnstickied;
 use Flarum\Sticky\Post\DiscussionStickiedPost;
@@ -24,19 +23,10 @@ class CreatePostWhenDiscussionIsStickied
      */
     public function subscribe(Dispatcher $events)
     {
-        $events->listen(ConfigurePostTypes::class, [$this, 'configurePostTypes']);
         $events->listen(DiscussionWasStickied::class, [$this, 'whenDiscussionWasStickied']);
         $events->listen(DiscussionWasUnstickied::class, [$this, 'whenDiscussionWasUnstickied']);
     }
 
-    /**
-     * @param ConfigurePostTypes $event
-     */
-    public function configurePostTypes(ConfigurePostTypes $event)
-    {
-        $event->add(DiscussionStickiedPost::class);
-    }
-
     /**
      * @param DiscussionWasStickied $event
      */