Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-05-27 19:23:11 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move Room Owners above Admins in the userlist (#1618)

Browse Source
This commit is contained in:
Annika 2020-09-18 05:08:09 -07:00 committed by GitHub
parent 452cab4ffe
commit 10caa40df2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/client-chat.js
View File

@ -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);

8
js/client.js
View File

@ -2434,13 +2434,13 @@ function toId() {
type: 'leadership',
order: 10001
},
'&': {
name: "Administrator (&)",
'#': {
name: "Room Owner (#)",
type: 'leadership',
order: 10002
},
'#': {
name: "Room Owner (#)",
'&': {
name: "Administrator (&)",
type: 'leadership',
order: 10003
},

8
src/client-main.ts
View File

@ -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,
},

2
src/panel-chat.tsx
View File

@ -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>