fix: sort options not persisted after page reload (#35)

* fix: sort options not persisted after page reload

* Apply fixes from StyleCI

---------

Co-authored-by: StyleCI Bot <[email protected]>

extend.php

@@ -9,13 +9,15 @@
  * file that was distributed with this source code.
  */
 
+namespace Flarumite\DiscussionViews;
+
 use Flarum\Api\Controller;
 use Flarum\Api\Serializer\DiscussionSerializer;
 use Flarum\Database\AbstractModel;
 use Flarum\Discussion\Event\Saving;
+use Flarum\Discussion\Filter\DiscussionFilterer;
+use Flarum\Discussion\Search\DiscussionSearcher;
 use Flarum\Extend;
-use Flarumite\DiscussionViews\AddAttributesBasedOnPermission;
-use Flarumite\DiscussionViews\Listeners;
 
 return [
     (new Extend\Frontend('forum'))
@@ -44,4 +46,13 @@
 
     (new Extend\Settings())
         ->default('fsdv.ignore-crawlers', true),
+
+    (new Extend\ServiceProvider())
+        ->register(Provider\DiscussionViewsProvider::class),
+
+    (new Extend\SimpleFlarumSearch(DiscussionSearcher::class))
+        ->addGambit(Search\PopularFilterGambit::class),
+
+    (new Extend\Filter(DiscussionFilterer::class))
+        ->addFilter(Search\PopularFilterGambit::class),
 ];

src/Listeners/AddDiscussionViewHandler.php

@@ -32,6 +32,7 @@ class AddDiscussionViewHandler
      * @var SettingsRepositoryInterface
      */
     public $settings;
+
     /**
      * @var bool
      *

src/Provider/DiscussionViewsProvider.php

@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of flarumite/simple-discussion-views.
+ *
+ * Copyright (c) 2020 Flarumite.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Flarumite\DiscussionViews\Provider;
+
+use Flarum\Foundation\AbstractServiceProvider;
+
+class DiscussionViewsProvider extends AbstractServiceProvider
+{
+    public function register()
+    {
+        $this->container->extend('flarum.forum.discussions.sortmap', function (array $map) {
+            return array_merge($map, [
+                'popular'   => '-view_count',
+                'unpopular' => 'view_count',
+            ]);
+        });
+    }
+}

src/Search/PopularFilterGambit.php

@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of flarumite/simple-discussion-views.
+ *
+ * Copyright (c) 2020 Flarumite.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Flarumite\DiscussionViews\Search;
+
+use Flarum\Filter\FilterInterface;
+use Flarum\Filter\FilterState;
+use Flarum\Search\AbstractRegexGambit;
+use Flarum\Search\SearchState;
+use Flarum\User\User;
+use Illuminate\Database\Query\Builder;
+
+class PopularFilterGambit extends AbstractRegexGambit implements FilterInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function getFilterKey(): string
+    {
+        return 'popular';
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getGambitPattern()
+    {
+        return 'is:popular';
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function filter(FilterState $filterState, string $filterValue, bool $negate)
+    {
+        $this->sort($filterState->getQuery(), $filterState->getActor(), $negate);
+    }
+
+    protected function sort(Builder $query, User $actor, bool $negate)
+    {
+        $query->orderBy('view_count', 'desc');
+    }
+
+    /**
+     * @param SearchState $search
+     * @param array       $matches
+     * @param             $negate
+     */
+    protected function conditions(SearchState $search, array $matches, $negate)
+    {
+        $this->sort($search->getQuery(), $search->getActor(), $negate);
+    }
+}