Merge remote-tracking branch 'origin/unstable' into unstable

src/handbook/src/backend/data.ts

@@ -70,9 +70,7 @@ export function getCommands(): CommandDump {
  * Fetches and lists all the commands in the file.
  */
 export function listCommands(): Command[] {
-    return Object.values(getCommands())
+    return Object.values(getCommands()).sort((a, b) => a.name[0].localeCompare(b.name[0]));
-        .sort((a, b) =>
-            a.name[0].localeCompare(b.name[0]));
 }
 
 /**
@@ -115,9 +113,7 @@ export function getAvatars(): AvatarDump {
  * Fetches and lists all the avatars in the file.
  */
 export function listAvatars(): Avatar[] {
-    return Object.values(getAvatars())
+    return Object.values(getAvatars()).sort((a, b) => a.name.localeCompare(b.name));
-        .sort((a, b) =>
-            a.name.localeCompare(b.name));
 }
 
 /**

src/handbook/src/ui/pages/HomePage.tsx

@@ -41,10 +41,7 @@ class HomePage extends React.Component<any, any> {
                             <p>trademarks and copyrights of HoYoverse.</p>
                         </div>
 
-                        <div
+                        <div className={"HomePage_Discord"} onClick={() => openUrl("https://discord.gg/grasscutter")}>
-                            className={"HomePage_Discord"}
-                            onClick={() => openUrl("https://discord.gg/grasscutter")}
-                        >
                             <DiscordLogo />
                             <p>Join the Community!</p>
                         </div>

src/handbook/src/ui/pages/ScenesPage.tsx

@@ -45,7 +45,7 @@ class ScenesPage extends React.PureComponent {
         if (connected) {
             await teleportTo(scene);
         } else {
-            await copyToClipboard(action.teleport(scene))
+            await copyToClipboard(action.teleport(scene));
         }
     }
 
@@ -61,9 +61,7 @@ class ScenesPage extends React.PureComponent {
                             title={scene.identifier}
                             alternate={`ID: ${scene.id} | ${sceneTypeToString(scene.type)}`}
                             button={
-                                <button className={"ScenesPage_Button"}
+                                <button className={"ScenesPage_Button"} onClick={() => this.teleport(scene.id)}>
-                                        onClick={() => this.teleport(scene.id)}
-                                >
                                     Teleport
                                 </button>
                             }

src/handbook/src/ui/widgets/Character.tsx

@@ -49,11 +49,7 @@ class Character extends React.PureComponent<IProps> {
                 />
 
                 <div className={"Character_Label"}>
-                    <p
+                    <p style={{ fontSize: characterName.length >= 12 ? 13 : 17 }}>{characterName}</p>
-                        style={{ fontSize: characterName.length >= 12 ? 13 : 17 }}
-                    >
-                        {characterName}
-                    </p>
                 </div>
             </div>
         );