Merge branch 'master' into dev_discussion_count

extend.php

@@ -5,35 +5,38 @@
 use Flarum\Api\Serializer\ForumSerializer;
 use Flarum\Api\Serializer\UserSerializer;
 use Flarum\Extend;
-use Flarum\Extend\ApiController;
 use Flarum\Post\Event\Posted;
 use Flarum\Discussion\Event\Started;
+use Flarum\Post\Event\Deleted as PostDeleted;
+use Flarum\Discussion\Event\Deleted as DiscussionDeleted;
 use Flarum\Api\Controller\ListUsersController;
 use Flarum\User\Filter\UserFilterer;
 use Illuminate\Database\Eloquent\Builder;
 
 return [
     (new Extend\Frontend('admin'))
-        ->js(__DIR__ . '/js/dist/admin.js'),
+        ->js(__DIR__.'/js/dist/admin.js'),
 
     (new Extend\Frontend('forum'))
-        ->js(__DIR__ . '/js/dist/forum.js')
-        ->css(__DIR__ . '/resources/less/forum.less')
+        ->js(__DIR__.'/js/dist/forum.js')
+        ->css(__DIR__.'/resources/less/forum.less')
         ->route('/leaderboard', 'nodeloc_leaderboard', Content\LeaderBoard::class),
 
-    new Extend\Locales(__DIR__ . '/resources/locale'),
+    new Extend\Locales(__DIR__.'/resources/locale'),
 
     (new Extend\ApiSerializer(ForumSerializer::class))
         ->attributes(PermissionBasedForumSettings::class),
-    // (new Extend\ApiSerializer(UserSerializer::class))
-    //     ->attribute('monthlyDiscussionCount', "monthlyDiscussionCount"),
+    (new Extend\ApiSerializer(UserSerializer::class))
+        ->attributes(AddMonthlyCountAttributes::class),
     (new Extend\Policy())
         ->globalPolicy(Access\UserPolicy::class),
-    // (new Extend\Event())
-    //     ->listen(Posted::class, [Listeners\UpdateCount::class, 'postWasPosted'])
-    //     ->listen(Started::class, [Listeners\UpdateCount::class, 'discussionWasStarted']),
+    (new Extend\Event())
+        ->listen(Posted::class, [Listeners\UpdateCount::class, 'postWasPosted'])
+        ->listen(Started::class, [Listeners\UpdateCount::class, 'discussionWasStarted'])
+        ->listen(PostDeleted::class, [Listeners\UpdateCount::class, 'postWasDeleted'])
+        ->listen(DiscussionDeleted::class, [Listeners\UpdateCount::class, 'discussionWasDeleted']),
     (new Extend\View())
-        ->namespace('nodeloc.leaderboard', __DIR__ . '/resources/views'),
+        ->namespace('nodeloc.leaderboard', __DIR__.'/resources/views'),
     (new Extend\ApiController(ListUsersController::class))
         ->addSortField('money')
         ->addSortField('lotteryCount')
@@ -49,10 +52,4 @@
         ->add(Middleware\BeforeMiddleware::class),
     (new Extend\Filter(UserFilterer::class))
         ->addFilterMutator(Filter\CheckDateFilter::class),
-    (new Extend\ApiSerializer(UserSerializer::class))
-        ->attributes(function ($s, $model, $attrs) {
-            $attrs['monthlyCommentCount'] = $model->monthly_comment_count ?? 0;
-            $attrs['monthlyDiscussionCount'] = $model->monthly_discussion_count ?? 0;
-            return $attrs;
-        })
 ];

js/package.json

@@ -4,6 +4,7 @@
     "prettier": "@flarum/prettier-config",
     "dependencies": {
         "@flarum/prettier-config": "^1.0.0",
+        "@nodeloc/flarum-ext-leaderboard": "file:",
         "flarum-tsconfig": "^1.0.2",
         "flarum-webpack-config": "^2.0.2",
         "webpack": "^5.88.2",

src/AddMonthlyCountAttributes.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Nodeloc\LeaderBoard;
+
+use Flarum\Api\Serializer\UserSerializer;
+use Flarum\User\User;
+
+class AddMonthlyCountAttributes
+{
+    public function __invoke(UserSerializer $serializer, User $user)
+    {
+        $attributes = [];
+        $attributes['monthlyDiscussionCount'] = $user->monthly_discussion_count ;
+        $attributes['monthlyCommentCount'] = $user->monthly_comment_count ;
+        return $attributes;
+    }
+}

src/Listeners/UpdateCount.php

@@ -43,16 +43,30 @@ public function __construct(SettingsRepositoryInterface $settings, Dispatcher $e
 
     public function postWasPosted(Posted $event)
     {
-        $user = $event->actor;
-        $user ->increment('monthly_comment_count', 1);
-        $user->save();
+        if ($event->post['number'] > 1) {
+            $user = $event->actor;
+            $user ->increment('monthly_comment_count', 1);
+            $user->save();
+        }
+    }
+    public function postWasDeleted(PostDeleted $event)
+    {
+        if ($event->post['number'] > 1) {
+            $user = $event->actor;
+            $user ->decrement('monthly_comment_count', 1);
+            $user->save();
+        }
     }
-
     public function discussionWasStarted(Started $event)
     {
         $user = $event->actor;
         $user ->increment('monthly_discussion_count', 1);
         $user->save();
     }
-
+    public function discussionWasDeleted(DiscussionDeleted $event)
+    {
+        $user = $event->actor;
+        $user ->decrement('monthly_discussion_count', 1);
+        $user->save();
+    }
 }