From 467b6e68b0dc8962a06af8010534581679c87ca1 Mon Sep 17 00:00:00 2001
From: Dragon Fire <danielbodendahl@gmail.com>
Date: Thu, 19 Jul 2018 15:29:30 -0400
Subject: [PATCH] Show basic info if member resolve fails

---
 commands/info/user.js | 20 ++++++++++++--------
 package.json          |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/commands/info/user.js b/commands/info/user.js
index fc540131..72eb108e 100644
--- a/commands/info/user.js
+++ b/commands/info/user.js
@@ -29,14 +29,18 @@ module.exports = class UserInfoCommand extends Command {
 			.addField('❯ Discord Join Date', user.createdAt.toDateString(), true)
 			.addField('❯ Bot?', user.bot ? 'Yes' : 'No', true);
 		if (msg.channel.type === 'text') {
-			const member = await msg.guild.members.fetch(user.id);
-			embed
-				.setColor(member.displayHexColor)
-				.addField('❯ Server Join Date', member.joinedAt.toDateString(), true)
-				.addField('❯ Nickname', member.nickname || 'None', true)
-				.addField('❯ Highest Role',
-					member.roles.highest.id !== msg.guild.defaultRole.id ? member.roles.highest.name : 'None', true)
-				.addField('❯ Hoist Role', member.roles.hoist ? member.roles.hoist.name : 'None', true);
+			try {
+				const member = await msg.guild.members.fetch(user.id);
+				embed
+					.setColor(member.displayHexColor)
+					.addField('❯ Server Join Date', member.joinedAt.toDateString(), true)
+					.addField('❯ Nickname', member.nickname || 'None', true)
+					.addField('❯ Highest Role',
+						member.roles.highest.id !== msg.guild.defaultRole.id ? member.roles.highest.name : 'None', true)
+					.addField('❯ Hoist Role', member.roles.hoist ? member.roles.hoist.name : 'None', true);
+			} catch (err) {
+				embed.setFooter('Failed to resolve member, showing basic user information instead.');
+			}
 		}
 		return msg.embed(embed);
 	}
diff --git a/package.json b/package.json
index 8e51a828..461b5a67 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xiao",
-	"version": "85.1.3",
+	"version": "85.1.4",
 	"description": "Your personal server companion.",
 	"main": "Xiao.js",
 	"scripts": {