fix(Action): Don't crash when partials are disabled (#4822)

discordjs · Sep 15, 2020 · 8fa3a89 · 8fa3a89
1 parent 9c76129
commit 8fa3a89
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/client/actions/Action.js b/src/client/actions/Action.js
@@ -93,7 +93,8 @@ class GenericAction {
     if (data.guild_id) {
       const guild = this.client.guilds.cache.get(data.guild_id);
       if (guild) {
-        return this.getMember(data.member, guild).user;
+        const member = this.getMember(data.member, guild);
+        return member ? member.user : undefined;
       }
     }
     return this.getUser(data);

diff --git a/src/client/actions/TypingStart.js b/src/client/actions/TypingStart.js
@@ -7,6 +7,9 @@ const textBasedChannelTypes = ['dm', 'text', 'news'];
 class TypingStart extends Action {
   handle(data) {
     const channel = this.getChannel(data);
+    if (!channel) {
+      return;
+    }
     if (!textBasedChannelTypes.includes(channel.type)) {
       this.client.emit(Events.WARN, `Discord sent a typing packet to a ${channel.type} channel ${channel.id}`);
       return;