From 10caa40df2e620d35d8f67ea98e6ee24d813ac37 Mon Sep 17 00:00:00 2001
From: Annika <56906084+AnnikaCodes@users.noreply.github.com>
Date: Fri, 18 Sep 2020 05:08:09 -0700
Subject: [PATCH] Move Room Owners above Admins in the userlist (#1618)

---
 js/client-chat.js  | 2 --
 js/client.js       | 8 ++++----
 src/client-main.ts | 8 ++++----
 src/panel-chat.tsx | 2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/js/client-chat.js b/js/client-chat.js
index 20ca720e2..5b82b2ab0 100644
--- a/js/client-chat.js
+++ b/js/client-chat.js
@@ -1851,8 +1851,6 @@
 				{order: (Config.defaultOrder || 10006.5)}
 			).order;
 
-			if (a === 'zarel' && aRank === 10003) aRank = 10000.5;
-			if (b === 'zarel' && bRank === 10003) bRank = 10000.5;
 			if (aRank !== bRank) return aRank - bRank;
 			if (aUser.away !== bUser.away) return aUser.away - bUser.away;
 			return (a > b ? 1 : -1);
diff --git a/js/client.js b/js/client.js
index a9d306fd5..2e3a4940f 100644
--- a/js/client.js
+++ b/js/client.js
@@ -2434,13 +2434,13 @@ function toId() {
 			type: 'leadership',
 			order: 10001
 		},
-		'&': {
-			name: "Administrator (&amp;)",
+		'#': {
+			name: "Room Owner (#)",
 			type: 'leadership',
 			order: 10002
 		},
-		'#': {
-			name: "Room Owner (#)",
+		'&': {
+			name: "Administrator (&amp;)",
 			type: 'leadership',
 			order: 10003
 		},
diff --git a/src/client-main.ts b/src/client-main.ts
index 3973c37eb..3ab79415e 100644
--- a/src/client-main.ts
+++ b/src/client-main.ts
@@ -311,13 +311,13 @@ class PSServer {
 			type: 'leadership',
 			order: 101,
 		},
-		'&': {
-			name: "Administrator (&)",
+		'#': {
+			name: "Room Owner (#)",
 			type: 'leadership',
 			order: 102,
 		},
-		'#': {
-			name: "Room Owner (#)",
+		'&': {
+			name: "Administrator (&)",
 			type: 'leadership',
 			order: 103,
 		},
diff --git a/src/panel-chat.tsx b/src/panel-chat.tsx
index b16346200..77dc38ed5 100644
--- a/src/panel-chat.tsx
+++ b/src/panel-chat.tsx
@@ -410,7 +410,7 @@ class ChatUserList extends preact.Component<{room: ChatRoom, left?: number, mini
 		const room = this.props.room;
 		let userList = Object.entries(room.users) as [ID, string][];
 		PSUtils.sortBy(userList, ([id, name]) => (
-			[name === '#Zarel', PS.server.getGroup(name.charAt(0)).order, !name.endsWith('@!'), id]
+			[PS.server.getGroup(name.charAt(0)).order, !name.endsWith('@!'), id]
 		));
 		return <ul class={'userlist' + (this.props.minimized ? (this.state.expanded ? ' userlist-maximized' : ' userlist-minimized') : '')} style={{left: this.props.left || 0}}>
 			<li class="userlist-count" style="text-align:center;padding:2px 0" onClick={this.toggleExpanded}><small>{room.userCount} users</small></li>