Get rid of event subscribers that resolve services too early

Refs flarum/core#1578.

extensions/subscriptions/extend.php

@@ -9,8 +9,21 @@
  * file that was distributed with this source code.
  */
 
+use Flarum\Api\Event\Serializing;
+use Flarum\Api\Serializer\BasicDiscussionSerializer;
+use Flarum\Discussion\Event\Saving;
+use Flarum\Discussion\Event\Searching;
+use Flarum\Event\ConfigureDiscussionGambits;
+use Flarum\Event\ConfigureNotificationTypes;
+use Flarum\Event\ConfigureUserPreferences;
 use Flarum\Extend;
+use Flarum\Post\Event\Deleted;
+use Flarum\Post\Event\Hidden;
+use Flarum\Post\Event\Posted;
+use Flarum\Post\Event\Restored;
+use Flarum\Subscriptions\Gambit\SubscriptionGambit;
 use Flarum\Subscriptions\Listener;
+use Flarum\Subscriptions\Notification\NewPostBlueprint;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Contracts\View\Factory;
 
@@ -21,11 +34,26 @@ return [
         ->route('/following', 'following'),
 
     function (Dispatcher $events, Factory $views) {
-        $events->subscribe(Listener\AddDiscussionSubscriptionAttribute::class);
-        $events->subscribe(Listener\FilterDiscussionListBySubscription::class);
-        $events->subscribe(Listener\SaveSubscriptionToDatabase::class);
-        $events->subscribe(Listener\SendNotificationWhenReplyIsPosted::class);
-        $events->subscribe(Listener\FollowAfterReply::class);
+        $events->listen(Serializing::class, Listener\AddDiscussionSubscriptionAttribute::class);
+        $events->listen(Saving::class, Listener\SaveSubscriptionToDatabase::class);
+
+        $events->listen(ConfigureDiscussionGambits::class, function (ConfigureDiscussionGambits $event) {
+            $event->gambits->add(SubscriptionGambit::class);
+        });
+        $events->listen(Searching::class, Listener\FilterDiscussionListBySubscription::class);
+
+        $events->listen(ConfigureNotificationTypes::class, function (ConfigureNotificationTypes $event) {
+            $event->add(NewPostBlueprint::class, BasicDiscussionSerializer::class, ['alert', 'email']);
+        });
+        $events->listen(Posted::class, Listener\SendNotificationWhenReplyIsPosted::class);
+        $events->listen(Hidden::class, Listener\DeleteNotificationWhenPostIsHiddenOrDeleted::class);
+        $events->listen(Restored::class, Listener\RestoreNotificationWhenPostIsRestored::class);
+        $events->listen(Deleted::class, Listener\DeleteNotificationWhenPostIsHiddenOrDeleted::class);
+
+        $events->listen(ConfigureUserPreferences::class, function (ConfigureUserPreferences $event) {
+            $event->add('followAfterReply', 'boolval', false);
+        });
+        $events->listen(Posted::class, Listener\FollowAfterReply::class);
 
         $views->addNamespace('flarum-subscriptions', __DIR__.'/views');
     }