Skip to content

Commit

Permalink
Add Registered event as a universal trigger (#4)
Browse files Browse the repository at this point in the history
  • Loading branch information
nxta committed Sep 22, 2021
1 parent f18bfa1 commit 516b9aa
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 4 deletions.
1 change: 1 addition & 0 deletions extend.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
use Flarum\Api\Controller\ShowUserController;
use Flarum\Api\Serializer\UserSerializer;
use Flarum\Extend;
use Flarum\User\Event\Registered;
use Flarum\User\User;

return [
Expand Down
3 changes: 2 additions & 1 deletion src/CriteriaCalculator.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
use Askvortsov\AutoModerator\Requirement\RequirementDriverInterface;
use Askvortsov\AutoModerator\Requirement\RequirementManager;
use Flarum\User\Event\LoggedIn;
use Flarum\User\Event\Registered;
use Flarum\User\User;
use Illuminate\Support\Arr;

Expand Down Expand Up @@ -136,7 +137,7 @@ protected function whereTriggeredBy($criteria, $eventClass)
return $criterion->isValid($this->actions, $this->metrics, $this->requirements);
});

if ($eventClass === LoggedIn::class) {
if ($eventClass === LoggedIn::class || $eventClass === Registered::class) {
return $validCriteria;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Metric/DiscussionsStarted.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ public function eventTriggers(): array

public function getValue(User $user): int
{
return $user->discussion_count;
return intval($user->discussion_count);
}
}
2 changes: 1 addition & 1 deletion src/Metric/LikesReceived.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function eventTriggers(): array
public function getValue(User $user): int
{
if (property_exists($user, 'clarkwinkelmann_likes_received_count')) {
return $user->clarkwinkelmann_likes_received_count;
return intval($user->clarkwinkelmann_likes_received_count);
}

return Post::where('user_id', $user->id)->select('id')->withCount('likes')->get()->sum('likes_count');
Expand Down
2 changes: 1 addition & 1 deletion src/Metric/PostsMade.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ public function eventTriggers(): array

public function getValue(User $user): int
{
return $user->comment_count;
return intval($user->comment_count);
}
}
7 changes: 7 additions & 0 deletions src/Provider/AutoModeratorProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use Askvortsov\AutoModerator\Metric\MetricManager;
use Flarum\Foundation\AbstractServiceProvider;
use Flarum\User\Event\LoggedIn;
use Flarum\User\Event\Registered;
use Illuminate\Contracts\Events\Dispatcher;

class AutoModeratorProvider extends AbstractServiceProvider
Expand All @@ -26,6 +27,12 @@ public function boot(Dispatcher $events, MetricManager $metrics)
'getUser' => function (LoggedIn $event) {
return $event->user;
}
],
[
'eventClass' => Registered::class,
'getUser' => function (Registered $event) {
return $event->user;
}
]
];

Expand Down

0 comments on commit 516b9aa

Please sign in to comment.