From 5a2c4b3cabd38efa2c7b1f79220d817f859e8b68 Mon Sep 17 00:00:00 2001
From: Dragon Fire <danielbodendahl@gmail.com>
Date: Fri, 13 Dec 2019 21:20:03 -0500
Subject: [PATCH] Test new embed format on user command

---
 commands/info/user.js | 38 ++++++++++++++++++++++----------------
 package.json          |  2 +-
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/commands/info/user.js b/commands/info/user.js
index 2af8264f..e3c7d117 100644
--- a/commands/info/user.js
+++ b/commands/info/user.js
@@ -1,6 +1,7 @@
 const Command = require('../../structures/Command');
 const moment = require('moment');
 const { MessageEmbed } = require('discord.js');
+const { stripIndents } = require('common-tags');
 const { trimArray } = require('../../util/Util');
 const activities = {
 	PLAYING: 'Playing',
@@ -32,11 +33,14 @@ module.exports = class UserCommand extends Command {
 	async run(msg, { user }) {
 		const format = user.avatar && user.avatar.startsWith('a_') ? 'gif' : 'png';
 		const embed = new MessageEmbed()
-			.setThumbnail(user.displayAvatarURL({ format }))
-			.addField('❯ Name', user.tag, true)
-			.addField('❯ ID', user.id, true)
-			.addField('❯ Discord Join Date', moment.utc(user.createdAt).format('MM/DD/YYYY h:mm A'), true)
-			.addField('❯ Bot?', user.bot ? 'Yes' : 'No', true);
+			.setAuthor(user.tag)
+			.setThumbnail(user.displayAvatarURL({ format }));
+		let description = stripIndents`
+			**General User Info:**
+			• ID: ${user.id}
+			• Discord Join Date: ${moment.utc(user.createdAt).format('MM/DD/YYYY h:mm A')}
+			• ${user.bot ? 'Bot' : 'Not a Bot'}
+		`;
 		if (msg.channel.type === 'text') {
 			try {
 				const member = await msg.guild.members.fetch(user.id);
@@ -45,21 +49,23 @@ module.exports = class UserCommand extends Command {
 					.filter(role => role.id !== defaultRole.id)
 					.sort((a, b) => b.position - a.position)
 					.map(role => role.name);
-				embed
-					.setColor(member.displayHexColor)
-					.setDescription(member.presence.activity
-						? `${activities[member.presence.activity.type]} **${member.presence.activity.name}**`
-						: '')
-					.addField('❯ Server Join Date', moment.utc(member.joinedAt).format('MM/DD/YYYY h:mm A'), true)
-					.addField('❯ Nickname', member.nickname || 'None', true)
-					.addField('❯ Highest Role',
-						member.roles.highest.id === defaultRole.id ? 'None' : member.roles.highest.name, true)
-					.addField('❯ Hoist Role', member.roles.hoist ? member.roles.hoist.name : 'None', true)
-					.addField(`❯ Roles (${roles.length})`, roles.length ? trimArray(roles, 10).join(', ') : 'None');
+				description += stripIndents`
+
+					**Server Member Info:**
+					• Nickname: ${member.nickname || 'None'}
+					• Server Join Date: ${moment.utc(member.joinedAt).format('MM/DD/YYYY h:mm A')}
+					• Highest Role: ${member.roles.highest.id === defaultRole.id ? 'None' : member.roles.highest.name}
+					• Hoist Role: ${member.roles.hoist ? member.roles.hoist.name : 'None'}
+
+					**Roles (${roles.length})**
+					• ${roles.length ? trimArray(roles, 6).join(', ') : 'None'}
+				`;
+				embed.setColor(member.displayHexColor);
 			} catch (err) {
 				embed.setFooter('Failed to resolve member, showing basic user information instead.');
 			}
 		}
+		embed.setDescription(description);
 		return msg.embed(embed);
 	}
 };
diff --git a/package.json b/package.json
index 1b30a8da..c02e493f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xiao",
-	"version": "109.3.2",
+	"version": "109.3.3",
 	"description": "Your personal server companion.",
 	"main": "Xiao.js",
 	"scripts": {