1
0
mirror of https://github.com/flarum/core.git synced 2025-08-10 18:35:56 +02:00

Get rid of event subscribers that resolve services too early

Refs flarum/core#1578.
This commit is contained in:
Franz Liedke
2018-12-16 15:05:58 +01:00
parent 9302014dfa
commit de1ff99356
4 changed files with 59 additions and 53 deletions

View File

@@ -9,9 +9,16 @@
* file that was distributed with this source code.
*/
use Flarum\Api\Serializer\BasicUserSerializer;
use Flarum\Event\ConfigureNotificationTypes;
use Flarum\Extend;
use Flarum\Suspend\Access;
use Flarum\Suspend\Event\Suspended;
use Flarum\Suspend\Event\Unsuspended;
use Flarum\Suspend\Listener;
use Flarum\Suspend\Notification\UserSuspendedBlueprint;
use Flarum\Suspend\Notification\UserUnsuspendedBlueprint;
use Flarum\User\Event\Saving;
use Illuminate\Contracts\Events\Dispatcher;
return [
@@ -26,8 +33,15 @@ return [
function (Dispatcher $events) {
$events->subscribe(Listener\AddUserSuspendAttributes::class);
$events->subscribe(Listener\RevokeAccessFromSuspendedUsers::class);
$events->subscribe(Listener\SaveSuspensionToDatabase::class);
$events->subscribe(Listener\SendNotificationWhenUserIsSuspended::class);
$events->listen(Saving::class, Listener\SaveSuspensionToDatabase::class);
$events->listen(ConfigureNotificationTypes::class, function (ConfigureNotificationTypes $event) {
$event->add(UserSuspendedBlueprint::class, BasicUserSerializer::class, ['alert', 'email']);
$event->add(UserUnsuspendedBlueprint::class, BasicUserSerializer::class, ['alert', 'email']);
});
$events->listen(Suspended::class, Listener\SendNotificationWhenUserIsSuspended::class);
$events->listen(Unsuspended::class, Listener\SendNotificationWhenUserIsUnsuspended::class);
$events->subscribe(Access\UserPolicy::class);
}