Add user caching from event (#694)

* Add user caching from event * add from member * add from member * update GUILD_MEMBER_ADD user caching * Simplified code into common functions
discord-php · Jan 29, 2022 · 13f03de · 13f03de
1 parent 4430d41
commit 13f03de
Show file tree

Hide file tree

Showing 18 changed files with 77 additions and 23 deletions.
diff --git a/src/Discord/WebSockets/Event.php b/src/Discord/WebSockets/Event.php
@@ -150,6 +150,21 @@ public function __construct(Http $http, Factory $factory, Discord $discord)
      */
     abstract public function handle(Deferred &$deferred, $data);
 
+    /**
+     * Cache User repository from Event data
+     *
+     * @param object $userdata
+     */
+    protected function cacheUser($userdata)
+    {
+        // User caching
+        if ($user = $this->discord->users->get('id', $userdata->id)) {
+            $user->fill((array) $userdata);
+        } else {
+            $this->discord->users->pushItem($this->factory->part(\Discord\Parts\User\User::class, (array) $userdata, true));
+        }
+    }
+
     public function __debugInfo(): array
     {
         return [];

diff --git a/src/Discord/WebSockets/Events/GuildBanAdd.php b/src/Discord/WebSockets/Events/GuildBanAdd.php
@@ -29,6 +29,8 @@ public function handle(Deferred &$deferred, $data): void
             $this->discord->guilds->push($guild);
         }
 
+        $this->cacheUser($data->user);
+
         $deferred->resolve($ban);
     }
 }
diff --git a/src/Discord/WebSockets/Events/GuildBanRemove.php b/src/Discord/WebSockets/Events/GuildBanRemove.php
@@ -29,6 +29,8 @@ public function handle(Deferred &$deferred, $data): void
             $this->discord->guilds->push($guild);
         }
 
+        $this->cacheUser($data->user);
+
         $deferred->resolve($ban);
     }
 }
diff --git a/src/Discord/WebSockets/Events/GuildEmojisUpdate.php b/src/Discord/WebSockets/Events/GuildEmojisUpdate.php
@@ -32,7 +32,10 @@ public function handle(Deferred &$deferred, $data): void
         }
 
         foreach ($data->emojis as $emoji) {
-            if (! isset($emoji->user) && $oldPart = $oldParts->offsetGet($emoji->id)) {
+            if (isset($emoji->user)) {
+                // User caching from emoji uploader
+                $this->cacheUser($emoji->user);
+            } elseif ($oldPart = $oldParts->offsetGet($emoji->id)) {
                 $emoji->user = $oldPart->user;
             }
             $emojiPart = $this->factory->create(Emoji::class, $emoji, true);

diff --git a/src/Discord/WebSockets/Events/GuildMemberAdd.php b/src/Discord/WebSockets/Events/GuildMemberAdd.php
@@ -30,7 +30,8 @@ public function handle(Deferred &$deferred, $data): void
             ++$guild->member_count;
         }
 
-        $this->discord->users->push($member->user);
+        $this->cacheUser($data->user);
+
         $deferred->resolve($member);
     }
 }
diff --git a/src/Discord/WebSockets/Events/GuildMemberRemove.php b/src/Discord/WebSockets/Events/GuildMemberRemove.php
@@ -31,6 +31,8 @@ public function handle(Deferred &$deferred, $data): void
             $this->discord->guilds->push($guild);
         }
 
+        $this->cacheUser($data->user);
+
         $deferred->resolve($member);
     }
 }
diff --git a/src/Discord/WebSockets/Events/GuildMemberUpdate.php b/src/Discord/WebSockets/Events/GuildMemberUpdate.php
@@ -34,9 +34,7 @@ public function handle(Deferred &$deferred, $data): void
             $guild->members->push($memberPart);
         }
 
-        if ($user = $this->discord->users->get('id', $data->user->id)) {
-            $user->fill((array) $data->user);
-        }
+        $this->cacheUser($data->user);
 
         $deferred->resolve([$memberPart, $old]);
     }

diff --git a/src/Discord/WebSockets/Events/GuildScheduledEventCreate.php b/src/Discord/WebSockets/Events/GuildScheduledEventCreate.php
@@ -29,6 +29,10 @@ public function handle(Deferred &$deferred, $data): void
             $guild->guild_scheduled_events->push($scheduled_event);
         }
 
+        if (isset($data->creator)) {
+            $this->cacheUser($data->creator);
+        }
+
         $deferred->resolve($scheduled_event);
     }
 }
diff --git a/src/Discord/WebSockets/Events/GuildScheduledEventDelete.php b/src/Discord/WebSockets/Events/GuildScheduledEventDelete.php
@@ -29,6 +29,10 @@ public function handle(Deferred &$deferred, $data): void
             $guild->guild_scheduled_events->pull($scheduled_event->id);
         }
 
+        if (isset($data->creator)) {
+            $this->cacheUser($data->creator);
+        }
+
         $deferred->resolve($scheduled_event);
     }
 }
diff --git a/src/Discord/WebSockets/Events/GuildScheduledEventUpdate.php b/src/Discord/WebSockets/Events/GuildScheduledEventUpdate.php
@@ -30,6 +30,8 @@ public function handle(Deferred &$deferred, $data): void
             $guild->guild_scheduled_events->push($scheduled_event);
         }
 
+        $this->cacheUser($data->creator);
+
         $deferred->resolve([$scheduled_event, $old]);
     }
 }
