fix possible memory leak from legacy ready event and optimize the logic

discord-php · Sep 10, 2023 · bf21b6c · bf21b6c
1 parent 6234b07
commit bf21b6c
Showing 1 changed file with 5 additions and 15 deletions.
diff --git a/src/Discord/Discord.php b/src/Discord/Discord.php
@@ -106,7 +106,7 @@ class Discord
     /**
      * An array of loggers for voice clients.
      *
-     * @var array Loggers.
+     * @var ?LoggerInterface[] Loggers.
      */
     protected $voiceLoggers = [];
 
@@ -379,13 +379,6 @@ public function __construct(array $options = [])
             $this->handlers->removeHandler($event);
         }
 
-        $function = function () use (&$function) {
-            $this->emittedInit = true;
-            $this->removeListener('ready', $function);
-        };
-
-        $this->on('ready', $function);
-
         $this->http = new Http(
             'Bot '.$this->token,
             $this->loop,
@@ -1130,17 +1123,14 @@ protected function ready()
         if ($this->emittedInit) {
             return false;
         }
+        $this->emittedInit = true;
 
         $this->logger->info('client is ready');
         $this->emit('init', [$this]);
 
-        /* deprecated */
-        if ($this->listeners['ready']) {
-            if (count($this->listeners['ready'] ?? []) > 1 || count($this->onceListeners['ready'] ?? []) > 1) {
-                $this->logger->info('The \'ready\' event is deprecated and will be removed in a future version of DiscordPHP. Please use \'init\' instead.');
-            }
-
-            $this->emit('ready', [$this]);
+        if (count($this->listeners('ready'))) {
+            $this->logger->info("The 'ready' event is deprecated and will be removed in a future version of DiscordPHP. Please use 'init' instead.");
+            $this->emit('ready', [$this]); // deprecated
         }
 
         foreach ($this->unparsedPackets as $parser) {