Merge pull request 'Fix emoji category sorting' (#56) from dev into stable

Reviewed-on: https://codeberg.org/yeentown/barkey/pulls/56

packages/frontend/src/custom-emojis.ts

@@ -17,7 +17,7 @@ export const customEmojiCategories = computed<[ ...string[], null ]>(() => {
 			categories.add(emoji.category);
 		}
 	}
-	return markRaw([...Array.from(categories), null]);
+	return markRaw([...Array.from(categories).sort(), null]);
 });
 
 export function compareBySortKey(a: Misskey.entities.EmojiSimple, b: Misskey.entities.EmojiSimple): number {

packages/misskey-js/src/autogen/types.ts

@@ -4948,6 +4948,7 @@ export type components = {
       localOnly?: boolean;
       isSensitive?: boolean;
       roleIdsThatCanBeUsedThisEmojiAsReaction?: string[];
+      sortKey: string | null;
     };
     EmojiDetailed: {
       /** Format: id */
@@ -4962,6 +4963,7 @@ export type components = {
       isSensitive: boolean;
       localOnly: boolean;
       roleIdsThatCanBeUsedThisEmojiAsReaction: string[];
+      sortKey: string | null;
     };
     Flash: {
       /**
@@ -7319,6 +7321,7 @@ export type operations = {
           isSensitive?: boolean;
           localOnly?: boolean;
           roleIdsThatCanBeUsedThisEmojiAsReaction?: string[];
+          sortKey?: string | null;
         };
       };
     };
@@ -7684,6 +7687,7 @@ export type operations = {
               /** @description The local host is represented with `null`. The field exists for compatibility with other API endpoints that return files. */
               host: string | null;
               url: string;
+              sortKey: string | null;
             })[];
         };
       };
@@ -7951,6 +7955,7 @@ export type operations = {
           isSensitive?: boolean;
           localOnly?: boolean;
           roleIdsThatCanBeUsedThisEmojiAsReaction?: string[];
+          sortKey?: string | null;
         };
       };
     };