Merge branch 'smogon:master' into master

js/client-topbar.js

@@ -36,7 +36,7 @@
 			if (!app.user.loaded) {
 				buf = '<button disabled>Loading...</button>';
 			} else if (app.user.get('named')) {
-				buf = '<span class="username" data-name="' + BattleLog.escapeHTML(name) + '"' + (away ? ' data-away="true"' : '') + (status ? 'data-status="' + BattleLog.escapeHTML(status) + '"' : '') + ' style="' + color + '"><i class="fa fa-user" style="color:' + (away ? '#888;' : '#779EC5') + '"></i> ' + BattleLog.escapeHTML(name) + '</span>';
+				buf = '<span class="username" data-name="' + BattleLog.escapeHTML(name) + '"' + (away ? ' data-away="true"' : '') + (status ? 'data-status="' + BattleLog.escapeHTML(status) + '"' : '') + ' style="' + color + '"><i class="fa fa-user" style="color:' + (away ? '#888;' : '#779EC5') + '"></i> <span class="usernametext">' + BattleLog.escapeHTML(name) + '</span></span>';
 			} else {
 				buf = '<button name="login">Choose name</button>';
 			}

lib/ntbb-ladder.lib.php

@@ -316,8 +316,8 @@ function update(&$user, $newM = false, $newMelo = 1000, $force = false) {
 						$decay = 1 + intval(($elo-1400)/50);
 					}
 					switch ($this->formatid) {
-					case 'gen8randombattle':
-					case 'gen8ou':
+					case 'gen9randombattle':
+					case 'gen9ou':
 						break;
 					default:
 						$decay -= 2;

src/battle-dex-search.ts

@@ -637,10 +637,11 @@ abstract class BattleTypedSearch<T extends SearchType> {
 			this.formatType = 'nfe';
 			if (!format) format = 'ou' as ID;
 		}
-		if ((format.endsWith('lc') || format.startsWith('lc')) && format !== 'caplc') {
+		if ((format.endsWith('lc') || format.startsWith('lc')) && format !== 'caplc' && !this.formatType) {
 			this.formatType = 'lc';
 			format = 'lc' as ID;
 		}
+		if (format.endsWith('draft')) format = format.slice(0, -5) as ID;
 		this.format = format;
 
 		this.species = '' as ID;

src/panel-topbar.tsx

@@ -213,7 +213,7 @@ class PSHeader extends preact.Component<{style: {}}> {
 		}
 		const userColor = window.BattleLog && {color: BattleLog.usernameColor(PS.user.userid)};
 		return <span class="username" data-name={PS.user.name} style={userColor}>
-			<i class="fa fa-user" style="color:#779EC5"></i> {PS.user.name}
+			<i class="fa fa-user" style="color:#779EC5"></i> <span class="usernametext">{PS.user.name}</span>
 		</span>;
 	}
 	render() {

style/client.css

@@ -289,6 +289,11 @@ select {
 .username {
 	cursor: pointer;
 }
+@media (max-width: 500px) {
+	.usernametext {
+		display: none
+	}
+}
 .userbar button.icon {
 	height: 25px;
 	width: 27px;
@@ -2008,7 +2013,7 @@ a.ilink.yours {
 	white-space: pre;
 	overflow: hidden;
 }
-.allyparty button .picon, 
+.allyparty button .picon,
 .switchmenu button .picon {
 	float: left;
 	margin: -6px -3px -6px -4px;

style/client2.css

@@ -148,6 +148,11 @@ body {
 .username {
 	cursor: pointer;
 }
+@media (max-width: 500px) {
+	.usernametext {
+		display: none
+	}
+}
 .userbar button.icon {
 	height: 25px;
 	width: 27px;

website/pages/staff.md

@@ -6,7 +6,7 @@ Staff are represented by the symbols next to their names and appear at the top o
 
 ### What's the difference between room staff and global staff?
 
-Room staff have permissions tied specifically to the room they were promoted in, whereas global staff have increased permissions across the server. Room staff can only perform moderation duties within their rooms, whereas global staff have the ability to globally lock or ban users and thus should be sought instead of room staff for PM or battle abuse. Global staff may also hold higher positions as room staff. Global staff can be identified by the "Global" indicator when clicking on their username.
+Room staff have permissions tied specifically to the room they were promoted in, whereas global staff have increased permissions across the server. Room staff can only perform moderation duties within their rooms, whereas global staff have the ability to globally lock or ban users and thus should be sought instead of room staff for PM or battle abuse. Global staff may also hold higher positions as room staff. Global staff can be identified by the "Global" indicator when clicking on their username. You can also refer to the [staff list](https://www.smogon.com/sim/staff_list) to see all Global Staff members. 
 
 ### What is the difference between the ranks?