From 129a5cf383cfb70a35c958523624dc1c5a76efa1 Mon Sep 17 00:00:00 2001
From: Vyquos <75266055+Vyquos@users.noreply.github.com>
Date: Wed, 12 Oct 2022 22:51:20 +0200
Subject: [PATCH] Upgrade better-discord.js dependency

Bump better-discord.js to newest version (5e58e1e). Note that better-discord.js
is still very outdated, with its latest commit being from December
2020. Alternatives for this dependency should be considered, see also #768.
---
 package.json |  2 +-
 src/bot.ts   | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/package.json b/package.json
index b26e995a..3a35ead5 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
   "homepage": "https://github.com/Half-Shot/matrix-appservice-discord#readme",
   "dependencies": {
     "@mx-puppet/matrix-discord-parser": "0.1.10",
-    "better-discord.js": "git+https://github.com/Sorunome/better-discord.js.git#b5a28499899fe2d9e6aa1aa3b3c5d693ae672117",
+    "better-discord.js": "git+https://github.com/Sorunome/better-discord.js.git#5e58e1e7510cf2192f3503ca146dd61a56a75c72",
     "better-sqlite3": "^7.1.0",
     "command-line-args": "^5.1.1",
     "command-line-usage": "^6.1.0",
diff --git a/src/bot.ts b/src/bot.ts
index c15abad8..8dd14a33 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -342,19 +342,11 @@ export class DiscordBot {
 
         client.on("userUpdate", async (_, user) => {
             try {
-                if (!(user instanceof Discord.User)) {
-                    log.warn(`Ignoring update for ${user.username}. User was partial.`);
-                    return;
-                }
                 await this.userSync.OnUpdateUser(user);
             } catch (err) { log.error("Exception thrown while handling \"userUpdate\" event", err); }
         });
         client.on("guildMemberAdd", async (member) => {
             try {
-                if (!(member instanceof Discord.GuildMember)) {
-                    log.warn(`Ignoring update for ${member.guild.id} ${member.id}. User was partial.`);
-                    return;
-                }
                 await this.userSync.OnAddGuildMember(member);
             } catch (err) { log.error("Exception thrown while handling \"guildMemberAdd\" event", err); }
         });
@@ -369,10 +361,6 @@ export class DiscordBot {
         });
         client.on("guildMemberUpdate", async (_, member) => {
             try {
-                if (!(member instanceof Discord.GuildMember)) {
-                    log.warn(`Ignoring update for ${member.guild.id} ${member.id}. User was partial.`);
-                    return;
-                }
                 await this.userSync.OnUpdateGuildMember(member);
             } catch (err) { log.error("Exception thrown while handling \"guildMemberUpdate\" event", err); }
         });