From 2b0fe4bb803b61b9891acecab2b6bd2b1e574cf0 Mon Sep 17 00:00:00 2001
From: Daniel Odendahl Jr <danielbodendahl@gmail.com>
Date: Fri, 7 Sep 2018 10:58:23 +0000
Subject: [PATCH] Sort roles and emoji

---
 commands/info/emoji-list.js | 2 +-
 commands/info/user.js       | 8 +++++---
 package.json                | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/commands/info/emoji-list.js b/commands/info/emoji-list.js
index 282e4ac7..16875e2f 100644
--- a/commands/info/emoji-list.js
+++ b/commands/info/emoji-list.js
@@ -25,7 +25,7 @@ module.exports = class EmojiListCommand extends Command {
 	}
 
 	run(msg, { type }) {
-		const emojis = msg.guild.emojis.filter(emoji => type === 'animated' ? emoji.animated : !emoji.animated);
+		const emojis = msg.guild.emojis.filter(emoji => type === 'animated' ? emoji.animated : !emoji.animated).sort();
 		if (!emojis.size) return msg.say(`This server has no ${type} custom emoji.`);
 		return msg.say(emojis.map(emoji => emoji.toString()).join(' '), { split: { char: ' ' } });
 	}
diff --git a/commands/info/user.js b/commands/info/user.js
index 1e2cc51c..a040049f 100644
--- a/commands/info/user.js
+++ b/commands/info/user.js
@@ -38,7 +38,10 @@ module.exports = class UserInfoCommand extends Command {
 		if (msg.channel.type === 'text') {
 			try {
 				const member = await msg.guild.members.fetch(user.id);
-				const roles = member.roles.filter(role => role.id !== msg.guild.defaultRole.id);
+				const roles = member.roles
+					.filter(role => role.id !== msg.guild.defaultRole.id)
+					.sort((a, b) => b.position - a.position)
+					.map(role => role.name);
 				embed
 					.setColor(member.displayHexColor)
 					.setDescription(member.presence.activity
@@ -49,8 +52,7 @@ module.exports = class UserInfoCommand extends Command {
 					.addField('❯ Highest Role',
 						member.roles.highest.id === msg.guild.defaultRole.id ? 'None' : member.roles.highest.name, true)
 					.addField('❯ Hoist Role', member.roles.hoist ? member.roles.hoist.name : 'None', true)
-					.addField(`❯ Roles (${roles.size})`,
-						roles.size ? trimArray(roles.map(role => role.name), 10).join(', ') : 'None');
+					.addField(`❯ Roles (${roles.length})`, roles.length ? trimArray(roles, 10).join(', ') : 'None');
 			} catch (err) {
 				embed.setFooter('Failed to resolve member, showing basic user information instead.');
 			}
diff --git a/package.json b/package.json
index 905e67d9..f6f353fa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xiao",
-	"version": "90.3.2",
+	"version": "90.3.3",
 	"description": "Your personal server companion.",
 	"main": "Xiao.js",
 	"scripts": {