diff --git a/src/Discord/WebSockets/Events/GuildStickersUpdate.php b/src/Discord/WebSockets/Events/GuildStickersUpdate.php
@@ -32,7 +32,10 @@ public function handle(Deferred &$deferred, $data): void
         }
 
         foreach ($data->stickers as $sticker) {
-            if (! isset($sticker->user) && $oldPart = $oldParts->offsetGet($sticker->id)) {
+            if (isset($sticker->user)) {
+                // User caching from sticker uploader
+                $this->cacheUser($sticker->user);
+            } elseif($oldPart = $oldParts->offsetGet($sticker->id)) {
                 $sticker->user = $oldPart->user;
             }
             $stickerPart = $this->factory->create(Sticker::class, $sticker, true);

diff --git a/src/Discord/WebSockets/Events/IntegrationCreate.php b/src/Discord/WebSockets/Events/IntegrationCreate.php
@@ -29,13 +29,8 @@ public function handle(Deferred &$deferred, $data): void
             $guild->integrations->pushItem($integration);
         }
 
-        // User caching
-        if (! isset($data->user)) {
-            if ($user = $this->discord->users->get('id', $data->user->id)) {
-                $user->fill((array) $data->user);
-            } else {
-                $this->discord->users->pushItem($this->factory->part(User::class, (array) $data->user, true));
-            }
+        if (isset($data->user)) {
+            $this->cacheUser($data->user);
         }
 
         $deferred->resolve($integration);

diff --git a/src/Discord/WebSockets/Events/IntegrationUpdate.php b/src/Discord/WebSockets/Events/IntegrationUpdate.php
@@ -29,13 +29,8 @@ public function handle(Deferred &$deferred, $data): void
             $guild->integrations->pushItem($integration);
         }
 
-        // User caching
-        if (! isset($data->user)) {
-            if ($user = $this->discord->users->get('id', $data->user->id)) {
-                $user->fill((array) $data->user);
-            } else {
-                $this->discord->users->pushItem($this->factory->part(User::class, (array) $data->user, true));
-            }
+        if (isset($data->user)) {
+            $this->cacheUser($data->user);
         }
 
         $deferred->resolve($integration);

diff --git a/src/Discord/WebSockets/Events/InteractionCreate.php b/src/Discord/WebSockets/Events/InteractionCreate.php
@@ -30,8 +30,7 @@ public function handle(Deferred &$deferred, $data): void
             if ($userPart = $this->discord->users->get('id', $snowflake)) {
                 $userPart->fill((array) $user);
             } else {
-                $userPart = $this->factory->create(User::class, $user, true);
-                $this->discord->users->pushItem($userPart);
+                $this->discord->users->pushItem($this->factory->part(User::class, (array) $user, true));
             }
         }
 
@@ -59,6 +58,16 @@ public function handle(Deferred &$deferred, $data): void
             }
         }
 
+        if (isset($data->member->user)) {
+            // User caching from member
+            $this->cacheUser($data->member->user);
+        }
+
+        if (isset($data->user)) {
+            // User caching from user dm
+            $this->cacheUser($data->user);
+        }
+
         $deferred->resolve($interaction);
     }
 }
diff --git a/src/Discord/WebSockets/Events/InviteCreate.php b/src/Discord/WebSockets/Events/InviteCreate.php
@@ -24,6 +24,16 @@ public function handle(Deferred &$deferred, $data): void
     {
         $invite = $this->factory->create(Invite::class, $data, true);
 
+        if (isset($data->inviter)) {
+            // User caching from inviter
+            $this->cacheUser($data->inviter);
+        }
+
+        if (isset($data->target_user)) {
+            // User caching from target user
+            $this->cacheUser($data->target_user);
+        }
+
         $deferred->resolve($invite);
     }
 }
diff --git a/src/Discord/WebSockets/Events/MessageReactionAdd.php b/src/Discord/WebSockets/Events/MessageReactionAdd.php
@@ -14,7 +14,6 @@
 use Discord\Parts\WebSockets\MessageReaction;
 use Discord\WebSockets\Event;
 use Discord\Helpers\Deferred;
-use Discord\Parts\Channel\Reaction;
 
 class MessageReactionAdd extends Event
 {
@@ -53,6 +52,10 @@ public function handle(Deferred &$deferred, $data): void
             }
         }
 
+        if (isset($data->member->user)) {
+            $this->cacheUser($data->member->user);
+        }
+
         $deferred->resolve($reaction);
     }
 }
diff --git a/src/Discord/WebSockets/Events/TypingStart.php b/src/Discord/WebSockets/Events/TypingStart.php
@@ -24,6 +24,10 @@ public function handle(Deferred &$deferred, $data): void
     {
         $typing = $this->factory->create(TypingStartPart::class, $data, true);
 
+        if (isset($data->member->user)) {
+            $this->cacheUser($data->member->user);
+        }
+
         $deferred->resolve($typing);
     }
 }
diff --git a/src/Discord/WebSockets/Events/VoiceStateUpdate.php b/src/Discord/WebSockets/Events/VoiceStateUpdate.php
@@ -50,6 +50,8 @@ public function handle(Deferred &$deferred, $data): void
             $this->discord->guilds->offsetSet($state->guild->id, $state->guild);
         }
 
+        $this->cacheUser($data->member->user);
+
         $deferred->resolve([$state, $old_state]);
     }
 }