Use new model extender

composer.json

@@ -3,7 +3,7 @@
   "description": "Add views to flarum discussions",
   "type": "flarum-extension",
   "require": {
-    "flarum/core": "^0.1.0-beta.8"
+    "flarum/core": "^0.1.0-beta.13"
   },
   "license": "MIT",
   "authors": [

extend.php

@@ -1,9 +1,17 @@
 <?php
 
+use Flarum\Database\AbstractModel;
+use Flarum\Discussion\Discussion;
 use Michaelbelgium\Discussionviews\Listeners;
 use Illuminate\Contracts\Events\Dispatcher;
 use Flarum\Extend\Locales;
 use Flarum\Extend\Frontend;
+use Flarum\Extend\Model;
+use Flarum\Settings\SettingsRepositoryInterface;
+use Michaelbelgium\Discussionviews\Listeners\AddRelationship;
+use Michaelbelgium\Discussionviews\Models\DiscussionView;
+
+$settings = app(SettingsRepositoryInterface::class);
 
 return [
     (new Frontend('forum'))
@@ -15,6 +23,12 @@
 
     new Locales(__DIR__ . '/locale'),
 
+    (new Model(Discussion::class))->relationship(AddRelationship::RELATIONSHIP, function (AbstractModel $model) {
+        return $model->hasMany(DiscussionView::class)->orderBy('visited_at', 'DESC');
+    })->relationship(AddRelationship::RELATIONSHIP_LATEST, function (AbstractModel $model) use ($settings) {
+        return $model->views()->limit($settings->get('michaelbelgium-discussionviews.max_listcount', 5));
+    }),
+
     function (Dispatcher $events) {
         $events->subscribe(Listeners\AddRelationship::class);
         $events->subscribe(Listeners\AddDiscussionViewHandler::class);

src/Listeners/AddRelationship.php

@@ -5,47 +5,25 @@
 use Flarum\Api\Event\WillGetData;
 use Flarum\Api\Serializer\DiscussionSerializer;
 use Flarum\Api\Event\Serializing;
-use Flarum\Discussion\Discussion;
 use Flarum\Event\GetApiRelationship;
-use Flarum\Event\GetModelRelationship;
-use Flarum\Settings\SettingsRepositoryInterface;
 use Illuminate\Contracts\Events\Dispatcher;
-use Michaelbelgium\Discussionviews\Models\DiscussionView;
 use Michaelbelgium\Discussionviews\Serializers\DiscussionViewSerializer;
 
 class AddRelationship
 {
     const RELATIONSHIP = 'views'; //$discussion->views()
     const RELATIONSHIP_LATEST = 'latestViews';
 
-    private $settings;
-
-    public function __construct(SettingsRepositoryInterface $settings) {
-        $this->settings = $settings;
-    }
-
     /**
      * @param Dispatcher $events
      */
     public function subscribe(Dispatcher $events)
     {
-        $events->listen(GetModelRelationship::class, [$this, "addRelationship"]);
         $events->listen(GetApiRelationship::class, [$this, 'addApiRelationship']);
         $events->listen(WillGetData::class, [$this, 'includeRelationship']);
         $events->listen(Serializing::class, [$this, 'prepareApiAttributes']);
     }
 
-    public function addRelationship(GetModelRelationship $event)
-    {
-        if($event->isRelationship(Discussion::class, self::RELATIONSHIP)) {
-            return $event->model->hasMany(DiscussionView::class)->orderBy('visited_at', 'DESC');
-        }
-
-        if($event->isRelationship(Discussion::class, self::RELATIONSHIP_LATEST)) {
-            return $event->model->views()->limit($this->settings->get('michaelbelgium-discussionviews.max_listcount', 5));
-        }
-    }
-
     public function addApiRelationship(GetApiRelationship $event)
     {
         if($event->isRelationship(DiscussionSerializer::class, self::RELATIONSHIP_LATEST)) {