Use new Model extender

This commit is contained in:
Franz Liedke 2020-04-24 15:56:07 +02:00
parent 2d9c38674b
commit 91d7b6730f
2 changed files with 4 additions and 13 deletions

View File

@ -17,6 +17,7 @@ use Flarum\Suspend\Listener;
use Flarum\Suspend\Notification\UserSuspendedBlueprint;
use Flarum\Suspend\Notification\UserUnsuspendedBlueprint;
use Flarum\User\Event\Saving;
use Flarum\User\User;
use Illuminate\Contracts\Events\Dispatcher;
return [
@ -28,6 +29,9 @@ return [
->js(__DIR__.'/js/dist/admin.js')
->css(__DIR__.'/less/admin.less'),
(new Extend\Model(User::class))
->dateAttribute('suspendedUntil'),
function (Dispatcher $events) {
$events->subscribe(Listener\AddUserSuspendAttributes::class);
$events->subscribe(Listener\RevokeAccessFromSuspendedUsers::class);

View File

@ -11,8 +11,6 @@ namespace Flarum\Suspend\Listener;
use Flarum\Api\Event\Serializing;
use Flarum\Api\Serializer\UserSerializer;
use Flarum\Event\ConfigureModelDates;
use Flarum\User\User;
use Illuminate\Contracts\Events\Dispatcher;
class AddUserSuspendAttributes
@ -22,20 +20,9 @@ class AddUserSuspendAttributes
*/
public function subscribe(Dispatcher $events)
{
$events->listen(ConfigureModelDates::class, [$this, 'addDates']);
$events->listen(Serializing::class, [$this, 'addAttributes']);
}
/**
* @param ConfigureModelDates $event
*/
public function addDates(ConfigureModelDates $event)
{
if ($event->isModel(User::class)) {
$event->dates[] = 'suspended_until';
}
}
/**
* @param Serializing $event
*/