From 21e4c3dfe9b439a76782ab86be93298de2878ab9 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 16 Jan 2023 09:39:58 +0000
Subject: [PATCH 001/177] wip

---
 .../src/server/api/endpoints/emojis.ts        |  4 +-
 .../src/components/MkAutocomplete.vue         | 90 +++++++++----------
 .../frontend/src/components/MkEmojiPicker.vue |  4 +-
 packages/frontend/src/custom-emojis.ts        | 18 ++--
 packages/frontend/src/pages/about.emojis.vue  |  7 +-
 .../src/pages/custom-emojis-manager.vue       |  8 ++
 .../frontend/src/pages/mfm-cheat-sheet.vue    |  2 +-
 packages/frontend/src/scripts/aiscript/api.ts |  2 +-
 8 files changed, 74 insertions(+), 61 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/emojis.ts b/packages/backend/src/server/api/endpoints/emojis.ts
index 97dcfde59..67538b0bd 100644
--- a/packages/backend/src/server/api/endpoints/emojis.ts
+++ b/packages/backend/src/server/api/endpoints/emojis.ts
@@ -10,6 +10,8 @@ export const meta = {
 	tags: ['meta'],
 
 	requireCredential: false,
+	allowGet: true,
+	cacheSec: 60,
 
 	res: {
 		type: 'object',
@@ -75,7 +77,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				},
 				cache: {
 					id: 'meta_emojis',
-					milliseconds: 3600000,	// 1 hour
+					milliseconds: 60000,	// 1 minute
 				},
 			});
 
diff --git a/packages/frontend/src/components/MkAutocomplete.vue b/packages/frontend/src/components/MkAutocomplete.vue
index 702fba979..ab4bf4f79 100644
--- a/packages/frontend/src/components/MkAutocomplete.vue
+++ b/packages/frontend/src/components/MkAutocomplete.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script lang="ts">
-import { markRaw, ref, shallowRef, onUpdated, onMounted, onBeforeUnmount, nextTick, watch } from 'vue';
+import { markRaw, ref, shallowRef, computed, onUpdated, onMounted, onBeforeUnmount, nextTick, watch } from 'vue';
 import sanitizeHtml from 'sanitize-html';
 import contains from '@/scripts/contains';
 import { char2twemojiFilePath, char2fluentEmojiFilePath } from '@/scripts/emoji-base';
@@ -61,59 +61,59 @@ type EmojiDef = {
 
 const lib = emojilist.filter(x => x.category !== 'flags');
 
-const char2path = defaultStore.state.emojiStyle === 'twemoji' ? char2twemojiFilePath : char2fluentEmojiFilePath;
+const emojiDb = computed(() => {
+	const char2path = defaultStore.reactiveState.emojiStyle.value === 'twemoji' ? char2twemojiFilePath : char2fluentEmojiFilePath;
 
-const emjdb: EmojiDef[] = lib.map(x => ({
-	emoji: x.char,
-	name: x.name,
-	url: char2path(x.char),
-}));
-
-for (const x of lib) {
-	if (x.keywords) {
-		for (const k of x.keywords) {
-			emjdb.push({
-				emoji: x.char,
-				name: k,
-				aliasOf: x.name,
-				url: char2path(x.char),
-			});
-		}
-	}
-}
-
-emjdb.sort((a, b) => a.name.length - b.name.length);
-
-//#region Construct Emoji DB
-const emojiDefinitions: EmojiDef[] = [];
-
-for (const x of customEmojis) {
-	emojiDefinitions.push({
+	const unicodeEmojiDB: EmojiDef[] = lib.map(x => ({
+		emoji: x.char,
 		name: x.name,
-		emoji: `:${x.name}:`,
-		isCustomEmoji: true,
-	});
+		url: char2path(x.char),
+	}));
 
-	if (x.aliases) {
-		for (const alias of x.aliases) {
-			emojiDefinitions.push({
-				name: alias,
-				aliasOf: x.name,
-				emoji: `:${x.name}:`,
-				isCustomEmoji: true,
-			});
+	for (const x of lib) {
+		if (x.keywords) {
+			for (const k of x.keywords) {
+				unicodeEmojiDB.push({
+					emoji: x.char,
+					name: k,
+					aliasOf: x.name,
+					url: char2path(x.char),
+				});
+			}
 		}
 	}
-}
 
-emojiDefinitions.sort((a, b) => a.name.length - b.name.length);
+	unicodeEmojiDB.sort((a, b) => a.name.length - b.name.length);
 
-const emojiDb = markRaw(emojiDefinitions.concat(emjdb));
-//#endregion
+	//#region Construct Emoji DB
+	const customEmojiDB: EmojiDef[] = [];
+
+	for (const x of customEmojis.value) {
+		customEmojiDB.push({
+			name: x.name,
+			emoji: `:${x.name}:`,
+			isCustomEmoji: true,
+		});
+
+		if (x.aliases) {
+			for (const alias of x.aliases) {
+				customEmojiDB.push({
+					name: alias,
+					aliasOf: x.name,
+					emoji: `:${x.name}:`,
+					isCustomEmoji: true,
+				});
+			}
+		}
+	}
+
+	customEmojiDB.sort((a, b) => a.name.length - b.name.length);
+
+	return markRaw([ ...customEmojiDB, ...unicodeEmojiDB ]);
+});
 
 export default {
 	emojiDb,
-	emojiDefinitions,
 	emojilist,
 };
 </script>
@@ -230,7 +230,7 @@ function exec() {
 	} else if (props.type === 'emoji') {
 		if (!props.q || props.q === '') {
 			// 最近使った絵文字をサジェスト
-			emojis.value = defaultStore.state.recentlyUsedEmojis.map(emoji => emojiDb.find(dbEmoji => dbEmoji.emoji === emoji)).filter(x => x) as EmojiDef[];
+			emojis.value = defaultStore.state.recentlyUsedEmojis.map(emoji => emojiDb.value.find(dbEmoji => dbEmoji.emoji === emoji)).filter(x => x) as EmojiDef[];
 			return;
 		}
 
diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue
index 9c6d62ce8..abb14564f 100644
--- a/packages/frontend/src/components/MkEmojiPicker.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.vue
@@ -138,7 +138,7 @@ watch(q, () => {
 
 	const searchCustom = () => {
 		const max = 8;
-		const emojis = customEmojis;
+		const emojis = customEmojis.value;
 		const matches = new Set<Misskey.entities.CustomEmoji>();
 
 		const exactMatch = emojis.find(emoji => emoji.name === newQ);
@@ -323,7 +323,7 @@ function done(query?: string): boolean | void {
 	if (query == null || typeof query !== 'string') return;
 
 	const q2 = query.replace(/:/g, '');
-	const exactMatchCustom = customEmojis.find(emoji => emoji.name === q2);
+	const exactMatchCustom = customEmojis.value.find(emoji => emoji.name === q2);
 	if (exactMatchCustom) {
 		chosen(exactMatchCustom);
 		return true;
diff --git a/packages/frontend/src/custom-emojis.ts b/packages/frontend/src/custom-emojis.ts
index 19469999b..52a114823 100644
--- a/packages/frontend/src/custom-emojis.ts
+++ b/packages/frontend/src/custom-emojis.ts
@@ -1,20 +1,22 @@
-import { api } from './os';
+import { apiGet } from './os';
 import { miLocalStorage } from './local-storage';
+import { shallowRef } from 'vue';
+import * as Misskey from 'misskey-js';
 
 const storageCache = miLocalStorage.getItem('emojis');
-export let customEmojis = storageCache ? JSON.parse(storageCache) : [];
+export const customEmojis = shallowRef<Misskey.entities.CustomEmoji[]>(storageCache ? JSON.parse(storageCache) : []);
 
 fetchCustomEmojis();
 
 export async function fetchCustomEmojis() {
 	const now = Date.now();
 	const lastFetchedAt = miLocalStorage.getItem('lastEmojisFetchedAt');
-	if (lastFetchedAt && (now - parseInt(lastFetchedAt)) < 1000 * 60 * 60) return;
+	if (lastFetchedAt && (now - parseInt(lastFetchedAt)) < 1000 * 60) return;
 
-	const res = await api('emojis', {});
+	const res = await apiGet('emojis', {});
 
-	customEmojis = res.emojis;
-	miLocalStorage.setItem('emojis', JSON.stringify(customEmojis));
+	customEmojis.value = res.emojis;
+	miLocalStorage.setItem('emojis', JSON.stringify(res.emojis));
 	miLocalStorage.setItem('lastEmojisFetchedAt', now.toString());
 }
 
@@ -23,7 +25,7 @@ export function getCustomEmojiCategories() {
 	if (cachedCategories) return cachedCategories;
 
 	const categories = new Set();
-	for (const emoji of customEmojis) {
+	for (const emoji of customEmojis.value) {
 		categories.add(emoji.category);
 	}
 	const res = Array.from(categories);
@@ -36,7 +38,7 @@ export function getCustomEmojiTags() {
 	if (cachedTags) return cachedTags;
 
 	const tags = new Set();
-	for (const emoji of customEmojis) {
+	for (const emoji of customEmojis.value) {
 		for (const tag of emoji.aliases) {
 			tags.add(tag);
 		}
diff --git a/packages/frontend/src/pages/about.emojis.vue b/packages/frontend/src/pages/about.emojis.vue
index c0145a503..7d146d1fd 100644
--- a/packages/frontend/src/pages/about.emojis.vue
+++ b/packages/frontend/src/pages/about.emojis.vue
@@ -41,11 +41,12 @@ import MkTab from '@/components/MkTab.vue';
 import * as os from '@/os';
 import { customEmojis, getCustomEmojiCategories, getCustomEmojiTags } from '@/custom-emojis';
 import { i18n } from '@/i18n';
+import * as Misskey from 'misskey-js';
 
 const customEmojiCategories = getCustomEmojiCategories();
 const customEmojiTags = getCustomEmojiTags();
 let q = $ref('');
-let searchEmojis = $ref(null);
+let searchEmojis = $ref<Misskey.entities.CustomEmoji[]>(null);
 let selectedTags = $ref(new Set());
 
 function search() {
@@ -55,9 +56,9 @@ function search() {
 	}
 
 	if (selectedTags.size === 0) {
-		searchEmojis = customEmojis.filter(emoji => emoji.name.includes(q) || emoji.aliases.includes(q));
+		searchEmojis = customEmojis.value.filter(emoji => emoji.name.includes(q) || emoji.aliases.includes(q));
 	} else {
-		searchEmojis = customEmojis.filter(emoji => (emoji.name.includes(q) || emoji.aliases.includes(q)) && [...selectedTags].every(t => emoji.aliases.includes(t)));
+		searchEmojis = customEmojis.value.filter(emoji => (emoji.name.includes(q) || emoji.aliases.includes(q)) && [...selectedTags].every(t => emoji.aliases.includes(t)));
 	}
 }
 
diff --git a/packages/frontend/src/pages/custom-emojis-manager.vue b/packages/frontend/src/pages/custom-emojis-manager.vue
index 87d205ed7..e113c38a1 100644
--- a/packages/frontend/src/pages/custom-emojis-manager.vue
+++ b/packages/frontend/src/pages/custom-emojis-manager.vue
@@ -79,6 +79,7 @@ import { selectFile, selectFiles } from '@/scripts/select-file';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
+import { fetchCustomEmojis } from '@/custom-emojis';
 
 const emojisPaginationComponent = shallowRef<InstanceType<typeof MkPagination>>();
 
@@ -130,6 +131,7 @@ const add = async (ev: MouseEvent) => {
 	})));
 	promise.then(() => {
 		emojisPaginationComponent.value.reload();
+		fetchCustomEmojis();
 	});
 	os.promiseDialog(promise);
 };
@@ -147,6 +149,7 @@ const edit = (emoji) => {
 			} else if (result.deleted) {
 				emojisPaginationComponent.value.removeItem((item) => item.id === emoji.id);
 			}
+			fetchCustomEmojis();
 		},
 	}, 'closed');
 };
@@ -220,6 +223,7 @@ const setCategoryBulk = async () => {
 		category: result,
 	});
 	emojisPaginationComponent.value.reload();
+	fetchCustomEmojis();
 };
 
 const addTagBulk = async () => {
@@ -232,6 +236,7 @@ const addTagBulk = async () => {
 		aliases: result.split(' '),
 	});
 	emojisPaginationComponent.value.reload();
+	fetchCustomEmojis();
 };
 
 const removeTagBulk = async () => {
@@ -244,6 +249,7 @@ const removeTagBulk = async () => {
 		aliases: result.split(' '),
 	});
 	emojisPaginationComponent.value.reload();
+	fetchCustomEmojis();
 };
 
 const setTagBulk = async () => {
@@ -256,6 +262,7 @@ const setTagBulk = async () => {
 		aliases: result.split(' '),
 	});
 	emojisPaginationComponent.value.reload();
+	fetchCustomEmojis();
 };
 
 const delBulk = async () => {
@@ -268,6 +275,7 @@ const delBulk = async () => {
 		ids: selectedEmojis.value,
 	});
 	emojisPaginationComponent.value.reload();
+	fetchCustomEmojis();
 };
 
 const headerActions = $computed(() => [{
diff --git a/packages/frontend/src/pages/mfm-cheat-sheet.vue b/packages/frontend/src/pages/mfm-cheat-sheet.vue
index b3932ff7c..73a571623 100644
--- a/packages/frontend/src/pages/mfm-cheat-sheet.vue
+++ b/packages/frontend/src/pages/mfm-cheat-sheet.vue
@@ -313,7 +313,7 @@ let preview_mention = $ref('@example');
 let preview_hashtag = $ref('#test');
 let preview_url = $ref('https://example.com');
 let preview_link = $ref(`[${i18n.ts._mfm.dummy}](https://example.com)`);
-let preview_emoji = $ref(customEmojis.length ? `:${customEmojis[0].name}:` : ':emojiname:');
+let preview_emoji = $ref(customEmojis.value.length ? `:${customEmojis.value[0].name}:` : ':emojiname:');
 let preview_bold = $ref(`**${i18n.ts._mfm.dummy}**`);
 let preview_small = $ref(`<small>${i18n.ts._mfm.dummy}</small>`);
 let preview_center = $ref(`<center>${i18n.ts._mfm.dummy}</center>`);
diff --git a/packages/frontend/src/scripts/aiscript/api.ts b/packages/frontend/src/scripts/aiscript/api.ts
index 29736ac60..12f00bd32 100644
--- a/packages/frontend/src/scripts/aiscript/api.ts
+++ b/packages/frontend/src/scripts/aiscript/api.ts
@@ -10,7 +10,7 @@ export function createAiScriptEnv(opts) {
 		USER_ID: $i ? values.STR($i.id) : values.NULL,
 		USER_NAME: $i ? values.STR($i.name) : values.NULL,
 		USER_USERNAME: $i ? values.STR($i.username) : values.NULL,
-		CUSTOM_EMOJIS: utils.jsToVal(customEmojis),
+		CUSTOM_EMOJIS: utils.jsToVal(customEmojis.value),
 		'Mk:dialog': values.FN_NATIVE(async ([title, text, type]) => {
 			await os.alert({
 				type: type ? type.value : 'info',

From 4cd70df7f465be53dd4fa48e2ab5724b36f4d167 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 16 Jan 2023 09:52:45 +0000
Subject: [PATCH 002/177] setInterval

---
 packages/frontend/src/components/MkAutocomplete.vue | 6 +++---
 packages/frontend/src/custom-emojis.ts              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/components/MkAutocomplete.vue b/packages/frontend/src/components/MkAutocomplete.vue
index ab4bf4f79..f85c92cec 100644
--- a/packages/frontend/src/components/MkAutocomplete.vue
+++ b/packages/frontend/src/components/MkAutocomplete.vue
@@ -237,20 +237,20 @@ function exec() {
 		const matched: EmojiDef[] = [];
 		const max = 30;
 
-		emojiDb.some(x => {
+		emojiDb.value.some(x => {
 			if (x.name.startsWith(props.q ?? '') && !x.aliasOf && !matched.some(y => y.emoji === x.emoji)) matched.push(x);
 			return matched.length === max;
 		});
 
 		if (matched.length < max) {
-			emojiDb.some(x => {
+			emojiDb.value.some(x => {
 				if (x.name.startsWith(props.q ?? '') && !matched.some(y => y.emoji === x.emoji)) matched.push(x);
 				return matched.length === max;
 			});
 		}
 
 		if (matched.length < max) {
-			emojiDb.some(x => {
+			emojiDb.value.some(x => {
 				if (x.name.includes(props.q ?? '') && !matched.some(y => y.emoji === x.emoji)) matched.push(x);
 				return matched.length === max;
 			});
diff --git a/packages/frontend/src/custom-emojis.ts b/packages/frontend/src/custom-emojis.ts
index 52a114823..6d20187ab 100644
--- a/packages/frontend/src/custom-emojis.ts
+++ b/packages/frontend/src/custom-emojis.ts
@@ -6,7 +6,7 @@ import * as Misskey from 'misskey-js';
 const storageCache = miLocalStorage.getItem('emojis');
 export const customEmojis = shallowRef<Misskey.entities.CustomEmoji[]>(storageCache ? JSON.parse(storageCache) : []);
 
-fetchCustomEmojis();
+window.setInterval(fetchCustomEmojis, 1000 * 60 * 10);
 
 export async function fetchCustomEmojis() {
 	const now = Date.now();

From f2a9194c79524298a23f7fcba7abe8ef1f6077c7 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 16 Jan 2023 10:13:19 +0000
Subject: [PATCH 003/177] :v:

---
 packages/frontend/src/custom-emojis.ts        |  1 +
 .../src/pages/custom-emojis-manager.vue       | 21 +++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/custom-emojis.ts b/packages/frontend/src/custom-emojis.ts
index 6d20187ab..8fd5078bd 100644
--- a/packages/frontend/src/custom-emojis.ts
+++ b/packages/frontend/src/custom-emojis.ts
@@ -6,6 +6,7 @@ import * as Misskey from 'misskey-js';
 const storageCache = miLocalStorage.getItem('emojis');
 export const customEmojis = shallowRef<Misskey.entities.CustomEmoji[]>(storageCache ? JSON.parse(storageCache) : []);
 
+fetchCustomEmojis();
 window.setInterval(fetchCustomEmojis, 1000 * 60 * 10);
 
 export async function fetchCustomEmojis() {
diff --git a/packages/frontend/src/pages/custom-emojis-manager.vue b/packages/frontend/src/pages/custom-emojis-manager.vue
index e113c38a1..00c736a6a 100644
--- a/packages/frontend/src/pages/custom-emojis-manager.vue
+++ b/packages/frontend/src/pages/custom-emojis-manager.vue
@@ -79,7 +79,7 @@ import { selectFile, selectFiles } from '@/scripts/select-file';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
-import { fetchCustomEmojis } from '@/custom-emojis';
+import { fetchCustomEmojis, customEmojis } from '@/custom-emojis';
 
 const emojisPaginationComponent = shallowRef<InstanceType<typeof MkPagination>>();
 
@@ -146,10 +146,27 @@ const edit = (emoji) => {
 					...oldEmoji,
 					...result.updated,
 				}));
+
+				if (customEmojis.value.some(e => e.name === emoji.name)) {
+					customEmojis.value = [
+						{
+							name: result.updated.name,
+							aliases: result.updated.aliases,
+							category: result.updated.category,
+						},
+						...customEmojis.value,
+					];
+				} else {
+					customEmojis.value = customEmojis.value.map(e => e.name !== emoji.name ? e : {
+						name: result.updated.name,
+						aliases: result.updated.aliases,
+						category: result.updated.category,
+					});
+				}
 			} else if (result.deleted) {
 				emojisPaginationComponent.value.removeItem((item) => item.id === emoji.id);
+				customEmojis.value = customEmojis.value.filter(e => e.name !== emoji.name);
 			}
-			fetchCustomEmojis();
 		},
 	}, 'closed');
 };

From 43956f3ffb616e6813f179b7a9040f158812fbac Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 16 Jan 2023 10:36:29 +0000
Subject: [PATCH 004/177] customEmojiCategories as computed

---
 .../frontend/src/components/MkEmojiPicker.vue |  3 +--
 packages/frontend/src/custom-emojis.ts        | 22 +++++++------------
 packages/frontend/src/pages/about.emojis.vue  |  3 +--
 .../frontend/src/pages/emoji-edit-dialog.vue  |  5 ++---
 4 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue
index abb14564f..3399124e8 100644
--- a/packages/frontend/src/components/MkEmojiPicker.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.vue
@@ -88,7 +88,7 @@ import { deviceKind } from '@/scripts/device-kind';
 import { instance } from '@/instance';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
-import { getCustomEmojiCategories, customEmojis } from '@/custom-emojis';
+import { customEmojiCategories, customEmojis } from '@/custom-emojis';
 
 const props = withDefaults(defineProps<{
 	showPinned?: boolean;
@@ -104,7 +104,6 @@ const emit = defineEmits<{
 	(ev: 'chosen', v: string): void;
 }>();
 
-const customEmojiCategories = getCustomEmojiCategories();
 const searchEl = shallowRef<HTMLInputElement>();
 const emojisEl = shallowRef<HTMLDivElement>();
 
diff --git a/packages/frontend/src/custom-emojis.ts b/packages/frontend/src/custom-emojis.ts
index 8fd5078bd..57842459b 100644
--- a/packages/frontend/src/custom-emojis.ts
+++ b/packages/frontend/src/custom-emojis.ts
@@ -1,10 +1,17 @@
 import { apiGet } from './os';
 import { miLocalStorage } from './local-storage';
-import { shallowRef } from 'vue';
+import { shallowRef, computed, markRaw } from 'vue';
 import * as Misskey from 'misskey-js';
 
 const storageCache = miLocalStorage.getItem('emojis');
 export const customEmojis = shallowRef<Misskey.entities.CustomEmoji[]>(storageCache ? JSON.parse(storageCache) : []);
+export const customEmojiCategories = computed<string[]>(() => {
+	const categories = new Set<string>();
+	for (const emoji of customEmojis.value) {
+		categories.add(emoji.category);
+	}
+	return markRaw(Array.from(categories));
+});
 
 fetchCustomEmojis();
 window.setInterval(fetchCustomEmojis, 1000 * 60 * 10);
@@ -21,19 +28,6 @@ export async function fetchCustomEmojis() {
 	miLocalStorage.setItem('lastEmojisFetchedAt', now.toString());
 }
 
-let cachedCategories;
-export function getCustomEmojiCategories() {
-	if (cachedCategories) return cachedCategories;
-
-	const categories = new Set();
-	for (const emoji of customEmojis.value) {
-		categories.add(emoji.category);
-	}
-	const res = Array.from(categories);
-	cachedCategories = res;
-	return res;
-}
-
 let cachedTags;
 export function getCustomEmojiTags() {
 	if (cachedTags) return cachedTags;
diff --git a/packages/frontend/src/pages/about.emojis.vue b/packages/frontend/src/pages/about.emojis.vue
index 7d146d1fd..d964e48b3 100644
--- a/packages/frontend/src/pages/about.emojis.vue
+++ b/packages/frontend/src/pages/about.emojis.vue
@@ -39,11 +39,10 @@ import MkSelect from '@/components/MkSelect.vue';
 import MkFoldableSection from '@/components/MkFoldableSection.vue';
 import MkTab from '@/components/MkTab.vue';
 import * as os from '@/os';
-import { customEmojis, getCustomEmojiCategories, getCustomEmojiTags } from '@/custom-emojis';
+import { customEmojis, customEmojiCategories, getCustomEmojiTags } from '@/custom-emojis';
 import { i18n } from '@/i18n';
 import * as Misskey from 'misskey-js';
 
-const customEmojiCategories = getCustomEmojiCategories();
 const customEmojiTags = getCustomEmojiTags();
 let q = $ref('');
 let searchEmojis = $ref<Misskey.entities.CustomEmoji[]>(null);
diff --git a/packages/frontend/src/pages/emoji-edit-dialog.vue b/packages/frontend/src/pages/emoji-edit-dialog.vue
index b2880b60b..4d84ed7f1 100644
--- a/packages/frontend/src/pages/emoji-edit-dialog.vue
+++ b/packages/frontend/src/pages/emoji-edit-dialog.vue
@@ -15,7 +15,7 @@
 			<MkInput v-model="name">
 				<template #label>{{ i18n.ts.name }}</template>
 			</MkInput>
-			<MkInput v-model="category" :datalist="categories">
+			<MkInput v-model="category" :datalist="customEmojiCategories">
 				<template #label>{{ i18n.ts.category }}</template>
 			</MkInput>
 			<MkInput v-model="aliases">
@@ -36,7 +36,7 @@ import MkInput from '@/components/MkInput.vue';
 import * as os from '@/os';
 import { unique } from '@/scripts/array';
 import { i18n } from '@/i18n';
-import { getCustomEmojiCategories } from '@/custom-emojis';
+import { customEmojiCategories } from '@/custom-emojis';
 
 const props = defineProps<{
 	emoji: any,
@@ -46,7 +46,6 @@ let dialog = $ref(null);
 let name: string = $ref(props.emoji.name);
 let category: string = $ref(props.emoji.category);
 let aliases: string = $ref(props.emoji.aliases.join(' '));
-const categories = getCustomEmojiCategories();
 
 const emit = defineEmits<{
 	(ev: 'done', v: { deleted?: boolean, updated?: any }): void,

From 002f98987d8b26b7a86c5bb6505cefa439701a94 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 16 Jan 2023 10:51:51 +0000
Subject: [PATCH 005/177] fix

---
 packages/frontend/src/pages/custom-emojis-manager.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/custom-emojis-manager.vue b/packages/frontend/src/pages/custom-emojis-manager.vue
index 00c736a6a..20b6c32e8 100644
--- a/packages/frontend/src/pages/custom-emojis-manager.vue
+++ b/packages/frontend/src/pages/custom-emojis-manager.vue
@@ -147,7 +147,7 @@ const edit = (emoji) => {
 					...result.updated,
 				}));
 
-				if (customEmojis.value.some(e => e.name === emoji.name)) {
+				if (!customEmojis.value.some(e => e.name === emoji.name)) {
 					customEmojis.value = [
 						{
 							name: result.updated.name,

From 890564e1daeec3b4b08e933945640ecead48a12e Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 16 Jan 2023 10:56:43 +0000
Subject: [PATCH 006/177] refactor

---
 packages/frontend/src/components/MkAutocomplete.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkAutocomplete.vue b/packages/frontend/src/components/MkAutocomplete.vue
index f85c92cec..2cb3aeb3d 100644
--- a/packages/frontend/src/components/MkAutocomplete.vue
+++ b/packages/frontend/src/components/MkAutocomplete.vue
@@ -62,6 +62,7 @@ type EmojiDef = {
 const lib = emojilist.filter(x => x.category !== 'flags');
 
 const emojiDb = computed(() => {
+	//#region Unicode Emoji
 	const char2path = defaultStore.reactiveState.emojiStyle.value === 'twemoji' ? char2twemojiFilePath : char2fluentEmojiFilePath;
 
 	const unicodeEmojiDB: EmojiDef[] = lib.map(x => ({
@@ -84,8 +85,9 @@ const emojiDb = computed(() => {
 	}
 
 	unicodeEmojiDB.sort((a, b) => a.name.length - b.name.length);
+	//#endregion
 
-	//#region Construct Emoji DB
+	//#region Custom Emoji
 	const customEmojiDB: EmojiDef[] = [];
 
 	for (const x of customEmojis.value) {
@@ -108,6 +110,7 @@ const emojiDb = computed(() => {
 	}
 
 	customEmojiDB.sort((a, b) => a.name.length - b.name.length);
+	//#endregion
 
 	return markRaw([ ...customEmojiDB, ...unicodeEmojiDB ]);
 });

From 65577e43c88d6dda587e64db663b19b1972131ea Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 16 Jan 2023 14:41:11 +0000
Subject: [PATCH 007/177] add docker note to CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ef711d57..8fe41ef15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,8 @@ You should also include the user name that made the change.
 	- ユーザーごとのドライブ容量設定はロールに統合されました。
 	- インスタンスデフォルトのドライブ容量設定はロールに統合されました。アップデート後、ベースロールのドライブ容量を編集してください。
 	- LTL/GTLの解放状態はロールに統合されました。
+- Dockerの実行をrootで行わないようにしました。Dockerかつオブジェクトストレージを使用していない場合は`chown -hR 991.991 ./files`を実行してください。  
+  https://github.com/misskey-dev/misskey/pull/9560
 
 #### For users
 - ノートのウォッチ機能が削除されました

From fe98ad88490efd0bbdd69a51369da4cdc206c2bd Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 16 Jan 2023 14:53:57 +0000
Subject: [PATCH 008/177] add comments to CHANGELOG

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fe41ef15..20efe6261 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,12 +32,13 @@ You should also include the user name that made the change.
 - Elasticsearchのサポートが削除されました
 	- 代わりに今後任意の検索プロバイダを設定できる仕組みを構想しています。その仕組みを使えば今まで通りElasticsearchも利用できます
 - Yarnからpnpmに移行されました
+  corepackの有効化を推奨します: `sudo corepack enable`
 - インスタンスブロックはサブドメインにも適用されるようになります
 - ロールの導入に伴い、いくつかの機能がロールと統合されました
 	- モデレーターはロールに統合されました。今までのモデレーター情報は失われるため、予めモデレーター一覧を記録しておき、アップデート後にモデレーターロールを作りアサインし直してください。
 	- サイレンスはロールに統合されました。今までのユーザーは恩赦されるため、予めサイレンス一覧を記録しておくのをおすすめします。
 	- ユーザーごとのドライブ容量設定はロールに統合されました。
-	- インスタンスデフォルトのドライブ容量設定はロールに統合されました。アップデート後、ベースロールのドライブ容量を編集してください。
+	- インスタンスデフォルトのドライブ容量設定はロールに統合されました。アップデート後、ベースロールもしくはコンディショナルロールでドライブ容量を編集してください。
 	- LTL/GTLの解放状態はロールに統合されました。
 - Dockerの実行をrootで行わないようにしました。Dockerかつオブジェクトストレージを使用していない場合は`chown -hR 991.991 ./files`を実行してください。  
   https://github.com/misskey-dev/misskey/pull/9560

From 3feaf39294052c1edd0753fb9c3968ba2c05f57f Mon Sep 17 00:00:00 2001
From: Mary <Ipadlover8322@gmail.com>
Date: Mon, 16 Jan 2023 12:21:15 -0500
Subject: [PATCH 009/177] ApRequestService: don't generate our own Host header
 (#9378)

---
 packages/backend/src/core/activitypub/ApRequestService.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/activitypub/ApRequestService.ts b/packages/backend/src/core/activitypub/ApRequestService.ts
index d44d06a44..ab22a0c41 100644
--- a/packages/backend/src/core/activitypub/ApRequestService.ts
+++ b/packages/backend/src/core/activitypub/ApRequestService.ts
@@ -57,7 +57,7 @@ export class ApRequestService {
 			method: 'POST',
 			headers: this.objectAssignWithLcKey({
 				'Date': new Date().toUTCString(),
-				'Host': u.hostname,
+				'Host': u.host,
 				'Content-Type': 'application/activity+json',
 				'Digest': digestHeader,
 			}, args.additionalHeaders),
@@ -83,7 +83,7 @@ export class ApRequestService {
 			headers: this.objectAssignWithLcKey({
 				'Accept': 'application/activity+json, application/ld+json',
 				'Date': new Date().toUTCString(),
-				'Host': new URL(args.url).hostname,
+				'Host': new URL(args.url).host,
 			}, args.additionalHeaders),
 		};
 
@@ -106,6 +106,8 @@ export class ApRequestService {
 		request.headers = this.objectAssignWithLcKey(request.headers, {
 			Signature: signatureHeader,
 		});
+		// node-fetch will generate this for us. if we keep 'Host', it won't change with redirects!
+		delete request.headers['host'];
 
 		return {
 			request,

From 84b8ffb7d0663087b1b0c9df04e20b88b3a3e2d7 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <44733677+ThatOneCalculator@users.noreply.github.com>
Date: Mon, 16 Jan 2023 10:26:41 -0800
Subject: [PATCH 010/177] enhance(client): Force error screen (#8947)

---
 packages/backend/src/server/web/boot.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js
index e2fc27fec..a4513696a 100644
--- a/packages/backend/src/server/web/boot.js
+++ b/packages/backend/src/server/web/boot.js
@@ -24,6 +24,11 @@
 
 	const v = localStorage.getItem('v') || VERSION;
 
+	let forceError = localStorage.getItem('forceError');
+	if (forceError != null) {
+		renderError('FORCED_ERROR', 'This error is forced by having forceError in local storage.')
+	}
+
 	//#region Detect language & fetch translations
 	const localeVersion = localStorage.getItem('localeVersion');
 	const localeOutdated = (localeVersion == null || localeVersion !== v);

From a69c78e709dd9fd679b33706b455047c286d5fd7 Mon Sep 17 00:00:00 2001
From: Takuya Yoshida <hawaiianphoto@geekhost.net>
Date: Tue, 17 Jan 2023 05:34:14 +0900
Subject: [PATCH 011/177] Use corepack (#9620)

---
 Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 175be0fdb..47fe31bca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,8 @@ RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \
 	build-essential
 
+RUN corepack enable
+
 WORKDIR /misskey
 
 COPY ["pnpm-lock.yaml", "pnpm-workspace.yaml", "package.json", "./"]
@@ -14,7 +16,6 @@ COPY ["packages/backend/package.json", "./packages/backend/"]
 COPY ["packages/frontend/package.json", "./packages/frontend/"]
 COPY ["packages/sw/package.json", "./packages/sw/"]
 
-RUN npm i -g pnpm
 RUN pnpm i --frozen-lockfile
 
 COPY . ./
@@ -34,10 +35,10 @@ RUN apt-get update \
 	ffmpeg tini \
 	&& apt-get -y clean \
 	&& rm -rf /var/lib/apt/lists/* \
+	&& corepack enable \
 	&& groupadd -g "${GID}" misskey \
 	&& useradd -l -u "${UID}" -g "${GID}" -m -d /misskey misskey
 
-RUN npm i -g pnpm
 USER misskey
 WORKDIR /misskey
 

From f8d09020807b6db6341bed43b1bb25a182ee29ca Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 17 Jan 2023 06:22:57 +0900
Subject: [PATCH 012/177] =?UTF-8?q?enhahce(client):=20:art:=20=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E3=81=AE=E3=83=8E=E3=83=BC=E3=83=88=E3=82=B5=E3=83=9E?=
 =?UTF-8?q?=E3=83=AA=E3=83=BC=E3=82=921=E8=A1=8C=E3=81=AB=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=20(#9625)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* :art: add nowrap to notification

* :art: 通知のノートサマリーを1行にする
---
 packages/frontend/src/components/MkNotification.vue  | 6 +++---
 packages/frontend/src/components/MkNotifications.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue
index 4f8257991..5b8041c1d 100644
--- a/packages/frontend/src/components/MkNotification.vue
+++ b/packages/frontend/src/components/MkNotification.vue
@@ -267,9 +267,9 @@ useTooltip(reactionRef, (showing) => {
 }
 
 .text {
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
+	display: flex;
+	width: 100%;
+	overflow: clip;
 }
 
 .quote {
diff --git a/packages/frontend/src/components/MkNotifications.vue b/packages/frontend/src/components/MkNotifications.vue
index ab5dff8db..f5ae7bcee 100644
--- a/packages/frontend/src/components/MkNotifications.vue
+++ b/packages/frontend/src/components/MkNotifications.vue
@@ -10,7 +10,7 @@
 	<template #default="{ items: notifications }">
 		<MkDateSeparatedList v-slot="{ item: notification }" :class="$style.list" :items="notifications" :no-gap="true">
 			<XNote v-if="['reply', 'quote', 'mention'].includes(notification.type)" :key="notification.id" :note="notification.note"/>
-			<XNotification v-else :key="notification.id" :notification="notification" :with-time="true" :full="true" class="_panel notification"/>
+			<XNotification v-else :key="notification.id" :notification="notification" :with-time="true" :full="false" class="_panel notification"/>
 		</MkDateSeparatedList>
 	</template>
 </MkPagination>

From d79478c26567e15ff37cd3bfd8c6ff5b18c0a243 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 17 Jan 2023 13:40:27 +0900
Subject: [PATCH 013/177] =?UTF-8?q?fix(client):=20play=E3=82=92=E5=89=8A?=
 =?UTF-8?q?=E9=99=A4=E3=81=99=E3=82=8B=E6=89=8B=E6=AE=B5=E3=81=8C=E3=81=AA?=
 =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #9630
---
 CHANGELOG.md                                      |  7 +++++++
 packages/frontend/src/pages/flash/flash-edit.vue  | 14 ++++++++++++++
 packages/frontend/src/pages/flash/flash-index.vue | 14 ++++++++------
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20efe6261..56b25eae2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,13 @@
 You should also include the user name that made the change.
 -->
 
+## 13.x.x (unreleased)
+
+### Improvements
+
+### Bugfixes
+- playを削除する手段がなかったのを修正
+
 ## 13.0.0 (2023/01/16)
 
 ### TL;DR
diff --git a/packages/frontend/src/pages/flash/flash-edit.vue b/packages/frontend/src/pages/flash/flash-edit.vue
index 5ba226c10..539aeec85 100644
--- a/packages/frontend/src/pages/flash/flash-edit.vue
+++ b/packages/frontend/src/pages/flash/flash-edit.vue
@@ -16,6 +16,7 @@
 			<div class="_buttons">
 				<MkButton primary @click="save"><i class="ti ti-check"></i> {{ i18n.ts.save }}</MkButton>
 				<MkButton @click="show"><i class="ti ti-eye"></i> {{ i18n.ts.show }}</MkButton>
+				<MkButton v-if="flash" danger @click="del"><i class="ti ti-trash"></i> {{ i18n.ts.delete }}</MkButton>
 			</div>
 		</div>
 	</MkSpacer>
@@ -212,6 +213,19 @@ function show() {
 	}
 }
 
+async function del() {
+	const { canceled } = await os.confirm({
+		type: 'warning',
+		text: i18n.t('deleteAreYouSure', { x: flash.title }),
+	});
+	if (canceled) return;
+
+	await os.apiWithDialog('flash/delete', {
+		flashId: props.id,
+	});
+	router.push('/play');
+}
+
 const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
diff --git a/packages/frontend/src/pages/flash/flash-index.vue b/packages/frontend/src/pages/flash/flash-index.vue
index 7a1080d3f..a3a48d3b9 100644
--- a/packages/frontend/src/pages/flash/flash-index.vue
+++ b/packages/frontend/src/pages/flash/flash-index.vue
@@ -11,12 +11,14 @@
 		</div>
 
 		<div v-else-if="tab === 'my'" class="my">
-			<MkButton class="new" @click="create()"><i class="ti ti-plus"></i></MkButton>
-			<MkPagination v-slot="{items}" :pagination="myFlashsPagination">
-				<div class="_gaps_s">
-					<MkFlashPreview v-for="flash in items" :key="flash.id" class="" :flash="flash"/>
-				</div>
-			</MkPagination>
+			<div class="_gaps">
+				<MkButton class="new" gradate rounded style="margin: 0 auto;" @click="create()"><i class="ti ti-plus"></i></MkButton>
+				<MkPagination v-slot="{items}" :pagination="myFlashsPagination">
+					<div class="_gaps_s">
+						<MkFlashPreview v-for="flash in items" :key="flash.id" class="" :flash="flash"/>
+					</div>
+				</MkPagination>
+			</div>
 		</div>
 
 		<div v-else-if="tab === 'liked'" class="">

From 0de41063daaeb4f679bd0f99968dbc6809aa1ac9 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 17 Jan 2023 14:10:25 +0900
Subject: [PATCH 014/177] :art:

---
 packages/frontend/src/components/MkAsUi.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkAsUi.vue b/packages/frontend/src/components/MkAsUi.vue
index cbdf92453..9543ccc4d 100644
--- a/packages/frontend/src/components/MkAsUi.vue
+++ b/packages/frontend/src/components/MkAsUi.vue
@@ -7,7 +7,7 @@
 	</div>
 	<span v-else-if="c.type === 'text'" :class="{ [$style.fontSerif]: c.font === 'serif', [$style.fontMonospace]: c.font === 'monospace' }" :style="{ fontSize: c.size ? `${c.size * 100}%` : null, fontWeight: c.bold ? 'bold' : null, color: c.color ?? null }">{{ c.text }}</span>
 	<Mfm v-else-if="c.type === 'mfm'" :class="{ [$style.fontSerif]: c.font === 'serif', [$style.fontMonospace]: c.font === 'monospace' }" :style="{ fontSize: c.size ? `${c.size * 100}%` : null, fontWeight: c.bold ? 'bold' : null, color: c.color ?? null }" :text="c.text"/>
-	<MkButton v-else-if="c.type === 'button'" :primary="c.primary" :rounded="c.rounded" :small="size === 'small'" @click="c.onClick">{{ c.text }}</MkButton>
+	<MkButton v-else-if="c.type === 'button'" :primary="c.primary" :rounded="c.rounded" :small="size === 'small'" inline @click="c.onClick">{{ c.text }}</MkButton>
 	<div v-else-if="c.type === 'buttons'" class="_buttons">
 		<MkButton v-for="button in c.buttons" :primary="button.primary" :rounded="button.rounded" :small="size === 'small'" @click="button.onClick">{{ button.text }}</MkButton>
 	</div>

From c62a4d62821687bdf249c00d9025b38df903b69a Mon Sep 17 00:00:00 2001
From: Takuya Yoshida <hawaiianphoto@geekhost.net>
Date: Tue, 17 Jan 2023 15:27:01 +0900
Subject: [PATCH 015/177] Update actions (#9638)

---
 .github/workflows/docker-develop.yml | 6 +++---
 .github/workflows/docker.yml         | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
index f04888e98..d2cf4bf62 100644
--- a/.github/workflows/docker-develop.yml
+++ b/.github/workflows/docker-develop.yml
@@ -16,16 +16,16 @@ jobs:
         uses: actions/checkout@v3.3.0
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: misskey/misskey
       - name: Log in to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           push: true
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 84d36f846..d7803ce3e 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v3.3.0
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: misskey/misskey
           tags: |
@@ -26,12 +26,12 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
       - name: Log in to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           push: true

From fe4fbafcf0846f100a1614a47a20fb1bbbcf58da Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 17 Jan 2023 15:58:12 +0900
Subject: [PATCH 016/177] =?UTF-8?q?=E5=AD=98=E5=9C=A8=E3=81=97=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E3=82=AB=E3=82=B9=E3=82=BF=E3=83=A0=E7=B5=B5=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E3=82=92=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=81=A7?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resolve #9516
---
 CHANGELOG.md                                        | 1 +
 packages/backend/src/server/ServerService.ts        | 9 +++++++--
 packages/frontend/src/components/global/MkEmoji.vue | 4 +++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56b25eae2..c877be07b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ You should also include the user name that made the change.
 ## 13.x.x (unreleased)
 
 ### Improvements
+- 存在しないカスタム絵文字をテキストで表示するように
 
 ### Bugfixes
 - playを削除する手段がなかったのを修正
diff --git a/packages/backend/src/server/ServerService.ts b/packages/backend/src/server/ServerService.ts
index fac8497b5..47d11ed0a 100644
--- a/packages/backend/src/server/ServerService.ts
+++ b/packages/backend/src/server/ServerService.ts
@@ -14,6 +14,7 @@ import { genIdenticon } from '@/misc/gen-identicon.js';
 import { createTemp } from '@/misc/create-temp.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { LoggerService } from '@/core/LoggerService.js';
+import { bindThis } from '@/decorators.js';
 import { ActivityPubServerService } from './ActivityPubServerService.js';
 import { NodeinfoServerService } from './NodeinfoServerService.js';
 import { ApiServerService } from './api/ApiServerService.js';
@@ -22,7 +23,6 @@ import { WellKnownServerService } from './WellKnownServerService.js';
 import { MediaProxyServerService } from './MediaProxyServerService.js';
 import { FileServerService } from './FileServerService.js';
 import { ClientServerService } from './web/ClientServerService.js';
-import { bindThis } from '@/decorators.js';
 
 @Injectable()
 export class ServerService {
@@ -101,7 +101,12 @@ export class ServerService {
 			reply.header('Content-Security-Policy', 'default-src \'none\'; style-src \'unsafe-inline\'');
 
 			if (emoji == null) {
-				return await reply.redirect('/static-assets/emoji-unknown.png');
+				if ('fallback' in request.query) {
+					return await reply.redirect('/static-assets/emoji-unknown.png');
+				} else {
+					reply.code(404);
+					return;
+				}
 			}
 
 			const url = new URL('/proxy/emoji.webp', this.config.url);
diff --git a/packages/frontend/src/components/global/MkEmoji.vue b/packages/frontend/src/components/global/MkEmoji.vue
index bc88cf3be..b7dd0296c 100644
--- a/packages/frontend/src/components/global/MkEmoji.vue
+++ b/packages/frontend/src/components/global/MkEmoji.vue
@@ -1,5 +1,6 @@
 <template>
-<img v-if="isCustom" :class="[$style.root, $style.custom, { [$style.normal]: normal, [$style.noStyle]: noStyle }]" :src="url" :alt="alt" :title="alt" decoding="async"/>
+<span v-if="isCustom && errored">:{{ customEmojiName }}:</span>
+<img v-else-if="isCustom" :class="[$style.root, $style.custom, { [$style.normal]: normal, [$style.noStyle]: noStyle }]" :src="url" :alt="alt" :title="alt" decoding="async" @error="errored = true"/>
 <img v-else-if="char && !useOsNativeEmojis" :class="$style.root" :src="url" :alt="alt" decoding="async" @pointerenter="computeTitle"/>
 <span v-else-if="char && useOsNativeEmojis" :alt="alt" @pointerenter="computeTitle">{{ char }}</span>
 <span v-else>{{ emoji }}</span>
@@ -37,6 +38,7 @@ const url = computed(() => {
 	}
 });
 const alt = computed(() => isCustom.value ? `:${customEmojiName}:` : char.value);
+let errored = $ref(false);
 
 // Searching from an array with 2000 items for every emoji felt like too energy-consuming, so I decided to do it lazily on pointerenter
 function computeTitle(event: PointerEvent): void {

From 8f0c598772fdb70d9381d5d83046515241b7052a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 17 Jan 2023 17:09:43 +0900
Subject: [PATCH 017/177] improve aiscript ui

---
 packages/frontend/src/components/MkAsUi.vue  | 10 ++++++----
 packages/frontend/src/scripts/aiscript/ui.ts |  7 +++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/components/MkAsUi.vue b/packages/frontend/src/components/MkAsUi.vue
index 9543ccc4d..4f463d73d 100644
--- a/packages/frontend/src/components/MkAsUi.vue
+++ b/packages/frontend/src/components/MkAsUi.vue
@@ -7,9 +7,9 @@
 	</div>
 	<span v-else-if="c.type === 'text'" :class="{ [$style.fontSerif]: c.font === 'serif', [$style.fontMonospace]: c.font === 'monospace' }" :style="{ fontSize: c.size ? `${c.size * 100}%` : null, fontWeight: c.bold ? 'bold' : null, color: c.color ?? null }">{{ c.text }}</span>
 	<Mfm v-else-if="c.type === 'mfm'" :class="{ [$style.fontSerif]: c.font === 'serif', [$style.fontMonospace]: c.font === 'monospace' }" :style="{ fontSize: c.size ? `${c.size * 100}%` : null, fontWeight: c.bold ? 'bold' : null, color: c.color ?? null }" :text="c.text"/>
-	<MkButton v-else-if="c.type === 'button'" :primary="c.primary" :rounded="c.rounded" :small="size === 'small'" inline @click="c.onClick">{{ c.text }}</MkButton>
-	<div v-else-if="c.type === 'buttons'" class="_buttons">
-		<MkButton v-for="button in c.buttons" :primary="button.primary" :rounded="button.rounded" :small="size === 'small'" @click="button.onClick">{{ button.text }}</MkButton>
+	<MkButton v-else-if="c.type === 'button'" :primary="c.primary" :rounded="c.rounded" :disabled="c.disabled" :small="size === 'small'" inline @click="c.onClick">{{ c.text }}</MkButton>
+	<div v-else-if="c.type === 'buttons'" class="_buttons" :style="{ justifyContent: align }">
+		<MkButton v-for="button in c.buttons" :primary="button.primary" :rounded="button.rounded" :disabled="button.disabled" inline :small="size === 'small'" @click="button.onClick">{{ button.text }}</MkButton>
 	</div>
 	<MkSwitch v-else-if="c.type === 'switch'" :model-value="valueForSwitch" @update:model-value="onSwitchUpdate">
 		<template v-if="c.label" #label>{{ c.label }}</template>
@@ -41,7 +41,7 @@
 	</MkFolder>
 	<div v-else-if="c.type === 'container'" :class="[$style.container, { [$style.fontSerif]: c.font === 'serif', [$style.fontMonospace]: c.font === 'monospace', [$style.containerCenter]: c.align === 'center' }]" :style="{ backgroundColor: c.bgColor ?? null, color: c.fgColor ?? null, borderWidth: c.borderWidth ? `${c.borderWidth}px` : 0, borderColor: c.borderColor ?? 'var(--divider)', padding: c.padding ? `${c.padding}px` : 0, borderRadius: c.rounded ? '8px' : 0 }">
 		<template v-for="child in c.children" :key="child">
-			<MkAsUi v-if="!g(child).hidden" :component="g(child)" :components="props.components" :size="size"/>
+			<MkAsUi v-if="!g(child).hidden" :component="g(child)" :components="props.components" :size="size" :align="c.align"/>
 		</template>
 	</div>
 </div>
@@ -62,8 +62,10 @@ const props = withDefaults(defineProps<{
 	component: AsUiComponent;
 	components: Ref<AsUiComponent>[];
 	size: 'small' | 'medium' | 'large';
+	align: 'left' | 'center' | 'right';
 }>(), {
 	size: 'medium',
+	align: 'left',
 });
 
 const c = props.component;
diff --git a/packages/frontend/src/scripts/aiscript/ui.ts b/packages/frontend/src/scripts/aiscript/ui.ts
index 2555cd391..b1895a5f3 100644
--- a/packages/frontend/src/scripts/aiscript/ui.ts
+++ b/packages/frontend/src/scripts/aiscript/ui.ts
@@ -50,6 +50,7 @@ export type AsUiButton = AsUiComponentBase & {
 	onClick?: () => void;
 	primary?: boolean;
 	rounded?: boolean;
+	disabled?: boolean;
 };
 
 export type AsUiButtons = AsUiComponentBase & {
@@ -302,6 +303,8 @@ function getButtonOptions(def: values.Value | undefined, call: (fn: values.VFn,
 	if (primary) utils.assertBoolean(primary);
 	const rounded = def.value.get('rounded');
 	if (rounded) utils.assertBoolean(rounded);
+	const disabled = button.value.get('disabled');
+	if (disabled) utils.assertBoolean(disabled);
 
 	return {
 		text: text?.value,
@@ -310,6 +313,7 @@ function getButtonOptions(def: values.Value | undefined, call: (fn: values.VFn,
 		},
 		primary: primary?.value,
 		rounded: rounded?.value,
+		disabled: disabled?.value,
 	};
 }
 
@@ -330,6 +334,8 @@ function getButtonsOptions(def: values.Value | undefined, call: (fn: values.VFn,
 			if (primary) utils.assertBoolean(primary);
 			const rounded = button.value.get('rounded');
 			if (rounded) utils.assertBoolean(rounded);
+			const disabled = button.value.get('disabled');
+			if (disabled) utils.assertBoolean(disabled);
 
 			return {
 				text: text.value,
@@ -338,6 +344,7 @@ function getButtonsOptions(def: values.Value | undefined, call: (fn: values.VFn,
 				},
 				primary: primary?.value,
 				rounded: rounded?.value,
+				disabled: disabled?.value,
 			};
 		}) : [],
 	};

From d75225e23b537bbc76c6ce7f506d28662171418b Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 17 Jan 2023 17:10:33 +0900
Subject: [PATCH 018/177] add new play preset

---
 .../frontend/src/pages/flash/flash-edit.vue   | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/packages/frontend/src/pages/flash/flash-edit.vue b/packages/frontend/src/pages/flash/flash-edit.vue
index 539aeec85..321477259 100644
--- a/packages/frontend/src/pages/flash/flash-edit.vue
+++ b/packages/frontend/src/pages/flash/flash-edit.vue
@@ -95,6 +95,85 @@ Ui:render([
 ])
 `;
 
+const PRESET_SHUFFLE = `/// @ 0.12.2
+// 巻き戻し可能な文字シャッフルのプリセット
+
+let string = "ペペロンチーノ"
+let length = string.len
+
+// 過去の結果を保存しておくやつ
+var results = []
+
+// どれだけ巻き戻しているか
+var cursor = 0
+
+@do() {
+	if (cursor != 0) {
+		results = results.slice(0 (cursor + 1))
+		cursor = 0
+	}
+
+	let chars = []
+	for (let i, length) {
+		let r = Math:rnd(0 (length - 1))
+		chars.push(string.pick(r))
+	}
+	let result = chars.join("")
+
+	results.push(result)
+
+	// UIを表示
+	render(result)
+}
+
+@back() {
+	cursor = cursor + 1
+	let result = results[results.len - (cursor + 1)]
+	render(result)
+}
+
+@forward() {
+	cursor = cursor - 1
+	let result = results[results.len - (cursor + 1)]
+	render(result)
+}
+
+@render(result) {
+	Ui:render([
+		Ui:C:container({
+			align: 'center'
+			children: [
+				Ui:C:mfm({ text: result })
+				Ui:C:buttons({
+					buttons: [{
+						text: "←"
+						disabled: !(results.len > 1 && (results.len - cursor) > 1)
+						onClick: back
+					} {
+						text: "→"
+						disabled: !(results.len > 1 && cursor > 0)
+						onClick: forward
+					} {
+						text: "引き直す"
+						onClick: do
+					}]
+				})
+				Ui:C:postFormButton({
+					text: "投稿する"
+					rounded: true
+					primary: true
+					form: {
+						text: \`{result}{Str:lf}{THIS_URL}\`
+					}
+				})
+			]
+		})
+	])
+}
+
+do()
+`;
+
 const PRESET_TIMELINE = `/// @ 0.12.2
 // APIリクエストを行いローカルタイムラインを表示するプリセット
 
@@ -175,6 +254,11 @@ function selectPreset(ev: MouseEvent) {
 		action: () => {
 			script = PRESET_OMIKUJI;
 		},
+	}, {
+		text: 'Shuffle',
+		action: () => {
+			script = PRESET_SHUFFLE;
+		},
 	}, {
 		text: 'Timeline viewer',
 		action: () => {

From 424919ffd0ef2b8083f388bc454a2731d5f1a438 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 17 Jan 2023 17:11:02 +0900
Subject: [PATCH 019/177] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c877be07b..d78294515 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@ You should also include the user name that made the change.
 ## 13.x.x (unreleased)
 
 ### Improvements
+- Playのプリセットを追加
+- AiScript GUIの強化
 - 存在しないカスタム絵文字をテキストで表示するように
 
 ### Bugfixes

From d456308653bcadbb95dbd954b01eab1df9464c03 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 17 Jan 2023 17:36:18 +0900
Subject: [PATCH 020/177] pref: Optimize client imports (#9506)

* pref: Optimize client imports

* split api?

* fix

* :v:

* no vue split?

* Revert "no vue split?"

This reverts commit 27ccec971e2925184a58da65c3472655def2617c.

* function => const

* :v:

* Revert "function => const"

This reverts commit 34f2feb224f65cc4fca090b29450adb00e85c2c5.

* function api
---
 packages/frontend/src/os.ts          | 39 ++++++++++++++++------------
 packages/frontend/src/scripts/api.ts |  2 +-
 packages/frontend/vite.config.ts     |  1 +
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index b19443aa5..111bd0cd8 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -1,5 +1,7 @@
 // TODO: なんでもかんでもos.tsに突っ込むのやめたいのでよしなに分割する
 
+import { pendingApiRequestsCount, api, apiGet } from '@/scripts/api';
+export { pendingApiRequestsCount, api, apiGet };
 import { Component, markRaw, Ref, ref, defineAsyncComponent } from 'vue';
 import { EventEmitter } from 'eventemitter3';
 import insertTextAtCursor from 'insert-text-at-cursor';
@@ -7,9 +9,14 @@ import * as Misskey from 'misskey-js';
 import { i18n } from './i18n';
 import MkPostFormDialog from '@/components/MkPostFormDialog.vue';
 import MkWaitingDialog from '@/components/MkWaitingDialog.vue';
+import MkPageWindow from '@/components/MkPageWindow.vue'
+import MkToast from '@/components/MkToast.vue';
+import MkDialog from '@/components/MkDialog.vue';
+import MkEmojiPickerDialog from '@/components/MkEmojiPickerDialog.vue';
+import MkEmojiPickerWindow from '@/components/MkEmojiPickerWindow.vue';
+import MkPopupMenu from '@/components/MkPopupMenu.vue';
+import MkContextMenu from '@/components/MkContextMenu.vue';
 import { MenuItem } from '@/types/menu';
-import { pendingApiRequestsCount, api, apiGet } from '@/scripts/api';
-export { pendingApiRequestsCount, api, apiGet };
 
 export const apiWithDialog = ((
 	endpoint: string,
@@ -124,7 +131,7 @@ export async function popup(component: Component, props: Record<string, any>, ev
 }
 
 export function pageWindow(path: string) {
-	popup(defineAsyncComponent(() => import('@/components/MkPageWindow.vue')), {
+	popup(MkPageWindow, {
 		initialPath: path,
 	}, {}, 'closed');
 }
@@ -136,7 +143,7 @@ export function modalPageWindow(path: string) {
 }
 
 export function toast(message: string) {
-	popup(defineAsyncComponent(() => import('@/components/MkToast.vue')), {
+	popup(MkToast, {
 		message,
 	}, {}, 'closed');
 }
@@ -147,7 +154,7 @@ export function alert(props: {
 	text?: string | null;
 }): Promise<void> {
 	return new Promise((resolve, reject) => {
-		popup(defineAsyncComponent(() => import('@/components/MkDialog.vue')), props, {
+		popup(MkDialog, props, {
 			done: result => {
 				resolve();
 			},
@@ -161,7 +168,7 @@ export function confirm(props: {
 	text?: string | null;
 }): Promise<{ canceled: boolean }> {
 	return new Promise((resolve, reject) => {
-		popup(defineAsyncComponent(() => import('@/components/MkDialog.vue')), {
+		popup(MkDialog, {
 			...props,
 			showCancelButton: true,
 		}, {
@@ -182,7 +189,7 @@ export function inputText(props: {
 	canceled: false; result: string;
 }> {
 	return new Promise((resolve, reject) => {
-		popup(defineAsyncComponent(() => import('@/components/MkDialog.vue')), {
+		popup(MkDialog, {
 			title: props.title,
 			text: props.text,
 			input: {
@@ -207,7 +214,7 @@ export function inputNumber(props: {
 	canceled: false; result: number;
 }> {
 	return new Promise((resolve, reject) => {
-		popup(defineAsyncComponent(() => import('@/components/MkDialog.vue')), {
+		popup(MkDialog, {
 			title: props.title,
 			text: props.text,
 			input: {
@@ -232,7 +239,7 @@ export function inputDate(props: {
 	canceled: false; result: Date;
 }> {
 	return new Promise((resolve, reject) => {
-		popup(defineAsyncComponent(() => import('@/components/MkDialog.vue')), {
+		popup(MkDialog, {
 			title: props.title,
 			text: props.text,
 			input: {
@@ -269,7 +276,7 @@ export function select<C = any>(props: {
 	canceled: false; result: C;
 }> {
 	return new Promise((resolve, reject) => {
-		popup(defineAsyncComponent(() => import('@/components/MkDialog.vue')), {
+		popup(MkDialog, {
 			title: props.title,
 			text: props.text,
 			select: {
@@ -291,7 +298,7 @@ export function success() {
 		window.setTimeout(() => {
 			showing.value = false;
 		}, 1000);
-		popup(defineAsyncComponent(() => import('@/components/MkWaitingDialog.vue')), {
+		popup(MkWaitingDialog, {
 			success: true,
 			showing: showing,
 		}, {
@@ -303,7 +310,7 @@ export function success() {
 export function waiting() {
 	return new Promise((resolve, reject) => {
 		const showing = ref(true);
-		popup(defineAsyncComponent(() => import('@/components/MkWaitingDialog.vue')), {
+		popup(MkWaitingDialog, {
 			success: false,
 			showing: showing,
 		}, {
@@ -366,7 +373,7 @@ export async function selectDriveFolder(multiple: boolean) {
 
 export async function pickEmoji(src: HTMLElement | null, opts) {
 	return new Promise((resolve, reject) => {
-		popup(defineAsyncComponent(() => import('@/components/MkEmojiPickerDialog.vue')), {
+		popup(MkEmojiPickerDialog, {
 			src,
 			...opts,
 		}, {
@@ -431,7 +438,7 @@ export async function openEmojiPicker(src?: HTMLElement, opts, initialTextarea:
 		characterData: false,
 	});
 
-	openingEmojiPicker = await popup(defineAsyncComponent(() => import('@/components/MkEmojiPickerWindow.vue')), {
+	openingEmojiPicker = await popup(MkEmojiPickerWindow, {
 		src,
 		...opts,
 	}, {
@@ -454,7 +461,7 @@ export function popupMenu(items: MenuItem[] | Ref<MenuItem[]>, src?: HTMLElement
 }) {
 	return new Promise((resolve, reject) => {
 		let dispose;
-		popup(defineAsyncComponent(() => import('@/components/MkPopupMenu.vue')), {
+		popup(MkPopupMenu, {
 			items,
 			src,
 			width: options?.width,
@@ -478,7 +485,7 @@ export function contextMenu(items: MenuItem[] | Ref<MenuItem[]>, ev: MouseEvent)
 	ev.preventDefault();
 	return new Promise((resolve, reject) => {
 		let dispose;
-		popup(defineAsyncComponent(() => import('@/components/MkContextMenu.vue')), {
+		popup(MkContextMenu, {
 			items,
 			ev,
 		}, {
diff --git a/packages/frontend/src/scripts/api.ts b/packages/frontend/src/scripts/api.ts
index f9fd11f06..5f34f5333 100644
--- a/packages/frontend/src/scripts/api.ts
+++ b/packages/frontend/src/scripts/api.ts
@@ -45,7 +45,7 @@ export function api<E extends keyof Endpoints, P extends Endpoints[E]['req']>(en
 }
 
 // Implements Misskey.api.ApiClient.request
-export function apiGet<E extends keyof Endpoints, P extends Endpoints[E]['req']>(endpoint: E, data: P = {} as any): Promise<Endpoints[E]['res']> {
+export function apiGet <E extends keyof Endpoints, P extends Endpoints[E]['req']>(endpoint: E, data: P = {} as any): Promise<Endpoints[E]['res']> {
 	pendingApiRequestsCount.value++;
 
 	const onFinally = () => {
diff --git a/packages/frontend/vite.config.ts b/packages/frontend/vite.config.ts
index ba82eda60..0bf35ec1b 100644
--- a/packages/frontend/vite.config.ts
+++ b/packages/frontend/vite.config.ts
@@ -97,6 +97,7 @@ export default defineConfig(({ command, mode }) => {
 				output: {
 					manualChunks: {
 						vue: ['vue'],
+						photoswipe: ['photoswipe', 'photoswipe/lightbox', 'photoswipe/style.css'],
 					},
 				},
 			},

From 79212bbd375705f0fd658dd5b50b47f77d622fb8 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 17 Jan 2023 17:12:41 +0000
Subject: [PATCH 021/177] refactor(server): notify url when fetch error

---
 packages/backend/src/core/HttpRequestService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/core/HttpRequestService.ts b/packages/backend/src/core/HttpRequestService.ts
index 8639b5713..2864ad440 100644
--- a/packages/backend/src/core/HttpRequestService.ts
+++ b/packages/backend/src/core/HttpRequestService.ts
@@ -125,7 +125,7 @@ export class UndiciFetcher {
 				...(options.headers ?? {}),
 			},
 		}).catch((err) => {
-			this.logger?.error('fetch error', err);
+			this.logger?.error(`fetch error to ${typeof url === 'string' ? url : url.href}`, err);
 			throw new StatusError('Resource Unreachable', 500, 'Resource Unreachable');
 		});
 		if (!res.ok && !privateOptions.noOkError) {

From 57b1fe44d402c1ee4b2218808b275f9dab4c3de3 Mon Sep 17 00:00:00 2001
From: atsuchan <83960488+atsu1125@users.noreply.github.com>
Date: Wed, 18 Jan 2023 06:13:44 +0900
Subject: [PATCH 022/177] Bump Postgres 12.2 to 15.x on docker-compose.yml
 (#9641)

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 01bd1b1e6..ca7ce1ca2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -36,7 +36,7 @@ services:
 
   db:
     restart: always
-    image: postgres:12.2-alpine
+    image: postgres:15-alpine
     networks:
       - internal_network
     env_file:

From eea47ca2e862c6a8fbe86bd4fff23bab5c22c6e5 Mon Sep 17 00:00:00 2001
From: Takuya Yoshida <hawaiianphoto@geekhost.net>
Date: Wed, 18 Jan 2023 16:18:23 +0900
Subject: [PATCH 023/177] Update redis to 7 (#9654)

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ca7ce1ca2..b0c4a914d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,7 +24,7 @@ services:
 
   redis:
     restart: always
-    image: redis:4.0-alpine
+    image: redis:7-alpine
     networks:
       - internal_network
     volumes:

From 85f3df4c0ebb179fe9446f29deb7b4ebbb87a85f Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 18 Jan 2023 20:26:38 +0900
Subject: [PATCH 024/177] =?UTF-8?q?fix(client):=20messaging-room=E5=91=A8?=
 =?UTF-8?q?=E3=82=8A=20(#9643)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* wip

* :v:

* clean up
---
 .../src/pages/messaging/messaging-room.vue    | 204 +++++++++---------
 1 file changed, 103 insertions(+), 101 deletions(-)

diff --git a/packages/frontend/src/pages/messaging/messaging-room.vue b/packages/frontend/src/pages/messaging/messaging-room.vue
index f1749d449..0867f003a 100644
--- a/packages/frontend/src/pages/messaging/messaging-room.vue
+++ b/packages/frontend/src/pages/messaging/messaging-room.vue
@@ -1,11 +1,15 @@
 <template>
+<MkStickyContainer>
+<template #header>
+	<MkPageHeader />
+</template>
 <div
 	ref="rootEl"
-	class="root"
+	:class="$style['root']"
 	@dragover.prevent.stop="onDragover"
 	@drop.prevent.stop="onDrop"
 >
-	<div class="body">
+	<div :class="$style['body']">
 		<MkPagination v-if="pagination" ref="pagingComponent" :key="userAcct || groupId" :pagination="pagination">
 			<template #empty>
 				<div class="_fullinfo">
@@ -17,7 +21,7 @@
 				<MkDateSeparatedList
 					v-if="messages.length > 0"
 					v-slot="{ item: message }"
-					:class="{ messages: true, 'deny-move-transition': pFetching }"
+					:class="{ [$style['messages']]: true, 'deny-move-transition': pFetching }"
 					:items="messages"
 					direction="up"
 					reversed
@@ -27,23 +31,26 @@
 			</template>
 		</MkPagination>
 	</div>
-	<footer>
-		<div v-if="typers.length > 0" class="typers">
-			<I18n :src="i18n.ts.typingUsers" text-tag="span" class="users">
+	<footer :class="$style['footer']">
+		<div v-if="typers.length > 0" :class="$style['typers']">
+			<I18n :src="i18n.ts.typingUsers" text-tag="span">
 				<template #users>
-					<b v-for="typer in typers" :key="typer.id" class="user">{{ typer.username }}</b>
+					<b v-for="typer in typers" :key="typer.id" :class="$style['user']">{{ typer.username }}</b>
 				</template>
 			</I18n>
 			<MkEllipsis/>
 		</div>
 		<Transition :name="animation ? 'fade' : ''">
-			<div v-show="showIndicator" class="new-message">
-				<button class="_buttonPrimary" @click="onIndicatorClick"><i class="fas ti-fw fa-arrow-circle-down"></i>{{ i18n.ts.newMessageExists }}</button>
+			<div v-show="showIndicator" :class="$style['new-message']">
+				<button class="_buttonPrimary" @click="onIndicatorClick" :class="$style['new-message-button']">
+					<i class="fas ti-fw fa-arrow-circle-down" :class="$style['new-message-icon']"></i>{{ i18n.ts.newMessageExists }}
+				</button>
 			</div>
 		</Transition>
-		<XForm v-if="!fetching" ref="formEl" :user="user" :group="group" class="form"/>
+		<XForm v-if="!fetching" ref="formEl" :user="user" :group="group" :class="$style['form']"/>
 	</footer>
 </div>
+</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
@@ -303,103 +310,98 @@ definePageMetadata(computed(() => !fetching ? user ? {
 } : null));
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" module>
 .root {
 	display: content;
+}
 
-	> .body {
-		min-height: 80%;
+.body {
+	min-height: 80%;
+}
 
-		.more {
-			display: block;
-			margin: 16px auto;
-			padding: 0 12px;
-			line-height: 24px;
-			color: #fff;
-			background: rgba(#000, 0.3);
-			border-radius: 12px;
-
-			&:hover {
-				background: rgba(#000, 0.4);
-			}
-
-			&:active {
-				background: rgba(#000, 0.5);
-			}
-
-			&.fetching {
-				cursor: wait;
-			}
-
-			> i {
-				margin-right: 4px;
-			}
-		}
-
-		.messages {
-			padding: 8px 0;
-
-			> ::v-deep(*) {
-				margin-bottom: 16px;
-			}
-		}
+.more {
+	display: block;
+	margin: 16px auto;
+	padding: 0 12px;
+	line-height: 24px;
+	color: #fff;
+	background: rgba(#000, 0.3);
+	border-radius: 12px;
+	&:hover {
+		background: rgba(#000, 0.4);
 	}
-
-	> footer {
-		width: 100%;
-		position: sticky;
-		z-index: 2;
-		padding-top: 8px;
-		bottom: 0;
-		bottom: env(safe-area-inset-bottom, 0px);
-
-		> .new-message {
-			width: 100%;
-			padding-bottom: 8px;
-			text-align: center;
-
-			> button {
-				display: inline-block;
-				margin: 0;
-				padding: 0 12px;
-				line-height: 32px;
-				font-size: 12px;
-				border-radius: 16px;
-
-				> i {
-					display: inline-block;
-					margin-right: 8px;
-				}
-			}
-		}
-
-		> .typers {
-			position: absolute;
-			bottom: 100%;
-			padding: 0 8px 0 8px;
-			font-size: 0.9em;
-			color: var(--fgTransparentWeak);
-
-			> .users {
-				> .user + .user:before {
-					content: ", ";
-					font-weight: normal;
-				}
-
-				> .user:last-of-type:after {
-					content: " ";
-				}
-			}
-		}
-
-		> .form {
-			max-height: 12em;
-			overflow-y: scroll;
-			border-top: solid 0.5px var(--divider);
-			border-bottom-left-radius: 0;
-			border-bottom-right-radius: 0;
-		}
+	&:active {
+		background: rgba(#000, 0.5);
 	}
+	> i {
+		margin-right: 4px;
+	}
+}
+
+.fetching {
+	cursor: wait;
+}
+
+.messages {
+	padding: 16px 0 0;
+
+	> * {
+		margin-bottom: 16px;
+	}
+}
+
+.footer {
+	width: 100%;
+	position: sticky;
+	z-index: 2;
+	padding-top: 8px;
+	bottom: var(--minBottomSpacing);
+}
+
+.new-message {
+	width: 100%;
+	padding-bottom: 8px;
+	text-align: center;
+}
+
+.new-message-button {
+	display: inline-block;
+	margin: 0;
+	padding: 0 12px;
+	line-height: 32px;
+	font-size: 12px;
+	border-radius: 16px;
+}
+
+.new-message-icon {
+	display: inline-block;
+	margin-right: 8px;
+}
+
+.typers {
+	position: absolute;
+	bottom: 100%;
+	padding: 0 8px 0 8px;
+	font-size: 0.9em;
+	color: var(--fgTransparentWeak);
+}
+
+
+.user + .user:before {
+	content: ", ";
+	font-weight: normal;
+}
+
+.user:last-of-type:after {
+	content: " ";
+}
+
+.form {
+	max-height: 12em;
+	overflow-y: scroll;
+	border-top: solid 0.5px var(--divider);
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
 }
 
 .fade-enter-active, .fade-leave-active {

From afc0be67908f92fd57803329cebdee454fd75442 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 19 Jan 2023 09:06:11 +0900
Subject: [PATCH 025/177] =?UTF-8?q?enhance:=20play=E3=81=AEscript=E3=81=AE?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E6=95=B0=E5=88=B6=E9=99=90=E3=82=92=E7=B7=A9?=
 =?UTF-8?q?=E5=92=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                          |  1 +
 .../migration/1674086433654-flashScriptLength.js      | 11 +++++++++++
 packages/backend/src/models/entities/Flash.ts         |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 packages/backend/migration/1674086433654-flashScriptLength.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d78294515..69f1123f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ You should also include the user name that made the change.
 
 ### Improvements
 - Playのプリセットを追加
+- Playのscriptの文字数制限を緩和
 - AiScript GUIの強化
 - 存在しないカスタム絵文字をテキストで表示するように
 
diff --git a/packages/backend/migration/1674086433654-flashScriptLength.js b/packages/backend/migration/1674086433654-flashScriptLength.js
new file mode 100644
index 000000000..a4d149fe1
--- /dev/null
+++ b/packages/backend/migration/1674086433654-flashScriptLength.js
@@ -0,0 +1,11 @@
+export class flashScriptLength1674086433654 {
+    name = 'flashScriptLength1674086433654'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "flash" ALTER COLUMN "script" TYPE character varying(32768)`);
+    }
+
+    async down(queryRunner) {
+			await queryRunner.query(`ALTER TABLE "flash" ALTER COLUMN "script" TYPE character varying(16384)`);
+    }
+}
diff --git a/packages/backend/src/models/entities/Flash.ts b/packages/backend/src/models/entities/Flash.ts
index d9a6ac987..07039d4fa 100644
--- a/packages/backend/src/models/entities/Flash.ts
+++ b/packages/backend/src/models/entities/Flash.ts
@@ -44,7 +44,7 @@ export class Flash {
 	public user: User | null;
 
 	@Column('varchar', {
-		length: 16384,
+		length: 32768,
 	})
 	public script: string;
 

From d05ffc0a7cb856f19187e7966f287aee3a98bdbc Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 19 Jan 2023 09:12:52 +0900
Subject: [PATCH 026/177] New Crowdin updates (#9616)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Indonesian)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)
---
 locales/de-DE.yml | 11 +++++++----
 locales/en-US.yml | 20 ++++++++++----------
 locales/id-ID.yml | 17 +++++++++++++++++
 locales/it-IT.yml |  5 ++++-
 locales/ko-KR.yml | 21 ++++++++++++---------
 locales/uk-UA.yml |  5 ++++-
 locales/zh-CN.yml |  7 ++++---
 locales/zh-TW.yml | 12 +++++++++++-
 8 files changed, 69 insertions(+), 29 deletions(-)

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index ea4a72dc0..71ed02cd4 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -931,10 +931,12 @@ undefined: "Undefiniert"
 assign: "Zuweisen"
 unassign: "Entfernen"
 color: "Farbe"
-manageCustomEmojis: "Benutzerdefinierte Emojis verwalten"
+manageCustomEmojis: "Kann benutzerdefinierte Emojis verwalten"
 youCannotCreateAnymore: "Du hast das Erstellungslimit erreicht."
 cannotPerformTemporary: "Vorübergehend nicht verfügbar"
 cannotPerformTemporaryDescription: "Diese Aktion ist wegen des Überschreitenes des Ausführungslimits temporär nicht verfügbar. Bitte versuche es nach einiger Zeit erneut."
+preset: "Vorlage"
+selectFromPresets: "Aus Vorlagen wählen"
 _role:
   new: "Rolle erstellen"
   edit: "Rolle bearbeiten"
@@ -943,7 +945,7 @@ _role:
   permission: "Rollenberechtigungen"
   descriptionOfPermission: "<b>Moderatoren</b> können grundlegende Verwaltungsaufgaben erledigen.\n<b>Administratoren</b> können alle Einstellungen der Instanz verwalten."
   assignTarget: "Zuweisungsart"
-  descriptionOfAssignTarget: "<b>Manuell</b> bedeutet, dass die Liste der Benutzer einer Rolle manuell verwaltet wird.\n<b>Konditionell</b> bedeutet, dass die Liste der Benutzer einer Rolle durch eine Bedingung automatisch verwaltet wird."
+  descriptionOfAssignTarget: "<b>Manuell</b> bedeutet, dass die Liste der Benutzer einer Rolle manuell verwaltet wird.\n<b>Konditional</b> bedeutet, dass die Liste der Benutzer einer Rolle durch eine Bedingung automatisch verwaltet wird."
   manual: "Manuell"
   conditional: "Konditional"
   condition: "Bedingung"
@@ -966,7 +968,7 @@ _role:
     gtlAvailable: "Kann auf die globale Chronik zugreifen"
     ltlAvailable: "Kann auf die lokale Chronik zugreifen"
     canPublicNote: "Kann öffentliche Notizen erstellen"
-    canInvite: "Einladungscodes für diese Instanz erstellen"
+    canInvite: "Kann Einladungscodes für diese Instanz erstellen"
     canManageCustomEmojis: "Benutzerdefinierte Emojis verwalten"
     driveCapacity: "Drive-Kapazität"
     pinMax: "Maximale Anzahl an angehefteten Notizen"
@@ -979,6 +981,7 @@ _role:
     userEachUserListsMax: "Maximale Anzahl an Benutzerlisten"
     rateLimitFactor: "Versuchsanzahl"
     descriptionOfRateLimitFactor: "Je niedriger desto weniger restriktiv, je höher destro restriktiver."
+    canHideAds: "Kann Werbung ausblenden"
   _condition:
     isLocal: "Lokaler Benutzer"
     isRemote: "Benutzer fremder Instanz"
@@ -1023,7 +1026,7 @@ _accountDelete:
 _ad:
   back: "Zurück"
   reduceFrequencyOfThisAd: "Diese Werbung weniger anzeigen"
-  hide: "Nie anzeigen"
+  hide: "Ausblenden"
 _forgotPassword:
   enterEmail: "Gib die Email-Adresse ein, mit der du dich registriert hast. An diese wird ein Link gesendet, mit dem du dein Passwort zurücksetzen kannst."
   ifNoEmail: "Solltest du bei der Registrierung keine Email-Adresse angegeben haben, wende dich bitte an den Administrator."
diff --git a/locales/en-US.yml b/locales/en-US.yml
index b92ea24f2..4cecca84f 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -935,7 +935,7 @@ manageCustomEmojis: "Manage Custom Emojis"
 youCannotCreateAnymore: "You've hit the creation limit."
 cannotPerformTemporary: "Temporarily unavailable"
 cannotPerformTemporaryDescription: "This action cannot be performed temporarily due to exceeding the execution limit. Please wait for a while and then try again."
-preset: "Presets"
+preset: "Preset"
 selectFromPresets: "Choose from presets"
 _role:
   new: "New role"
@@ -954,10 +954,10 @@ _role:
   descriptionOfIsPublic: "Anyone will be able to view a list of users assigned to this role. In addition, this role will be displayed in the profiles of assigned users."
   options: "Role options"
   policies: "Policies"
-  baseRole: "Base role"
-  useBaseValue: "Use base role value"
+  baseRole: "Role template"
+  useBaseValue: "Use role template value"
   chooseRoleToAssign: "Select the role to assign"
-  canEditMembersByModerator: "Allow moderators to edit the list members of this role"
+  canEditMembersByModerator: "Allow moderators to edit the list of members for this role"
   descriptionOfCanEditMembersByModerator: "When turned on, moderators as well as administrators will be able to assign and unassign users to this role. When turned off, only administrators will be able to assign users."
   priority: "Priority"
   _priority:
@@ -965,11 +965,11 @@ _role:
     middle: "Medium"
     high: "High"
   _options:
-    gtlAvailable: "Viewing the global timeline"
-    ltlAvailable: "Viewing the local timeline"
+    gtlAvailable: "Can view the global timeline"
+    ltlAvailable: "Can view the local timeline"
     canPublicNote: "Can send public notes"
-    canInvite: "Create instance invite codes"
-    canManageCustomEmojis: "Manage Custom Emojis"
+    canInvite: "Can create instance invite codes"
+    canManageCustomEmojis: "Can manage custom emojis"
     driveCapacity: "Drive capacity"
     pinMax: "Maximum number of pinned notes"
     antennaMax: "Maximum number of antennas"
@@ -981,7 +981,7 @@ _role:
     userEachUserListsMax: "Maximum number of users within a user list"
     rateLimitFactor: "Rate limit"
     descriptionOfRateLimitFactor: "Lower rate limits are less restrictive, higher ones more restrictive. "
-    canHideAds: "Remove ads"
+    canHideAds: "Can hide ads"
   _condition:
     isLocal: "Local user"
     isRemote: "Remote user"
@@ -1026,7 +1026,7 @@ _accountDelete:
 _ad:
   back: "Back"
   reduceFrequencyOfThisAd: "Show this ad less"
-  hide: "Never show"
+  hide: "Hide"
 _forgotPassword:
   enterEmail: "Enter the email address you used to register. A link with which you can reset your password will then be sent to it."
   ifNoEmail: "If you did not use an email during registration, please contact the instance administrator instead."
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index e3fa177f3..7f7d582ee 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -2,6 +2,7 @@
 _lang_: "Bahasa Indonesia"
 headlineMisskey: "Jaringan terhubung melalui catatan"
 introMisskey: "Selamat datang! Misskey adalah perangkat mikroblog tercatu bersifat sumber terbuka.\nMulailah menuliskan catatan, bagikan peristiwa terkini, serta ceritakan segala tentangmu.📡\nTunjukkan juga reaksimu pada catatan pengguna lain.👍\nMari jelajahi dunia baru🚀"
+poweredByMisskeyDescription: "{name} adalah sebuah layanan (instance) yang menggunakan platform sumber terbuka <b>Misskey</b>."
 monthAndDay: "{day} {month}"
 search: "Penelusuran"
 notifications: "Pemberitahuan"
@@ -47,6 +48,7 @@ deleteAndEdit: "Hapus dan sunting"
 deleteAndEditConfirm: "Apakah kamu yakin ingin menghapus note ini dan menyuntingnya? Kamu akan kehilangan semua reaksi, renote dan balasan di note ini."
 addToList: "Tambahkan ke daftar"
 sendMessage: "Kirim pesan"
+copyRSS: "Salin RSS"
 copyUsername: "Salin nama pengguna"
 searchUser: "Cari pengguna"
 reply: "Balas"
@@ -383,6 +385,7 @@ administrator: "Admin"
 token: "Token"
 twoStepAuthentication: "Otentikasi dua faktor"
 moderator: "Moderator"
+moderation: "Moderasi"
 nUsersMentioned: "{n} pengguna disebut"
 securityKey: "Kunci keamanan"
 securityKeyName: "Nama kunci"
@@ -449,6 +452,7 @@ language: "Bahasa"
 uiLanguage: "Bahasa antarmuka pengguna"
 groupInvited: "Telah diundang ke grup"
 aboutX: "Tentang {x}"
+emojiStyle: "Gaya emoji"
 disableDrawer: "Jangan gunakan menu bergaya laci"
 youHaveNoGroups: "Kamu tidak memiliki grup"
 joinOrCreateGroup: "Bergabunglah dengan grup atau kamu dapat membuat grupmu sendiri."
@@ -561,6 +565,7 @@ author: "Pembuat"
 leaveConfirm: "Ada perubahan yang belum disimpan. Apakah kamu ingin membuangnya?"
 manage: "Manajemen"
 plugins: "Plugin"
+preferencesBackups: "Aturan pencadangan"
 deck: "Dek"
 undeck: "Keluar dari dek"
 useBlurEffectForModal: "Gunakan efek buram untuk modal"
@@ -706,6 +711,7 @@ accentColor: "Aksen"
 textColor: "Teks"
 saveAs: "Simpan sebagai…"
 advanced: "Tingkat lanjut"
+advancedSettings: "Pengaturan Lanjut"
 value: "Nilai"
 createdAt: "Dibuat pada"
 updatedAt: "Diperbarui pada"
@@ -850,10 +856,21 @@ rateLimitExceeded: "Batas sudah terlampaui"
 cropImage: "potong gambar"
 cropImageAsk: "Ingin memotong gambar?"
 file: "Berkas"
+noEmailServerWarning: "Mail Server tidak disetel."
+recommended: "Disarankan"
+check: "Cek"
+deleteAccount: "Hapus Akun"
+logoutConfirm: "Anda yakin ingin keluar?"
+lastActiveDate: "Terakhir digunakan"
+statusbar: "Bilah status"
+pleaseSelect: "Pilih opsi..."
 reverse: "Balik"
 colored: "Diwarnai"
+refreshInterval: "Jeda pembaharuan"
 label: "Label"
+type: "Tipe"
 localOnly: "Hanya lokal"
+shuffle: "Acak"
 account: "Akun"
 like: "Suka"
 unlike: "Tidak Suka"
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index bedeb9474..3879932e2 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -836,7 +836,7 @@ hide: "Nascondere"
 leaveGroup: "Esci dal gruppo"
 leaveGroupConfirm: "Uscire da「{name}」?"
 useDrawerReactionPickerForMobile: "Mostra sul drawer da dispositivo mobile"
-welcomeBackWithName: "Eccoti di nuovo, {name}! Ciao!"
+welcomeBackWithName: "Ciao, {name}! Eccoti di nuovo!"
 clickToFinishEmailVerification: "Fai click su [{ok}] per completare la verifica dell'indirizzo email."
 overridedDeviceKind: "Tipo di dispositivo"
 smartphone: "Smartphone"
@@ -935,6 +935,8 @@ manageCustomEmojis: "Gestisci le emoji personalizzate"
 youCannotCreateAnymore: "Non puoi creare, hai raggiunto il limite."
 cannotPerformTemporary: "Indisponibilità temporanea"
 cannotPerformTemporaryDescription: "L'attività non può essere svolta, poiché si è raggiunto il limite di esecuzioni possibili. Per favore, riprova più tardi."
+preset: "Preimpostato"
+selectFromPresets: "Seleziona preimpostato"
 _role:
   new: "Nuovo ruolo"
   edit: "Modifica ruolo"
@@ -979,6 +981,7 @@ _role:
     userEachUserListsMax: "Quantità massima di profili per lista"
     rateLimitFactor: "Limite del rapporto"
     descriptionOfRateLimitFactor: "I rapporti più bassi sono meno restrittivi, quelli più alti lo sono di più."
+    canHideAds: "Può nascondere i banner"
   _condition:
     isLocal: "Profilo locale"
     isRemote: "Profilo remoto"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 628a631d2..4605e8296 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -935,12 +935,14 @@ manageCustomEmojis: "커스텀 이모지 관리"
 youCannotCreateAnymore: "더 이상 생성할 수 없습니다."
 cannotPerformTemporary: "일시적으로 사용할 수 없음"
 cannotPerformTemporaryDescription: "조작 횟수 제한을 초과하여 일시적으로 사용이 불가합니다. 잠시 후 다시 시도해 주세요."
+preset: "프리셋"
+selectFromPresets: "프리셋에서 선택"
 _role:
   new: "새 역할 생성"
   edit: "역할 수정"
   name: "역할 이름"
   description: "역할 설명"
-  permission: "역할의 권한"
+  permission: "역할 권한"
   descriptionOfPermission: "<b>모더레이터</b>는 기본적인 중재와 관련된 작업을 수행할 수 있습니다.\n<b>관리자</b>는 인스턴스의 모든 설정을 변경할 수 있습니다."
   assignTarget: "할당 대상"
   descriptionOfAssignTarget: "<b>수동</b>을 선택하면 누가 이 역할에 포함되는지를 수동으로 관리할 수 있습니다.\n<b>조건부</b>를 선택하면 조건을 설정해 일치하는 사용자를 자동으로 포함되게 할 수 있습니다."
@@ -948,7 +950,7 @@ _role:
   conditional: "조건부"
   condition: "조건"
   isConditionalRole: "조건부 역할입니다."
-  isPublic: "공개 역할"
+  isPublic: "역할 공개"
   descriptionOfIsPublic: "역할에 할당된 사용자를 누구나 볼 수 있습니다. 또한 사용자 프로필에 이 역할이 표시됩니다."
   options: "옵션"
   policies: "정책"
@@ -956,7 +958,7 @@ _role:
   useBaseValue: "기본값 사용"
   chooseRoleToAssign: "할당할 역할 선택"
   canEditMembersByModerator: "모더레이터의 역할 수정 허용"
-  descriptionOfCanEditMembersByModerator: "이 옵션을 켜면 모더레이터도 이 역할에 사용자를 추가하거나 삭제할 수 있습니다. 꺼져 있으면 관리자만 가능합니다."
+  descriptionOfCanEditMembersByModerator: "이 옵션을 켜면 모더레이터도 이 역할에 사용자를 할당하거나 삭제할 수 있습니다. 꺼져 있으면 관리자만 할당이 가능합니다."
   priority: "우선순위"
   _priority:
     low: "낮음"
@@ -971,19 +973,20 @@ _role:
     driveCapacity: "드라이브 용량"
     pinMax: "고정할 수 있는 노트 수"
     antennaMax: "최대 안테나 생성 허용 수"
-    wordMuteMax: "뮤트할 수 있는 단어의 수"
-    webhookMax: "생성할 수 있는 WebHook의 수"
+    wordMuteMax: "단어 뮤트할 수 있는 문자 수"
+    webhookMax: "생성할 수 있는 웹훅 수"
     clipMax: "생성할 수 있는 클립 수"
     noteEachClipsMax: "각 클립에 추가할 수 있는 노트 수"
-    userListMax: "생성할 수 있는 리스트 수"
-    userEachUserListsMax: "리스트당 최대 사용자 수"
+    userListMax: "생성할 수 있는 유저 리스트 수"
+    userEachUserListsMax: "유저 리스트당 최대 사용자 수"
     rateLimitFactor: "속도 제한"
     descriptionOfRateLimitFactor: "작을수록 제한이 완화되고, 클수록 제한이 강화됩니다."
+    canHideAds: "광고 숨기기"
   _condition:
     isLocal: "로컬 사용자"
     isRemote: "리모트 사용자"
-    createdLessThan: "다음 일수 이내에 가입한 유저"
-    createdMoreThan: "다음 일수 이상 활동한 유저"
+    createdLessThan: "가압한 지 다음 일수 이내인 유저"
+    createdMoreThan: "가입한 지 다음 일수 이상인 유저"
     followersLessThanOrEq: "팔로워 수가 다음 이하인 유저"
     followersMoreThanOrEq: "팔로워 수가 다음 이상인 유저"
     followingLessThanOrEq: "팔로잉 수가 다음 이하인 유저"
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index 992275c7e..72397fb06 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -586,7 +586,7 @@ pluginTokenRequestedDescription: "Цей плагін зможе викорис
 notificationType: "Тип сповіщення"
 edit: "Редагувати"
 useStarForReactionFallback: "Використовувати ★ як запасний варіант, якщо емодзі реакції невідомий"
-emailServer: "Сервер електронної пошти"
+emailServer: "Email сервер"
 enableEmail: "Увімкнути функцію доставки пошти"
 emailConfigInfo: "Використовується для підтвердження електронної пошти підчас реєстрації, а також для відновлення паролю."
 email: "E-mail"
@@ -892,7 +892,10 @@ unsubscribePushNotification: "Вимкнути push-сповіщення"
 windowMaximize: "Розгорнути"
 windowRestore: "Відновити"
 caption: "Підпис"
+tools: "Інструменти"
 like: "Вподобати"
+unlike: "Не вподобати"
+numberOfLikes: "Вподобання"
 show: "Відображення"
 color: "Колір"
 _role:
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index c857f04f9..d026422ca 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -607,7 +607,7 @@ wordMute: "文字屏蔽"
 regexpError: "正则表达式错误"
 regexpErrorDescription: "{tab} 屏蔽文字的第 {line} 行的正则表达式有错误："
 instanceMute: "实例的屏蔽"
-userSaysSomething: "{name}说了什么,但是被您屏蔽了"
+userSaysSomething: "{name}说了什么,但是被屏蔽词过滤了"
 makeActive: "启用"
 display: "显示"
 copy: "复制"
@@ -826,7 +826,7 @@ makeReactionsPublicDescription: "将您发表过的回应设置成公开可见
 classic: "经典"
 muteThread: "屏蔽帖子列表"
 unmuteThread: "取消屏蔽帖子列表"
-ffVisibility: "连接的可见范围"
+ffVisibility: "关注关系的可见范围"
 ffVisibilityDescription: "您可以设置您的关注/关注者信息的公开范围"
 continueThread: "查看更多帖子"
 deleteAccountConfirm: "将要删除账户。是否确认？"
@@ -981,6 +981,7 @@ _role:
     userEachUserListsMax: "单个用户列表内用户数量限制"
     rateLimitFactor: "速率限制"
     descriptionOfRateLimitFactor: "值越小限制越少，值越大限制越多。"
+    canHideAds: "可以隐藏广告"
   _condition:
     isLocal: "是本地用户"
     isRemote: "是远程用户"
@@ -1008,7 +1009,7 @@ _emailUnavailable:
   mx: "邮件服务器不正确"
   smtp: "邮件服务器没有响应"
 _ffVisibility:
-  public: "发布"
+  public: "公开"
   followers: "只有关注你的用户能看到"
   private: "私密"
 _signup:
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 50f4a12c7..2a2cdfbc7 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -389,7 +389,7 @@ administrator: "管理員"
 token: "權杖"
 twoStepAuthentication: "兩階段驗證"
 moderator: "監察員"
-moderation: "言論調節"
+moderation: "監察"
 nUsersMentioned: "提到了{n}"
 securityKey: "安全金鑰"
 securityKeyName: "金鑰名稱"
@@ -932,8 +932,11 @@ assign: "指派"
 unassign: "取消指派"
 color: "顏色"
 manageCustomEmojis: "管理自訂表情符號"
+youCannotCreateAnymore: "您無法再建立更多了。"
 cannotPerformTemporary: "暫時無法進行"
 cannotPerformTemporaryDescription: "由於超過操作次數限制，暫時無法進行。請過一段時間之後再嘗試。"
+preset: "預設值"
+selectFromPresets: "從預設值中選擇"
 _role:
   new: "建立角色"
   edit: "編輯角色"
@@ -970,8 +973,15 @@ _role:
     driveCapacity: "雲端硬碟容量"
     pinMax: "置頂貼文的最大數量"
     antennaMax: "可建立的天線數量"
+    wordMuteMax: "靜音文字的最大字數"
     webhookMax: "可建立的Webhook數量"
     clipMax: "可建立的摘錄數量"
+    noteEachClipsMax: "摘錄內貼文的最大數量"
+    userListMax: "可建立的使用者清單數量"
+    userEachUserListsMax: "使用者清單內使用者的最大數量"
+    rateLimitFactor: "速率限制"
+    descriptionOfRateLimitFactor: "值越小限制越少，值越大限制越多。"
+    canHideAds: "不顯示廣告"
   _condition:
     isLocal: "本地使用者"
     isRemote: "遠端使用者"

From a160b01cffe563225f2b6716b4d701d941241ef3 Mon Sep 17 00:00:00 2001
From: nullobsi <me@nullob.si>
Date: Wed, 18 Jan 2023 16:16:52 -0800
Subject: [PATCH 027/177] enhance: Alt text in image viewer (#9109)

* Alt text in image viewer

* :art:

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
---
 .../frontend/src/components/MkMediaImage.vue  |  2 +-
 .../frontend/src/components/MkMediaList.vue   | 54 ++++++++++++++++++-
 2 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/MkMediaImage.vue b/packages/frontend/src/components/MkMediaImage.vue
index 9912faffe..c0638c0fe 100644
--- a/packages/frontend/src/components/MkMediaImage.vue
+++ b/packages/frontend/src/components/MkMediaImage.vue
@@ -13,7 +13,7 @@
 		:href="image.url"
 		:title="image.name"
 	>
-		<ImgWithBlurhash :hash="image.blurhash" :src="url" :alt="image.comment" :title="image.comment" :cover="false"/>
+		<ImgWithBlurhash :hash="image.blurhash" :src="url" :alt="image.comment || image.name" :title="image.comment || image.name" :cover="false"/>
 		<div v-if="image.type === 'image/gif'" class="gif">GIF</div>
 	</a>
 	<button v-tooltip="$ts.hide" class="_button hide" @click="hide = true"><i class="ti ti-eye-off"></i></button>
diff --git a/packages/frontend/src/components/MkMediaList.vue b/packages/frontend/src/components/MkMediaList.vue
index c6f861218..f263ae0ce 100644
--- a/packages/frontend/src/components/MkMediaList.vue
+++ b/packages/frontend/src/components/MkMediaList.vue
@@ -45,7 +45,8 @@ onMounted(() => {
 					src: media.url,
 					w: media.properties.width,
 					h: media.properties.height,
-					alt: media.name,
+					alt: media.comment || media.name,
+					comment: media.comment || media.name,
 				};
 				if (media.properties.orientation != null && media.properties.orientation >= 5) {
 					[item.w, item.h] = [item.h, item.w];
@@ -69,6 +70,7 @@ onMounted(() => {
 		},
 		imageClickAction: 'close',
 		tapAction: 'toggle-controls',
+		bgOpacity: 1,
 		pswpModule: PhotoSwipe,
 	});
 
@@ -88,9 +90,28 @@ onMounted(() => {
 			[itemData.w, itemData.h] = [itemData.h, itemData.w];
 		}
 		itemData.msrc = file.thumbnailUrl;
+		itemData.alt = file.comment || file.name;
+		itemData.comment = file.comment || file.name;
 		itemData.thumbCropped = true;
 	});
 
+	lightbox.on('uiRegister', () => {
+		lightbox.pswp.ui.registerElement({
+			name: 'altText',
+			className: 'pwsp__alt-text-container',
+			appendTo: 'wrapper',
+			onInit: (el, pwsp) => {
+				let textBox = document.createElement('p');
+				textBox.className = 'pwsp__alt-text _acrylic';
+				el.appendChild(textBox);
+
+				pwsp.on('change', (a) => {
+					textBox.textContent = pwsp.currSlide.data.comment;
+				});
+			},
+		});
+	});
+
 	lightbox.init();
 });
 
@@ -185,5 +206,36 @@ const previewable = (file: misskey.entities.DriveFile): boolean => {
 	// なぜか機能しない
   //z-index: v-bind(pswpZIndex);
 	z-index: 2000000;
+	--pswp-bg: var(--modalBg);
+}
+
+.pswp__bg {
+	background: var(--modalBg);
+	backdrop-filter: var(--modalBgFilter);
+}
+
+.pwsp__alt-text-container {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+
+	position: absolute;
+	bottom: 30px;
+	left: 50%;
+	transform: translateX(-50%);
+
+	width: 75%;
+	max-width: 800px;
+}
+
+.pwsp__alt-text {
+	color: var(--fg);
+	margin: 0 auto;
+	text-align: center;
+	padding: var(--margin);
+	border-radius: var(--radius);
+	max-height: 8em;
+	overflow-y: auto;
+	text-shadow: var(--bg) 0 0 10px, var(--bg) 0 0 3px, var(--bg) 0 0 3px;
 }
 </style>

From ed9a49687ea516d6a6ff93c1187a65065fb53d5a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 19 Jan 2023 09:17:18 +0900
Subject: [PATCH 028/177] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69f1123f0..05ad4f8a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ You should also include the user name that made the change.
 - Playのscriptの文字数制限を緩和
 - AiScript GUIの強化
 - 存在しないカスタム絵文字をテキストで表示するように
+- Alt text in image viewer
 
 ### Bugfixes
 - playを削除する手段がなかったのを修正

From 336d8fe785d5b26f85088659db022a45b74c5d9f Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 19 Jan 2023 10:29:30 +0900
Subject: [PATCH 029/177] =?UTF-8?q?feat(client):=20=E3=83=AA=E3=82=A2?=
 =?UTF-8?q?=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E4=B8=80=E8=A6=A7=E8=A9=B3?=
 =?UTF-8?q?=E7=B4=B0=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=E3=82=92?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resolve #9634
---
 CHANGELOG.md                                  |  1 +
 locales/ja-JP.yml                             |  1 +
 .../src/components/MkReactedUsersDialog.vue   | 92 +++++++++++++++++++
 .../src/components/MkUserCardMini.vue         | 20 ++--
 .../frontend/src/scripts/get-note-menu.ts     | 12 +++
 5 files changed, 120 insertions(+), 6 deletions(-)
 create mode 100644 packages/frontend/src/components/MkReactedUsersDialog.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05ad4f8a8..21fecb681 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ You should also include the user name that made the change.
 - Playのプリセットを追加
 - Playのscriptの文字数制限を緩和
 - AiScript GUIの強化
+- リアクション一覧詳細ダイアログを表示できるように
 - 存在しないカスタム絵文字をテキストで表示するように
 - Alt text in image viewer
 
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index f0e53cb81..5721fcc88 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -110,6 +110,7 @@ clickToShow: "クリックして表示"
 sensitive: "閲覧注意"
 add: "追加"
 reaction: "リアクション"
+reactions: "リアクション"
 reactionSetting: "ピッカーに表示するリアクション"
 reactionSettingDescription2: "ドラッグして並び替え、クリックして削除、＋を押して追加します。"
 rememberNoteVisibility: "公開範囲を記憶する"
diff --git a/packages/frontend/src/components/MkReactedUsersDialog.vue b/packages/frontend/src/components/MkReactedUsersDialog.vue
new file mode 100644
index 000000000..2a8dffc01
--- /dev/null
+++ b/packages/frontend/src/components/MkReactedUsersDialog.vue
@@ -0,0 +1,92 @@
+<template>
+<MkModalWindow
+	ref="dialog"
+	:width="400"
+	:height="450"
+	@close="dialog.close()"
+	@closed="emit('closed')"
+>
+	<template #header>{{ i18n.ts.reactions }}</template>
+
+	<MkSpacer :margin-min="20" :margin-max="28">
+		<div v-if="note" class="_gaps">
+			<div :class="$style.tabs">
+				<button v-for="reaction in reactions" :key="reaction" :class="[$style.tab, { [$style.tabActive]: tab === reaction }]" class="_button" @click="tab = reaction">
+					<MkReactionIcon :reaction="reaction"/>
+					<span style="margin-left: 4px;">{{ note.reactions[reaction] }}</span>
+				</button>
+			</div>
+			<MkA v-for="user in users" :key="user.id" :to="userPage(user)">
+				<MkUserCardMini :user="user" :with-chart="false"/>
+			</MkA>
+		</div>
+		<div v-else>
+			<MkLoading/>
+		</div>
+	</MkSpacer>
+</MkModalWindow>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, watch } from 'vue';
+import * as misskey from 'misskey-js';
+import MkModalWindow from '@/components/MkModalWindow.vue';
+import MkReactionIcon from '@/components/MkReactionIcon.vue';
+import MkUserCardMini from '@/components/MkUserCardMini.vue';
+import { userPage } from '@/filters/user';
+import { i18n } from '@/i18n';
+import * as os from '@/os';
+
+const emit = defineEmits<{
+	(ev: 'closed'): void,
+}>();
+
+const props = defineProps<{
+	noteId: misskey.entities.Note['id'];
+}>();
+
+const dialog = $shallowRef<InstanceType<typeof MkModalWindow>>();
+
+let note = $ref<misskey.entities.Note>();
+let tab = $ref<string>();
+let reactions = $ref<string[]>();
+let users = $ref();
+
+watch($$(tab), async () => {
+	const res = await os.api('notes/reactions', {
+		noteId: props.noteId,
+		type: tab,
+		limit: 30,
+	});
+
+	users = res.map(x => x.user);
+});
+
+onMounted(() => {
+	os.api('notes/show', {
+		noteId: props.noteId,
+	}).then((res) => {
+		reactions = Object.keys(res.reactions);
+		tab = reactions[0];
+		note = res;
+	});
+});
+</script>
+
+<style lang="scss" module>
+.tabs {
+	display: flex;
+	gap: 8px;
+	flex-wrap: wrap;
+}
+
+.tab {
+	padding: 4px 6px;
+	border: solid 1px var(--divider);
+	border-radius: 6px;
+}
+
+.tabActive {
+	border-color: var(--accent);
+}
+</style>
diff --git a/packages/frontend/src/components/MkUserCardMini.vue b/packages/frontend/src/components/MkUserCardMini.vue
index ec199ad27..457504e6c 100644
--- a/packages/frontend/src/components/MkUserCardMini.vue
+++ b/packages/frontend/src/components/MkUserCardMini.vue
@@ -11,20 +11,28 @@
 
 <script lang="ts" setup>
 import * as misskey from 'misskey-js';
+import { onMounted } from 'vue';
 import MkMiniChart from '@/components/MkMiniChart.vue';
 import * as os from '@/os';
 import { acct } from '@/filters/user';
 
-const props = defineProps<{
+const props = withDefaults(defineProps<{
 	user: misskey.entities.User;
-}>();
+	withChart: boolean;
+}>(), {
+	withChart: true,
+});
 
 let chartValues = $ref<number[] | null>(null);
 
-os.apiGet('charts/user/notes', { userId: props.user.id, limit: 16 + 1, span: 'day' }).then(res => {
-	// 今日のぶんの値はまだ途中の値であり、それも含めると大抵の場合前日よりも下降しているようなグラフになってしまうため今日は弾く
-	res.inc.splice(0, 1);
-	chartValues = res.inc;
+onMounted(() => {
+	if (props.withChart) {
+		os.apiGet('charts/user/notes', { userId: props.user.id, limit: 16 + 1, span: 'day' }).then(res => {
+			// 今日のぶんの値はまだ途中の値であり、それも含めると大抵の場合前日よりも下降しているようなグラフになってしまうため今日は弾く
+			res.inc.splice(0, 1);
+			chartValues = res.inc;
+		});
+	}
 });
 </script>
 
diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
index 54de3d95d..7a426ec72 100644
--- a/packages/frontend/src/scripts/get-note-menu.ts
+++ b/packages/frontend/src/scripts/get-note-menu.ts
@@ -174,9 +174,17 @@ export function getNoteMenu(props: {
 			url: `${url}/notes/${appearNote.id}`,
 		});
 	}
+
 	function notedetails(): void {
 		os.pageWindow(`/notes/${appearNote.id}`);
 	}
+
+	function showReactions(): void {
+		os.popup(defineAsyncComponent(() => import('@/components/MkReactedUsersDialog.vue')), {
+			noteId: appearNote.id,
+		}, {}, 'closed');
+	}
+
 	async function translate(): Promise<void> {
 		if (props.translation.value != null) return;
 		props.translating.value = true;
@@ -206,6 +214,10 @@ export function getNoteMenu(props: {
 				icon: 'ti ti-info-circle',
 				text: i18n.ts.details,
 				action: notedetails,
+			}, {
+				icon: 'ti ti-users',
+				text: i18n.ts.reactions,
+				action: showReactions,
 			}, {
 				icon: 'ti ti-copy',
 				text: i18n.ts.copyContent,

From 02b6595d76bbe1e0cc256f2555d2b5e28f38f1ba Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 19 Jan 2023 10:39:23 +0900
Subject: [PATCH 030/177] :art:

---
 packages/frontend/src/pages/admin/roles.vue | 2 +-
 packages/frontend/src/pages/user-info.vue   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/pages/admin/roles.vue b/packages/frontend/src/pages/admin/roles.vue
index 6e0c03898..ff8f8a356 100644
--- a/packages/frontend/src/pages/admin/roles.vue
+++ b/packages/frontend/src/pages/admin/roles.vue
@@ -7,7 +7,7 @@
 				<MkButton primary rounded @click="create"><i class="ti ti-plus"></i> {{ i18n.ts._role.new }}</MkButton>
 				<MkFolder>
 					<template #label>{{ i18n.ts._role.baseRole }}</template>
-					<div class="_gaps">
+					<div class="_gaps_s">
 						<MkFolder>
 							<template #label>{{ i18n.ts._role._options.rateLimitFactor }}</template>
 							<template #suffix>{{ Math.floor(policies.rateLimitFactor * 100) }}%</template>
diff --git a/packages/frontend/src/pages/user-info.vue b/packages/frontend/src/pages/user-info.vue
index 13942da7c..7ba8a3d16 100644
--- a/packages/frontend/src/pages/user-info.vue
+++ b/packages/frontend/src/pages/user-info.vue
@@ -113,7 +113,8 @@
 
 						<div v-for="role in info.roles" :key="role.id" :class="$style.roleItem">
 							<MkRolePreview :class="$style.role" :role="role"/>
-							<button class="_button" :class="$style.roleUnassign" @click="unassignRole(role, $event)"><i class="ti ti-x"></i></button>
+							<button v-if="role.target === 'manual'" class="_button" :class="$style.roleUnassign" @click="unassignRole(role, $event)"><i class="ti ti-x"></i></button>
+							<button v-else class="_button" :class="$style.roleUnassign" disabled><i class="ti ti-ban"></i></button>
 						</div>
 					</div>
 				</MkFolder>

From b8afabde2c65027f572d2b3e59e9697bf98c46a1 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 19 Jan 2023 16:57:37 +0900
Subject: [PATCH 031/177] add commands for build with swc

---
 packages/backend/.swcrc       |  12 +-
 packages/backend/package.json |   3 +
 pnpm-lock.yaml                | 711 +++++++++++++++++++++++++++++++++-
 3 files changed, 704 insertions(+), 22 deletions(-)

diff --git a/packages/backend/.swcrc b/packages/backend/.swcrc
index c82564eab..55a88456e 100644
--- a/packages/backend/.swcrc
+++ b/packages/backend/.swcrc
@@ -9,7 +9,17 @@
     "transform": {
       "legacyDecorator": true,
       "decoratorMetadata": true
-    }
+    },
+		"experimental": {
+			"keepImportAssertions": true
+		},
+		"baseUrl": ".",
+		"paths": {
+			"@/*": [
+				"./src/*"
+			]
+		},
+		"target": "es2021"
   },
   "minify": false
 }
diff --git a/packages/backend/package.json b/packages/backend/package.json
index a9ba3ebaf..68cfbb05a 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -7,6 +7,8 @@
 		"start": "node ./built/index.js",
 		"start:test": "NODE_ENV=test node ./built/index.js",
 		"migrate": "pnpm typeorm migration:run -d ormconfig.js",
+		"build:swc": "swc src -d built -D",
+		"watch:swc": "swc src -d built -D -w",
 		"build": "tsc -p tsconfig.json || echo done. && tsc-alias -p tsconfig.json",
 		"watch": "node watch.mjs",
 		"lint": "tsc --noEmit && eslint --quiet \"src/**/*.ts\"",
@@ -129,6 +131,7 @@
 	},
 	"devDependencies": {
 		"@redocly/openapi-core": "1.0.0-beta.120",
+		"@swc/cli": "^0.1.59",
 		"@swc/core": "1.3.26",
 		"@swc/jest": "0.2.24",
 		"@types/accepts": "1.3.5",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 43f34c5d9..993efd174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -65,6 +65,7 @@ importers:
       '@peertube/http-signature': 1.7.0
       '@redocly/openapi-core': 1.0.0-beta.120
       '@sinonjs/fake-timers': 10.0.2
+      '@swc/cli': ^0.1.59
       '@swc/core': 1.3.26
       '@swc/jest': 0.2.24
       '@tensorflow/tfjs': ^4.1.0
@@ -320,6 +321,7 @@ importers:
       '@tensorflow/tfjs-node': 4.1.0_seedrandom@3.0.5
     devDependencies:
       '@redocly/openapi-core': 1.0.0-beta.120
+      '@swc/cli': 0.1.59_cr4os3zuq4gmhe2qzzjtw2pxeu
       '@swc/core': 1.3.26
       '@swc/jest': 0.2.24_@swc+core@1.3.26
       '@types/accepts': 1.3.5
@@ -2116,6 +2118,11 @@ packages:
     resolution: {integrity: sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==}
     dev: true
 
+  /@sindresorhus/is/0.7.0:
+    resolution: {integrity: sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==}
+    engines: {node: '>=4'}
+    dev: true
+
   /@sindresorhus/is/4.6.0:
     resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==}
     engines: {node: '>=10'}
@@ -2154,6 +2161,27 @@ packages:
     resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
     dev: false
 
+  /@swc/cli/0.1.59_cr4os3zuq4gmhe2qzzjtw2pxeu:
+    resolution: {integrity: sha512-BlX3wIxYTwdtR22dIqZ3FEIOJPqnlByAp4JY46OMZi2UXMB3ZbOzefawD2ZlLafRUWyy5NtiZZty5waKzaYRnA==}
+    engines: {node: '>= 12.13'}
+    hasBin: true
+    peerDependencies:
+      '@swc/core': ^1.2.66
+      chokidar: ^3.5.1
+    peerDependenciesMeta:
+      chokidar:
+        optional: true
+    dependencies:
+      '@swc/core': 1.3.26
+      bin-wrapper: 4.1.0
+      chokidar: 3.5.3
+      commander: 7.2.0
+      fast-glob: 3.2.12
+      semver: 7.3.8
+      slash: 3.0.0
+      source-map: 0.7.4
+    dev: true
+
   /@swc/core-darwin-arm64/1.3.26:
     resolution: {integrity: sha512-FWWflBfKRYrUJtko2xiedC5XCa31O75IZZqnTWuLpe9g3C5tnUuF3M8LSXZS/dn6wprome1MhtG9GMPkSYkhkg==}
     engines: {node: '>=10'}
@@ -2651,7 +2679,6 @@ packages:
     resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==}
     dependencies:
       '@types/node': 18.11.18
-    dev: false
 
   /@types/long/4.0.2:
     resolution: {integrity: sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==}
@@ -2763,7 +2790,6 @@ packages:
     resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==}
     dependencies:
       '@types/node': 18.11.18
-    dev: false
 
   /@types/sanitize-html/2.8.0:
     resolution: {integrity: sha512-Uih6caOm3DsBYnVGOYn0A9NoTNe1c4aPStmHC/YA2JrpP9kx//jzaRcIklFvSpvVQEcpl/ZCr4DgISSf/YxTvg==}
@@ -3423,6 +3449,13 @@ packages:
     resolution: {integrity: sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==}
     dev: true
 
+  /archive-type/4.0.0:
+    resolution: {integrity: sha512-zV4Ky0v1F8dBrdYElwTvQhweQ0P7Kwc1aluqJsYtOBP01jXcWCyW2IEfI1YiqsG+Iy7ZR+o5LF1N+PGECBxHWA==}
+    engines: {node: '>=4'}
+    dependencies:
+      file-type: 4.4.0
+    dev: true
+
   /archiver-utils/2.1.0:
     resolution: {integrity: sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==}
     engines: {node: '>= 6'}
@@ -3880,6 +3913,43 @@ packages:
     resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==}
     dev: false
 
+  /bin-check/4.1.0:
+    resolution: {integrity: sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==}
+    engines: {node: '>=4'}
+    dependencies:
+      execa: 0.7.0
+      executable: 4.1.1
+    dev: true
+
+  /bin-version-check/4.0.0:
+    resolution: {integrity: sha512-sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ==}
+    engines: {node: '>=6'}
+    dependencies:
+      bin-version: 3.1.0
+      semver: 5.7.1
+      semver-truncate: 1.1.2
+    dev: true
+
+  /bin-version/3.1.0:
+    resolution: {integrity: sha512-Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ==}
+    engines: {node: '>=6'}
+    dependencies:
+      execa: 1.0.0
+      find-versions: 3.2.0
+    dev: true
+
+  /bin-wrapper/4.1.0:
+    resolution: {integrity: sha512-hfRmo7hWIXPkbpi0ZltboCMVrU+0ClXR/JgbCKKjlDjQf6igXa7OwdqNcFWQZPZTgiY7ZpzE3+LjjkLiTN2T7Q==}
+    engines: {node: '>=6'}
+    dependencies:
+      bin-check: 4.1.0
+      bin-version-check: 4.0.0
+      download: 7.1.0
+      import-lazy: 3.1.0
+      os-filter-obj: 2.0.0
+      pify: 4.0.1
+    dev: true
+
   /binary-extensions/2.2.0:
     resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
     engines: {node: '>=8'}
@@ -3896,6 +3966,13 @@ packages:
     engines: {node: '>=0.8'}
     dev: false
 
+  /bl/1.2.3:
+    resolution: {integrity: sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==}
+    dependencies:
+      readable-stream: 2.3.7
+      safe-buffer: 5.2.1
+    dev: true
+
   /bl/4.1.0:
     resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
     dependencies:
@@ -3998,6 +4075,17 @@ packages:
       node-int64: 0.4.0
     dev: true
 
+  /buffer-alloc-unsafe/1.1.0:
+    resolution: {integrity: sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==}
+    dev: true
+
+  /buffer-alloc/1.2.0:
+    resolution: {integrity: sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==}
+    dependencies:
+      buffer-alloc-unsafe: 1.1.0
+      buffer-fill: 1.0.0
+    dev: true
+
   /buffer-crc32/0.2.13:
     resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
 
@@ -4010,6 +4098,10 @@ packages:
     engines: {node: '>=0.4'}
     dev: false
 
+  /buffer-fill/1.0.0:
+    resolution: {integrity: sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==}
+    dev: true
+
   /buffer-from/1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
@@ -4157,6 +4249,18 @@ packages:
       responselike: 3.0.0
     dev: false
 
+  /cacheable-request/2.1.4:
+    resolution: {integrity: sha512-vag0O2LKZ/najSoUwDbVlnlCFvhBE/7mGTY2B5FgCBDcRD+oVV1HYTOwM6JZfMg/hIcM6IwnTZ1uQQL5/X3xIQ==}
+    dependencies:
+      clone-response: 1.0.2
+      get-stream: 3.0.0
+      http-cache-semantics: 3.8.1
+      keyv: 3.0.0
+      lowercase-keys: 1.0.0
+      normalize-url: 2.0.1
+      responselike: 1.0.2
+    dev: true
+
   /cacheable-request/7.0.2:
     resolution: {integrity: sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==}
     engines: {node: '>=8'}
@@ -4228,6 +4332,16 @@ packages:
   /caseless/0.12.0:
     resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
 
+  /caw/2.0.1:
+    resolution: {integrity: sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==}
+    engines: {node: '>=4'}
+    dependencies:
+      get-proxy: 2.1.0
+      isurl: 1.0.0
+      tunnel-agent: 0.6.0
+      url-to-options: 1.0.1
+    dev: true
+
   /cbor/8.1.0:
     resolution: {integrity: sha512-DwGjNW9omn6EwP70aXsn7FQJx5kO12tX0bZkaTjzdVFM6/7nhA4t0EENocKGx6D2Bch9PE2KzCUf5SceBdeijg==}
     engines: {node: '>=12.19'}
@@ -4485,6 +4599,12 @@ packages:
     engines: {node: '>= 0.10'}
     dev: false
 
+  /clone-response/1.0.2:
+    resolution: {integrity: sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q==}
+    dependencies:
+      mimic-response: 1.0.1
+    dev: true
+
   /clone-response/1.0.3:
     resolution: {integrity: sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==}
     dependencies:
@@ -4639,13 +4759,17 @@ packages:
 
   /commander/2.20.3:
     resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
-    dev: false
 
   /commander/5.1.0:
     resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==}
     engines: {node: '>= 6'}
     dev: true
 
+  /commander/7.2.0:
+    resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==}
+    engines: {node: '>= 10'}
+    dev: true
+
   /commander/9.5.0:
     resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==}
     engines: {node: ^12.20.0 || >=14}
@@ -4687,6 +4811,13 @@ packages:
       typedarray: 0.0.6
     dev: false
 
+  /config-chain/1.1.13:
+    resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==}
+    dependencies:
+      ini: 1.3.8
+      proto-list: 1.2.4
+    dev: true
+
   /consola/2.15.3:
     resolution: {integrity: sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==}
     dev: false
@@ -4707,7 +4838,6 @@ packages:
     engines: {node: '>= 0.6'}
     dependencies:
       safe-buffer: 5.2.1
-    dev: false
 
   /content-type/1.0.4:
     resolution: {integrity: sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==}
@@ -4756,7 +4886,6 @@ packages:
 
   /core-util-is/1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
-    dev: false
 
   /crc-32/1.2.2:
     resolution: {integrity: sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==}
@@ -4793,6 +4922,25 @@ packages:
       cross-spawn: 7.0.3
     dev: true
 
+  /cross-spawn/5.1.0:
+    resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==}
+    dependencies:
+      lru-cache: 4.1.5
+      shebang-command: 1.2.0
+      which: 1.3.1
+    dev: true
+
+  /cross-spawn/6.0.5:
+    resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==}
+    engines: {node: '>=4.8'}
+    dependencies:
+      nice-try: 1.0.5
+      path-key: 2.0.1
+      semver: 5.7.1
+      shebang-command: 1.2.0
+      which: 1.3.1
+    dev: true
+
   /cross-spawn/7.0.3:
     resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
     engines: {node: '>= 8'}
@@ -5072,7 +5220,13 @@ packages:
   /decode-uri-component/0.2.2:
     resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
     engines: {node: '>=0.10'}
-    dev: false
+
+  /decompress-response/3.3.0:
+    resolution: {integrity: sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==}
+    engines: {node: '>=4'}
+    dependencies:
+      mimic-response: 1.0.1
+    dev: true
 
   /decompress-response/6.0.0:
     resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
@@ -5081,6 +5235,59 @@ packages:
       mimic-response: 3.1.0
     dev: false
 
+  /decompress-tar/4.1.1:
+    resolution: {integrity: sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==}
+    engines: {node: '>=4'}
+    dependencies:
+      file-type: 5.2.0
+      is-stream: 1.1.0
+      tar-stream: 1.6.2
+    dev: true
+
+  /decompress-tarbz2/4.1.1:
+    resolution: {integrity: sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==}
+    engines: {node: '>=4'}
+    dependencies:
+      decompress-tar: 4.1.1
+      file-type: 6.2.0
+      is-stream: 1.1.0
+      seek-bzip: 1.0.6
+      unbzip2-stream: 1.4.3
+    dev: true
+
+  /decompress-targz/4.1.1:
+    resolution: {integrity: sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==}
+    engines: {node: '>=4'}
+    dependencies:
+      decompress-tar: 4.1.1
+      file-type: 5.2.0
+      is-stream: 1.1.0
+    dev: true
+
+  /decompress-unzip/4.0.1:
+    resolution: {integrity: sha512-1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw==}
+    engines: {node: '>=4'}
+    dependencies:
+      file-type: 3.9.0
+      get-stream: 2.3.1
+      pify: 2.3.0
+      yauzl: 2.10.0
+    dev: true
+
+  /decompress/4.2.1:
+    resolution: {integrity: sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==}
+    engines: {node: '>=4'}
+    dependencies:
+      decompress-tar: 4.1.1
+      decompress-tarbz2: 4.1.1
+      decompress-targz: 4.1.1
+      decompress-unzip: 4.0.1
+      graceful-fs: 4.2.10
+      make-dir: 1.3.0
+      pify: 2.3.0
+      strip-dirs: 2.1.0
+    dev: true
+
   /dedent/0.7.0:
     resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}
     dev: true
@@ -5312,6 +5519,24 @@ packages:
     engines: {node: '>=12'}
     dev: false
 
+  /download/7.1.0:
+    resolution: {integrity: sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ==}
+    engines: {node: '>=6'}
+    dependencies:
+      archive-type: 4.0.0
+      caw: 2.0.1
+      content-disposition: 0.5.4
+      decompress: 4.2.1
+      ext-name: 5.0.0
+      file-type: 8.1.0
+      filenamify: 2.1.0
+      get-stream: 3.0.0
+      got: 8.3.2
+      make-dir: 1.3.0
+      p-event: 2.3.1
+      pify: 3.0.0
+    dev: true
+
   /duplexer/0.1.2:
     resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
     dev: true
@@ -5322,6 +5547,10 @@ packages:
       readable-stream: 2.3.7
     dev: false
 
+  /duplexer3/0.1.5:
+    resolution: {integrity: sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==}
+    dev: true
+
   /duplexify/3.7.1:
     resolution: {integrity: sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==}
     dependencies:
@@ -6069,6 +6298,32 @@ packages:
     engines: {node: '>=0.8.x'}
     dev: false
 
+  /execa/0.7.0:
+    resolution: {integrity: sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw==}
+    engines: {node: '>=4'}
+    dependencies:
+      cross-spawn: 5.1.0
+      get-stream: 3.0.0
+      is-stream: 1.1.0
+      npm-run-path: 2.0.2
+      p-finally: 1.0.0
+      signal-exit: 3.0.7
+      strip-eof: 1.0.0
+    dev: true
+
+  /execa/1.0.0:
+    resolution: {integrity: sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==}
+    engines: {node: '>=6'}
+    dependencies:
+      cross-spawn: 6.0.5
+      get-stream: 4.1.0
+      is-stream: 1.1.0
+      npm-run-path: 2.0.2
+      p-finally: 1.0.0
+      signal-exit: 3.0.7
+      strip-eof: 1.0.0
+    dev: true
+
   /execa/4.1.0:
     resolution: {integrity: sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==}
     engines: {node: '>=10'}
@@ -6163,6 +6418,21 @@ packages:
       jest-util: 29.3.1
     dev: true
 
+  /ext-list/2.2.2:
+    resolution: {integrity: sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      mime-db: 1.52.0
+    dev: true
+
+  /ext-name/5.0.0:
+    resolution: {integrity: sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==}
+    engines: {node: '>=4'}
+    dependencies:
+      ext-list: 2.2.2
+      sort-keys-length: 1.0.1
+    dev: true
+
   /ext/1.7.0:
     resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
     dependencies:
@@ -6375,12 +6645,51 @@ packages:
       token-types: 5.0.1
     dev: false
 
+  /file-type/3.9.0:
+    resolution: {integrity: sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /file-type/4.4.0:
+    resolution: {integrity: sha512-f2UbFQEk7LXgWpi5ntcO86OeA/cC80fuDDDaX/fZ2ZGel+AF7leRQqBBW1eJNiiQkrZlAoM6P+VYP5P6bOlDEQ==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /file-type/5.2.0:
+    resolution: {integrity: sha512-Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /file-type/6.2.0:
+    resolution: {integrity: sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /file-type/8.1.0:
+    resolution: {integrity: sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==}
+    engines: {node: '>=6'}
+    dev: true
+
   /filelist/1.0.4:
     resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
     dependencies:
       minimatch: 5.1.2
     dev: false
 
+  /filename-reserved-regex/2.0.0:
+    resolution: {integrity: sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /filenamify/2.1.0:
+    resolution: {integrity: sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==}
+    engines: {node: '>=4'}
+    dependencies:
+      filename-reserved-regex: 2.0.0
+      strip-outer: 1.0.1
+      trim-repeated: 1.0.0
+    dev: true
+
   /fill-range/4.0.0:
     resolution: {integrity: sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==}
     engines: {node: '>=0.10.0'}
@@ -6429,6 +6738,13 @@ packages:
       path-exists: 4.0.0
     dev: true
 
+  /find-versions/3.2.0:
+    resolution: {integrity: sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==}
+    engines: {node: '>=6'}
+    dependencies:
+      semver-regex: 2.0.0
+    dev: true
+
   /findup-sync/2.0.0:
     resolution: {integrity: sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g==}
     engines: {node: '>= 0.10'}
@@ -6589,9 +6905,15 @@ packages:
     resolution: {integrity: sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==}
     dev: true
 
+  /from2/2.3.0:
+    resolution: {integrity: sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==}
+    dependencies:
+      inherits: 2.0.4
+      readable-stream: 2.3.7
+    dev: true
+
   /fs-constants/1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
-    dev: false
 
   /fs-extra/8.1.0:
     resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
@@ -6751,6 +7073,33 @@ packages:
     resolution: {integrity: sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==}
     engines: {node: '>=8'}
 
+  /get-proxy/2.1.0:
+    resolution: {integrity: sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==}
+    engines: {node: '>=4'}
+    dependencies:
+      npm-conf: 1.1.3
+    dev: true
+
+  /get-stream/2.3.1:
+    resolution: {integrity: sha512-AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      object-assign: 4.1.1
+      pinkie-promise: 2.0.1
+    dev: true
+
+  /get-stream/3.0.0:
+    resolution: {integrity: sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /get-stream/4.1.0:
+    resolution: {integrity: sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==}
+    engines: {node: '>=6'}
+    dependencies:
+      pump: 3.0.0
+    dev: true
+
   /get-stream/5.2.0:
     resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
     engines: {node: '>=8'}
@@ -6970,6 +7319,31 @@ packages:
       responselike: 3.0.0
     dev: false
 
+  /got/8.3.2:
+    resolution: {integrity: sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==}
+    engines: {node: '>=4'}
+    dependencies:
+      '@sindresorhus/is': 0.7.0
+      '@types/keyv': 3.1.4
+      '@types/responselike': 1.0.0
+      cacheable-request: 2.1.4
+      decompress-response: 3.3.0
+      duplexer3: 0.1.5
+      get-stream: 3.0.0
+      into-stream: 3.1.0
+      is-retry-allowed: 1.2.0
+      isurl: 1.0.0
+      lowercase-keys: 1.0.1
+      mimic-response: 1.0.1
+      p-cancelable: 0.4.1
+      p-timeout: 2.0.1
+      pify: 3.0.0
+      safe-buffer: 5.2.1
+      timed-out: 4.0.1
+      url-parse-lax: 3.0.0
+      url-to-options: 1.0.1
+    dev: true
+
   /graceful-fs/4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
 
@@ -7113,10 +7487,20 @@ packages:
     dependencies:
       get-intrinsic: 1.1.3
 
+  /has-symbol-support-x/1.4.2:
+    resolution: {integrity: sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==}
+    dev: true
+
   /has-symbols/1.0.3:
     resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
     engines: {node: '>= 0.4'}
 
+  /has-to-string-tag-x/1.4.1:
+    resolution: {integrity: sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==}
+    dependencies:
+      has-symbol-support-x: 1.4.2
+    dev: true
+
   /has-tostringtag/1.0.0:
     resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
     engines: {node: '>= 0.4'}
@@ -7244,6 +7628,10 @@ packages:
       http-errors: 1.8.1
     dev: false
 
+  /http-cache-semantics/3.8.1:
+    resolution: {integrity: sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==}
+    dev: true
+
   /http-cache-semantics/4.1.0:
     resolution: {integrity: sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==}
     dev: false
@@ -7411,6 +7799,11 @@ packages:
       resolve-from: 4.0.0
     dev: true
 
+  /import-lazy/3.1.0:
+    resolution: {integrity: sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==}
+    engines: {node: '>=6'}
+    dev: true
+
   /import-local/3.1.0:
     resolution: {integrity: sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==}
     engines: {node: '>=8'}
@@ -7447,7 +7840,6 @@ packages:
 
   /ini/1.3.8:
     resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
-    dev: false
 
   /ini/2.0.0:
     resolution: {integrity: sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==}
@@ -7477,6 +7869,14 @@ packages:
     engines: {node: '>= 0.10'}
     dev: false
 
+  /into-stream/3.1.0:
+    resolution: {integrity: sha512-TcdjPibTksa1NQximqep2r17ISRiNE9fwlfbg3F8ANdvP5/yrFTew86VcO//jk4QTaMlbjypPBq76HN2zaKfZQ==}
+    engines: {node: '>=4'}
+    dependencies:
+      from2: 2.3.0
+      p-is-promise: 1.1.0
+    dev: true
+
   /invert-kv/1.0.0:
     resolution: {integrity: sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==}
     engines: {node: '>=0.10.0'}
@@ -7764,6 +8164,10 @@ packages:
     resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==}
     dev: false
 
+  /is-natural-number/4.0.1:
+    resolution: {integrity: sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ==}
+    dev: true
+
   /is-negated-glob/1.0.0:
     resolution: {integrity: sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==}
     engines: {node: '>=0.10.0'}
@@ -7797,6 +8201,10 @@ packages:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
 
+  /is-object/1.0.2:
+    resolution: {integrity: sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==}
+    dev: true
+
   /is-path-inside/3.0.3:
     resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
     engines: {node: '>=8'}
@@ -7805,7 +8213,6 @@ packages:
   /is-plain-obj/1.1.0:
     resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
     engines: {node: '>=0.10.0'}
-    dev: false
 
   /is-plain-object/2.0.4:
     resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}
@@ -7841,12 +8248,22 @@ packages:
       is-unc-path: 1.0.0
     dev: false
 
+  /is-retry-allowed/1.2.0:
+    resolution: {integrity: sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /is-shared-array-buffer/1.0.2:
     resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
     dependencies:
       call-bind: 1.0.2
     dev: true
 
+  /is-stream/1.1.0:
+    resolution: {integrity: sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /is-stream/2.0.1:
     resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
     engines: {node: '>=8'}
@@ -7936,7 +8353,6 @@ packages:
 
   /isarray/1.0.0:
     resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
-    dev: false
 
   /isexe/2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
@@ -8010,6 +8426,14 @@ packages:
       textextensions: 3.3.0
     dev: false
 
+  /isurl/1.0.0:
+    resolution: {integrity: sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==}
+    engines: {node: '>= 4'}
+    dependencies:
+      has-to-string-tag-x: 1.4.1
+      is-object: 1.0.2
+    dev: true
+
   /iterare/1.2.1:
     resolution: {integrity: sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==}
     engines: {node: '>=6'}
@@ -8560,6 +8984,10 @@ packages:
     hasBin: true
     dev: true
 
+  /json-buffer/3.0.0:
+    resolution: {integrity: sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==}
+    dev: true
+
   /json-buffer/3.0.1:
     resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
     dev: false
@@ -8701,6 +9129,12 @@ packages:
       tsscmp: 1.0.6
     dev: false
 
+  /keyv/3.0.0:
+    resolution: {integrity: sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==}
+    dependencies:
+      json-buffer: 3.0.0
+    dev: true
+
   /keyv/4.5.2:
     resolution: {integrity: sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==}
     dependencies:
@@ -9041,6 +9475,16 @@ packages:
     resolution: {integrity: sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==}
     dev: false
 
+  /lowercase-keys/1.0.0:
+    resolution: {integrity: sha512-RPlX0+PHuvxVDZ7xX+EBVAp4RsVxP/TdDSN2mJYdiq1Lc4Hz7EUSjUI7RZrKKlmrIzVhf6Jo2stj7++gVarS0A==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /lowercase-keys/1.0.1:
+    resolution: {integrity: sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /lowercase-keys/2.0.0:
     resolution: {integrity: sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==}
     engines: {node: '>=8'}
@@ -9051,6 +9495,13 @@ packages:
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dev: false
 
+  /lru-cache/4.1.5:
+    resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==}
+    dependencies:
+      pseudomap: 1.0.2
+      yallist: 2.1.2
+    dev: true
+
   /lru-cache/5.1.1:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
     dependencies:
@@ -9081,6 +9532,13 @@ packages:
     resolution: {integrity: sha512-3WjL8+ZDouZwKlyJBMp/4LeziLFXgleOdsYu87piGcMLqhBzCsy2QFdbtAwv757TFC/rtqd738fgJw1tFQCSgA==}
     dev: false
 
+  /make-dir/1.3.0:
+    resolution: {integrity: sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==}
+    engines: {node: '>=4'}
+    dependencies:
+      pify: 3.0.0
+    dev: true
+
   /make-dir/3.1.0:
     resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
     engines: {node: '>=8'}
@@ -9235,7 +9693,6 @@ packages:
   /mimic-response/1.0.1:
     resolution: {integrity: sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==}
     engines: {node: '>=4'}
-    dev: false
 
   /mimic-response/3.1.0:
     resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
@@ -9542,6 +9999,10 @@ packages:
     resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
     dev: false
 
+  /nice-try/1.0.5:
+    resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
+    dev: true
+
   /node-abi/3.31.0:
     resolution: {integrity: sha512-eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ==}
     engines: {node: '>=10'}
@@ -9680,6 +10141,15 @@ packages:
       sort-keys: 1.1.2
     dev: false
 
+  /normalize-url/2.0.1:
+    resolution: {integrity: sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==}
+    engines: {node: '>=4'}
+    dependencies:
+      prepend-http: 2.0.0
+      query-string: 5.1.1
+      sort-keys: 2.0.0
+    dev: true
+
   /normalize-url/6.1.0:
     resolution: {integrity: sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==}
     engines: {node: '>=10'}
@@ -9697,6 +10167,21 @@ packages:
       once: 1.4.0
     dev: false
 
+  /npm-conf/1.1.3:
+    resolution: {integrity: sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==}
+    engines: {node: '>=4'}
+    dependencies:
+      config-chain: 1.1.13
+      pify: 3.0.0
+    dev: true
+
+  /npm-run-path/2.0.2:
+    resolution: {integrity: sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==}
+    engines: {node: '>=4'}
+    dependencies:
+      path-key: 2.0.1
+    dev: true
+
   /npm-run-path/4.0.1:
     resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
     engines: {node: '>=8'}
@@ -9779,7 +10264,6 @@ packages:
   /object-assign/4.1.1:
     resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
     engines: {node: '>=0.10.0'}
-    dev: false
 
   /object-copy/0.1.0:
     resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==}
@@ -9941,6 +10425,13 @@ packages:
       readable-stream: 2.3.7
     dev: false
 
+  /os-filter-obj/2.0.0:
+    resolution: {integrity: sha512-uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg==}
+    engines: {node: '>=4'}
+    dependencies:
+      arch: 2.2.0
+    dev: true
+
   /os-locale/1.4.0:
     resolution: {integrity: sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==}
     engines: {node: '>=0.10.0'}
@@ -9956,6 +10447,11 @@ packages:
     resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==}
     dev: true
 
+  /p-cancelable/0.4.1:
+    resolution: {integrity: sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==}
+    engines: {node: '>=4'}
+    dev: true
+
   /p-cancelable/2.1.1:
     resolution: {integrity: sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==}
     engines: {node: '>=8'}
@@ -9966,10 +10462,22 @@ packages:
     engines: {node: '>=12.20'}
     dev: false
 
+  /p-event/2.3.1:
+    resolution: {integrity: sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA==}
+    engines: {node: '>=6'}
+    dependencies:
+      p-timeout: 2.0.1
+    dev: true
+
   /p-finally/1.0.0:
     resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==}
     engines: {node: '>=4'}
 
+  /p-is-promise/1.1.0:
+    resolution: {integrity: sha512-zL7VE4JVS2IFSkR2GQKDSPEVxkoH43/p7oEnwpdCndKYJO0HVeRB7fA8TJwuLOTBREtK0ea8eHaxdwcpob5dmg==}
+    engines: {node: '>=4'}
+    dev: true
+
   /p-limit/2.3.0:
     resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
     engines: {node: '>=6'}
@@ -10014,6 +10522,13 @@ packages:
       p-timeout: 3.2.0
     dev: false
 
+  /p-timeout/2.0.1:
+    resolution: {integrity: sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==}
+    engines: {node: '>=4'}
+    dependencies:
+      p-finally: 1.0.0
+    dev: true
+
   /p-timeout/3.2.0:
     resolution: {integrity: sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==}
     engines: {node: '>=8'}
@@ -10129,6 +10644,11 @@ packages:
     resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
     engines: {node: '>=0.10.0'}
 
+  /path-key/2.0.1:
+    resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==}
+    engines: {node: '>=4'}
+    dev: true
+
   /path-key/3.1.1:
     resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
     engines: {node: '>=8'}
@@ -10257,17 +10777,25 @@ packages:
     resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
     engines: {node: '>=0.10.0'}
 
+  /pify/3.0.0:
+    resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /pify/4.0.1:
+    resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
+    engines: {node: '>=6'}
+    dev: true
+
   /pinkie-promise/2.0.1:
     resolution: {integrity: sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       pinkie: 2.0.4
-    dev: false
 
   /pinkie/2.0.4:
     resolution: {integrity: sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==}
     engines: {node: '>=0.10.0'}
-    dev: false
 
   /pino-abstract-transport/1.0.0:
     resolution: {integrity: sha512-c7vo5OpW4wIS42hUVcT5REsL8ZljsUfBjqV/e2sFxmFEFZiq1XLUp5EYLtuDH6PEHq9W1egWqRbnLUP5FuZmOA==}
@@ -10629,6 +11157,11 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: false
 
+  /prepend-http/2.0.0:
+    resolution: {integrity: sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==}
+    engines: {node: '>=4'}
+    dev: true
+
   /pretty-bytes/5.6.0:
     resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==}
     engines: {node: '>=6'}
@@ -10735,6 +11268,10 @@ packages:
       sisteransi: 1.0.5
     dev: true
 
+  /proto-list/1.2.4:
+    resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
+    dev: true
+
   /proxy-addr/2.0.7:
     resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}
     engines: {node: '>= 0.10'}
@@ -10755,6 +11292,10 @@ packages:
       event-stream: 3.3.4
     dev: true
 
+  /pseudomap/1.0.2:
+    resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==}
+    dev: true
+
   /psl/1.9.0:
     resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}
 
@@ -10923,6 +11464,15 @@ packages:
       strict-uri-encode: 1.1.0
     dev: false
 
+  /query-string/5.1.1:
+    resolution: {integrity: sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      decode-uri-component: 0.2.2
+      object-assign: 4.1.1
+      strict-uri-encode: 1.1.0
+    dev: true
+
   /querystring/0.2.0:
     resolution: {integrity: sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==}
     engines: {node: '>=0.4.x'}
@@ -11044,7 +11594,6 @@ packages:
       safe-buffer: 5.1.2
       string_decoder: 1.1.1
       util-deprecate: 1.0.2
-    dev: false
 
   /readable-stream/3.6.0:
     resolution: {integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==}
@@ -11353,6 +11902,12 @@ packages:
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
+  /responselike/1.0.2:
+    resolution: {integrity: sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==}
+    dependencies:
+      lowercase-keys: 1.0.1
+    dev: true
+
   /responselike/2.0.1:
     resolution: {integrity: sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==}
     dependencies:
@@ -11451,7 +12006,6 @@ packages:
 
   /safe-buffer/5.1.2:
     resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
-    dev: false
 
   /safe-buffer/5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
@@ -11541,6 +12095,13 @@ packages:
     resolution: {integrity: sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==}
     dev: false
 
+  /seek-bzip/1.0.6:
+    resolution: {integrity: sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==}
+    hasBin: true
+    dependencies:
+      commander: 2.20.3
+    dev: true
+
   /semver-greatest-satisfied-range/1.1.0:
     resolution: {integrity: sha512-Ny/iyOzSSa8M5ML46IAx3iXc6tfOsYU2R4AXi2UpHk60Zrgyq6eqPj/xiOfS0rRl/iiQ/rdJkVjw/5cdUyCntQ==}
     engines: {node: '>= 0.10'}
@@ -11548,10 +12109,21 @@ packages:
       sver-compat: 1.5.0
     dev: false
 
+  /semver-regex/2.0.0:
+    resolution: {integrity: sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==}
+    engines: {node: '>=6'}
+    dev: true
+
+  /semver-truncate/1.1.2:
+    resolution: {integrity: sha512-V1fGg9i4CL3qesB6U0L6XAm4xOJiHmt4QAacazumuasc03BvtFGIMCduv01JWQ69Nv+JST9TqhSCiJoxoY031w==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      semver: 5.7.1
+    dev: true
+
   /semver/5.7.1:
     resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==}
     hasBin: true
-    dev: false
 
   /semver/6.3.0:
     resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}
@@ -11613,12 +12185,24 @@ packages:
       tunnel-agent: 0.6.0
     dev: false
 
+  /shebang-command/1.2.0:
+    resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      shebang-regex: 1.0.0
+    dev: true
+
   /shebang-command/2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
     engines: {node: '>=8'}
     dependencies:
       shebang-regex: 3.0.0
 
+  /shebang-regex/1.0.0:
+    resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /shebang-regex/3.0.0:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
@@ -11745,12 +12329,25 @@ packages:
       atomic-sleep: 1.0.0
     dev: false
 
+  /sort-keys-length/1.0.1:
+    resolution: {integrity: sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      sort-keys: 1.1.2
+    dev: true
+
   /sort-keys/1.1.2:
     resolution: {integrity: sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-plain-obj: 1.1.0
-    dev: false
+
+  /sort-keys/2.0.0:
+    resolution: {integrity: sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==}
+    engines: {node: '>=4'}
+    dependencies:
+      is-plain-obj: 1.1.0
+    dev: true
 
   /sortablejs/1.14.0:
     resolution: {integrity: sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==}
@@ -11799,6 +12396,11 @@ packages:
     resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
     engines: {node: '>=0.10.0'}
 
+  /source-map/0.7.4:
+    resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==}
+    engines: {node: '>= 8'}
+    dev: true
+
   /sourcemap-codec/1.4.8:
     resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
     deprecated: Please use @jridgewell/sourcemap-codec instead
@@ -11971,7 +12573,6 @@ packages:
   /strict-uri-encode/1.1.0:
     resolution: {integrity: sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==}
     engines: {node: '>=0.10.0'}
-    dev: false
 
   /string-length/4.0.2:
     resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==}
@@ -12022,7 +12623,6 @@ packages:
     resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
     dependencies:
       safe-buffer: 5.1.2
-    dev: false
 
   /string_decoder/1.3.0:
     resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
@@ -12065,6 +12665,17 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /strip-dirs/2.1.0:
+    resolution: {integrity: sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==}
+    dependencies:
+      is-natural-number: 4.0.1
+    dev: true
+
+  /strip-eof/1.0.0:
+    resolution: {integrity: sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /strip-final-newline/2.0.0:
     resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
     engines: {node: '>=6'}
@@ -12084,6 +12695,13 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /strip-outer/1.0.1:
+    resolution: {integrity: sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      escape-string-regexp: 1.0.5
+    dev: true
+
   /strnum/1.0.5:
     resolution: {integrity: sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==}
     dev: false
@@ -12196,6 +12814,19 @@ packages:
       tar-stream: 2.2.0
     dev: false
 
+  /tar-stream/1.6.2:
+    resolution: {integrity: sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==}
+    engines: {node: '>= 0.8.0'}
+    dependencies:
+      bl: 1.2.3
+      buffer-alloc: 1.2.0
+      end-of-stream: 1.4.4
+      fs-constants: 1.0.0
+      readable-stream: 2.3.7
+      to-buffer: 1.1.1
+      xtend: 4.0.2
+    dev: true
+
   /tar-stream/2.2.0:
     resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
     engines: {node: '>=6'}
@@ -12334,6 +12965,11 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: false
 
+  /timed-out/4.0.1:
+    resolution: {integrity: sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /tiny-lru/10.0.1:
     resolution: {integrity: sha512-Vst+6kEsWvb17Zpz14sRJV/f8bUWKhqm6Dc+v08iShmIJ/WxqWytHzCTd6m88pS33rE2zpX34TRmOpAJPloNCA==}
     engines: {node: '>=6'}
@@ -12361,6 +12997,10 @@ packages:
       is-negated-glob: 1.0.0
     dev: false
 
+  /to-buffer/1.1.1:
+    resolution: {integrity: sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==}
+    dev: true
+
   /to-fast-properties/2.0.0:
     resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
     engines: {node: '>=4'}
@@ -12455,6 +13095,13 @@ packages:
     resolution: {integrity: sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==}
     dev: false
 
+  /trim-repeated/1.0.0:
+    resolution: {integrity: sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      escape-string-regexp: 1.0.5
+    dev: true
+
   /tsc-alias/1.8.2:
     resolution: {integrity: sha512-ukBkcNekOgwtnSWYLD5QsMX3yQWg7JviAs8zg3qJGgu4LGtY3tsV4G6vnqvOXIDkbC+XL9vbhObWSpRA5/6wbg==}
     hasBin: true
@@ -12673,6 +13320,13 @@ packages:
       which-boxed-primitive: 1.0.2
     dev: true
 
+  /unbzip2-stream/1.4.3:
+    resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==}
+    dependencies:
+      buffer: 5.7.1
+      through: 2.3.8
+    dev: true
+
   /unc-path-regex/0.1.2:
     resolution: {integrity: sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==}
     engines: {node: '>=0.10.0'}
@@ -12813,6 +13467,13 @@ packages:
     deprecated: Please see https://github.com/lydell/urix#deprecated
     dev: false
 
+  /url-parse-lax/3.0.0:
+    resolution: {integrity: sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==}
+    engines: {node: '>=4'}
+    dependencies:
+      prepend-http: 2.0.0
+    dev: true
+
   /url-parse/1.5.10:
     resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
     dependencies:
@@ -12820,6 +13481,11 @@ packages:
       requires-port: 1.0.0
     dev: false
 
+  /url-to-options/1.0.1:
+    resolution: {integrity: sha512-0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A==}
+    engines: {node: '>= 4'}
+    dev: true
+
   /url/0.10.3:
     resolution: {integrity: sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==}
     dependencies:
@@ -13218,7 +13884,6 @@ packages:
     hasBin: true
     dependencies:
       isexe: 2.0.0
-    dev: false
 
   /which/2.0.2:
     resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
@@ -13360,6 +14025,10 @@ packages:
     engines: {node: '>=0.10.32'}
     dev: false
 
+  /yallist/2.1.2:
+    resolution: {integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==}
+    dev: true
+
   /yallist/3.1.1:
     resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
 

From 65cd605b739ae0d213b3502308e9cd523d3e1ae7 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 21 Jan 2023 13:14:55 +0900
Subject: [PATCH 032/177] Achievements (#9665)

* wip

* Update ja-JP.yml

* wip

* wip

* Update MkAchievements.vue

* wip

* :art:

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip
---
 locales/ja-JP.yml                             | 217 +++++++++
 .../migration/1674118260469-achievement.js    |  33 ++
 .../migration/1674255666603-loggedInDates.js  |  11 +
 .../backend/src/core/AchievementService.ts    | 114 +++++
 packages/backend/src/core/CoreModule.ts       |   6 +
 .../entities/NotificationEntityService.ts     |   3 +
 .../src/core/entities/UserEntityService.ts    |   7 +-
 .../src/models/entities/Notification.ts       |   6 +
 .../src/models/entities/UserProfile.ts        |  13 +
 .../backend/src/server/api/EndpointsModule.ts |   8 +
 packages/backend/src/server/api/endpoints.ts  |   4 +
 .../api/endpoints/drive/folders/update.ts     |   4 +-
 .../backend/src/server/api/endpoints/i.ts     |  27 +-
 .../api/endpoints/i/claim-achievement.ts      |  28 ++
 .../api/endpoints/users/achievements.ts       |  31 ++
 packages/backend/src/types.ts                 |   2 +-
 packages/frontend/src/account.ts              |   7 +-
 .../src/components/MkAchievements.vue         | 224 +++++++++
 .../frontend/src/components/MkClickerGame.vue |  11 +-
 .../src/components/MkDrive.folder.vue         |   7 +-
 packages/frontend/src/components/MkDrive.vue  |   7 +-
 .../src/components/MkFollowButton.vue         |  17 +
 packages/frontend/src/components/MkNote.vue   |   4 +
 .../src/components/MkNoteDetailed.vue         |   4 +
 .../src/components/MkNotification.vue         |  13 +
 .../frontend/src/components/MkPostForm.vue    |  31 +-
 .../components/MkReactionsViewer.reaction.vue |   4 +
 packages/frontend/src/init.ts                 |  77 ++++
 packages/frontend/src/navbar.ts               |   8 +-
 packages/frontend/src/pages/achievements.vue  |  25 ++
 .../frontend/src/pages/settings/profile.vue   |   9 +
 packages/frontend/src/router.ts               |   4 +
 packages/frontend/src/scripts/achievements.ts | 425 ++++++++++++++++++
 .../frontend/src/scripts/get-note-menu.ts     |  12 +
 34 files changed, 1385 insertions(+), 18 deletions(-)
 create mode 100644 packages/backend/migration/1674118260469-achievement.js
 create mode 100644 packages/backend/migration/1674255666603-loggedInDates.js
 create mode 100644 packages/backend/src/core/AchievementService.ts
 create mode 100644 packages/backend/src/server/api/endpoints/i/claim-achievement.ts
 create mode 100644 packages/backend/src/server/api/endpoints/users/achievements.ts
 create mode 100644 packages/frontend/src/components/MkAchievements.vue
 create mode 100644 packages/frontend/src/pages/achievements.vue
 create mode 100644 packages/frontend/src/scripts/achievements.ts

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 5721fcc88..e46e6ab9d 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -938,6 +938,222 @@ cannotPerformTemporary: "一時的に利用できません"
 cannotPerformTemporaryDescription: "操作回数が制限を超過するため一時的に利用できません。しばらく時間を置いてから再度お試しください。"
 preset: "プリセット"
 selectFromPresets: "プリセットから選択"
+achievements: "実績"
+
+_achievements:
+  earnedAt: "獲得日時"
+  _types:
+    _notes1:
+      title: "just setting up my msky"
+      description: "初めてノートを投稿した"
+      flavor: "良いMisskeyライフを！"
+    _notes10:
+      title: "いくつかのノート"
+      description: "ノートを10回投稿した"
+    _notes100:
+      title: "たくさんのノート"
+      description: "ノートを100回投稿した"
+    _notes500:
+      title: "ノートまみれ"
+      description: "ノートを500回投稿した"
+    _notes1000:
+      title: "ノートの山"
+      description: "ノートを1,000回投稿した"
+    _notes5000:
+      title: "湧き出るノート"
+      description: "ノートを5,000回投稿した"
+    _notes10000:
+      title: "スーパーノート"
+      description: "ノートを10,000回投稿した"
+    _notes20000:
+      title: "ニードモアノート"
+      description: "ノートを20,000回投稿した"
+    _notes30000:
+      title: "ノートノートノート"
+      description: "ノートを30,000回投稿した"
+    _notes40000:
+      title: "ノート工場"
+      description: "ノートを40,000回投稿した"
+    _notes50000:
+      title: "ノートの惑星"
+      description: "ノートを50,000回投稿した"
+    _notes60000:
+      title: "ノートクエーサー"
+      description: "ノートを60,000回投稿した"
+    _notes70000:
+      title: "ブラックノートホール"
+      description: "ノートを70,000回投稿した"
+    _notes80000:
+      title: "ノートギャラクシー"
+      description: "ノートを80,000回投稿した"
+    _notes90000:
+      title: "ノートバース"
+      description: "ノートを90,000回投稿した"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "ノートを100,000回投稿した"
+      flavor: "そんなに書くことある？"
+    _login3:
+      title: "ビギナーⅠ"
+      description: "通算ログイン日数が3日"
+      flavor: "今日からね僕は ミスキストってことで"
+    _login7:
+      title: "ビギナーⅡ"
+      description: "通算ログイン日数が7日"
+      flavor: "慣れてきましたか？"
+    _login15:
+      title: "ビギナーⅢ"
+      description: "通算ログイン日数が15日"
+    _login30:
+      title: "ミスキストⅠ"
+      description: "通算ログイン日数が30日"
+    _login60:
+      title: "ミスキストⅡ"
+      description: "通算ログイン日数が60日"
+    _login100:
+      title: "ミスキストⅢ"
+      description: "通算ログイン日数が100日"
+      flavor: "そのユーザー、ミスキストにつき"
+    _login200:
+      title: "常連Ⅰ"
+      description: "通算ログイン日数が200日"
+    _login300:
+      title: "常連Ⅱ"
+      description: "通算ログイン日数が300日"
+    _login400:
+      title: "常連Ⅲ"
+      description: "通算ログイン日数が400日"
+    _login500:
+      title: "ベテランⅠ"
+      description: "通算ログイン日数が500日"
+      flavor: "諸君、私はノートが好きだ"
+    _login600:
+      title: "ベテランⅡ"
+      description: "通算ログイン日数が600日"
+    _login700:
+      title: "ベテランⅢ"
+      description: "通算ログイン日数が700日"
+    _login800:
+      title: "ノートマスターⅠ"
+      description: "通算ログイン日数が800日"
+    _login900:
+      title: "ノートマスターⅡ"
+      description: "通算ログイン日数が900日"
+    _login1000:
+      title: "ノートマスターⅢ"
+      description: "通算ログイン日数が1,000日"
+      flavor: "Misskeyを使ってくれてありがとう！"
+    _noteClipped1:
+      title: "クリップせずにはいられないな"
+      description: "初めてノートをクリップした"
+    _noteFavorited1:
+      title: "星をみるひと"
+      description: "初めてノートをお気に入りに登録した"
+    _profileFilled:
+      title: "準備万端"
+      description: "プロフィール設定を行った"
+    _markedAsCat:
+      title: "吾輩は猫である"
+      description: "アカウントをCatとして設定した"
+      flavor: "名前はまだない。"
+    _following1:
+      title: "はじめてのフォロー"
+      description: "初めてフォローした"
+    _following10:
+      title: "ついてく、ついてく"
+      description: "フォローが10人を超した"
+    _following50:
+      title: "友達たくさん"
+      description: "フォローが50人を超した"
+    _following100:
+      title: "友達100人"
+      description: "フォローが100人を超した"
+    _following300:
+      title: "友達過多"
+      description: "フォローが300人を超した"
+    _followers1:
+      title: "はじめてのフォロワー"
+      description: "初めてフォローされた"
+    _followers10:
+      title: "フォローミー！"
+      description: "フォロワーが10人を超した"
+    _followers50:
+      title: "ぞろぞろ"
+      description: "フォロワーが50人を超した"
+    _followers100:
+      title: "人気者"
+      description: "フォロワーが100人を超した"
+    _followers300:
+      title: "一列でお並びください"
+      description: "フォロワーが300人を超した"
+    _followers500:
+      title: "基地局"
+      description: "フォロワーが500人を超した"
+    _followers1000:
+      title: "インフルエンサー"
+      description: "フォロワーが1,000人を超した"
+    _collectAchievements30:
+      title: "実績コレクター"
+      description: "実績を30個以上獲得した"
+    _iLoveMisskey:
+      title: "I Love Misskey"
+      description: "\"I ❤ #Misskey\"を投稿した"
+      flavor: "Misskeyを使ってくださりありがとうございます！ by 開発チーム"
+    _client30min:
+      title: "ひとやすみ"
+      description: "クライアントを起動してから30分以上経過した"
+    _noteDeletedWithin1min:
+      title: "いまのなし"
+      description: "投稿してから1分以内にその投稿を削除した"
+    _postedAtLateNight:
+      title: "夜行性"
+      description: "深夜にノートを投稿した"
+      flavor: "そろそろ寝よう。"
+    _postedAt0min0sec:
+      title: "時報"
+      description: "0分0秒にノートを投稿した"
+      flavor: "ポッ ポッ ポッ ピーン"
+    _selfQuote:
+      title: "自己言及"
+      description: "自分のノートを引用した"
+    _htl20npm:
+      title: "流れるTL"
+      description: "ホームタイムラインの流速が20npmを越す"
+    _driveFolderCircularReference:
+      title: "循環参照"
+      description: "ドライブのフォルダを再帰的な入れ子にしようとした"
+    _reactWithoutRead:
+      title: "ちゃんと読んだ？"
+      description: "100文字以上のテキストを含むノートに投稿されてから3秒以内にリアクションした"
+    _clickedClickHere:
+      title: "ここをクリック"
+      description: "ここをクリックした"
+    _justPlainLucky:
+      title: "単なるラッキー"
+      description: "10秒ごとに0.01%の確率で獲得"
+    _setNameToSyuilo:
+      title: "神様コンプレックス"
+      description: "名前を syuilo に設定した"
+    _passedSinceAccountCreated1:
+      title: "一周年"
+      description: "アカウント作成から1年経過した"
+    _passedSinceAccountCreated2:
+      title: "二周年"
+      description: "アカウント作成から2年経過した"
+    _passedSinceAccountCreated3:
+      title: "三周年"
+      description: "アカウント作成から3年経過した"
+    _loggedInOnBirthday:
+      title: "ハッピーバースデー"
+      description: "誕生日にログインした"
+    _cookieClicked:
+      title: "クッキーをクリックするゲーム"
+      description: "クッキーをクリックした"
+      flavor: "ソフト間違ってない？"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "Brain Diverへのリンクを投稿した"
+      flavor: "Misskey-Misskey La-Tu-Ma"
 
 _role:
   new: "ロールの作成"
@@ -1635,6 +1851,7 @@ _notification:
   pollEnded: "アンケートの結果が出ました"
   unreadAntennaNote: "アンテナ {name}"
   emptyPushNotificationMessage: "プッシュ通知の更新をしました"
+  achievementEarned: "実績を獲得"
 
   _types:
     all: "すべて"
diff --git a/packages/backend/migration/1674118260469-achievement.js b/packages/backend/migration/1674118260469-achievement.js
new file mode 100644
index 000000000..131ab96f8
--- /dev/null
+++ b/packages/backend/migration/1674118260469-achievement.js
@@ -0,0 +1,33 @@
+export class achievement1674118260469 {
+    name = 'achievement1674118260469'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "notification" ADD "achievement" character varying(128)`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "achievements" jsonb NOT NULL DEFAULT '[]'`);
+        await queryRunner.query(`ALTER TYPE "public"."notification_type_enum" RENAME TO "notification_type_enum_old"`);
+        await queryRunner.query(`CREATE TYPE "public"."notification_type_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'achievementEarned', 'app')`);
+        await queryRunner.query(`ALTER TABLE "notification" ALTER COLUMN "type" TYPE "public"."notification_type_enum" USING "type"::"text"::"public"."notification_type_enum"`);
+        await queryRunner.query(`DROP TYPE "public"."notification_type_enum_old"`);
+        await queryRunner.query(`ALTER TYPE "public"."user_profile_mutingnotificationtypes_enum" RENAME TO "user_profile_mutingnotificationtypes_enum_old"`);
+        await queryRunner.query(`CREATE TYPE "public"."user_profile_mutingnotificationtypes_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'achievementEarned', 'app')`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" TYPE "public"."user_profile_mutingnotificationtypes_enum"[] USING "mutingNotificationTypes"::"text"::"public"."user_profile_mutingnotificationtypes_enum"[]`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" SET DEFAULT '{}'`);
+        await queryRunner.query(`DROP TYPE "public"."user_profile_mutingnotificationtypes_enum_old"`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`CREATE TYPE "public"."user_profile_mutingnotificationtypes_enum_old" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app', 'pollEnded')`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" TYPE "public"."user_profile_mutingnotificationtypes_enum_old"[] USING "mutingNotificationTypes"::"text"::"public"."user_profile_mutingnotificationtypes_enum_old"[]`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" SET DEFAULT '{}'`);
+        await queryRunner.query(`DROP TYPE "public"."user_profile_mutingnotificationtypes_enum"`);
+        await queryRunner.query(`ALTER TYPE "public"."user_profile_mutingnotificationtypes_enum_old" RENAME TO "user_profile_mutingnotificationtypes_enum"`);
+        await queryRunner.query(`CREATE TYPE "public"."notification_type_enum_old" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`);
+        await queryRunner.query(`ALTER TABLE "notification" ALTER COLUMN "type" TYPE "public"."notification_type_enum_old" USING "type"::"text"::"public"."notification_type_enum_old"`);
+        await queryRunner.query(`DROP TYPE "public"."notification_type_enum"`);
+        await queryRunner.query(`ALTER TYPE "public"."notification_type_enum_old" RENAME TO "notification_type_enum"`);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "achievements"`);
+        await queryRunner.query(`ALTER TABLE "notification" DROP COLUMN "achievement"`);
+    }
+}
diff --git a/packages/backend/migration/1674255666603-loggedInDates.js b/packages/backend/migration/1674255666603-loggedInDates.js
new file mode 100644
index 000000000..6d75ab643
--- /dev/null
+++ b/packages/backend/migration/1674255666603-loggedInDates.js
@@ -0,0 +1,11 @@
+export class loggedInDates1674255666603 {
+    name = 'loggedInDates1674255666603'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "loggedInDates" character varying(32) array NOT NULL DEFAULT '{}'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "loggedInDates"`);
+    }
+}
diff --git a/packages/backend/src/core/AchievementService.ts b/packages/backend/src/core/AchievementService.ts
new file mode 100644
index 000000000..4ed75308e
--- /dev/null
+++ b/packages/backend/src/core/AchievementService.ts
@@ -0,0 +1,114 @@
+import { Inject, Injectable } from '@nestjs/common';
+import type { UserProfilesRepository, UsersRepository } from '@/models/index.js';
+import type { User } from '@/models/entities/User.js';
+import { DI } from '@/di-symbols.js';
+import { bindThis } from '@/decorators.js';
+import { CreateNotificationService } from '@/core/CreateNotificationService.js';
+
+const ACHIEVEMENT_TYPES = [
+	'notes1',
+	'notes10',
+	'notes100',
+	'notes500',
+	'notes1000',
+	'notes5000',
+	'notes10000',
+	'notes20000',
+	'notes30000',
+	'notes40000',
+	'notes50000',
+	'notes60000',
+	'notes70000',
+	'notes80000',
+	'notes90000',
+	'notes100000',
+	'login3',
+	'login7',
+	'login15',
+	'login30',
+	'login60',
+	'login100',
+	'login200',
+	'login300',
+	'login400',
+	'login500',
+	'login600',
+	'login700',
+	'login800',
+	'login900',
+	'login1000',
+	'passedSinceAccountCreated1',
+	'passedSinceAccountCreated2',
+	'passedSinceAccountCreated3',
+	'loggedInOnBirthday',
+	'noteClipped1',
+	'noteFavorited1',
+	'profileFilled',
+	'markedAsCat',
+	'following1',
+	'following10',
+	'following50',
+	'following100',
+	'following300',
+	'followers1',
+	'followers10',
+	'followers50',
+	'followers100',
+	'followers300',
+	'followers500',
+	'followers1000',
+	'collectAchievements30',
+	'iLoveMisskey',
+	'client30min',
+	'noteDeletedWithin1min',
+	'postedAtLateNight',
+	'postedAt0min0sec',
+	'selfQuote',
+	'htl20npm',
+	'driveFolderCircularReference',
+	'reactWithoutRead',
+	'clickedClickHere',
+	'justPlainLucky',
+	'setNameToSyuilo',
+	'cookieClicked',
+	'brainDiver',
+] as const;
+
+@Injectable()
+export class AchievementService {
+	constructor(
+		@Inject(DI.usersRepository)
+		private usersRepository: UsersRepository,
+
+		@Inject(DI.userProfilesRepository)
+		private userProfilesRepository: UserProfilesRepository,
+
+		private createNotificationService: CreateNotificationService,
+	) {
+	}
+
+	@bindThis
+	public async create(
+		userId: User['id'],
+		type: string,
+	): Promise<void> {
+		if (!ACHIEVEMENT_TYPES.includes(type)) return;
+
+		const date = Date.now();
+
+		const profile = await this.userProfilesRepository.findOneByOrFail({ userId: userId });
+
+		if (profile.achievements.some(a => a.name === type)) return;
+
+		await this.userProfilesRepository.update(userId, {
+			achievements: [...profile.achievements, {
+				name: type,
+				unlockedAt: date,
+			}],
+		});
+
+		this.createNotificationService.createNotification(userId, 'achievementEarned', {
+			achievement: type,
+		});
+	}
+}
diff --git a/packages/backend/src/core/CoreModule.ts b/packages/backend/src/core/CoreModule.ts
index 0ae1ee32b..eddf40794 100644
--- a/packages/backend/src/core/CoreModule.ts
+++ b/packages/backend/src/core/CoreModule.ts
@@ -4,6 +4,7 @@ import { AccountUpdateService } from './AccountUpdateService.js';
 import { AiService } from './AiService.js';
 import { AntennaService } from './AntennaService.js';
 import { AppLockService } from './AppLockService.js';
+import { AchievementService } from './AchievementService.js';
 import { CaptchaService } from './CaptchaService.js';
 import { CreateNotificationService } from './CreateNotificationService.js';
 import { CreateSystemUserService } from './CreateSystemUserService.js';
@@ -128,6 +129,7 @@ const $AccountUpdateService: Provider = { provide: 'AccountUpdateService', useEx
 const $AiService: Provider = { provide: 'AiService', useExisting: AiService };
 const $AntennaService: Provider = { provide: 'AntennaService', useExisting: AntennaService };
 const $AppLockService: Provider = { provide: 'AppLockService', useExisting: AppLockService };
+const $AchievementService: Provider = { provide: 'AchievementService', useExisting: AchievementService };
 const $CaptchaService: Provider = { provide: 'CaptchaService', useExisting: CaptchaService };
 const $CreateNotificationService: Provider = { provide: 'CreateNotificationService', useExisting: CreateNotificationService };
 const $CreateSystemUserService: Provider = { provide: 'CreateSystemUserService', useExisting: CreateSystemUserService };
@@ -255,6 +257,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		AiService,
 		AntennaService,
 		AppLockService,
+		AchievementService,
 		CaptchaService,
 		CreateNotificationService,
 		CreateSystemUserService,
@@ -376,6 +379,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$AiService,
 		$AntennaService,
 		$AppLockService,
+		$AchievementService,
 		$CaptchaService,
 		$CreateNotificationService,
 		$CreateSystemUserService,
@@ -498,6 +502,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		AiService,
 		AntennaService,
 		AppLockService,
+		AchievementService,
 		CaptchaService,
 		CreateNotificationService,
 		CreateSystemUserService,
@@ -618,6 +623,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$AiService,
 		$AntennaService,
 		$AppLockService,
+		$AchievementService,
 		$CaptchaService,
 		$CreateNotificationService,
 		$CreateSystemUserService,
diff --git a/packages/backend/src/core/entities/NotificationEntityService.ts b/packages/backend/src/core/entities/NotificationEntityService.ts
index a1c2c9cff..a8210eea0 100644
--- a/packages/backend/src/core/entities/NotificationEntityService.ts
+++ b/packages/backend/src/core/entities/NotificationEntityService.ts
@@ -114,6 +114,9 @@ export class NotificationEntityService implements OnModuleInit {
 			...(notification.type === 'groupInvited' ? {
 				invitation: this.userGroupInvitationEntityService.pack(notification.userGroupInvitationId!),
 			} : {}),
+			...(notification.type === 'achievementEarned' ? {
+				achievement: notification.achievement,
+			} : {}),
 			...(notification.type === 'app' ? {
 				body: notification.customBody,
 				header: notification.customHeader ?? token?.name,
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index bf6f6f455..34b523e14 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -12,7 +12,7 @@ import { Cache } from '@/misc/cache.js';
 import type { Instance } from '@/models/entities/Instance.js';
 import type { ILocalUser, IRemoteUser, User } from '@/models/entities/User.js';
 import { birthdaySchema, descriptionSchema, localUsernameSchema, locationSchema, nameSchema, passwordSchema } from '@/models/entities/User.js';
-import type { UsersRepository, UserSecurityKeysRepository, FollowingsRepository, FollowRequestsRepository, BlockingsRepository, MutingsRepository, DriveFilesRepository, NoteUnreadsRepository, ChannelFollowingsRepository, NotificationsRepository, UserNotePiningsRepository, UserProfilesRepository, InstancesRepository, AnnouncementReadsRepository, MessagingMessagesRepository, UserGroupJoiningsRepository, AnnouncementsRepository, AntennaNotesRepository, PagesRepository } from '@/models/index.js';
+import type { UsersRepository, UserSecurityKeysRepository, FollowingsRepository, FollowRequestsRepository, BlockingsRepository, MutingsRepository, DriveFilesRepository, NoteUnreadsRepository, ChannelFollowingsRepository, NotificationsRepository, UserNotePiningsRepository, UserProfilesRepository, InstancesRepository, AnnouncementReadsRepository, MessagingMessagesRepository, UserGroupJoiningsRepository, AnnouncementsRepository, AntennaNotesRepository, PagesRepository, UserProfile } from '@/models/index.js';
 import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
 import type { OnModuleInit } from '@nestjs/common';
@@ -343,6 +343,7 @@ export class UserEntityService implements OnModuleInit {
 		options?: {
 			detail?: D,
 			includeSecrets?: boolean,
+			userProfile?: UserProfile,
 		},
 	): Promise<IsMeAndIsUserDetailed<ExpectsMe, D>> {
 		const opts = Object.assign({
@@ -375,7 +376,7 @@ export class UserEntityService implements OnModuleInit {
 			.innerJoinAndSelect('pin.note', 'note')
 			.orderBy('pin.id', 'DESC')
 			.getMany() : [];
-		const profile = opts.detail ? await this.userProfilesRepository.findOneByOrFail({ userId: user.id }) : null;
+		const profile = opts.detail ? (opts.userProfile ?? await this.userProfilesRepository.findOneByOrFail({ userId: user.id })) : null;
 
 		const followingCount = profile == null ? null :
 			(profile.ffVisibility === 'public') || isMe ? user.followingCount :
@@ -493,6 +494,8 @@ export class UserEntityService implements OnModuleInit {
 				mutingNotificationTypes: profile!.mutingNotificationTypes,
 				emailNotificationTypes: profile!.emailNotificationTypes,
 				showTimelineReplies: user.showTimelineReplies ?? falsy,
+				achievements: profile!.achievements,
+				loggedInDays: profile!.loggedInDates.length,
 			} : {}),
 
 			...(opts.includeSecrets ? {
diff --git a/packages/backend/src/models/entities/Notification.ts b/packages/backend/src/models/entities/Notification.ts
index 6679cdb80..66f131d1c 100644
--- a/packages/backend/src/models/entities/Notification.ts
+++ b/packages/backend/src/models/entities/Notification.ts
@@ -64,6 +64,7 @@ export class Notification {
 	 * receiveFollowRequest - フォローリクエストされた
 	 * followRequestAccepted - 自分の送ったフォローリクエストが承認された
 	 * groupInvited - グループに招待された
+	 * achievementEarned - 実績を獲得
 	 * app - アプリ通知
 	 */
 	@Index()
@@ -129,6 +130,11 @@ export class Notification {
 	})
 	public choice: number | null;
 
+	@Column('varchar', {
+		length: 128, nullable: true,
+	})
+	public achievement: string | null;
+
 	/**
 	 * アプリ通知のbody
 	 */
diff --git a/packages/backend/src/models/entities/UserProfile.ts b/packages/backend/src/models/entities/UserProfile.ts
index c561da87c..86df8d5d9 100644
--- a/packages/backend/src/models/entities/UserProfile.ts
+++ b/packages/backend/src/models/entities/UserProfile.ts
@@ -213,6 +213,19 @@ export class UserProfile {
 	})
 	public mutingNotificationTypes: typeof notificationTypes[number][];
 
+	@Column('varchar', {
+		length: 32, array: true, default: '{}',
+	})
+	public loggedInDates: string[];
+
+	@Column('jsonb', {
+		default: [],
+	})
+	public achievements: {
+		name: string;
+		unlockedAt: number;
+	}[];
+
 	//#region Denormalized fields
 	@Index()
 	@Column('varchar', {
diff --git a/packages/backend/src/server/api/EndpointsModule.ts b/packages/backend/src/server/api/EndpointsModule.ts
index 14927da7d..466651f37 100644
--- a/packages/backend/src/server/api/EndpointsModule.ts
+++ b/packages/backend/src/server/api/EndpointsModule.ts
@@ -175,6 +175,7 @@ import * as ep___i_2fa_removeKey from './endpoints/i/2fa/remove-key.js';
 import * as ep___i_2fa_unregister from './endpoints/i/2fa/unregister.js';
 import * as ep___i_apps from './endpoints/i/apps.js';
 import * as ep___i_authorizedApps from './endpoints/i/authorized-apps.js';
+import * as ep___i_claimAchievement from './endpoints/i/claim-achievement.js';
 import * as ep___i_changePassword from './endpoints/i/change-password.js';
 import * as ep___i_deleteAccount from './endpoints/i/delete-account.js';
 import * as ep___i_exportBlocking from './endpoints/i/export-blocking.js';
@@ -329,6 +330,7 @@ import * as ep___users_searchByUsernameAndHost from './endpoints/users/search-by
 import * as ep___users_search from './endpoints/users/search.js';
 import * as ep___users_show from './endpoints/users/show.js';
 import * as ep___users_stats from './endpoints/users/stats.js';
+import * as ep___users_achievements from './endpoints/users/achievements.js';
 import * as ep___fetchRss from './endpoints/fetch-rss.js';
 import * as ep___retention from './endpoints/retention.js';
 import { GetterService } from './GetterService.js';
@@ -509,6 +511,7 @@ const $i_2fa_removeKey: Provider = { provide: 'ep:i/2fa/remove-key', useClass: e
 const $i_2fa_unregister: Provider = { provide: 'ep:i/2fa/unregister', useClass: ep___i_2fa_unregister.default };
 const $i_apps: Provider = { provide: 'ep:i/apps', useClass: ep___i_apps.default };
 const $i_authorizedApps: Provider = { provide: 'ep:i/authorized-apps', useClass: ep___i_authorizedApps.default };
+const $i_claimAchievement: Provider = { provide: 'ep:i/claim-achievement', useClass: ep___i_claimAchievement.default };
 const $i_changePassword: Provider = { provide: 'ep:i/change-password', useClass: ep___i_changePassword.default };
 const $i_deleteAccount: Provider = { provide: 'ep:i/delete-account', useClass: ep___i_deleteAccount.default };
 const $i_exportBlocking: Provider = { provide: 'ep:i/export-blocking', useClass: ep___i_exportBlocking.default };
@@ -663,6 +666,7 @@ const $users_searchByUsernameAndHost: Provider = { provide: 'ep:users/search-by-
 const $users_search: Provider = { provide: 'ep:users/search', useClass: ep___users_search.default };
 const $users_show: Provider = { provide: 'ep:users/show', useClass: ep___users_show.default };
 const $users_stats: Provider = { provide: 'ep:users/stats', useClass: ep___users_stats.default };
+const $users_achievements: Provider = { provide: 'ep:users/achievements', useClass: ep___users_achievements.default };
 const $fetchRss: Provider = { provide: 'ep:fetch-rss', useClass: ep___fetchRss.default };
 const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention.default };
 
@@ -847,6 +851,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
 		$i_2fa_unregister,
 		$i_apps,
 		$i_authorizedApps,
+		$i_claimAchievement,
 		$i_changePassword,
 		$i_deleteAccount,
 		$i_exportBlocking,
@@ -1001,6 +1006,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
 		$users_search,
 		$users_show,
 		$users_stats,
+		$users_achievements,
 		$fetchRss,
 		$retention,
 	],
@@ -1179,6 +1185,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
 		$i_2fa_unregister,
 		$i_apps,
 		$i_authorizedApps,
+		$i_claimAchievement,
 		$i_changePassword,
 		$i_deleteAccount,
 		$i_exportBlocking,
@@ -1331,6 +1338,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
 		$users_search,
 		$users_show,
 		$users_stats,
+		$users_achievements,
 		$fetchRss,
 		$retention,
 	],
diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index 54c4206ea..3678fe14e 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -174,6 +174,7 @@ import * as ep___i_2fa_removeKey from './endpoints/i/2fa/remove-key.js';
 import * as ep___i_2fa_unregister from './endpoints/i/2fa/unregister.js';
 import * as ep___i_apps from './endpoints/i/apps.js';
 import * as ep___i_authorizedApps from './endpoints/i/authorized-apps.js';
+import * as ep___i_claimAchievement from './endpoints/i/claim-achievement.js';
 import * as ep___i_changePassword from './endpoints/i/change-password.js';
 import * as ep___i_deleteAccount from './endpoints/i/delete-account.js';
 import * as ep___i_exportBlocking from './endpoints/i/export-blocking.js';
@@ -328,6 +329,7 @@ import * as ep___users_searchByUsernameAndHost from './endpoints/users/search-by
 import * as ep___users_search from './endpoints/users/search.js';
 import * as ep___users_show from './endpoints/users/show.js';
 import * as ep___users_stats from './endpoints/users/stats.js';
+import * as ep___users_achievements from './endpoints/users/achievements.js';
 import * as ep___fetchRss from './endpoints/fetch-rss.js';
 import * as ep___retention from './endpoints/retention.js';
 
@@ -506,6 +508,7 @@ const eps = [
 	['i/2fa/unregister', ep___i_2fa_unregister],
 	['i/apps', ep___i_apps],
 	['i/authorized-apps', ep___i_authorizedApps],
+	['i/claim-achievement', ep___i_claimAchievement],
 	['i/change-password', ep___i_changePassword],
 	['i/delete-account', ep___i_deleteAccount],
 	['i/export-blocking', ep___i_exportBlocking],
@@ -660,6 +663,7 @@ const eps = [
 	['users/search', ep___users_search],
 	['users/show', ep___users_show],
 	['users/stats', ep___users_stats],
+	['users/achievements', ep___users_achievements],
 	['fetch-rss', ep___fetchRss],
 	['retention', ep___retention],
 ];
diff --git a/packages/backend/src/server/api/endpoints/drive/folders/update.ts b/packages/backend/src/server/api/endpoints/drive/folders/update.ts
index ee63d291b..ff0a78b92 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders/update.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders/update.ts
@@ -28,8 +28,8 @@ export const meta = {
 
 		recursiveNesting: {
 			message: 'It can not be structured like nesting folders recursively.',
-			code: 'NO_SUCH_PARENT_FOLDER',
-			id: 'ce104e3a-faaf-49d5-b459-10ff0cbbcaa1',
+			code: 'RECURSIVE_NESTING',
+			id: 'dbeb024837894013aed44279f9199740',
 		},
 	},
 
diff --git a/packages/backend/src/server/api/endpoints/i.ts b/packages/backend/src/server/api/endpoints/i.ts
index 3bcd6ff8f..6beef5ab8 100644
--- a/packages/backend/src/server/api/endpoints/i.ts
+++ b/packages/backend/src/server/api/endpoints/i.ts
@@ -1,5 +1,5 @@
 import { Inject, Injectable } from '@nestjs/common';
-import type { UsersRepository } from '@/models/index.js';
+import type { UserProfilesRepository, UsersRepository } from '@/models/index.js';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { DI } from '@/di-symbols.js';
@@ -29,15 +29,36 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
 
+		@Inject(DI.userProfilesRepository)
+		private userProfilesRepository: UserProfilesRepository,
+
 		private userEntityService: UserEntityService,
 	) {
 		super(meta, paramDef, async (ps, user, token) => {
 			const isSecure = token == null;
 
-			// ここで渡ってきている user はキャッシュされていて古い可能性もあるので id だけ渡す
-			return await this.userEntityService.pack<true, true>(user.id, user, {
+			const now = new Date();
+			const today = `${now.getFullYear()}/${now.getMonth() + 1}/${now.getDate()}`;
+
+			// 渡ってきている user はキャッシュされていて古い可能性があるので改めて取得
+			const userProfile = await this.userProfilesRepository.findOneOrFail({
+				where: {
+					userId: user.id,
+				},
+				relations: ['user'],
+			});
+
+			if (!userProfile.loggedInDates.includes(today)) {
+				this.userProfilesRepository.update({ userId: user.id }, {
+					loggedInDates: [...userProfile.loggedInDates, today],
+				});
+				userProfile.loggedInDates = [...userProfile.loggedInDates, today];
+			}
+			
+			return await this.userEntityService.pack<true, true>(userProfile.user!, userProfile.user!, {
 				detail: true,
 				includeSecrets: isSecure,
+				userProfile,
 			});
 		});
 	}
diff --git a/packages/backend/src/server/api/endpoints/i/claim-achievement.ts b/packages/backend/src/server/api/endpoints/i/claim-achievement.ts
new file mode 100644
index 000000000..52ae5475b
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/i/claim-achievement.ts
@@ -0,0 +1,28 @@
+import { Inject, Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { DI } from '@/di-symbols.js';
+import { AchievementService } from '@/core/AchievementService.js';
+
+export const meta = {
+	requireCredential: true,
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		name: { type: 'string' },
+	},
+	required: ['name'],
+} as const;
+
+// eslint-disable-next-line import/no-default-export
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> {
+	constructor(
+		private achievementService: AchievementService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			await this.achievementService.create(me.id, ps.name);
+		});
+	}
+}
diff --git a/packages/backend/src/server/api/endpoints/users/achievements.ts b/packages/backend/src/server/api/endpoints/users/achievements.ts
new file mode 100644
index 000000000..2a095d83e
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/users/achievements.ts
@@ -0,0 +1,31 @@
+import { Inject, Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import type { UserProfilesRepository } from '@/models/index.js';
+import { DI } from '@/di-symbols.js';
+
+export const meta = {
+	requireCredential: true,
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		userId: { type: 'string', format: 'misskey:id' },
+	},
+	required: ['userId'],
+} as const;
+
+// eslint-disable-next-line import/no-default-export
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> {
+	constructor(
+		@Inject(DI.userProfilesRepository)
+		private userProfilesRepository: UserProfilesRepository,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			const profile = await this.userProfilesRepository.findOneByOrFail({ userId: ps.userId });
+
+			return profile.achievements;
+		});
+	}
+}
diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
index 573e2faf8..7e9e19336 100644
--- a/packages/backend/src/types.ts
+++ b/packages/backend/src/types.ts
@@ -1,4 +1,4 @@
-export const notificationTypes = ['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app'] as const;
+export const notificationTypes = ['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'achievementEarned', 'app'] as const;
 
 export const noteVisibilities = ['public', 'home', 'followers', 'specified'] as const;
 
diff --git a/packages/frontend/src/account.ts b/packages/frontend/src/account.ts
index 93916ccf2..31c125d3a 100644
--- a/packages/frontend/src/account.ts
+++ b/packages/frontend/src/account.ts
@@ -2,11 +2,11 @@ import { defineAsyncComponent, reactive } from 'vue';
 import * as misskey from 'misskey-js';
 import { showSuspendedDialog } from './scripts/show-suspended-dialog';
 import { i18n } from './i18n';
+import { miLocalStorage } from './local-storage';
 import { del, get, set } from '@/scripts/idb-proxy';
 import { apiUrl } from '@/config';
 import { waiting, api, popup, popupMenu, success, alert } from '@/os';
 import { unisonReload, reloadChannel } from '@/scripts/unison-reload';
-import { miLocalStorage } from './local-storage';
 
 // TODO: 他のタブと永続化されたstateを同期
 
@@ -20,6 +20,11 @@ export const $i = accountData ? reactive(JSON.parse(accountData) as Account) : n
 export const iAmModerator = $i != null && ($i.isAdmin || $i.isModerator);
 export const iAmAdmin = $i != null && $i.isAdmin;
 
+export let notesCount = $i == null ? 0 : $i.notesCount;
+export function incNotesCount() {
+	notesCount++;
+}
+
 export async function signout() {
 	waiting();
 	miLocalStorage.removeItem('account');
diff --git a/packages/frontend/src/components/MkAchievements.vue b/packages/frontend/src/components/MkAchievements.vue
new file mode 100644
index 000000000..64fea9635
--- /dev/null
+++ b/packages/frontend/src/components/MkAchievements.vue
@@ -0,0 +1,224 @@
+<template>
+<div>
+	<div v-if="achievements" :class="$style.root">
+		<div v-for="achievement in achievements" :key="achievement" :class="$style.achievement" class="_panel">
+			<div :class="$style.icon">
+				<div :class="[$style.iconFrame, $style['iconFrame_' + ACHIEVEMENT_BADGES[achievement.name].frame]]">
+					<div :class="[$style.iconInner]" :style="{ background: ACHIEVEMENT_BADGES[achievement.name].bg }">
+						<img :class="$style.iconImg" :src="ACHIEVEMENT_BADGES[achievement.name].img">
+					</div>
+				</div>
+			</div>
+			<div :class="$style.body">
+				<div :class="$style.header">
+					<span :class="$style.title">{{ i18n.ts._achievements._types['_' + achievement.name].title }}</span>
+					<span :class="$style.time">
+						<time v-tooltip="new Date(achievement.unlockedAt).toLocaleString()">{{ new Date(achievement.unlockedAt).getFullYear() }}/{{ new Date(achievement.unlockedAt).getMonth() + 1 }}/{{ new Date(achievement.unlockedAt).getDate() }}</time>
+					</span>
+				</div>
+				<div :class="$style.description">{{ i18n.ts._achievements._types['_' + achievement.name].description }}</div>
+				<div v-if="i18n.ts._achievements._types['_' + achievement.name].flavor" :class="$style.flavor">{{ i18n.ts._achievements._types['_' + achievement.name].flavor }}</div>
+			</div>
+		</div>
+		<template v-if="withLocked">
+			<div v-for="achievement in lockedAchievements" :key="achievement" :class="[$style.achievement, $style.locked]" class="_panel" @click="achievement === 'clickedClickHere' ? clickHere() : () => {}">
+				<div :class="$style.icon">
+				</div>
+				<div :class="$style.body">
+					<div :class="$style.header">
+						<span :class="$style.title">???</span>
+					</div>
+					<div :class="$style.description">???</div>
+				</div>
+			</div>
+		</template>
+	</div>
+	<div v-else>
+		<MkLoading/>
+	</div>
+</div>
+</template>
+
+<script lang="ts" setup>
+import * as misskey from 'misskey-js';
+import { onMounted } from 'vue';
+import * as os from '@/os';
+import { i18n } from '@/i18n';
+import { ACHIEVEMENT_TYPES, ACHIEVEMENT_BADGES, claimAchievement } from '@/scripts/achievements';
+
+const props = withDefaults(defineProps<{
+	user: misskey.entities.User;
+	withLocked: boolean;
+}>(), {
+	withLocked: true,
+});
+
+let achievements = $ref();
+const lockedAchievements = $computed(() => ACHIEVEMENT_TYPES.filter(x => !(achievements ?? []).some(a => a.name === x)));
+
+function fetch() {
+	os.api('users/achievements', { userId: props.user.id }).then(res => {
+		achievements = [];
+		for (const t of ACHIEVEMENT_TYPES) {
+			const a = res.find(x => x.name === t);
+			if (a) achievements.push(a);
+		}
+		//achievements = res.sort((a, b) => b.unlockedAt - a.unlockedAt);
+	});
+}
+
+function clickHere() {
+	claimAchievement('clickedClickHere');
+	fetch();
+}
+
+onMounted(() => {
+	fetch();
+});
+</script>
+
+<style lang="scss" module>
+.root {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, min(380px, 100%));
+	grid-gap: 12px;
+	place-content: center;
+}
+
+.achievement {
+	display: flex;
+	padding: 16px;
+
+	&.locked {
+		opacity: 0.5;
+	}
+}
+
+.icon {
+	flex-shrink: 0;
+	margin-right: 12px;
+}
+
+@keyframes shine {
+	0% { translate: -30px; }
+	100% { translate: -130px; }
+}
+
+.iconFrame {
+	width: 58px;
+	height: 58px;
+	padding: 6px;
+	border-radius: 100%;
+	box-sizing: border-box;
+	pointer-events: none;
+	user-select: none;
+	filter: drop-shadow(0px 2px 2px #00000044);
+	box-shadow: 0 1px 0px #ffffff88 inset;
+	overflow: clip;
+}
+.iconFrame_bronze {
+	background: linear-gradient(0deg, #703827, #d37566);
+
+	> .iconInner {
+		background: linear-gradient(0deg, #d37566, #703827);
+	}
+}
+.iconFrame_silver {
+	background: linear-gradient(0deg, #7c7c7c, #e1e1e1);
+
+	> .iconInner {
+		background: linear-gradient(0deg, #e1e1e1, #7c7c7c);
+	}
+}
+.iconFrame_gold {
+	background: linear-gradient(0deg, rgba(255,182,85,1) 0%, rgba(233,133,0,1) 49%, rgba(255,243,93,1) 51%, rgba(255,187,25,1) 100%);
+
+	> .iconInner {
+		background: linear-gradient(0deg, #ffee20, #eb7018);
+	}
+
+	&:before {
+		content: "";
+		display: block;
+		position: absolute;
+    top: 30px;
+    width: 200px;
+    height: 8px;
+    rotate: -45deg;
+    translate: -30px;
+		background: #ffffff88;
+		animation: shine 2s infinite;
+	}
+}
+.iconFrame_platinum {
+	background: linear-gradient(0deg, rgba(154,154,154,1) 0%, rgba(226,226,226,1) 49%, rgba(255,255,255,1) 51%, rgba(195,195,195,1) 100%);
+
+	> .iconInner {
+		background: linear-gradient(0deg, #e1e1e1, #7c7c7c);
+	}
+
+	&:before {
+		content: "";
+		display: block;
+		position: absolute;
+    top: 30px;
+    width: 200px;
+    height: 8px;
+    rotate: -45deg;
+    translate: -30px;
+		background: #ffffffee;
+		animation: shine 2s infinite;
+	}
+}
+
+.iconInner {
+	position: relative;
+	width: 100%;
+	height: 100%;
+	border-radius: 100%;
+	box-shadow: 0 1px 0px #ffffff88 inset;
+}
+
+.iconImg {
+	width: calc(100% - 12px);
+	height: calc(100% - 12px);
+	position: absolute;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	margin: auto;
+	filter: drop-shadow(0px 1px 2px #000000aa);
+}
+
+.body {
+	flex: 1;
+	min-width: 0;
+}
+
+.header {
+	margin-bottom: 8px;
+	display: flex;
+}
+
+.title {
+	font-weight: bold;
+}
+
+.time {
+	margin-left: auto;
+	font-size: 85%;
+	opacity: 0.7;
+}
+
+.description {
+	font-size: 85%;
+}
+
+.flavor {
+	opacity: 0.7;
+	transform: skewX(-15deg);
+	font-size: 85%;
+	margin-top: 8px;
+}
+</style>
diff --git a/packages/frontend/src/components/MkClickerGame.vue b/packages/frontend/src/components/MkClickerGame.vue
index 03736ac5e..68e0f8185 100644
--- a/packages/frontend/src/components/MkClickerGame.vue
+++ b/packages/frontend/src/components/MkClickerGame.vue
@@ -20,6 +20,7 @@ import * as os from '@/os';
 import { useInterval } from '@/scripts/use-interval';
 import * as game from '@/scripts/clicker-game';
 import number from '@/filters/number';
+import { claimAchievement } from '@/scripts/achievements';
 
 defineProps<{
 }>();
@@ -30,14 +31,18 @@ let cps = $ref(0);
 let prevCookies = $ref(0);
 
 function onClick(ev: MouseEvent) {
+	const x = ev.clientX;
+	const y = ev.clientY;
+	os.popup(MkPlusOneEffect, { x, y }, {}, 'end');
+
 	saveData.value!.cookies++;
 	saveData.value!.totalCookies++;
 	saveData.value!.totalHandmadeCookies++;
 	saveData.value!.clicked++;
 
-	const x = ev.clientX;
-	const y = ev.clientY;
-	os.popup(MkPlusOneEffect, { x, y }, {}, 'end');
+	if (cookies.value === 1) {
+		claimAchievement('cookieClicked');
+	}
 }
 
 useInterval(() => {
diff --git a/packages/frontend/src/components/MkDrive.folder.vue b/packages/frontend/src/components/MkDrive.folder.vue
index 82653ca0b..156013b9a 100644
--- a/packages/frontend/src/components/MkDrive.folder.vue
+++ b/packages/frontend/src/components/MkDrive.folder.vue
@@ -33,6 +33,7 @@ import * as Misskey from 'misskey-js';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
+import { claimAchievement } from '@/scripts/achievements';
 
 const props = withDefaults(defineProps<{
 	folder: Misskey.entities.DriveFolder;
@@ -159,9 +160,11 @@ function onDrop(ev: DragEvent) {
 		}).then(() => {
 			// noop
 		}).catch(err => {
-			switch (err) {
-				case 'detected-circular-definition':
+			switch (err.code) {
+				case 'RECURSIVE_NESTING':
+					claimAchievement('driveFolderCircularReference');
 					os.alert({
+						type: 'error',
 						title: i18n.ts.unableToProcess,
 						text: i18n.ts.circularReferenceFolder,
 					});
diff --git a/packages/frontend/src/components/MkDrive.vue b/packages/frontend/src/components/MkDrive.vue
index 112a64f52..af7175e5c 100644
--- a/packages/frontend/src/components/MkDrive.vue
+++ b/packages/frontend/src/components/MkDrive.vue
@@ -99,6 +99,7 @@ import { stream } from '@/stream';
 import { defaultStore } from '@/store';
 import { i18n } from '@/i18n';
 import { uploadFile, uploads } from '@/scripts/upload';
+import { claimAchievement } from '@/scripts/achievements';
 
 const props = withDefaults(defineProps<{
 	initialFolder?: Misskey.entities.DriveFolder;
@@ -268,9 +269,11 @@ function onDrop(ev: DragEvent): any {
 		}).then(() => {
 			// noop
 		}).catch(err => {
-			switch (err) {
-				case 'detected-circular-definition':
+			switch (err.code) {
+				case 'RECURSIVE_NESTING':
+					claimAchievement('driveFolderCircularReference');
 					os.alert({
+						type: 'error',
 						title: i18n.ts.unableToProcess,
 						text: i18n.ts.circularReferenceFolder,
 					});
diff --git a/packages/frontend/src/components/MkFollowButton.vue b/packages/frontend/src/components/MkFollowButton.vue
index ee256d926..de8db54bf 100644
--- a/packages/frontend/src/components/MkFollowButton.vue
+++ b/packages/frontend/src/components/MkFollowButton.vue
@@ -35,6 +35,8 @@ import * as Misskey from 'misskey-js';
 import * as os from '@/os';
 import { stream } from '@/stream';
 import { i18n } from '@/i18n';
+import { claimAchievement } from '@/scripts/achievements';
+import { $i } from '@/account';
 
 const props = withDefaults(defineProps<{
 	user: Misskey.entities.UserDetailed,
@@ -90,6 +92,21 @@ async function onClick() {
 					userId: props.user.id,
 				});
 				hasPendingFollowRequestFromYou = true;
+
+				claimAchievement('following1');
+
+				if ($i.followingCount >= 10) {
+					claimAchievement('following10');
+				}
+				if ($i.followingCount >= 50) {
+					claimAchievement('following50');
+				}
+				if ($i.followingCount >= 100) {
+					claimAchievement('following100');
+				}
+				if ($i.followingCount >= 300) {
+					claimAchievement('following300');
+				}
 			}
 		}
 	} catch (err) {
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 9b2501a2e..1f6a2883d 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -143,6 +143,7 @@ import { getNoteMenu } from '@/scripts/get-note-menu';
 import { useNoteCapture } from '@/scripts/use-note-capture';
 import { deepClone } from '@/scripts/clone';
 import { useTooltip } from '@/scripts/use-tooltip';
+import { claimAchievement } from '@/scripts/achievements';
 
 const props = defineProps<{
 	note: misskey.entities.Note;
@@ -268,6 +269,9 @@ function react(viaKeyboard = false): void {
 			noteId: appearNote.id,
 			reaction: reaction,
 		});
+		if (appearNote.text && appearNote.text.length > 100 && (Date.now() - new Date(appearNote.createdAt).getTime() < 1000 * 3)) {
+			claimAchievement('reactWithoutRead');
+		}
 	}, () => {
 		focus();
 	});
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 56061e0e6..48ace56d9 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -159,6 +159,7 @@ import { getNoteMenu } from '@/scripts/get-note-menu';
 import { useNoteCapture } from '@/scripts/use-note-capture';
 import { deepClone } from '@/scripts/clone';
 import { useTooltip } from '@/scripts/use-tooltip';
+import { claimAchievement } from '@/scripts/achievements';
 
 const props = defineProps<{
 	note: misskey.entities.Note;
@@ -279,6 +280,9 @@ function react(viaKeyboard = false): void {
 			noteId: appearNote.id,
 			reaction: reaction,
 		});
+		if (appearNote.text && appearNote.text.length > 100 && (Date.now() - new Date(appearNote.createdAt).getTime() < 1000 * 3)) {
+			claimAchievement('reactWithoutRead');
+		}
 	}, () => {
 		focus();
 	});
diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue
index 5b8041c1d..e992495a7 100644
--- a/packages/frontend/src/components/MkNotification.vue
+++ b/packages/frontend/src/components/MkNotification.vue
@@ -2,6 +2,7 @@
 <div ref="elRef" :class="$style.root">
 	<div v-once :class="$style.head">
 		<MkAvatar v-if="notification.type === 'pollEnded'" :class="$style.icon" :user="notification.note.user" link preview/>
+		<MkAvatar v-else-if="notification.type === 'achievementEarned'" :class="$style.icon" :user="$i" link preview/>
 		<MkAvatar v-else-if="notification.user" :class="$style.icon" :user="notification.user" link preview/>
 		<img v-else-if="notification.icon" :class="$style.icon" :src="notification.icon" alt=""/>
 		<div :class="[$style.subIcon, $style['t_' + notification.type]]">
@@ -14,6 +15,7 @@
 			<i v-else-if="notification.type === 'mention'" class="ti ti-at"></i>
 			<i v-else-if="notification.type === 'quote'" class="ti ti-quote"></i>
 			<i v-else-if="notification.type === 'pollEnded'" class="ti ti-chart-arrows"></i>
+			<i v-else-if="notification.type === 'achievementEarned'" class="ti ti-military-award"></i>
 			<!-- notification.reaction が null になることはまずないが、ここでoptional chaining使うと一部ブラウザで刺さるので念の為 -->
 			<MkReactionIcon
 				v-else-if="notification.type === 'reaction'"
@@ -28,6 +30,7 @@
 	<div :class="$style.tail">
 		<header :class="$style.header">
 			<span v-if="notification.type === 'pollEnded'">{{ i18n.ts._notification.pollEnded }}</span>
+			<span v-else-if="notification.type === 'achievementEarned'">{{ i18n.ts._notification.achievementEarned }}</span>
 			<MkA v-else-if="notification.user" v-user-preview="notification.user.id" :class="$style.headerName" :to="userPage(notification.user)"><MkUserName :user="notification.user"/></MkA>
 			<span v-else>{{ notification.header }}</span>
 			<MkTime v-if="withTime" :time="notification.createdAt" :class="$style.headerTime"/>
@@ -57,6 +60,9 @@
 				<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :author="notification.note.user"/>
 				<i class="ti ti-quote" :class="$style.quote"></i>
 			</MkA>
+			<MkA v-else-if="notification.type === 'achievementEarned'" :class="$style.text" to="/my/achievements">
+				{{ i18n.ts._achievements._types['_' + notification.achievement].title }}
+			</MkA>
 			<span v-else-if="notification.type === 'follow'" :class="$style.text" style="opacity: 0.6;">{{ i18n.ts.youGotNewFollower }}<div v-if="full"><MkFollowButton :user="notification.user" :full="true"/></div></span>
 			<span v-else-if="notification.type === 'followRequestAccepted'" :class="$style.text" style="opacity: 0.6;">{{ i18n.ts.followRequestAccepted }}</span>
 			<span v-else-if="notification.type === 'receiveFollowRequest'" :class="$style.text" style="opacity: 0.6;">{{ i18n.ts.receiveFollowRequest }}<div v-if="full && !followRequestDone"><button class="_textButton" @click="acceptFollowRequest()">{{ i18n.ts.accept }}</button> | <button class="_textButton" @click="rejectFollowRequest()">{{ i18n.ts.reject }}</button></div></span>
@@ -82,6 +88,7 @@ import { i18n } from '@/i18n';
 import * as os from '@/os';
 import { stream } from '@/stream';
 import { useTooltip } from '@/scripts/use-tooltip';
+import { $i } from '@/account';
 
 const props = withDefaults(defineProps<{
 	notification: misskey.entities.Notification;
@@ -240,6 +247,12 @@ useTooltip(reactionRef, (showing) => {
 	pointer-events: none;
 }
 
+.t_achievementEarned {
+	padding: 3px;
+	background: #88a6b7;
+	pointer-events: none;
+}
+
 .tail {
 	flex: 1;
 	min-width: 0;
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 6822caf4f..c7e7e85b2 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -93,11 +93,12 @@ import { defaultStore, notePostInterruptors, postFormActions } from '@/store';
 import MkInfo from '@/components/MkInfo.vue';
 import { i18n } from '@/i18n';
 import { instance } from '@/instance';
-import { $i, getAccounts, openAccountMenu as openAccountMenu_ } from '@/account';
+import { $i, notesCount, incNotesCount, getAccounts, openAccountMenu as openAccountMenu_ } from '@/account';
 import { uploadFile } from '@/scripts/upload';
 import { deepClone } from '@/scripts/clone';
 import MkRippleEffect from '@/components/MkRippleEffect.vue';
 import { miLocalStorage } from '@/local-storage';
+import { claimAchievement } from '@/scripts/achievements';
 
 const modal = inject('modal');
 
@@ -627,6 +628,34 @@ async function post(ev?: MouseEvent) {
 			}
 			posting = false;
 			postAccount = null;
+
+			incNotesCount();
+			if (notesCount === 1) {
+				claimAchievement('notes1');
+			}
+
+			const text = postData.text?.toLowerCase() ?? '';
+			if ((text.includes('love') || text.includes('❤')) && text.includes('misskey')) {
+				claimAchievement('iLoveMisskey');
+			}
+			if (text.includes('Efrlqw8ytg4'.toLowerCase()) || text.includes('XVCwzwxdHuA'.toLowerCase())) {
+				claimAchievement('brainDiver');
+			}
+
+			if (props.renote && (props.renote.userId === $i.id) && text.length > 0) {
+				claimAchievement('selfQuote');
+			}
+
+			const date = new Date();
+			const h = date.getHours();
+			const m = date.getMinutes();
+			const s = date.getSeconds();
+			if (h >= 0 && h <= 3) {
+				claimAchievement('postedAtLateNight');
+			}
+			if (m === 0 && s === 0) {
+				claimAchievement('postedAt0min0sec');
+			}
 		});
 	}).catch(err => {
 		posting = false;
diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index e90dd7ea6..ec4042d18 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -20,6 +20,7 @@ import * as os from '@/os';
 import { useTooltip } from '@/scripts/use-tooltip';
 import { $i } from '@/account';
 import MkReactionEffect from '@/components/MkReactionEffect.vue';
+import { claimAchievement } from '@/scripts/achievements';
 
 const props = defineProps<{
 	reaction: string;
@@ -52,6 +53,9 @@ const toggleReaction = () => {
 			noteId: props.note.id,
 			reaction: props.reaction,
 		});
+		if (props.note.text && props.note.text.length > 100 && (Date.now() - new Date(props.note.createdAt).getTime() < 1000 * 3)) {
+			claimAchievement('reactWithoutRead');
+		}
 	}
 };
 
diff --git a/packages/frontend/src/init.ts b/packages/frontend/src/init.ts
index e10315e1a..a2723d479 100644
--- a/packages/frontend/src/init.ts
+++ b/packages/frontend/src/init.ts
@@ -44,6 +44,7 @@ import { reactionPicker } from '@/scripts/reaction-picker';
 import { getUrlWithoutLoginId } from '@/scripts/login-id';
 import { getAccountFromId } from '@/scripts/get-account-from-id';
 import { miLocalStorage } from './local-storage';
+import { claimAchievement, claimedAchievements } from './scripts/achievements';
 
 (async () => {
 	console.info(`Misskey v${version}`);
@@ -345,6 +346,82 @@ import { miLocalStorage } from './local-storage';
 			});
 		}
 
+		if ($i.birthday) {
+			const now = new Date();
+			const m = now.getMonth() + 1;
+			const d = now.getDate();
+			const bm = parseInt($i.birthday.split('-')[1]);
+			const bd = parseInt($i.birthday.split('-')[2]);
+			if (m === bm && d === bd) {
+				claimAchievement('loggedInOnBirthday');
+			}
+		}
+
+		if ($i.loggedInDays >= 3) claimAchievement('login3');
+		if ($i.loggedInDays >= 7) claimAchievement('login7');
+		if ($i.loggedInDays >= 15) claimAchievement('login15');
+		if ($i.loggedInDays >= 30) claimAchievement('login30');
+		if ($i.loggedInDays >= 60) claimAchievement('login60');
+		if ($i.loggedInDays >= 100) claimAchievement('login100');
+		if ($i.loggedInDays >= 200) claimAchievement('login200');
+		if ($i.loggedInDays >= 300) claimAchievement('login300');
+		if ($i.loggedInDays >= 400) claimAchievement('login400');
+		if ($i.loggedInDays >= 500) claimAchievement('login500');
+		if ($i.loggedInDays >= 600) claimAchievement('login600');
+		if ($i.loggedInDays >= 700) claimAchievement('login700');
+		if ($i.loggedInDays >= 800) claimAchievement('login800');
+		if ($i.loggedInDays >= 900) claimAchievement('login900');
+		if ($i.loggedInDays >= 1000) claimAchievement('login1000');
+
+		if ($i.notesCount > 0) claimAchievement('notes1');
+		if ($i.notesCount >= 10) claimAchievement('notes10');
+		if ($i.notesCount >= 100) claimAchievement('notes100');
+		if ($i.notesCount >= 500) claimAchievement('notes500');
+		if ($i.notesCount >= 1000) claimAchievement('notes1000');
+		if ($i.notesCount >= 5000) claimAchievement('notes5000');
+		if ($i.notesCount >= 10000) claimAchievement('notes10000');
+		if ($i.notesCount >= 20000) claimAchievement('notes20000');
+		if ($i.notesCount >= 30000) claimAchievement('notes30000');
+		if ($i.notesCount >= 40000) claimAchievement('notes40000');
+		if ($i.notesCount >= 50000) claimAchievement('notes50000');
+		if ($i.notesCount >= 60000) claimAchievement('notes60000');
+		if ($i.notesCount >= 70000) claimAchievement('notes70000');
+		if ($i.notesCount >= 80000) claimAchievement('notes80000');
+		if ($i.notesCount >= 90000) claimAchievement('notes90000');
+		if ($i.notesCount >= 100000) claimAchievement('notes100000');
+
+		if ($i.followersCount > 0) claimAchievement('followers1');
+		if ($i.followersCount >= 10) claimAchievement('followers10');
+		if ($i.followersCount >= 50) claimAchievement('followers50');
+		if ($i.followersCount >= 100) claimAchievement('followers100');
+		if ($i.followersCount >= 300) claimAchievement('followers300');
+		if ($i.followersCount >= 500) claimAchievement('followers500');
+		if ($i.followersCount >= 1000) claimAchievement('followers1000');
+
+		if (Date.now() - new Date($i.createdAt).getTime() > 1000 * 60 * 60 * 24 * 365) {
+			claimAchievement('passedSinceAccountCreated1');
+		}
+		if (Date.now() - new Date($i.createdAt).getTime() > 1000 * 60 * 60 * 24 * 365 * 2) {
+			claimAchievement('passedSinceAccountCreated2');
+		}
+		if (Date.now() - new Date($i.createdAt).getTime() > 1000 * 60 * 60 * 24 * 365 * 3) {
+			claimAchievement('passedSinceAccountCreated3');
+		}
+
+		if (claimedAchievements.length >= 30) {
+			claimAchievement('collectAchievements30');
+		}
+	
+		window.setInterval(() => {
+			if (Math.floor(Math.random() * 10000) === 0) {
+				claimAchievement('justPlainLucky');
+			}
+		}, 1000 * 10);
+
+		window.setTimeout(() => {
+			claimAchievement('client30min');
+		}, 1000 * 60 * 30);
+
 		const lastUsed = miLocalStorage.getItem('lastUsed');
 		if (lastUsed) {
 			const lastUsedDate = parseInt(lastUsed, 10);
diff --git a/packages/frontend/src/navbar.ts b/packages/frontend/src/navbar.ts
index 9ee78741d..3d16a52e6 100644
--- a/packages/frontend/src/navbar.ts
+++ b/packages/frontend/src/navbar.ts
@@ -1,11 +1,11 @@
 import { computed, ref, reactive } from 'vue';
 import { $i } from './account';
+import { miLocalStorage } from './local-storage';
 import { search } from '@/scripts/search';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { ui } from '@/config';
 import { unisonReload } from '@/scripts/unison-reload';
-import { miLocalStorage } from './local-storage';
 
 export const navbarItemDef = reactive({
 	notifications: {
@@ -103,6 +103,12 @@ export const navbarItemDef = reactive({
 		icon: 'ti ti-device-tv',
 		to: '/channels',
 	},
+	achievements: {
+		title: i18n.ts.achievements,
+		icon: 'ti ti-military-award',
+		show: computed(() => $i != null),
+		to: '/my/achievements',
+	},
 	ui: {
 		title: i18n.ts.switchUi,
 		icon: 'ti ti-devices',
diff --git a/packages/frontend/src/pages/achievements.vue b/packages/frontend/src/pages/achievements.vue
new file mode 100644
index 000000000..b6cd174b4
--- /dev/null
+++ b/packages/frontend/src/pages/achievements.vue
@@ -0,0 +1,25 @@
+<template>
+<MkStickyContainer>
+	<template #header><MkPageHeader/></template>
+	<MkSpacer :content-max="1200">
+		<MkAchievements :user="$i"/>
+	</MkSpacer>
+</MkStickyContainer>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue';
+import MkAchievements from '@/components/MkAchievements.vue';
+import { i18n } from '@/i18n';
+import { definePageMetadata } from '@/scripts/page-metadata';
+import { $i } from '@/account';
+
+definePageMetadata({
+	title: i18n.ts.achievements,
+	icon: 'ti ti-military-award',
+});
+</script>
+
+<style lang="scss" module>
+
+</style>
diff --git a/packages/frontend/src/pages/settings/profile.vue b/packages/frontend/src/pages/settings/profile.vue
index ae74224db..da7d3d370 100644
--- a/packages/frontend/src/pages/settings/profile.vue
+++ b/packages/frontend/src/pages/settings/profile.vue
@@ -85,6 +85,7 @@ import { i18n } from '@/i18n';
 import { $i } from '@/account';
 import { langmap } from '@/scripts/langmap';
 import { definePageMetadata } from '@/scripts/page-metadata';
+import { claimAchievement } from '@/scripts/achievements';
 
 const profile = reactive({
 	name: $i.name,
@@ -133,6 +134,13 @@ function save() {
 		isCat: !!profile.isCat,
 		showTimelineReplies: !!profile.showTimelineReplies,
 	});
+	claimAchievement('profileFilled');
+	if (profile.name === 'syuilo' || profile.name === 'しゅいろ') {
+		claimAchievement('setNameToSyuilo');
+	}
+	if (profile.isCat) {
+		claimAchievement('markedAsCat');
+	}
 }
 
 function changeAvatar(ev) {
@@ -155,6 +163,7 @@ function changeAvatar(ev) {
 		});
 		$i.avatarId = i.avatarId;
 		$i.avatarUrl = i.avatarUrl;
+		claimAchievement('profileFilled');
 	});
 }
 
diff --git a/packages/frontend/src/router.ts b/packages/frontend/src/router.ts
index 26c73c610..22106e159 100644
--- a/packages/frontend/src/router.ts
+++ b/packages/frontend/src/router.ts
@@ -427,6 +427,10 @@ export const routes = [{
 	path: '/my/favorites',
 	component: page(() => import('./pages/favorites.vue')),
 	loginRequired: true,
+}, {
+	path: '/my/achievements',
+	component: page(() => import('./pages/achievements.vue')),
+	loginRequired: true,
 }, {
 	name: 'messaging',
 	path: '/my/messaging',
diff --git a/packages/frontend/src/scripts/achievements.ts b/packages/frontend/src/scripts/achievements.ts
new file mode 100644
index 000000000..c8245ad3d
--- /dev/null
+++ b/packages/frontend/src/scripts/achievements.ts
@@ -0,0 +1,425 @@
+import * as os from '@/os';
+import { $i } from '@/account';
+
+export const ACHIEVEMENT_TYPES = [
+	'notes1',
+	'notes10',
+	'notes100',
+	'notes500',
+	'notes1000',
+	'notes5000',
+	'notes10000',
+	'notes20000',
+	'notes30000',
+	'notes40000',
+	'notes50000',
+	'notes60000',
+	'notes70000',
+	'notes80000',
+	'notes90000',
+	'notes100000',
+	'login3',
+	'login7',
+	'login15',
+	'login30',
+	'login60',
+	'login100',
+	'login200',
+	'login300',
+	'login400',
+	'login500',
+	'login600',
+	'login700',
+	'login800',
+	'login900',
+	'login1000',
+	'passedSinceAccountCreated1',
+	'passedSinceAccountCreated2',
+	'passedSinceAccountCreated3',
+	'loggedInOnBirthday',
+	'noteClipped1',
+	'noteFavorited1',
+	'profileFilled',
+	'markedAsCat',
+	'following1',
+	'following10',
+	'following50',
+	'following100',
+	'following300',
+	'followers1',
+	'followers10',
+	'followers50',
+	'followers100',
+	'followers300',
+	'followers500',
+	'followers1000',
+	'collectAchievements30',
+	'iLoveMisskey',
+	'client30min',
+	'noteDeletedWithin1min',
+	'postedAtLateNight',
+	'postedAt0min0sec',
+	'selfQuote',
+	'htl20npm',
+	'driveFolderCircularReference',
+	'reactWithoutRead',
+	'clickedClickHere',
+	'justPlainLucky',
+	'setNameToSyuilo',
+	'cookieClicked',
+	'brainDiver',
+] as const;
+
+export const ACHIEVEMENT_BADGES = {
+	'notes1': {
+		img: '/fluent-emoji/1f4dd.png',
+		bg: 'linear-gradient(0deg, rgb(59 187 116), rgb(199 211 102))',
+		frame: 'bronze',
+	},
+	'notes10': {
+		img: '/fluent-emoji/1f4d1.png',
+		bg: null,
+		frame: 'bronze',
+	},
+	'notes100': {
+		img: '/fluent-emoji/1f4d2.png',
+		bg: 'linear-gradient(0deg, rgb(59 187 116), rgb(199 211 102))',
+		frame: 'bronze',
+	},
+	'notes500': {
+		img: '/fluent-emoji/1f4da.png',
+		bg: null,
+		frame: 'bronze',
+	},
+	'notes1000': {
+		img: '/fluent-emoji/1f5c3.png',
+		bg: 'linear-gradient(0deg, rgb(59 187 116), rgb(199 211 102))',
+		frame: 'bronze',
+	},
+	'notes5000': {
+		img: '/fluent-emoji/1f304.png',
+		bg: 'linear-gradient(0deg, rgb(59 187 116), rgb(199 211 102))',
+		frame: 'bronze',
+	},
+	'notes10000': {
+		img: '/fluent-emoji/1f3d9.png',
+		bg: 'linear-gradient(0deg, rgb(220 223 225), rgb(172 192 207))',
+		frame: 'silver',
+	},
+	'notes20000': {
+		img: '/fluent-emoji/1f307.png',
+		bg: 'linear-gradient(0deg, rgb(220 223 225), rgb(172 192 207))',
+		frame: 'silver',
+	},
+	'notes30000': {
+		img: '/fluent-emoji/1f306.png',
+		bg: 'linear-gradient(0deg, rgb(144 224 255), rgb(255 168 252))',
+		frame: 'silver',
+	},
+	'notes40000': {
+		img: '/fluent-emoji/1f303.png',
+		bg: 'linear-gradient(0deg, rgb(197 69 192), rgb(2 112 155))',
+		frame: 'silver',
+	},
+	'notes50000': {
+		img: '/fluent-emoji/1fa90.png',
+		bg: 'linear-gradient(0deg, rgb(144 224 255), rgb(255 168 252))',
+		frame: 'gold',
+	},
+	'notes60000': {
+		img: '/fluent-emoji/2604.png',
+		bg: 'linear-gradient(0deg, rgb(197 69 192), rgb(2 112 155))',
+		frame: 'gold',
+	},
+	'notes70000': {
+		img: '/fluent-emoji/1f30c.png',
+		bg: 'linear-gradient(0deg, rgb(144 224 255), rgb(255 168 252))',
+		frame: 'gold',
+	},
+	'notes80000': {
+		img: '/fluent-emoji/1f30c.png',
+		bg: 'linear-gradient(0deg, rgb(197 69 192), rgb(2 112 155))',
+		frame: 'gold',
+	},
+	'notes90000': {
+		img: '/fluent-emoji/1f30c.png',
+		bg: 'linear-gradient(0deg, rgb(255 232 119), rgb(255 140 41))',
+		frame: 'gold',
+	},
+	'notes100000': {
+		img: '/fluent-emoji/267e.png',
+		bg: 'linear-gradient(0deg, rgb(255 232 119), rgb(255 140 41))',
+		frame: 'platinum',
+	},
+	'login3': {
+		img: '/fluent-emoji/1f331.png',
+		bg: null,
+		frame: 'bronze',
+	},
+	'login7': {
+		img: '/fluent-emoji/1f331.png',
+		bg: 'linear-gradient(0deg, rgb(59 187 116), rgb(199 211 102))',
+		frame: 'bronze',
+	},
+	'login15': {
+		img: '/fluent-emoji/1f331.png',
+		bg: 'linear-gradient(0deg, rgb(144, 224, 255), rgb(255, 168, 252))',
+		frame: 'bronze',
+	},
+	'login30': {
+		img: '/fluent-emoji/1fab4.png',
+		bg: null,
+		frame: 'bronze',
+	},
+	'login60': {
+		img: '/fluent-emoji/1fab4.png',
+		bg: 'linear-gradient(0deg, rgb(59 187 116), rgb(199 211 102))',
+		frame: 'bronze',
+	},
+	'login100': {
+		img: '/fluent-emoji/1fab4.png',
+		bg: 'linear-gradient(0deg, rgb(144, 224, 255), rgb(255, 168, 252))',
+		frame: 'silver',
+	},
+	'login200': {
+		img: '/fluent-emoji/1f333.png',
+		bg: null,
+		frame: 'silver',
+	},
+	'login300': {
+		img: '/fluent-emoji/1f333.png',
+		bg: 'linear-gradient(0deg, rgb(59 187 116), rgb(199 211 102))',
+		frame: 'silver',
+	},
+	'login400': {
+		img: '/fluent-emoji/1f333.png',
+		bg: 'linear-gradient(0deg, rgb(144, 224, 255), rgb(255, 168, 252))',
+		frame: 'silver',
+	},
+	'login500': {
+		img: '/fluent-emoji/1f304.png',
+		bg: null,
+		frame: 'silver',
+	},
+	'login600': {
+		img: '/fluent-emoji/1f304.png',
+		bg: 'linear-gradient(0deg, rgb(59 187 116), rgb(199 211 102))',
+		frame: 'gold',
+	},
+	'login700': {
+		img: '/fluent-emoji/1f304.png',
+		bg: 'linear-gradient(0deg, rgb(144, 224, 255), rgb(255, 168, 252))',
+		frame: 'gold',
+	},
+	'login800': {
+		img: '/fluent-emoji/1f307.png',
+		bg: null,
+		frame: 'gold',
+	},
+	'login900': {
+		img: '/fluent-emoji/1f307.png',
+		bg: 'linear-gradient(0deg, rgb(59 187 116), rgb(199 211 102))',
+		frame: 'gold',
+	},
+	'login1000': {
+		img: '/fluent-emoji/1f307.png',
+		bg: 'linear-gradient(0deg, rgb(144, 224, 255), rgb(255, 168, 252))',
+		frame: 'platinum',
+	},
+	'noteClipped1': {
+		img: '/fluent-emoji/1f587.png',
+		bg: null,
+		frame: 'bronze',
+	},
+	'noteFavorited1': {
+		img: '/fluent-emoji/1f31f.png',
+		bg: null,
+		frame: 'bronze',
+	},
+	'profileFilled': {
+		img: '/fluent-emoji/1f44c.png',
+		bg: 'linear-gradient(0deg, rgb(187 183 59), rgb(255 143 77))',
+		frame: 'bronze',
+	},
+	'markedAsCat': {
+		img: '/fluent-emoji/1f408.png',
+		bg: 'linear-gradient(0deg, rgb(187 183 59), rgb(255 143 77))',
+		frame: 'bronze',
+	},
+	'following1': {
+		img: '/fluent-emoji/2618.png',
+		bg: 'linear-gradient(0deg, rgb(59 187 116), rgb(199 211 102))',
+		frame: 'bronze',
+	},
+	'following10': {
+		img: '/fluent-emoji/1f6b8.png',
+		bg: 'linear-gradient(0deg, rgb(59 187 116), rgb(199 211 102))',
+		frame: 'bronze',
+	},
+	'following50': {
+		img: '/fluent-emoji/1f91d.png',
+		bg: 'linear-gradient(0deg, rgb(59 187 116), rgb(199 211 102))',
+		frame: 'bronze',
+	},
+	'following100': {
+		img: '/fluent-emoji/1f4af.png',
+		bg: 'linear-gradient(0deg, rgb(255 53 184), rgb(255 206 69))',
+		frame: 'silver',
+	},
+	'following300': {
+		img: '/fluent-emoji/1f970.png',
+		bg: 'linear-gradient(0deg, rgb(144 224 255), rgb(255 168 252))',
+		frame: 'silver',
+	},
+	'followers1': {
+		img: '/fluent-emoji/2618.png',
+		bg: 'linear-gradient(0deg, rgb(59 187 116), rgb(199 211 102))',
+		frame: 'bronze',
+	},
+	'followers10': {
+		img: '/fluent-emoji/1f44b.png',
+		bg: 'linear-gradient(0deg, rgb(59 187 116), rgb(199 211 102))',
+		frame: 'bronze',
+	},
+	'followers50': {
+		img: '/fluent-emoji/1f411.png',
+		bg: 'linear-gradient(0deg, rgb(220 223 225), rgb(172 192 207))',
+		frame: 'bronze',
+	},
+	'followers100': {
+		img: '/fluent-emoji/1f396.png',
+		bg: 'linear-gradient(0deg, rgb(144 224 255), rgb(255 168 252))',
+		frame: 'silver',
+	},
+	'followers300': {
+		img: '/fluent-emoji/1f3c6.png',
+		bg: 'linear-gradient(0deg, rgb(144 224 255), rgb(255 168 252))',
+		frame: 'silver',
+	},
+	'followers500': {
+		img: '/fluent-emoji/1f4e1.png',
+		bg: 'linear-gradient(0deg, rgb(220 223 225), rgb(172 192 207))',
+		frame: 'gold',
+	},
+	'followers1000': {
+		img: '/fluent-emoji/1f451.png',
+		bg: 'linear-gradient(0deg, rgb(255 232 119), rgb(255 140 41))',
+		frame: 'platinum',
+	},
+	'collectAchievements30': {
+		img: '/fluent-emoji/1f3c5.png',
+		bg: 'linear-gradient(0deg, rgb(255 77 77), rgb(247 155 214))',
+		frame: 'silver',
+	},
+	'iLoveMisskey': {
+		img: '/fluent-emoji/2764.png',
+		bg: 'linear-gradient(0deg, rgb(255 77 77), rgb(247 155 214))',
+		frame: 'silver',
+	},
+	'client30min': {
+		img: '/fluent-emoji/1f552.png',
+		bg: 'linear-gradient(0deg, rgb(220 223 225), rgb(172 192 207))',
+		frame: 'bronze',
+	},
+	'noteDeletedWithin1min': {
+		img: '/fluent-emoji/1f5d1.png',
+		bg: 'linear-gradient(0deg, rgb(220 223 225), rgb(172 192 207))',
+		frame: 'bronze',
+	},
+	'postedAtLateNight': {
+		img: '/fluent-emoji/1f319.png',
+		bg: 'linear-gradient(0deg, rgb(197 69 192), rgb(2 112 155))',
+		frame: 'bronze',
+	},
+	'postedAt0min0sec': {
+		img: '/fluent-emoji/1f55b.png',
+		bg: 'linear-gradient(0deg, rgb(58 231 198), rgb(37 194 255))',
+		frame: 'bronze',
+	},
+	'selfQuote': {
+		img: '/fluent-emoji/1f4dd.png',
+		bg: null,
+		frame: 'bronze',
+	},
+	'htl20npm': {
+		img: '/fluent-emoji/1f30a.png',
+		bg: 'linear-gradient(0deg, rgb(220 223 225), rgb(172 192 207))',
+		frame: 'bronze',
+	},
+	'driveFolderCircularReference': {
+		img: '/fluent-emoji/1f4c2.png',
+		bg: 'linear-gradient(0deg, rgb(144 224 255), rgb(255 168 252))',
+		frame: 'bronze',
+	},
+	'reactWithoutRead': {
+		img: '/fluent-emoji/2753.png',
+		bg: 'linear-gradient(0deg, rgb(144 224 255), rgb(255 168 252))',
+		frame: 'bronze',
+	},
+	'clickedClickHere': {
+		img: '/fluent-emoji/2757.png',
+		bg: 'linear-gradient(0deg, rgb(144 224 255), rgb(255 168 252))',
+		frame: 'bronze',
+	},
+	'justPlainLucky': {
+		img: '/fluent-emoji/1f340.png',
+		bg: 'linear-gradient(0deg, rgb(187 183 59), rgb(255 143 77))',
+		frame: 'silver',
+	},
+	'setNameToSyuilo': {
+		img: '/fluent-emoji/1f36e.png',
+		bg: 'linear-gradient(0deg, rgb(187 183 59), rgb(255 143 77))',
+		frame: 'bronze',
+	},
+	'passedSinceAccountCreated1': {
+		img: '/fluent-emoji/0031-20e3.png',
+		bg: null,
+		frame: 'bronze',
+	},
+	'passedSinceAccountCreated2': {
+		img: '/fluent-emoji/0032-20e3.png',
+		bg: null,
+		frame: 'silver',
+	},
+	'passedSinceAccountCreated3': {
+		img: '/fluent-emoji/0033-20e3.png',
+		bg: null,
+		frame: 'gold',
+	},
+	'loggedInOnBirthday': {
+		img: '/fluent-emoji/1f382.png',
+		bg: 'linear-gradient(0deg, rgb(144 224 255), rgb(255 168 252))',
+		frame: 'silver',
+	},
+	'cookieClicked': {
+		img: '/fluent-emoji/1f36a.png',
+		bg: 'linear-gradient(0deg, rgb(187 183 59), rgb(255 143 77))',
+		frame: 'bronze',
+	},
+	'brainDiver': {
+		img: '/fluent-emoji/1f9e0.png',
+		bg: 'linear-gradient(0deg, rgb(144, 224, 255), rgb(255, 168, 252))',
+		frame: 'bronze',
+	},
+} as const satisfies Record<typeof ACHIEVEMENT_TYPES[number], {
+	img: string;
+	bg: string | null;
+	frame: 'bronze' | 'silver' | 'gold' | 'platinum';
+}>;
+
+export const claimedAchievements = ($i && $i.achievements) ? $i.achievements.map(x => x.name) : [];
+
+export function claimAchievement(type: typeof ACHIEVEMENT_TYPES[number]) {
+	if (claimedAchievements.includes(type)) return;
+	os.api('i/claim-achievement', { name: type });
+	claimedAchievements.push(type);
+}
+
+if (_DEV_) {
+	(window as any).unlockAllAchievements = async () => {
+		for (const t of ACHIEVEMENT_TYPES) {
+			await new Promise(resolve => setTimeout(resolve, 100));
+			claimAchievement(t);
+		}
+	};
+}
diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
index 7a426ec72..da7f2a5c2 100644
--- a/packages/frontend/src/scripts/get-note-menu.ts
+++ b/packages/frontend/src/scripts/get-note-menu.ts
@@ -1,6 +1,7 @@
 import { defineAsyncComponent, Ref, inject } from 'vue';
 import * as misskey from 'misskey-js';
 import { pleaseLogin } from './please-login';
+import { claimAchievement } from './achievements';
 import { $i } from '@/account';
 import { i18n } from '@/i18n';
 import { instance } from '@/instance';
@@ -38,6 +39,10 @@ export function getNoteMenu(props: {
 			os.api('notes/delete', {
 				noteId: appearNote.id,
 			});
+
+			if (Date.now() - new Date(appearNote.createdAt).getTime() < 1000 * 60) {
+				claimAchievement('noteDeletedWithin1min');
+			}
 		});
 	}
 
@@ -53,10 +58,15 @@ export function getNoteMenu(props: {
 			});
 
 			os.post({ initialNote: appearNote, renote: appearNote.renote, reply: appearNote.reply, channel: appearNote.channel });
+
+			if (Date.now() - new Date(appearNote.createdAt).getTime() < 1000 * 60) {
+				claimAchievement('noteDeletedWithin1min');
+			}
 		});
 	}
 
 	function toggleFavorite(favorite: boolean): void {
+		claimAchievement('noteFavorited1');
 		os.apiWithDialog(favorite ? 'notes/favorites/create' : 'notes/favorites/delete', {
 			noteId: appearNote.id,
 		});
@@ -118,11 +128,13 @@ export function getNoteMenu(props: {
 
 				const clip = await os.apiWithDialog('clips/create', result);
 
+				claimAchievement('noteClipped1');
 				os.apiWithDialog('clips/add-note', { clipId: clip.id, noteId: appearNote.id });
 			},
 		}, null, ...clips.map(clip => ({
 			text: clip.name,
 			action: () => {
+				claimAchievement('noteClipped1');
 				os.promiseDialog(
 					os.api('clips/add-note', { clipId: clip.id, noteId: appearNote.id }),
 					null,

From 59748f07d1183179b7d54773f714a1fc77c63b61 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 21 Jan 2023 13:18:17 +0900
Subject: [PATCH 033/177] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21fecb681..1c136995d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ You should also include the user name that made the change.
 ## 13.x.x (unreleased)
 
 ### Improvements
+- 実績機能
 - Playのプリセットを追加
 - Playのscriptの文字数制限を緩和
 - AiScript GUIの強化

From 0b4a7e8166318329883ebeb61d8376948e557cbc Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 21 Jan 2023 13:20:09 +0900
Subject: [PATCH 034/177] enhance(server): set Cache-Control header for some
 routes

---
 packages/backend/src/server/ServerService.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/server/ServerService.ts b/packages/backend/src/server/ServerService.ts
index 47d11ed0a..eb6a3795e 100644
--- a/packages/backend/src/server/ServerService.ts
+++ b/packages/backend/src/server/ServerService.ts
@@ -82,13 +82,13 @@ export class ServerService {
 		fastify.get<{ Params: { path: string }; Querystring: { static?: any; }; }>('/emoji/:path(.*)', async (request, reply) => {
 			const path = request.params.path;
 
+			reply.header('Cache-Control', 'public, max-age=86400');
+
 			if (!path.match(/^[a-zA-Z0-9\-_@\.]+?\.webp$/)) {
 				reply.code(404);
 				return;
 			}
 
-			reply.header('Cache-Control', 'public, max-age=86400');
-
 			const name = path.split('@')[0].replace('.webp', '');
 			const host = path.split('@')[1]?.replace('.webp', '');
 
@@ -132,6 +132,8 @@ export class ServerService {
 				relations: ['avatar'],
 			});
 
+			reply.header('Cache-Control', 'public, max-age=86400');
+
 			if (user) {
 				reply.redirect(this.userEntityService.getAvatarUrlSync(user));
 			} else {
@@ -143,6 +145,7 @@ export class ServerService {
 			const [temp, cleanup] = await createTemp();
 			await genIdenticon(request.params.x, fs.createWriteStream(temp));
 			reply.header('Content-Type', 'image/png');
+			reply.header('Cache-Control', 'public, max-age=86400');
 			return fs.createReadStream(temp).on('close', () => cleanup());
 		});
 

From 7e89e709346b466f311f9556c592919f2358b1e7 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 21 Jan 2023 14:09:01 +0900
Subject: [PATCH 035/177] enhance(server): separate job queue process (#9662)

* enhance(server): separate job queue process

* add commands for build with swc
---
 .../src/{RootModule.ts => MainModule.ts}      |  6 ++---
 packages/backend/src/boot/master.ts           | 25 ++++++++++++-------
 packages/backend/src/boot/worker.ts           | 19 ++++----------
 .../src/core/chart/ChartManagementService.ts  |  2 +-
 .../backend/src/queue/QueueProcessorModule.ts |  2 ++
 5 files changed, 27 insertions(+), 27 deletions(-)
 rename packages/backend/src/{RootModule.ts => MainModule.ts} (63%)

diff --git a/packages/backend/src/RootModule.ts b/packages/backend/src/MainModule.ts
similarity index 63%
rename from packages/backend/src/RootModule.ts
rename to packages/backend/src/MainModule.ts
index 3fc392776..fc568e883 100644
--- a/packages/backend/src/RootModule.ts
+++ b/packages/backend/src/MainModule.ts
@@ -1,13 +1,13 @@
 import { Module } from '@nestjs/common';
 import { ServerModule } from '@/server/ServerModule.js';
 import { GlobalModule } from '@/GlobalModule.js';
-import { QueueProcessorModule } from '@/queue/QueueProcessorModule.js';
+import { DaemonModule } from '@/daemons/DaemonModule.js';
 
 @Module({
 	imports: [
 		GlobalModule,
 		ServerModule,
-		QueueProcessorModule,
+		DaemonModule,
 	],
 })
-export class RootModule {}
+export class MainModule {}
diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts
index 4630217c4..93cb3131b 100644
--- a/packages/backend/src/boot/master.ts
+++ b/packages/backend/src/boot/master.ts
@@ -17,6 +17,9 @@ import { JanitorService } from '@/daemons/JanitorService.js';
 import { QueueStatsService } from '@/daemons/QueueStatsService.js';
 import { ServerStatsService } from '@/daemons/ServerStatsService.js';
 import { NestLogger } from '@/NestLogger.js';
+import { ChartManagementService } from '@/core/chart/ChartManagementService.js';
+import { ServerService } from '@/server/ServerService.js';
+import { MainModule } from '@/MainModule.js';
 import { envOption } from '../env.js';
 
 const _filename = fileURLToPath(import.meta.url);
@@ -70,6 +73,15 @@ export async function masterMain() {
 		process.exit(1);
 	}
 
+	const app = await NestFactory.createApplicationContext(MainModule, {
+		logger: new NestLogger(),
+	});
+	app.enableShutdownHooks();
+
+	// start server
+	const serverService = app.get(ServerService);
+	serverService.launch();
+
 	bootLogger.succ('Misskey initialized');
 
 	if (!envOption.disableClustering) {
@@ -78,15 +90,10 @@ export async function masterMain() {
 
 	bootLogger.succ(`Now listening on port ${config.port} on ${config.url}`, null, true);
 
-	if (!envOption.noDaemons) {
-		const daemons = await NestFactory.createApplicationContext(DaemonModule, {
-			logger: new NestLogger(),
-		});
-		daemons.enableShutdownHooks();
-		daemons.get(JanitorService).start();
-		daemons.get(QueueStatsService).start();
-		daemons.get(ServerStatsService).start();
-	}
+	app.get(ChartManagementService).start();
+	app.get(JanitorService).start();
+	app.get(QueueStatsService).start();
+	app.get(ServerStatsService).start();
 }
 
 function showEnvironment(): void {
diff --git a/packages/backend/src/boot/worker.ts b/packages/backend/src/boot/worker.ts
index f29e37de7..e0574643b 100644
--- a/packages/backend/src/boot/worker.ts
+++ b/packages/backend/src/boot/worker.ts
@@ -1,32 +1,23 @@
 import cluster from 'node:cluster';
 import { NestFactory } from '@nestjs/core';
-import { envOption } from '@/env.js';
 import { ChartManagementService } from '@/core/chart/ChartManagementService.js';
-import { ServerService } from '@/server/ServerService.js';
 import { QueueProcessorService } from '@/queue/QueueProcessorService.js';
 import { NestLogger } from '@/NestLogger.js';
-import { RootModule } from '../RootModule.js';
+import { QueueProcessorModule } from '@/queue/QueueProcessorModule.js';
 
 /**
  * Init worker process
  */
 export async function workerMain() {
-	const app = await NestFactory.createApplicationContext(RootModule, {
+	const jobQueue = await NestFactory.createApplicationContext(QueueProcessorModule, {
 		logger: new NestLogger(),
 	});
-	app.enableShutdownHooks();
-
-	// start server
-	const serverService = app.get(ServerService);
-	serverService.launch();
+	jobQueue.enableShutdownHooks();
 
 	// start job queue
-	if (!envOption.onlyServer) {
-		const queueProcessorService = app.get(QueueProcessorService);
-		queueProcessorService.start();
-	}
+	jobQueue.get(QueueProcessorService).start();
 
-	app.get(ChartManagementService).run();
+	jobQueue.get(ChartManagementService).start();
 
 	if (cluster.isWorker) {
 		// Send a 'ready' message to parent process
diff --git a/packages/backend/src/core/chart/ChartManagementService.ts b/packages/backend/src/core/chart/ChartManagementService.ts
index 37de30b71..4fba1b57d 100644
--- a/packages/backend/src/core/chart/ChartManagementService.ts
+++ b/packages/backend/src/core/chart/ChartManagementService.ts
@@ -54,7 +54,7 @@ export class ChartManagementService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async run() {
+	public async start() {
 		// 20分おきにメモリ情報をDBに書き込み
 		this.saveIntervalId = setInterval(() => {
 			for (const chart of this.charts) {
diff --git a/packages/backend/src/queue/QueueProcessorModule.ts b/packages/backend/src/queue/QueueProcessorModule.ts
index 034e9cc5a..6a8f35cdd 100644
--- a/packages/backend/src/queue/QueueProcessorModule.ts
+++ b/packages/backend/src/queue/QueueProcessorModule.ts
@@ -1,5 +1,6 @@
 import { Module } from '@nestjs/common';
 import { CoreModule } from '@/core/CoreModule.js';
+import { GlobalModule } from '@/GlobalModule.js';
 import { QueueLoggerService } from './QueueLoggerService.js';
 import { QueueProcessorService } from './QueueProcessorService.js';
 import { DbQueueProcessorsService } from './DbQueueProcessorsService.js';
@@ -34,6 +35,7 @@ import { ExportFavoritesProcessorService } from './processors/ExportFavoritesPro
 
 @Module({
 	imports: [
+		GlobalModule,
 		CoreModule,
 	],
 	providers: [

From 951ab90b1afff4e7ba61496cdd00dc1a94113491 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 21 Jan 2023 14:10:09 +0900
Subject: [PATCH 036/177] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c136995d..ef8238ab2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ You should also include the user name that made the change.
 - リアクション一覧詳細ダイアログを表示できるように
 - 存在しないカスタム絵文字をテキストで表示するように
 - Alt text in image viewer
+- ジョブキューのプロセスとWebサーバーのプロセスを分離
 
 ### Bugfixes
 - playを削除する手段がなかったのを修正

From 9d367882fb7e5fc375b7d14e6409a735e68fca8a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 21 Jan 2023 15:30:29 +0900
Subject: [PATCH 037/177] add some achievements

---
 locales/ja-JP.yml                                 |  6 ++++++
 packages/backend/src/core/AchievementService.ts   |  2 ++
 packages/frontend/src/components/MkPageWindow.vue | 15 ++++++++++++++-
 packages/frontend/src/os.ts                       |  4 +++-
 packages/frontend/src/pages/scratchpad.vue        |  4 ++++
 packages/frontend/src/scripts/achievements.ts     | 12 ++++++++++++
 6 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index e46e6ab9d..aac5d5e83 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1119,6 +1119,12 @@ _achievements:
     _htl20npm:
       title: "流れるTL"
       description: "ホームタイムラインの流速が20npmを越す"
+    _outputHelloWorldOnScratchpad:
+      title: "Hello, world!"
+      description: "スクラッチパッドで hello world を出力した"
+    _open3windows:
+      title: "マルチウィンドウ"
+      description: "ウィンドウを3つ以上開いた状態にした"
     _driveFolderCircularReference:
       title: "循環参照"
       description: "ドライブのフォルダを再帰的な入れ子にしようとした"
diff --git a/packages/backend/src/core/AchievementService.ts b/packages/backend/src/core/AchievementService.ts
index 4ed75308e..149974452 100644
--- a/packages/backend/src/core/AchievementService.ts
+++ b/packages/backend/src/core/AchievementService.ts
@@ -65,6 +65,8 @@ const ACHIEVEMENT_TYPES = [
 	'postedAt0min0sec',
 	'selfQuote',
 	'htl20npm',
+	'outputHelloWorldOnScratchpad',
+	'open3windows',
 	'driveFolderCircularReference',
 	'reactWithoutRead',
 	'clickedClickHere',
diff --git a/packages/frontend/src/components/MkPageWindow.vue b/packages/frontend/src/components/MkPageWindow.vue
index 25b9da2d0..d12aafd06 100644
--- a/packages/frontend/src/components/MkPageWindow.vue
+++ b/packages/frontend/src/components/MkPageWindow.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ComputedRef, inject, provide } from 'vue';
+import { ComputedRef, inject, onMounted, onUnmounted, provide } from 'vue';
 import RouterView from '@/components/global/RouterView.vue';
 import MkWindow from '@/components/MkWindow.vue';
 import { popout as _popout } from '@/scripts/popout';
@@ -35,6 +35,8 @@ import { mainRouter, routes } from '@/router';
 import { Router } from '@/nirax';
 import { i18n } from '@/i18n';
 import { PageMetadata, provideMetadataReceiver, setPageMetadata } from '@/scripts/page-metadata';
+import { openingWindowsCount } from '@/os';
+import { claimAchievement } from '@/scripts/achievements';
 
 const props = defineProps<{
 	initialPath: string;
@@ -128,6 +130,17 @@ function popout() {
 	windowEl.close();
 }
 
+onMounted(() => {
+	openingWindowsCount.value++;
+	if (openingWindowsCount.value >= 3) {
+		claimAchievement('open3windows');
+	}
+});
+
+onUnmounted(() => {
+	openingWindowsCount.value--;
+});
+
 defineExpose({
 	close,
 });
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index 111bd0cd8..01f824406 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -9,7 +9,7 @@ import * as Misskey from 'misskey-js';
 import { i18n } from './i18n';
 import MkPostFormDialog from '@/components/MkPostFormDialog.vue';
 import MkWaitingDialog from '@/components/MkWaitingDialog.vue';
-import MkPageWindow from '@/components/MkPageWindow.vue'
+import MkPageWindow from '@/components/MkPageWindow.vue';
 import MkToast from '@/components/MkToast.vue';
 import MkDialog from '@/components/MkDialog.vue';
 import MkEmojiPickerDialog from '@/components/MkEmojiPickerDialog.vue';
@@ -18,6 +18,8 @@ import MkPopupMenu from '@/components/MkPopupMenu.vue';
 import MkContextMenu from '@/components/MkContextMenu.vue';
 import { MenuItem } from '@/types/menu';
 
+export const openingWindowsCount = ref(0);
+
 export const apiWithDialog = ((
 	endpoint: string,
 	data: Record<string, any> = {},
diff --git a/packages/frontend/src/pages/scratchpad.vue b/packages/frontend/src/pages/scratchpad.vue
index bd68df724..0d52850b5 100644
--- a/packages/frontend/src/pages/scratchpad.vue
+++ b/packages/frontend/src/pages/scratchpad.vue
@@ -47,6 +47,7 @@ import { definePageMetadata } from '@/scripts/page-metadata';
 import { AsUiComponent, AsUiRoot, patch, registerAsUiLib, render } from '@/scripts/aiscript/ui';
 import MkAsUi from '@/components/MkAsUi.vue';
 import { miLocalStorage } from '@/local-storage';
+import { claimAchievement } from '@/scripts/achievements';
 
 const parser = new Parser();
 let aiscript: Interpreter;
@@ -90,6 +91,9 @@ async function run() {
 			});
 		},
 		out: (value) => {
+			if (value.type === 'str' && value.value.toLowerCase().replace(',', '').includes('hello world')) {
+				claimAchievement('outputHelloWorldOnScratchpad');
+			}
 			logs.value.push({
 				id: Math.random(),
 				text: value.type === 'str' ? value.value : utils.valToString(value),
diff --git a/packages/frontend/src/scripts/achievements.ts b/packages/frontend/src/scripts/achievements.ts
index c8245ad3d..70ea0ffbd 100644
--- a/packages/frontend/src/scripts/achievements.ts
+++ b/packages/frontend/src/scripts/achievements.ts
@@ -61,6 +61,8 @@ export const ACHIEVEMENT_TYPES = [
 	'postedAt0min0sec',
 	'selfQuote',
 	'htl20npm',
+	'outputHelloWorldOnScratchpad',
+	'open3windows',
 	'driveFolderCircularReference',
 	'reactWithoutRead',
 	'clickedClickHere',
@@ -346,6 +348,16 @@ export const ACHIEVEMENT_BADGES = {
 		bg: 'linear-gradient(0deg, rgb(220 223 225), rgb(172 192 207))',
 		frame: 'bronze',
 	},
+	'outputHelloWorldOnScratchpad': {
+		img: '/fluent-emoji/1f530.png',
+		bg: 'linear-gradient(0deg, rgb(58 231 198), rgb(37 194 255))',
+		frame: 'bronze',
+	},
+	'open3windows': {
+		img: '/fluent-emoji/1f5a5.png',
+		bg: 'linear-gradient(0deg, rgb(144 224 255), rgb(255 168 252))',
+		frame: 'bronze',
+	},
 	'driveFolderCircularReference': {
 		img: '/fluent-emoji/1f4c2.png',
 		bg: 'linear-gradient(0deg, rgb(144 224 255), rgb(255 168 252))',

From 2b377a3dc5f0beccf36d4b37237adb9c39e92652 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 21 Jan 2023 16:06:49 +0900
Subject: [PATCH 038/177] add some achievements

---
 locales/ja-JP.yml                             |  6 +++++
 .../backend/src/core/AchievementService.ts    |  2 ++
 packages/frontend/src/init.ts                 | 11 +++++---
 packages/frontend/src/pages/achievements.vue  | 27 ++++++++++++++++++-
 packages/frontend/src/scripts/achievements.ts | 16 +++++++++--
 5 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index aac5d5e83..fb9a3435a 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1095,6 +1095,9 @@ _achievements:
     _collectAchievements30:
       title: "実績コレクター"
       description: "実績を30個以上獲得した"
+    _viewAchievements3min:
+      title: "実績好き"
+      description: "実績一覧を3分以上眺め続けた"
     _iLoveMisskey:
       title: "I Love Misskey"
       description: "\"I ❤ #Misskey\"を投稿した"
@@ -1152,6 +1155,9 @@ _achievements:
     _loggedInOnBirthday:
       title: "ハッピーバースデー"
       description: "誕生日にログインした"
+    _loggedInOnNewYearsDay:
+      title: "あけましておめでとうございます"
+      description: "元日にログインした"
     _cookieClicked:
       title: "クッキーをクリックするゲーム"
       description: "クッキーをクリックした"
diff --git a/packages/backend/src/core/AchievementService.ts b/packages/backend/src/core/AchievementService.ts
index 149974452..26dd356d3 100644
--- a/packages/backend/src/core/AchievementService.ts
+++ b/packages/backend/src/core/AchievementService.ts
@@ -41,6 +41,7 @@ const ACHIEVEMENT_TYPES = [
 	'passedSinceAccountCreated2',
 	'passedSinceAccountCreated3',
 	'loggedInOnBirthday',
+	'loggedInOnNewYearsDay',
 	'noteClipped1',
 	'noteFavorited1',
 	'profileFilled',
@@ -58,6 +59,7 @@ const ACHIEVEMENT_TYPES = [
 	'followers500',
 	'followers1000',
 	'collectAchievements30',
+	'viewAchievements3min',
 	'iLoveMisskey',
 	'client30min',
 	'noteDeletedWithin1min',
diff --git a/packages/frontend/src/init.ts b/packages/frontend/src/init.ts
index a2723d479..09fb7caf1 100644
--- a/packages/frontend/src/init.ts
+++ b/packages/frontend/src/init.ts
@@ -346,10 +346,11 @@ import { claimAchievement, claimedAchievements } from './scripts/achievements';
 			});
 		}
 
+		const now = new Date();
+		const m = now.getMonth() + 1;
+		const d = now.getDate();
+		
 		if ($i.birthday) {
-			const now = new Date();
-			const m = now.getMonth() + 1;
-			const d = now.getDate();
 			const bm = parseInt($i.birthday.split('-')[1]);
 			const bd = parseInt($i.birthday.split('-')[2]);
 			if (m === bm && d === bd) {
@@ -357,6 +358,10 @@ import { claimAchievement, claimedAchievements } from './scripts/achievements';
 			}
 		}
 
+		if (m === 1 && d === 1) {
+			claimAchievement('loggedInOnNewYearsDay');
+		}
+
 		if ($i.loggedInDays >= 3) claimAchievement('login3');
 		if ($i.loggedInDays >= 7) claimAchievement('login7');
 		if ($i.loggedInDays >= 15) claimAchievement('login15');
diff --git a/packages/frontend/src/pages/achievements.vue b/packages/frontend/src/pages/achievements.vue
index b6cd174b4..3cec8f630 100644
--- a/packages/frontend/src/pages/achievements.vue
+++ b/packages/frontend/src/pages/achievements.vue
@@ -8,11 +8,36 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
+import { onActivated, onDeactivated, onMounted, onUnmounted, ref } from 'vue';
 import MkAchievements from '@/components/MkAchievements.vue';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { $i } from '@/account';
+import { claimAchievement } from '@/scripts/achievements';
+
+let timer;
+
+function viewAchievements3min() {
+	claimAchievement('viewAchievements3min');
+}
+
+onMounted(() => {
+	if (timer == null) timer = window.setTimeout(viewAchievements3min, 1000 * 60 * 3);
+});
+
+onUnmounted(() => {
+	window.clearTimeout(timer);
+	timer = null;
+});
+
+onActivated(() => {
+	if (timer == null) timer = window.setTimeout(viewAchievements3min, 1000 * 60 * 3);
+});
+
+onDeactivated(() => {
+	window.clearTimeout(timer);
+	timer = null;
+});
 
 definePageMetadata({
 	title: i18n.ts.achievements,
diff --git a/packages/frontend/src/scripts/achievements.ts b/packages/frontend/src/scripts/achievements.ts
index 70ea0ffbd..8f484f892 100644
--- a/packages/frontend/src/scripts/achievements.ts
+++ b/packages/frontend/src/scripts/achievements.ts
@@ -37,6 +37,7 @@ export const ACHIEVEMENT_TYPES = [
 	'passedSinceAccountCreated2',
 	'passedSinceAccountCreated3',
 	'loggedInOnBirthday',
+	'loggedInOnNewYearsDay',
 	'noteClipped1',
 	'noteFavorited1',
 	'profileFilled',
@@ -54,6 +55,7 @@ export const ACHIEVEMENT_TYPES = [
 	'followers500',
 	'followers1000',
 	'collectAchievements30',
+	'viewAchievements3min',
 	'iLoveMisskey',
 	'client30min',
 	'noteDeletedWithin1min',
@@ -289,7 +291,7 @@ export const ACHIEVEMENT_BADGES = {
 		frame: 'bronze',
 	},
 	'followers100': {
-		img: '/fluent-emoji/1f396.png',
+		img: '/fluent-emoji/1f60e.png',
 		bg: 'linear-gradient(0deg, rgb(144 224 255), rgb(255 168 252))',
 		frame: 'silver',
 	},
@@ -313,6 +315,11 @@ export const ACHIEVEMENT_BADGES = {
 		bg: 'linear-gradient(0deg, rgb(255 77 77), rgb(247 155 214))',
 		frame: 'silver',
 	},
+	'viewAchievements3min': {
+		img: '/fluent-emoji/1f3c5.png',
+		bg: 'linear-gradient(0deg, rgb(144 224 255), rgb(255 168 252))',
+		frame: 'bronze',
+	},
 	'iLoveMisskey': {
 		img: '/fluent-emoji/2764.png',
 		bg: 'linear-gradient(0deg, rgb(255 77 77), rgb(247 155 214))',
@@ -400,7 +407,12 @@ export const ACHIEVEMENT_BADGES = {
 	},
 	'loggedInOnBirthday': {
 		img: '/fluent-emoji/1f382.png',
-		bg: 'linear-gradient(0deg, rgb(144 224 255), rgb(255 168 252))',
+		bg: 'linear-gradient(0deg, rgb(255 77 77), rgb(247 155 214))',
+		frame: 'silver',
+	},
+	'loggedInOnNewYearsDay': {
+		img: '/fluent-emoji/1f38d.png',
+		bg: 'linear-gradient(0deg, rgb(255 144 144), rgb(255 232 168))',
 		frame: 'silver',
 	},
 	'cookieClicked': {

From 8dc0e0abbbfb480994b47db86705d2faca76006e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 21 Jan 2023 16:08:42 +0900
Subject: [PATCH 039/177] Update ja-JP.yml

---
 locales/ja-JP.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index fb9a3435a..898ae01e7 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1158,6 +1158,7 @@ _achievements:
     _loggedInOnNewYearsDay:
       title: "あけましておめでとうございます"
       description: "元日にログインした"
+      flavor: "今年も弊インスタンスをよろしくお願いします"
     _cookieClicked:
       title: "クッキーをクリックするゲーム"
       description: "クッキーをクリックした"

From 3bf775c9a8c9aadf8e8c5e7e8a1cbae5e168f2d9 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 21 Jan 2023 16:57:23 +0900
Subject: [PATCH 040/177] =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?=
 =?UTF-8?q?=E3=81=AE=E5=AE=9F=E7=B8=BE=E4=B8=80=E8=A6=A7=E3=82=92=E8=A6=8B?=
 =?UTF-8?q?=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/achievements.vue  | 14 +++--
 .../frontend/src/pages/user/achievements.vue  | 52 +++++++++++++++++++
 packages/frontend/src/pages/user/index.vue    |  8 ++-
 3 files changed, 68 insertions(+), 6 deletions(-)
 create mode 100644 packages/frontend/src/pages/user/achievements.vue

diff --git a/packages/frontend/src/pages/achievements.vue b/packages/frontend/src/pages/achievements.vue
index 3cec8f630..14b852069 100644
--- a/packages/frontend/src/pages/achievements.vue
+++ b/packages/frontend/src/pages/achievements.vue
@@ -15,7 +15,7 @@ import { definePageMetadata } from '@/scripts/page-metadata';
 import { $i } from '@/account';
 import { claimAchievement } from '@/scripts/achievements';
 
-let timer;
+let timer: number | null;
 
 function viewAchievements3min() {
 	claimAchievement('viewAchievements3min');
@@ -26,8 +26,10 @@ onMounted(() => {
 });
 
 onUnmounted(() => {
-	window.clearTimeout(timer);
-	timer = null;
+	if (timer != null) {
+		window.clearTimeout(timer);
+		timer = null;
+	}
 });
 
 onActivated(() => {
@@ -35,8 +37,10 @@ onActivated(() => {
 });
 
 onDeactivated(() => {
-	window.clearTimeout(timer);
-	timer = null;
+	if (timer != null) {
+		window.clearTimeout(timer);
+		timer = null;
+	}
 });
 
 definePageMetadata({
diff --git a/packages/frontend/src/pages/user/achievements.vue b/packages/frontend/src/pages/user/achievements.vue
new file mode 100644
index 000000000..eaea26db4
--- /dev/null
+++ b/packages/frontend/src/pages/user/achievements.vue
@@ -0,0 +1,52 @@
+<template>
+<MkSpacer :content-max="1200">
+	<MkAchievements :user="user" :with-locked="false"/>
+</MkSpacer>
+</template>
+
+<script lang="ts" setup>
+import { onActivated, onDeactivated, onMounted, onUnmounted, ref } from 'vue';
+import * as misskey from 'misskey-js';
+import MkAchievements from '@/components/MkAchievements.vue';
+import { i18n } from '@/i18n';
+import { claimAchievement } from '@/scripts/achievements';
+import { $i } from '@/account';
+
+const props = defineProps<{
+	user: misskey.entities.User;
+}>();
+
+let timer: number | null;
+
+function viewAchievements3min() {
+	if ($i && (props.user.id === $i.id)) {
+		claimAchievement('viewAchievements3min');
+	}
+}
+
+onMounted(() => {
+	if (timer == null) timer = window.setTimeout(viewAchievements3min, 1000 * 60 * 3);
+});
+
+onUnmounted(() => {
+	if (timer != null) {
+		window.clearTimeout(timer);
+		timer = null;
+	}
+});
+
+onActivated(() => {
+	if (timer == null) timer = window.setTimeout(viewAchievements3min, 1000 * 60 * 3);
+});
+
+onDeactivated(() => {
+	if (timer != null) {
+		window.clearTimeout(timer);
+		timer = null;
+	}
+});
+</script>
+
+<style lang="scss" module>
+
+</style>
diff --git a/packages/frontend/src/pages/user/index.vue b/packages/frontend/src/pages/user/index.vue
index 7abae1ea3..d63aa3a3a 100644
--- a/packages/frontend/src/pages/user/index.vue
+++ b/packages/frontend/src/pages/user/index.vue
@@ -6,6 +6,7 @@
 			<div v-if="user">
 				<XHome v-if="tab === 'home'" :user="user"/>
 				<XActivity v-else-if="tab === 'activity'" :user="user"/>
+				<XAchievements v-else-if="tab === 'achievements'" :user="user"/>
 				<XReactions v-else-if="tab === 'reactions'" :user="user"/>
 				<XClips v-else-if="tab === 'clips'" :user="user"/>
 				<XPages v-else-if="tab === 'pages'" :user="user"/>
@@ -34,6 +35,7 @@ import { $i } from '@/account';
 
 const XHome = defineAsyncComponent(() => import('./home.vue'));
 const XActivity = defineAsyncComponent(() => import('./activity.vue'));
+const XAchievements = defineAsyncComponent(() => import('./achievements.vue'));
 const XReactions = defineAsyncComponent(() => import('./reactions.vue'));
 const XClips = defineAsyncComponent(() => import('./clips.vue'));
 const XPages = defineAsyncComponent(() => import('./pages.vue'));
@@ -76,7 +78,11 @@ const headerTabs = $computed(() => user ? [{
 	key: 'activity',
 	title: i18n.ts.activity,
 	icon: 'ti ti-chart-line',
-}, ...($i && ($i.id === user.id)) || user.publicReactions ? [{
+}, ...(user.host == null ? [{
+	key: 'achievements',
+	title: i18n.ts.achievements,
+	icon: 'ti ti-military-award',
+}] : []), ...($i && ($i.id === user.id)) || user.publicReactions ? [{
 	key: 'reactions',
 	title: i18n.ts.reaction,
 	icon: 'ti ti-mood-happy',

From 4b75c68753deab3b445c8bea2d1b75f84357aac8 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 21 Jan 2023 16:59:58 +0900
Subject: [PATCH 041/177] =?UTF-8?q?fix(client):=20The=20=E2=80=A6=20button?=
 =?UTF-8?q?=20on=20notes=20does=20nothing=20when=20not=20logged=20in?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #9659
---
 CHANGELOG.md                                   | 1 +
 packages/frontend/src/scripts/get-note-menu.ts | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef8238ab2..26632b839 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ You should also include the user name that made the change.
 
 ### Bugfixes
 - playを削除する手段がなかったのを修正
+- The … button on notes does nothing when not logged in
 
 ## 13.0.0 (2023/01/16)
 
diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
index da7f2a5c2..b5d2251d2 100644
--- a/packages/frontend/src/scripts/get-note-menu.ts
+++ b/packages/frontend/src/scripts/get-note-menu.ts
@@ -187,7 +187,7 @@ export function getNoteMenu(props: {
 		});
 	}
 
-	function notedetails(): void {
+	function openDetail(): void {
 		os.pageWindow(`/notes/${appearNote.id}`);
 	}
 
@@ -225,7 +225,7 @@ export function getNoteMenu(props: {
 			), {
 				icon: 'ti ti-info-circle',
 				text: i18n.ts.details,
-				action: notedetails,
+				action: openDetail,
 			}, {
 				icon: 'ti ti-users',
 				text: i18n.ts.reactions,

From 8631740ca44b0e03d67ac2dd3c21ecf9ca9dcaa4 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 21 Jan 2023 17:01:02 +0900
Subject: [PATCH 042/177] =?UTF-8?q?fix(server):=20twitter=E3=81=A8?=
 =?UTF-8?q?=E9=80=A3=E6=90=BA=E3=81=99=E3=82=8B=E3=81=A8=E3=81=8D=E3=81=AB?=
 =?UTF-8?q?=20autwh=20is=20not=20a=20function=20=E3=81=AB=E3=81=AA?=
 =?UTF-8?q?=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #9658
---
 CHANGELOG.md                                                    | 1 +
 .../backend/src/server/api/integration/TwitterServerService.ts  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26632b839..85246595c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ You should also include the user name that made the change.
 ### Bugfixes
 - playを削除する手段がなかったのを修正
 - The … button on notes does nothing when not logged in
+- twitterと連携するときに autwh is not a function になるのを修正
 
 ## 13.0.0 (2023/01/16)
 
diff --git a/packages/backend/src/server/api/integration/TwitterServerService.ts b/packages/backend/src/server/api/integration/TwitterServerService.ts
index 9cfadbfa1..f31a788d3 100644
--- a/packages/backend/src/server/api/integration/TwitterServerService.ts
+++ b/packages/backend/src/server/api/integration/TwitterServerService.ts
@@ -2,7 +2,7 @@ import { Inject, Injectable } from '@nestjs/common';
 import Redis from 'ioredis';
 import { v4 as uuid } from 'uuid';
 import { IsNull } from 'typeorm';
-import autwh from 'autwh';
+import * as autwh from 'autwh';
 import type { Config } from '@/config.js';
 import type { UserProfilesRepository, UsersRepository } from '@/models/index.js';
 import { DI } from '@/di-symbols.js';

From 80bfa028311952fff02ddd0e5896347156f93132 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 21 Jan 2023 17:01:43 +0900
Subject: [PATCH 043/177] New Crowdin updates (#9666)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Romanian)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Arabic)

* New translations ja-JP.yml (Catalan)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Greek)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Dutch)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (Portuguese)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Slovak)

* New translations ja-JP.yml (Swedish)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Vietnamese)

* New translations ja-JP.yml (Indonesian)

* New translations ja-JP.yml (Bengali)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Korean)
---
 locales/ar-SA.yml |   1 +
 locales/bn-BD.yml |   1 +
 locales/ca-ES.yml |   1 +
 locales/cs-CZ.yml |   1 +
 locales/de-DE.yml |   1 +
 locales/el-GR.yml |   1 +
 locales/en-US.yml |   1 +
 locales/es-ES.yml |   1 +
 locales/fr-FR.yml |   1 +
 locales/id-ID.yml |   1 +
 locales/it-IT.yml |   1 +
 locales/ja-KS.yml |   7 +-
 locales/ko-KR.yml | 217 ++++++++++++++++++++++++++++++++++++++++++++++
 locales/nl-NL.yml |   1 +
 locales/pl-PL.yml |   1 +
 locales/pt-PT.yml |   1 +
 locales/ro-RO.yml |   1 +
 locales/ru-RU.yml |   1 +
 locales/sk-SK.yml |   1 +
 locales/sv-SE.yml |   1 +
 locales/th-TH.yml |  30 +++++++
 locales/uk-UA.yml |   1 +
 locales/vi-VN.yml |   1 +
 locales/zh-CN.yml |   1 +
 locales/zh-TW.yml |  57 ++++++++++++
 25 files changed, 329 insertions(+), 3 deletions(-)

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index 7f465c61b..1ff72668e 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -108,6 +108,7 @@ clickToShow: "اضغط للعرض"
 sensitive: "محتوى حساس"
 add: "إضافة"
 reaction: "التفاعلات"
+reactions: "التفاعلات"
 reactionSetting: "التفاعلات المراد عرضها في منتقي التفاعلات."
 reactionSettingDescription2: "اسحب لترتيب ، انقر للحذف ، استخدم \"+\" للإضافة."
 rememberNoteVisibility: "تذكر إعدادت مدى رؤية الملاحظات"
diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml
index 28a01e657..c6e94896e 100644
--- a/locales/bn-BD.yml
+++ b/locales/bn-BD.yml
@@ -107,6 +107,7 @@ clickToShow: "দেখার জন্য ক্লিক করুন"
 sensitive: "সংবেদনশীল বিষয়বস্তু"
 add: "যুক্ত করুন"
 reaction: "প্রতিক্রিয়া"
+reactions: "প্রতিক্রিয়া"
 reactionSetting: "রিঅ্যাকশন পিকারে যেসকল প্রতিক্রিয়া দেখানো হবে"
 reactionSettingDescription2: "পুনরায় সাজাতে টেনে আনুন, মুছতে ক্লিক করুন, যোগ করতে + টিপুন।"
 rememberNoteVisibility: "নোটের দৃশ্যমান্যতার সেটিংস মনে রাখুন"
diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index be97b7f60..8bc5bf036 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -108,6 +108,7 @@ clickToShow: "Fes clic per mostrar"
 sensitive: "NSFW"
 add: "Afegir"
 reaction: "Reaccions"
+reactions: "Reaccions"
 reactionSetting: "Reaccions a mostrar al selector de reaccions"
 reactionSettingDescription2: "Arrossega per reordenar, fes clic per suprimir, prem \"+\" per afegir."
 rememberNoteVisibility: "Recorda la configuració de visibilitat de les notes"
diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index 4d7c0168f..eb9ae6f87 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -105,6 +105,7 @@ clickToShow: "Klikněte pro zobrazení"
 sensitive: "NSFW"
 add: "Přidat"
 reaction: "Reakce"
+reactions: "Reakce"
 reactionSettingDescription2: "Přetažením změníte pořadí, kliknutím smažete, zmáčkněte \"+\" k přidání"
 rememberNoteVisibility: "Zapamatovat nastavení zobrazení poznámky"
 attachCancel: "Odstranit přílohu"
diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 71ed02cd4..f6095e4db 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -110,6 +110,7 @@ clickToShow: "Zum Anzeigen anklicken"
 sensitive: "NSFW"
 add: "Hinzufügen"
 reaction: "Reaktionen"
+reactions: "Reaktionen"
 reactionSetting: "In der Reaktionsauswahl anzuzeigende Reaktionen"
 reactionSettingDescription2: "Ziehe um Anzuordnen, klicke um zu löschen, drücke „+“ um hinzuzufügen"
 rememberNoteVisibility: "Notizsichtbarkeit merken"
diff --git a/locales/el-GR.yml b/locales/el-GR.yml
index 974e66c03..c711683ff 100644
--- a/locales/el-GR.yml
+++ b/locales/el-GR.yml
@@ -103,6 +103,7 @@ you: "Εσύ"
 clickToShow: "Κάντε κλικ για εμφάνιση"
 add: "Προσθέστε"
 reaction: "Αντιδράσεις"
+reactions: "Αντιδράσεις"
 reactionSetting: "Αντιδράσεις για εμφάνιση στην επιλογή αντίδρασης"
 reactionSettingDescription2: "Σύρετε για να αλλάξετε τη σειρά, κάντε κλικ για να διαγράψετε, πατήστε \"+\" για να προσθέσετε."
 rememberNoteVisibility: "Θυμήσου τις ρυθμίσεις ορατότητας σημειώματος"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 4cecca84f..964c79caa 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -110,6 +110,7 @@ clickToShow: "Click to show"
 sensitive: "NSFW"
 add: "Add"
 reaction: "Reactions"
+reactions: "Reactions"
 reactionSetting: "Reactions to show in the reaction picker"
 reactionSettingDescription2: "Drag to reorder, click to delete, press \"+\" to add."
 rememberNoteVisibility: "Remember note visibility settings"
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 8be0edc29..47799a091 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -110,6 +110,7 @@ clickToShow: "Click para ver"
 sensitive: "Marcado como sensible"
 add: "Agregar"
 reaction: "Reacción"
+reactions: "Reacción"
 reactionSetting: "Reacciones para mostrar en el menú de reacciones"
 reactionSettingDescription2: "Arrastre para reordenar, click para borrar, apriete la tecla + para añadir."
 rememberNoteVisibility: "Recordar visibilidad"
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index eacff8c43..462b561e4 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -110,6 +110,7 @@ clickToShow: "Cliquer pour afficher"
 sensitive: "Contenu sensible"
 add: "Ajouter"
 reaction: "Réactions"
+reactions: "Réactions"
 reactionSetting: "Réactions à afficher dans le sélecteur de réactions"
 reactionSettingDescription2: "Déplacer pour réorganiser, cliquer pour effacer, utiliser « + » pour ajouter."
 rememberNoteVisibility: "Activer l'option \" se souvenir de la visibilité des notes \" vous permet de réutiliser automatiquement la visibilité utilisée lors de la publication de votre note précédente."
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index 7f7d582ee..87e37518f 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -109,6 +109,7 @@ clickToShow: "Klik untuk melihat"
 sensitive: "Konten sensitif"
 add: "Tambahkan"
 reaction: "Reaksi"
+reactions: "Reaksi"
 reactionSetting: "Reaksi untuk dimunculkan di bilah reaksi"
 reactionSettingDescription2: "Geser untuk memindah urutkan, klik untuk menghapus, tekan \"+\" untuk menambahkan"
 rememberNoteVisibility: "Ingat pengaturan visibilitas catatan"
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index 3879932e2..e215b9f79 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -110,6 +110,7 @@ clickToShow: "Clicca per visualizzare"
 sensitive: "Contenuto sensibile"
 add: "Aggiungi"
 reaction: "Reazioni"
+reactions: "Reazioni"
 reactionSetting: "Reazioni visualizzate sul pannello"
 reactionSettingDescription2: "Trascina per riorganizzare, clicca per cancellare, usa il pulsante \"+\" per aggiungere."
 rememberNoteVisibility: "Ricordare le impostazioni di visibilità delle note"
diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
index e95b068b0..40d28b196 100644
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -8,9 +8,9 @@ search: "探す"
 notifications: "通知"
 username: "ユーザー名"
 password: "パスワード"
-forgotPassword: "パスワード忘れてん"
+forgotPassword: "パスワード忘れてもうた"
 fetchingAsApObject: "今ちと連合に照会しとるで"
-ok: "OKや"
+ok: "ええで"
 gotIt: "ほい"
 cancel: "やめとく"
 noThankYou: "やめとく"
@@ -110,6 +110,7 @@ clickToShow: "押したら見えるで"
 sensitive: "ちょっとアカンやつやで"
 add: "増やす"
 reaction: "リアクション"
+reactions: "リアクション"
 reactionSetting: "Reaction that will be displayed in Picker. "
 reactionSettingDescription2: "ドラッグで並び替え、クリックで削除、＋を押して追加やで。"
 rememberNoteVisibility: "公開範囲覚えといて"
@@ -607,7 +608,7 @@ wordMute: "ワードミュート"
 regexpError: "正規表現エラー"
 regexpErrorDescription: "{tab}ワードミュートの{line}行目の正規表現にエラーが出てきたで:"
 instanceMute: "インスタンスミュート"
-userSaysSomething: "{name}が何か言ったようやで"
+userSaysSomething: "{name}が何か言うとるわ"
 makeActive: "使うで"
 display: "表示"
 copy: "コピー"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 4605e8296..3e6ab5a2f 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -110,6 +110,7 @@ clickToShow: "클릭하여 보기"
 sensitive: "열람주의"
 add: "추가"
 reaction: "리액션"
+reactions: "리액션"
 reactionSetting: "선택기에 표시할 리액션"
 reactionSettingDescription2: "끌어서 순서 변경, 클릭해서 삭제, ＋를 눌러서 추가할 수 있습니다."
 rememberNoteVisibility: "공개 범위를 기억하기"
@@ -937,6 +938,221 @@ cannotPerformTemporary: "일시적으로 사용할 수 없음"
 cannotPerformTemporaryDescription: "조작 횟수 제한을 초과하여 일시적으로 사용이 불가합니다. 잠시 후 다시 시도해 주세요."
 preset: "프리셋"
 selectFromPresets: "프리셋에서 선택"
+achievements: "도전과제"
+_achievements:
+  earnedAt: "달성 일시"
+  _types:
+    _notes1:
+      title: "미스키 설정하고 있었는데요"
+      description: "첫 노트를 포스트했습니다"
+      flavor: "Misskey에 오신 것을 환영합니다!"
+    _notes10:
+      title: "노트 조금"
+      description: "10개의 노트를 작성했습니다"
+    _notes100:
+      title: "노트 많이"
+      description: "100개의 노트를 작성했습니다"
+    _notes500:
+      title: "노트로 뒤덮여버렸어"
+      description: "500개의 노트를 작성했습니다"
+    _notes1000:
+      title: "노트만 산더미"
+      description: "1,000개의 노트를 작성했습니다"
+    _notes5000:
+      title: "노트가 어디서 솟아?"
+      description: "5,000개의 노트를 작성했습니다"
+    _notes10000:
+      title: "슈퍼-노트"
+      description: "10,000개의 노트를 작성했습니다"
+    _notes20000:
+      title: "노트 더 없어?"
+      description: "20,000개의 노트를 작성했습니다"
+    _notes30000:
+      title: "노트노트노트"
+      description: "30,000개의 노트를 작성했습니다"
+    _notes40000:
+      title: "노트 공장"
+      description: "40,000개의 노트를 작성했습니다"
+    _notes50000:
+      title: "노트 행성"
+      description: "50,000개의 노트를 작성했습니다"
+    _notes60000:
+      title: "노트 퀘이사"
+      description: "60,000개의 노트를 작성했습니다"
+    _notes70000:
+      title: "노트 블랙홀"
+      description: "70,000개의 노트를 작성했습니다"
+    _notes80000:
+      title: "노트 은하"
+      description: "80,000개의 노트를 작성했습니다"
+    _notes90000:
+      title: "노트 우주"
+      description: "90,000개의 노트를 작성했습니다"
+    _notes100000:
+      title: "네 모든 노트는 내 거야"
+      description: "100,000개의 노트를 작성했습니다"
+      flavor: "이만큼 쓸 일도 없겠지만... 다른 할 일이 있진 않으신가요?"
+    _login3:
+      title: "비기너 I"
+      description: "총 3일간 로그인했습니다"
+      flavor: "오늘부터 여러분도 미스키스트에요!"
+    _login7:
+      title: "비기너 II"
+      description: "총 7일간 로그인했습니다"
+      flavor: "슬슬 익숙해지셨나요?"
+    _login15:
+      title: "비기너 III"
+      description: "총 15일간 로그인했습니다"
+    _login30:
+      title: "미스키스트 I"
+      description: "총 30일간 로그인했습니다"
+    _login60:
+      title: "미스키스트 II"
+      description: "총 60일간 로그인했습니다"
+    _login100:
+      title: "미스키스트 III"
+      description: "총 100일간 로그인했습니다"
+      flavor: "그 유저, 미스키스트를 위하여"
+    _login200:
+      title: "단골 I"
+      description: "총 200일간 로그인했습니다"
+    _login300:
+      title: "단골 II"
+      description: "총 300일간 로그인했습니다"
+    _login400:
+      title: "단골 III"
+      description: "총 400일간 로그인했습니다"
+    _login500:
+      title: "베테랑 I"
+      description: "총 500일간 로그인했습니다"
+      flavor: "여러분, 저 이 노트들 좋아해요"
+    _login600:
+      title: "베테랑 II"
+      description: "총 600일간 로그인했습니다"
+    _login700:
+      title: "베테랑 III"
+      description: "총 700일간 로그인했습니다"
+    _login800:
+      title: "노트 마스터 I"
+      description: "총 800일간 로그인했습니다"
+    _login900:
+      title: "노트 마스터 II"
+      description: "총 900일간 로그인했습니다"
+    _login1000:
+      title: "노트 마스터 III"
+      description: "총 1,000일간 로그인했습니다"
+      flavor: "미스키를 사용해 주셔서 감사합니다!"
+    _noteClipped1:
+      title: "클립할 수밖에 없었어"
+      description: "처음으로 노트를 클립했습니다"
+    _noteFavorited1:
+      title: "별을 바라보는 자"
+      description: "처음으로 노트를 즐겨찾기했습니다"
+    _profileFilled:
+      title: "준비 완료"
+      description: "프로필 설정을 완료했습니다"
+    _markedAsCat:
+      title: "나는 고양이다냥!"
+      description: "계정을 고양이로 설정했습니다냥"
+      flavor: "냐냐냐냐냐냐아아아아앙!"
+    _following1:
+      title: "첫 팔로우"
+      description: "사용자를 처음으로 팔로우했습니다"
+    _following10:
+      title: "팔로우, 팔로우"
+      description: "10명의 사용자를 팔로우했습니다"
+    _following50:
+      title: "친구 잔뜩"
+      description: "50명의 사용자를 팔로우했습니다"
+    _following100:
+      title: "주소록 한 권으론 부족해"
+      description: "100명의 사용자를 팔로우했습니다"
+    _following300:
+      title: "친구가 넘쳐나"
+      description: "300명의 사용자를 팔로우했습니다"
+    _followers1:
+      title: "첫 팔로워"
+      description: "사용자가 처음으로 팔로잉했습니다"
+    _followers10:
+      title: "날 따라와!"
+      description: "10명의 사용자가 팔로우했습니다"
+    _followers50:
+      title: "이곳저곳"
+      description: "50명의 사용자가 팔로우했습니다"
+    _followers100:
+      title: "인기왕"
+      description: "100명의 사용자가 팔로우했습니다"
+    _followers300:
+      title: "줄 좀 서봐요"
+      description: "100명의 사용자가 팔로우했습니다"
+    _followers500:
+      title: "기지국"
+      description: "500명의 사용자가 팔로우했습니다"
+    _followers1000:
+      title: "유명인사"
+      description: "1,000명의 사용자가 팔로우했습니다"
+    _collectAchievements30:
+      title: "도전과제 콜렉터"
+      description: "30개의 도전과제를 획득했습니다"
+    _iLoveMisskey:
+      title: "I Love Misskey"
+      description: "\"I ❤ #Misskey\"를 포스트했습니다"
+      flavor: "Misskey를 이용해주셔서 감사합니다! - 개발팀 일동"
+    _client30min:
+      title: "잠깐 쉬어"
+      description: "클라이언트를 시작하고 30분이 경과하였습니다"
+    _noteDeletedWithin1min:
+      title: "있었는데요 없었습니다"
+      description: "노트를 포스트한 후 1분 이내에 삭제했습니다"
+    _postedAtLateNight:
+      title: "올빼미"
+      description: "한밤중에 노트를 포스트했습니다"
+      flavor: "잠 좀 자세요. 걱정돼요."
+    _postedAt0min0sec:
+      title: "정각"
+      description: "1초도 어긋나지 않은 정각에 노트를 포스트했습니다"
+      flavor: "째깍 째깍 째깍 땡!"
+    _selfQuote:
+      title: "혼잣말"
+      description: "자기 노트를 인용했습니다"
+    _htl20npm:
+      title: "타임라인 폭주 중"
+      description: "1분 사이에 홈 타임라인에 노트가 20개 넘게 생성되었습니다"
+    _driveFolderCircularReference:
+      title: "순환 참조"
+      description: "드라이브 폴더를 자신을 가리키도록 만드려 시도했습니다"
+    _reactWithoutRead:
+      title: "읽고 답하긴 하시는 건가요?"
+      description: "100자가 넘는 포스트에 3초 안에 포스트했습니다"
+    _clickedClickHere:
+      title: "여길 눌러보세요"
+      description: "이 곳을 눌러봤습니다"
+    _justPlainLucky:
+      title: "그냥 운이 좋았어"
+      description: "매 10초마다 0.01%의 확률로 달성됩니다"
+    _setNameToSyuilo:
+      title: "신 콤플렉스"
+      description: "이름을 syuilo로 설정했습니다"
+    _passedSinceAccountCreated1:
+      title: "1년"
+      description: "계정을 생성하고 1년이 지났습니다"
+    _passedSinceAccountCreated2:
+      title: "2년"
+      description: "계정을 생성하고 2년이 지났습니다"
+    _passedSinceAccountCreated3:
+      title: "3년"
+      description: "계정을 생성하고 3년이 지났습니다"
+    _loggedInOnBirthday:
+      title: "생일 축하합니다!"
+      description: "설정한 생일에 로그인했습니다"
+    _cookieClicked:
+      title: "쿠키 클리커 게임"
+      description: "쿠키를 클릭했습니다"
+      flavor: "뭔가 문제가 있나요?"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "Brain Diver로의 링크를 첨부했습니다"
+      flavor: "Misskey-Misskey La-Tu-Ma"
 _role:
   new: "새 역할 생성"
   edit: "역할 수정"
@@ -1586,6 +1802,7 @@ _notification:
   pollEnded: "투표 결과가 발표되었습니다"
   unreadAntennaNote: "안테나 {name}"
   emptyPushNotificationMessage: "푸시 알림이 갱신되었습니다"
+  achievementEarned: "도전 과제를 달성했습니다"
   _types:
     all: "전부"
     follow: "팔로잉"
diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index 5735c6322..e99d49710 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -109,6 +109,7 @@ clickToShow: "Klik om te bekijken"
 sensitive: "NSFW"
 add: "Toevoegen"
 reaction: "Reacties"
+reactions: "Reacties"
 reactionSetting: "Reacties die in de reactie-selector worden getoond"
 reactionSettingDescription2: "Sleep om opnieuw te ordenen, Klik om te verwijderen, Druk op \"+\" om toe te voegen"
 rememberNoteVisibility: "Vergeet niet de notitie zichtbaarheidsinstellingen"
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index 1bdfcd967..d78185be8 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -110,6 +110,7 @@ clickToShow: "Kliknij, aby wyświetlić"
 sensitive: "NSFW"
 add: "Dodaj"
 reaction: "Reakcja"
+reactions: "Reakcja"
 reactionSetting: "Reakcje do pokazania w wyborniku reakcji"
 reactionSettingDescription2: "Przeciągnij aby zmienić kolejność, naciśnij aby usunąć, naciśnij „+” aby dodać"
 rememberNoteVisibility: "Zapamiętuj ustawienia widoczności wpisu"
diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml
index c8dc09723..8eac5fee6 100644
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@@ -107,6 +107,7 @@ clickToShow: "Clique para ver"
 sensitive: "Conteúdo sensível"
 add: "Adicionar"
 reaction: "Reações"
+reactions: "Reações"
 reactionSetting: "Quais reações a mostrar no selecionador de reações"
 reactionSettingDescription2: "Arraste para reordenar, clique para excluir, pressione + para adicionar."
 rememberNoteVisibility: "Lembrar das configurações de visibilidade de notas"
diff --git a/locales/ro-RO.yml b/locales/ro-RO.yml
index 7c01aa725..b1ec5426a 100644
--- a/locales/ro-RO.yml
+++ b/locales/ro-RO.yml
@@ -107,6 +107,7 @@ clickToShow: "Click pentru a afișa"
 sensitive: "NSFW"
 add: "Adaugă"
 reaction: "Reacție"
+reactions: "Reacție"
 reactionSetting: "Reacții care să apară in selectorul de reacții"
 reactionSettingDescription2: "Trage pentru a rearanja, apasă pe \"+\" pentru a adăuga."
 rememberNoteVisibility: "Amintește setarea de vizibilitate a notelor"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index 9d836f17b..d7aca1c9f 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -107,6 +107,7 @@ clickToShow: "Нажмите для просмотра"
 sensitive: "Содержимое не для всех"
 add: "Добавить"
 reaction: "Реакции"
+reactions: "Реакции"
 reactionSetting: "Реакции, отображаемые в палитре"
 reactionSettingDescription2: "Расставляйте перетаскиванием, удаляйте нажатием, добавляйте кнопкой «+»."
 rememberNoteVisibility: "Запоминать видимость заметок"
diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
index 60945593b..ee2ca11fa 100644
--- a/locales/sk-SK.yml
+++ b/locales/sk-SK.yml
@@ -110,6 +110,7 @@ clickToShow: "Kliknutím zobrazíte"
 sensitive: "NSFW"
 add: "Pridať"
 reaction: "Reakcie"
+reactions: "Reakcie"
 reactionSetting: "Reakcie zobrazené vo výbere reakcií"
 reactionSettingDescription2: "Ťahaním preusporiadate, kliknutím odstránite, Stlačením \"+\" pridáte"
 rememberNoteVisibility: "Zapamätať nastavenia viditeľnosti poznámky"
diff --git a/locales/sv-SE.yml b/locales/sv-SE.yml
index b2647c968..1abd0d194 100644
--- a/locales/sv-SE.yml
+++ b/locales/sv-SE.yml
@@ -110,6 +110,7 @@ clickToShow: "Klicka för att visa"
 sensitive: "Känsligt innehåll"
 add: "Lägg till"
 reaction: "Reaktioner"
+reactions: "Reaktioner"
 reactionSetting: "Reaktioner som ska visas i reaktionsväljaren"
 reactionSettingDescription2: "Dra för att omordna, klicka för att radera, tryck \"+\" för att lägga till."
 rememberNoteVisibility: "Komihåg notvisningsinställningar"
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index b77bc55b2..08737fb1b 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -110,6 +110,7 @@ clickToShow: "คลิกเพื่อแสดง"
 sensitive: "เนื้อหาที่ละเอียดอ่อน NSFW"
 add: "เพิ่ม"
 reaction: "รีแอคชั่น"
+reactions: "รีแอคชั่น"
 reactionSetting: "รีแอคชั่นไปยังแสดงผลในตัวเลือกการรีแอคชั่น"
 reactionSettingDescription2: "กดลากเพื่อจัดลำดับใหม่ กดคลิกเพื่อลบ กด \"+\" เพื่อเพิ่ม"
 rememberNoteVisibility: "จดจำการตั้งค่าการมองเห็นตัวโน้ต"
@@ -932,6 +933,23 @@ assign: "กำหนด"
 unassign: "ยังไม่มอบหมาย"
 color: "สี"
 manageCustomEmojis: "จัดการอีโมจิแบบกำหนดเอง"
+youCannotCreateAnymore: "คุณถึงขีดจํากัดการสร้างแล้วนะ"
+cannotPerformTemporary: "ไม่สามารถใช้การได้ชั่วคราว"
+cannotPerformTemporaryDescription: "การดําเนินการนี้ไม่สามารถดําเนินการได้ชั่วคราว เนื่องจากเกินขีดจํากัดการดําเนินการ กรุณารอสักครู่แล้วลองใหม่อีกครั้งนะค่ะ"
+preset: "พรีเซ็ต"
+selectFromPresets: "เลือกจากการพรีเซ็ต"
+achievements: "ความสำเร็จ"
+_achievements:
+  earnedAt: "ได้รับเมื่อ"
+  _types:
+    _followers100:
+      title: "บุคคลที่เป็นที่นิยม"
+    _followers500:
+      title: "เสาสัญญาณ"
+    _iLoveMisskey:
+      title: "ฉันรัก Misskey"
+    _driveFolderCircularReference:
+      title: "อ้างอิงวงจร"
 _role:
   new: "บทบาทใหม่"
   edit: "แก้ไขบทบาท"
@@ -948,6 +966,7 @@ _role:
   isPublic: "บทบาทสาธารณะ"
   descriptionOfIsPublic: "ทุกคนสามารถดูได้ว่าผู้ใช้งานนั้นได้รับมอบหมายบทบาทด้วยหรือไม่ \n\nบทบาทจะแสดงในโปรไฟล์ของผู้ใช้ด้วย"
   options: "ตัวเลือกบทบาท"
+  policies: "นโยบาย"
   baseRole: "บทบาทพื้นฐาน"
   useBaseValue: "ใช้บทบาทพื้นฐานเริ่มต้น"
   chooseRoleToAssign: "เลือกบทบาทที่ต้องการกำหนด"
@@ -965,7 +984,17 @@ _role:
     canInvite: "สร้างรหัสเชิญอินสแตนซ์"
     canManageCustomEmojis: "จัดการอีโมจิแบบกำหนดเอง"
     driveCapacity: "ความจุของไดรฟ์"
+    pinMax: "จํานวนสูงสุดของโน้ตที่ปักหมุดไว้"
     antennaMax: "จำนวนสูงสุดของเสาอากาศ"
+    wordMuteMax: "จำนวนอักขระสูงสุดที่อนุญาตในการปิดเสียงคำ"
+    webhookMax: "จำนวนเว็บฮุคสูงสุด"
+    clipMax: "จำนวนคลิปสูงสุด"
+    noteEachClipsMax: "จำนวนโน้ตสูงสุดภายในคลิป"
+    userListMax: "จำนวนรายชื่อผู้ใช้สูงสุด"
+    userEachUserListsMax: "จำนวนผู้ใช้สูงสุดภายในรายการผู้ใช้"
+    rateLimitFactor: "ขีดจำกัดอัตรา"
+    descriptionOfRateLimitFactor: "ขีดจํากัดอัตราที่ต่ำกว่ามีข้อจํากัดน้อยกว่าข้อจํากัดที่สูงกว่า"
+    canHideAds: "ซ่อนโฆษณา"
   _condition:
     isLocal: "ผู้ใช้ภายใน"
     isRemote: "ผู้ใช้ระยะไกล"
@@ -1570,6 +1599,7 @@ _notification:
   pollEnded: "โพลสำรวจความคิดเห็นผลลัพธ์มีพร้อมใช้งาน"
   unreadAntennaNote: "เสาอากาศ {name}"
   emptyPushNotificationMessage: "การแจ้งเตือนแบบพุชได้รับการอัพเดทแล้ว"
+  achievementEarned: "รับความสำเร็จ"
   _types:
     all: "ทั้งหมด"
     follow: "กำลังติดตาม"
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index 72397fb06..6ca8d7059 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -109,6 +109,7 @@ clickToShow: "Натисніть для перегляду"
 sensitive: "NSFW"
 add: "Додати"
 reaction: "Реакції"
+reactions: "Реакції"
 reactionSetting: "Налаштування реакцій"
 reactionSettingDescription2: "Перемістити щоб змінити порядок, Клацнути мишою щоб видалити, Натиснути \"+\" щоб додати."
 rememberNoteVisibility: "Пам’ятати параметри видимісті"
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index 92931de6f..b460b5e83 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -107,6 +107,7 @@ clickToShow: "Nhấn để xem"
 sensitive: "Nhạy cảm"
 add: "Thêm"
 reaction: "Biểu cảm"
+reactions: "Biểu cảm"
 reactionSetting: "Chọn những biểu cảm hiển thị"
 reactionSettingDescription2: "Kéo để sắp xếp, nhấn để xóa, nhấn \"+\" để thêm."
 rememberNoteVisibility: "Lưu kiểu tút mặc định"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index d026422ca..817fc6946 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -110,6 +110,7 @@ clickToShow: "点击以显示"
 sensitive: "敏感内容"
 add: "添加"
 reaction: "回应"
+reactions: "回应"
 reactionSetting: "在选择器中显示的回应"
 reactionSettingDescription2: "拖动重新排序，单击删除，点击 + 添加。"
 rememberNoteVisibility: "保存上次设置的可见性"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 2a2cdfbc7..025a4c3e5 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -110,6 +110,7 @@ clickToShow: "按一下以顯示"
 sensitive: "敏感內容"
 add: "新增"
 reaction: "情感"
+reactions: "情感"
 reactionSetting: "在選擇器中顯示反應"
 reactionSettingDescription2: "拖動以重新列序，點擊以刪除，按下 + 添加。"
 rememberNoteVisibility: "記住貼文可見性"
@@ -937,6 +938,62 @@ cannotPerformTemporary: "暫時無法進行"
 cannotPerformTemporaryDescription: "由於超過操作次數限制，暫時無法進行。請過一段時間之後再嘗試。"
 preset: "預設值"
 selectFromPresets: "從預設值中選擇"
+achievements: "成就"
+_achievements:
+  earnedAt: "獲得日期"
+  _types:
+    _notes1:
+      title: "just setting up my msky"
+      description: "發出了第一則貼文"
+      flavor: "祝您的Misskey生活愉快！"
+    _notes10:
+      title: "若干貼文"
+      description: "發表了10則貼文"
+    _notes100:
+      title: "許多的貼文"
+      description: "發表了100則貼文"
+    _notes500:
+      title: "滿滿的貼文"
+      description: "發表了500則貼文"
+    _notes1000:
+      title: "一堆貼文"
+      description: "發表了1000則貼文"
+    _notes5000:
+      title: "滔滔不絕的貼文"
+      description: "發表了5000則貼文"
+    _notes10000:
+      title: "超級貼文"
+      description: "發表了10000則貼文"
+    _notes20000:
+      title: "需要更多的貼文"
+      description: "發表了20000則貼文"
+    _notes30000:
+      title: "貼文貼文貼文"
+      description: "發表了30000則貼文"
+    _notes40000:
+      title: "貼文工廠"
+      description: "發表了40000則貼文"
+    _notes50000:
+      title: "貼文星球"
+      description: "發表了50000則貼文"
+    _notes60000:
+      title: "貼文類星體"
+      description: "發表了60000則貼文"
+    _notes70000:
+      title: "貼文黑洞"
+      description: "發表了70000則貼文"
+    _notes80000:
+      title: "貼文銀河"
+      description: "發表了80000則貼文"
+    _notes90000:
+      title: "貼文宇宙"
+      description: "發表了90000則貼文"
+    _notes100000:
+      description: "發表了100,000則貼文"
+      flavor: "有這麼多東西要寫嗎？"
+    _login3:
+      title: "初學者 I"
+      description: "總登入天數為3天"
 _role:
   new: "建立角色"
   edit: "編輯角色"

From 69bb377cb1ae2315846eddaa5475cd25122bafb3 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 21 Jan 2023 17:02:44 +0900
Subject: [PATCH 044/177] 13.1.0-beta.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index eafcab030..9ff6cf125 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.0.0",
+	"version": "13.1.0-beta.2",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From bd3d75df6bab819bc83fd2c2c52d4e10fa58f9fe Mon Sep 17 00:00:00 2001
From: CyberRex <hspwinx86@gmail.com>
Date: Sat, 21 Jan 2023 18:41:30 +0900
Subject: [PATCH 045/177] Update chokidar and use pnpm exec (#9640)

* Fix for dev mode

* Update packages/frontend/package.json

Co-authored-by: tamaina <tamaina@hotmail.co.jp>

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
---
 package.json   | 2 +-
 pnpm-lock.yaml | 4 ++--
 scripts/dev.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 9ff6cf125..3a8b8471b 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
 		"cleanall": "pnpm clean-all"
 	},
 	"resolutions": {
-		"chokidar": "^3.3.1",
+		"chokidar": "^3.5.3",
 		"lodash": "^4.17.21"
 	},
 	"dependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 993efd174..e0ffafd12 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,7 +1,7 @@
 lockfileVersion: 5.4
 
 overrides:
-  chokidar: ^3.3.1
+  chokidar: ^3.5.3
   lodash: ^4.17.21
 
 importers:
@@ -126,7 +126,7 @@ importers:
       cbor: 8.1.0
       chalk: 5.2.0
       chalk-template: 0.4.0
-      chokidar: ^3.3.1
+      chokidar: ^3.5.3
       cli-highlight: 2.1.11
       color-convert: 2.0.1
       content-disposition: 0.5.4
diff --git a/scripts/dev.js b/scripts/dev.js
index 943190f8b..b1970ebc5 100644
--- a/scripts/dev.js
+++ b/scripts/dev.js
@@ -14,7 +14,7 @@ const fs = require('fs');
 		stderr: process.stderr,
 	});
 
-	execa('pnpm', ['dlx', 'gulp', 'watch'], {
+	execa('pnpm', ['exec', 'gulp', 'watch'], {
 		cwd: __dirname + '/../',
 		stdout: process.stdout,
 		stderr: process.stderr,

From 4dc00ee72aba7d725d8e78fe9b4cccb046eeb999 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 21 Jan 2023 18:41:53 +0900
Subject: [PATCH 046/177] New translations ja-JP.yml (English) (#9673)

---
 locales/en-US.yml | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 964c79caa..b9f1603d2 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -938,6 +938,39 @@ cannotPerformTemporary: "Temporarily unavailable"
 cannotPerformTemporaryDescription: "This action cannot be performed temporarily due to exceeding the execution limit. Please wait for a while and then try again."
 preset: "Preset"
 selectFromPresets: "Choose from presets"
+_achievements:
+  _types:
+    _reactWithoutRead:
+      title: "Did you really read that?"
+      description: "React on a note that's over 100 characters long within 3 seconds of it being posted"
+    _clickedClickHere:
+      title: "Click here"
+      description: "You've clicked here"
+    _justPlainLucky:
+      title: "Just Plain Lucky"
+      description: "Has a chance to be obtained with a probability of 0.01% every 10 seconds"
+    _setNameToSyuilo:
+      title: "God Complex"
+      description: "Set your name to \"syuilo\""
+    _passedSinceAccountCreated1:
+      title: "One Year Anniversary"
+      description: "One year has passed since your account was created"
+    _passedSinceAccountCreated2:
+      title: "Two Year Anniversary"
+      description: "Two years have passed since your account was created"
+    _passedSinceAccountCreated3:
+      title: "Three Year Anniversary"
+      description: "Three years have passed since your account was created"
+    _loggedInOnBirthday:
+      title: "Happy Birthday"
+      description: "Logged in on your birthday"
+    _cookieClicked:
+      title: "A game in which you click cookies"
+      description: "Clicked the cookie"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "Post the link to Brain Diver"
+      flavor: "Misskey-Misskey La-Tu-Ma"
 _role:
   new: "New role"
   edit: "Edit role"
@@ -1587,6 +1620,7 @@ _notification:
   pollEnded: "Poll results have become available"
   unreadAntennaNote: "Antenna {name}"
   emptyPushNotificationMessage: "Push notifications have been updated"
+  achievementEarned: "Achievement unlocked"
   _types:
     all: "All"
     follow: "New followers"

From dc4fd3e505ab0ebd199ee38ffec930e0aac7c7bc Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 21 Jan 2023 18:45:41 +0900
Subject: [PATCH 047/177] 13.1.0

---
 CHANGELOG.md | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85246595c..ca8379bcf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@
 You should also include the user name that made the change.
 -->
 
-## 13.x.x (unreleased)
+## 13.1.0 (2023/01/21)
 
 ### Improvements
 - 実績機能
diff --git a/package.json b/package.json
index 3a8b8471b..25a74d404 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.1.0-beta.2",
+	"version": "13.1.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From bd469420fa6554db0caff17406f356761dbe1f00 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 21 Jan 2023 20:24:15 +0900
Subject: [PATCH 048/177] =?UTF-8?q?fix(client):=20=E3=82=AF=E3=83=A9?=
 =?UTF-8?q?=E3=82=A4=E3=82=A2=E3=83=B3=E3=83=88=E8=B5=B7=E5=8B=95=E6=99=82?=
 =?UTF-8?q?=E3=81=AB=E3=82=82=E8=A8=80=E8=AA=9E=E3=83=95=E3=82=A1=E3=82=A4?=
 =?UTF-8?q?=E3=83=AB=E3=81=AE=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=82=92?=
 =?UTF-8?q?=E8=A1=8C=E3=81=86=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #9005
---
 packages/frontend/src/init.ts          | 13 +++++++++++++
 packages/frontend/src/local-storage.ts |  1 +
 2 files changed, 14 insertions(+)

diff --git a/packages/frontend/src/init.ts b/packages/frontend/src/init.ts
index 09fb7caf1..d90d3b553 100644
--- a/packages/frontend/src/init.ts
+++ b/packages/frontend/src/init.ts
@@ -80,6 +80,19 @@ import { claimAchievement, claimedAchievements } from './scripts/achievements';
 		});
 	}
 
+	//#region Detect language & fetch translations
+	const localeVersion = miLocalStorage.getItem('localeVersion');
+	const localeOutdated = (localeVersion == null || localeVersion !== version);
+	if (localeOutdated) {
+		const res = await window.fetch(`/assets/locales/${lang}.${version}.json`);
+		if (res.status === 200) {
+			miLocalStorage.setItem('locale', await res.text());
+			miLocalStorage.setItem('localeVersion', version);
+			location.reload();
+		}
+	}
+	//#endregion
+
 	// タッチデバイスでCSSの:hoverを機能させる
 	document.addEventListener('touchend', () => {}, { passive: true });
 
diff --git a/packages/frontend/src/local-storage.ts b/packages/frontend/src/local-storage.ts
index bb8192e98..68dc9ebe4 100644
--- a/packages/frontend/src/local-storage.ts
+++ b/packages/frontend/src/local-storage.ts
@@ -19,6 +19,7 @@ type Keys =
 	'fontSize' |
 	'ui' |
 	'locale' |
+	'localeVersion' |
 	'theme' |
 	'customCss' |
 	'message_drafts' |

From 3e112da486e59d48c415a5bd3a251148ed7312b3 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 21 Jan 2023 20:40:09 +0900
Subject: [PATCH 049/177] =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=82=AB=E3=83=AB?=
 =?UTF-8?q?=E3=81=AE=E3=82=AB=E3=82=B9=E3=82=BF=E3=83=A0=E7=B5=B5=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6=E3=81=AF=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E3=82=AA=E3=83=AA=E3=82=B8=E3=83=8A=E3=83=ABURL?=
 =?UTF-8?q?=E3=81=AB=E3=83=AA=E3=82=AF=E3=82=A8=E3=82=B9=E3=83=88=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/entities/EmojiEntityService.ts | 6 ++++--
 packages/backend/src/models/schema/emoji.ts              | 4 ++++
 packages/backend/src/server/api/endpoints/emojis.ts      | 1 +
 packages/frontend/src/components/global/MkEmoji.vue      | 6 +++++-
 packages/frontend/src/custom-emojis.ts                   | 9 +++++++--
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/core/entities/EmojiEntityService.ts b/packages/backend/src/core/entities/EmojiEntityService.ts
index 2a4e09519..cee85a568 100644
--- a/packages/backend/src/core/entities/EmojiEntityService.ts
+++ b/packages/backend/src/core/entities/EmojiEntityService.ts
@@ -22,7 +22,7 @@ export class EmojiEntityService {
 	@bindThis
 	public async pack(
 		src: Emoji['id'] | Emoji,
-		opts: { omitHost?: boolean; omitId?: boolean; } = {},
+		opts: { omitHost?: boolean; omitId?: boolean; withUrl?: boolean; } = {},
 	): Promise<Packed<'Emoji'>> {
 		const emoji = typeof src === 'object' ? src : await this.emojisRepository.findOneByOrFail({ id: src });
 
@@ -32,13 +32,15 @@ export class EmojiEntityService {
 			name: emoji.name,
 			category: emoji.category,
 			host: opts.omitHost ? undefined : emoji.host,
+			// ?? emoji.originalUrl してるのは後方互換性のため
+			url: opts.withUrl ? (emoji.publicUrl ?? emoji.originalUrl) : undefined,
 		};
 	}
 
 	@bindThis
 	public packMany(
 		emojis: any[],
-		opts: { omitHost?: boolean; omitId?: boolean; } = {},
+		opts: { omitHost?: boolean; omitId?: boolean; withUrl?: boolean; } = {},
 	) {
 		return Promise.all(emojis.map(x => this.pack(x, opts)));
 	}
diff --git a/packages/backend/src/models/schema/emoji.ts b/packages/backend/src/models/schema/emoji.ts
index d897a0fc0..143f25373 100644
--- a/packages/backend/src/models/schema/emoji.ts
+++ b/packages/backend/src/models/schema/emoji.ts
@@ -29,5 +29,9 @@ export const packedEmojiSchema = {
 			optional: true, nullable: true,
 			description: 'The local host is represented with `null`.',
 		},
+		url: {
+			type: 'string',
+			optional: true, nullable: false,
+		},
 	},
 } as const;
diff --git a/packages/backend/src/server/api/endpoints/emojis.ts b/packages/backend/src/server/api/endpoints/emojis.ts
index 97dcfde59..db1eddc80 100644
--- a/packages/backend/src/server/api/endpoints/emojis.ts
+++ b/packages/backend/src/server/api/endpoints/emojis.ts
@@ -83,6 +83,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				emojis: await this.emojiEntityService.packMany(emojis, {
 					omitId: true,
 					omitHost: true,
+					withUrl: true,
 				}),
 			};
 		});
diff --git a/packages/frontend/src/components/global/MkEmoji.vue b/packages/frontend/src/components/global/MkEmoji.vue
index b7dd0296c..aaad81c65 100644
--- a/packages/frontend/src/components/global/MkEmoji.vue
+++ b/packages/frontend/src/components/global/MkEmoji.vue
@@ -12,6 +12,7 @@ import { getStaticImageUrl } from '@/scripts/media-proxy';
 import { char2twemojiFilePath, char2fluentEmojiFilePath } from '@/scripts/emoji-base';
 import { defaultStore } from '@/store';
 import { getEmojiName } from '@/scripts/emojilist';
+import { customEmojis } from '@/custom-emojis';
 
 const props = defineProps<{
 	emoji: string;
@@ -30,6 +31,9 @@ const useOsNativeEmojis = computed(() => defaultStore.state.emojiStyle === 'nati
 const url = computed(() => {
 	if (char.value) {
 		return char2path(char.value);
+	} else if (props.host == null) {
+		const found = customEmojis.find(x => x.name === customEmojiName);
+		return found ? found.url : null;
 	} else {
 		const rawUrl = props.host ? `/emoji/${customEmojiName}@${props.host}.webp` : `/emoji/${customEmojiName}.webp`;
 		return defaultStore.state.disableShowingAnimatedImages
@@ -38,7 +42,7 @@ const url = computed(() => {
 	}
 });
 const alt = computed(() => isCustom.value ? `:${customEmojiName}:` : char.value);
-let errored = $ref(false);
+let errored = $ref(isCustom.value && url.value == null);
 
 // Searching from an array with 2000 items for every emoji felt like too energy-consuming, so I decided to do it lazily on pointerenter
 function computeTitle(event: PointerEvent): void {
diff --git a/packages/frontend/src/custom-emojis.ts b/packages/frontend/src/custom-emojis.ts
index 19469999b..637ee9c06 100644
--- a/packages/frontend/src/custom-emojis.ts
+++ b/packages/frontend/src/custom-emojis.ts
@@ -2,14 +2,19 @@ import { api } from './os';
 import { miLocalStorage } from './local-storage';
 
 const storageCache = miLocalStorage.getItem('emojis');
-export let customEmojis = storageCache ? JSON.parse(storageCache) : [];
+export let customEmojis: {
+	name: string;
+	aliases: string[];
+	category: string;
+	url: string;
+}[] = storageCache ? JSON.parse(storageCache) : [];
 
 fetchCustomEmojis();
 
 export async function fetchCustomEmojis() {
 	const now = Date.now();
 	const lastFetchedAt = miLocalStorage.getItem('lastEmojisFetchedAt');
-	if (lastFetchedAt && (now - parseInt(lastFetchedAt)) < 1000 * 60 * 60) return;
+	if (lastFetchedAt && (now - parseInt(lastFetchedAt)) < 1000 * 60 * 60 * 24) return;
 
 	const res = await api('emojis', {});
 

From 307a882649691f2d816e8178a6df4a142f4932af Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 21 Jan 2023 20:53:11 +0900
Subject: [PATCH 050/177] tweak fetchCustomEmojis timing

---
 packages/frontend/src/custom-emojis.ts | 2 --
 packages/frontend/src/init.ts          | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/custom-emojis.ts b/packages/frontend/src/custom-emojis.ts
index 637ee9c06..a7ac4e03c 100644
--- a/packages/frontend/src/custom-emojis.ts
+++ b/packages/frontend/src/custom-emojis.ts
@@ -9,8 +9,6 @@ export let customEmojis: {
 	url: string;
 }[] = storageCache ? JSON.parse(storageCache) : [];
 
-fetchCustomEmojis();
-
 export async function fetchCustomEmojis() {
 	const now = Date.now();
 	const lastFetchedAt = miLocalStorage.getItem('lastEmojisFetchedAt');
diff --git a/packages/frontend/src/init.ts b/packages/frontend/src/init.ts
index d90d3b553..079003ee8 100644
--- a/packages/frontend/src/init.ts
+++ b/packages/frontend/src/init.ts
@@ -45,6 +45,7 @@ import { getUrlWithoutLoginId } from '@/scripts/login-id';
 import { getAccountFromId } from '@/scripts/get-account-from-id';
 import { miLocalStorage } from './local-storage';
 import { claimAchievement, claimedAchievements } from './scripts/achievements';
+import { fetchCustomEmojis } from './custom-emojis';
 
 (async () => {
 	console.info(`Misskey v${version}`);
@@ -178,6 +179,10 @@ import { claimAchievement, claimedAchievements } from './scripts/achievements';
 		initializeSw();
 	});
 
+	try {
+		await fetchCustomEmojis();
+	} catch (err) {}
+
 	const app = createApp(
 		window.location.search === '?zen' ? defineAsyncComponent(() => import('@/ui/zen.vue')) :
 		!$i ? defineAsyncComponent(() => import('@/ui/visitor.vue')) :

From a3aafa03ada6cd3fa62cff68929edcc6c23ee664 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 04:17:58 +0900
Subject: [PATCH 051/177] update deps

---
 package.json                   |   6 +-
 packages/backend/package.json  |  20 +-
 packages/frontend/package.json |  20 +-
 pnpm-lock.yaml                 | 516 ++++++++++++++++++++++-----------
 4 files changed, 375 insertions(+), 187 deletions(-)

diff --git a/package.json b/package.json
index 25a74d404..d30ea8eea 100644
--- a/package.json
+++ b/package.json
@@ -54,11 +54,11 @@
 	"devDependencies": {
 		"@types/gulp": "4.0.10",
 		"@types/gulp-rename": "2.0.1",
-		"@typescript-eslint/eslint-plugin": "5.48.1",
-		"@typescript-eslint/parser": "5.48.1",
+		"@typescript-eslint/eslint-plugin": "5.48.2",
+		"@typescript-eslint/parser": "5.48.2",
 		"cross-env": "7.0.3",
 		"cypress": "12.3.0",
-		"eslint": "^8.31.0",
+		"eslint": "^8.32.0",
 		"start-server-and-test": "1.15.2"
 	},
 	"optionalDependencies": {
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 68cfbb05a..be9012021 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -58,9 +58,9 @@
 		"date-fns": "2.29.3",
 		"deep-email-validator": "0.1.21",
 		"escape-regexp": "0.0.1",
-		"fastify": "4.11.0",
+		"fastify": "4.12.0",
 		"feed": "4.2.2",
-		"file-type": "18.1.0",
+		"file-type": "18.2.0",
 		"fluent-ffmpeg": "2.1.2",
 		"form-data": "^4.0.0",
 		"got": "12.5.3",
@@ -89,7 +89,7 @@
 		"probe-image-size": "7.2.3",
 		"promise-limit": "2.7.0",
 		"pug": "3.0.2",
-		"punycode": "2.2.0",
+		"punycode": "2.3.0",
 		"pureimage": "0.3.15",
 		"qrcode": "1.5.1",
 		"random-seed": "0.3.0",
@@ -120,7 +120,7 @@
 		"typeorm": "0.3.11",
 		"typescript": "4.9.4",
 		"ulid": "2.3.0",
-		"undici": "^5.15.0",
+		"undici": "^5.15.1",
 		"unzipper": "0.10.11",
 		"uuid": "9.0.0",
 		"vary": "1.1.2",
@@ -132,7 +132,7 @@
 	"devDependencies": {
 		"@redocly/openapi-core": "1.0.0-beta.120",
 		"@swc/cli": "^0.1.59",
-		"@swc/core": "1.3.26",
+		"@swc/core": "1.3.27",
 		"@swc/jest": "0.2.24",
 		"@types/accepts": "1.3.5",
 		"@types/archiver": "5.3.1",
@@ -144,7 +144,7 @@
 		"@types/escape-regexp": "0.0.1",
 		"@types/fluent-ffmpeg": "2.1.20",
 		"@types/ioredis": "4.28.10",
-		"@types/jest": "29.2.5",
+		"@types/jest": "29.2.6",
 		"@types/js-yaml": "4.0.5",
 		"@types/jsdom": "20.0.1",
 		"@types/jsonld": "1.5.8",
@@ -176,11 +176,11 @@
 		"@types/web-push": "3.3.2",
 		"@types/websocket": "1.0.5",
 		"@types/ws": "8.5.4",
-		"@typescript-eslint/eslint-plugin": "5.48.1",
-		"@typescript-eslint/parser": "5.48.1",
+		"@typescript-eslint/eslint-plugin": "5.48.2",
+		"@typescript-eslint/parser": "5.48.2",
 		"cross-env": "7.0.3",
-		"eslint": "8.31.0",
-		"eslint-plugin-import": "2.27.4",
+		"eslint": "8.32.0",
+		"eslint-plugin-import": "2.27.5",
 		"execa": "6.1.0",
 		"jest": "29.3.1",
 		"jest-mock": "^29.3.1",
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index 730389a2e..cdfa96ea8 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -8,7 +8,7 @@
 	},
 	"dependencies": {
 		"@discordapp/twemoji": "14.0.2",
-		"@rollup/plugin-alias": "4.0.2",
+		"@rollup/plugin-alias": "4.0.3",
 		"@rollup/plugin-json": "6.0.0",
 		"@rollup/pluginutils": "5.0.2",
 		"@syuilo/aiscript": "0.12.2",
@@ -18,10 +18,10 @@
 		"autobind-decorator": "2.4.0",
 		"autosize": "5.0.2",
 		"blurhash": "2.0.4",
-		"broadcast-channel": "4.20.1",
+		"broadcast-channel": "4.20.2",
 		"browser-image-resizer": "git+https://github.com/misskey-dev/browser-image-resizer#v2.2.1-misskey.3",
 		"canvas-confetti": "^1.6.0",
-		"chart.js": "4.1.2",
+		"chart.js": "4.2.0",
 		"chartjs-adapter-date-fns": "3.0.0",
 		"chartjs-chart-matrix": "^1.3.0",
 		"chartjs-plugin-gradient": "0.6.1",
@@ -41,10 +41,10 @@
 		"misskey-js": "0.0.14",
 		"photoswipe": "5.3.4",
 		"prismjs": "1.29.0",
-		"punycode": "2.2.0",
+		"punycode": "2.3.0",
 		"querystring": "0.2.1",
 		"rndstr": "1.0.0",
-		"rollup": "3.10.0",
+		"rollup": "3.10.1",
 		"s-age": "1.1.2",
 		"sanitize-html": "^2.8.1",
 		"sass": "1.57.1",
@@ -69,7 +69,7 @@
 	},
 	"devDependencies": {
 		"@types/escape-regexp": "0.0.1",
-		"@types/glob": "8.0.0",
+		"@types/glob": "8.0.1",
 		"@types/gulp": "4.0.10",
 		"@types/gulp-rename": "2.0.1",
 		"@types/matter-js": "0.18.2",
@@ -82,13 +82,13 @@
 		"@types/uuid": "9.0.0",
 		"@types/websocket": "1.0.5",
 		"@types/ws": "8.5.4",
-		"@typescript-eslint/eslint-plugin": "5.48.1",
-		"@typescript-eslint/parser": "5.48.1",
+		"@typescript-eslint/eslint-plugin": "5.48.2",
+		"@typescript-eslint/parser": "5.48.2",
 		"@vue/runtime-core": "3.2.45",
 		"cross-env": "7.0.3",
 		"cypress": "12.3.0",
-		"eslint": "8.31.0",
-		"eslint-plugin-import": "2.27.4",
+		"eslint": "8.32.0",
+		"eslint-plugin-import": "2.27.5",
 		"eslint-plugin-vue": "9.9.0",
 		"start-server-and-test": "1.15.2",
 		"vue-eslint-parser": "^9.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e0ffafd12..13b709bb2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -11,11 +11,11 @@ importers:
       '@tensorflow/tfjs-core': ^4.2.0
       '@types/gulp': 4.0.10
       '@types/gulp-rename': 2.0.1
-      '@typescript-eslint/eslint-plugin': 5.48.1
-      '@typescript-eslint/parser': 5.48.1
+      '@typescript-eslint/eslint-plugin': 5.48.2
+      '@typescript-eslint/parser': 5.48.2
       cross-env: 7.0.3
       cypress: 12.3.0
-      eslint: ^8.31.0
+      eslint: ^8.32.0
       execa: 5.1.1
       gulp: 4.0.2
       gulp-cssnano: 2.1.3
@@ -39,11 +39,11 @@ importers:
     devDependencies:
       '@types/gulp': 4.0.10
       '@types/gulp-rename': 2.0.1
-      '@typescript-eslint/eslint-plugin': 5.48.1_3jon24igvnqaqexgwtxk6nkpse
-      '@typescript-eslint/parser': 5.48.1_iukboom6ndih5an6iafl45j2fe
+      '@typescript-eslint/eslint-plugin': 5.48.2_caon6io6stgpr7lz2rtbhekxqy
+      '@typescript-eslint/parser': 5.48.2_7uibuqfxkfaozanbtbziikiqje
       cross-env: 7.0.3
       cypress: 12.3.0
-      eslint: 8.31.0
+      eslint: 8.32.0
       start-server-and-test: 1.15.2
 
   packages/backend:
@@ -66,7 +66,7 @@ importers:
       '@redocly/openapi-core': 1.0.0-beta.120
       '@sinonjs/fake-timers': 10.0.2
       '@swc/cli': ^0.1.59
-      '@swc/core': 1.3.26
+      '@swc/core': 1.3.27
       '@swc/jest': 0.2.24
       '@tensorflow/tfjs': ^4.1.0
       '@tensorflow/tfjs-node': 4.1.0
@@ -80,7 +80,7 @@ importers:
       '@types/escape-regexp': 0.0.1
       '@types/fluent-ffmpeg': 2.1.20
       '@types/ioredis': 4.28.10
-      '@types/jest': 29.2.5
+      '@types/jest': 29.2.6
       '@types/js-yaml': 4.0.5
       '@types/jsdom': 20.0.1
       '@types/jsonld': 1.5.8
@@ -112,8 +112,8 @@ importers:
       '@types/web-push': 3.3.2
       '@types/websocket': 1.0.5
       '@types/ws': 8.5.4
-      '@typescript-eslint/eslint-plugin': 5.48.1
-      '@typescript-eslint/parser': 5.48.1
+      '@typescript-eslint/eslint-plugin': 5.48.2
+      '@typescript-eslint/parser': 5.48.2
       accepts: ^1.3.8
       ajv: 8.12.0
       archiver: 5.3.1
@@ -134,12 +134,12 @@ importers:
       date-fns: 2.29.3
       deep-email-validator: 0.1.21
       escape-regexp: 0.0.1
-      eslint: 8.31.0
-      eslint-plugin-import: 2.27.4
+      eslint: 8.32.0
+      eslint-plugin-import: 2.27.5
       execa: 6.1.0
-      fastify: 4.11.0
+      fastify: 4.12.0
       feed: 4.2.2
-      file-type: 18.1.0
+      file-type: 18.2.0
       fluent-ffmpeg: 2.1.2
       form-data: ^4.0.0
       got: 12.5.3
@@ -171,7 +171,7 @@ importers:
       probe-image-size: 7.2.3
       promise-limit: 2.7.0
       pug: 3.0.2
-      punycode: 2.2.0
+      punycode: 2.3.0
       pureimage: 0.3.15
       qrcode: 1.5.1
       random-seed: 0.3.0
@@ -202,7 +202,7 @@ importers:
       typeorm: 0.3.11
       typescript: 4.9.4
       ulid: 2.3.0
-      undici: ^5.15.0
+      undici: ^5.15.1
       unzipper: 0.10.11
       uuid: 9.0.0
       vary: 1.1.2
@@ -246,9 +246,9 @@ importers:
       date-fns: 2.29.3
       deep-email-validator: 0.1.21
       escape-regexp: 0.0.1
-      fastify: 4.11.0
+      fastify: 4.12.0
       feed: 4.2.2
-      file-type: 18.1.0
+      file-type: 18.2.0
       fluent-ffmpeg: 2.1.2
       form-data: 4.0.0
       got: 12.5.3
@@ -277,7 +277,7 @@ importers:
       probe-image-size: 7.2.3
       promise-limit: 2.7.0
       pug: 3.0.2
-      punycode: 2.2.0
+      punycode: 2.3.0
       pureimage: 0.3.15
       qrcode: 1.5.1
       random-seed: 0.3.0
@@ -308,7 +308,7 @@ importers:
       typeorm: 0.3.11_ioredis@4.28.5+pg@8.8.0
       typescript: 4.9.4
       ulid: 2.3.0
-      undici: 5.15.0
+      undici: 5.15.1
       unzipper: 0.10.11
       uuid: 9.0.0
       vary: 1.1.2
@@ -321,9 +321,9 @@ importers:
       '@tensorflow/tfjs-node': 4.1.0_seedrandom@3.0.5
     devDependencies:
       '@redocly/openapi-core': 1.0.0-beta.120
-      '@swc/cli': 0.1.59_cr4os3zuq4gmhe2qzzjtw2pxeu
-      '@swc/core': 1.3.26
-      '@swc/jest': 0.2.24_@swc+core@1.3.26
+      '@swc/cli': 0.1.59_2w2rsb5d2wh3txrlxuiknf4vra
+      '@swc/core': 1.3.27
+      '@swc/jest': 0.2.24_@swc+core@1.3.27
       '@types/accepts': 1.3.5
       '@types/archiver': 5.3.1
       '@types/bcryptjs': 2.4.2
@@ -334,7 +334,7 @@ importers:
       '@types/escape-regexp': 0.0.1
       '@types/fluent-ffmpeg': 2.1.20
       '@types/ioredis': 4.28.10
-      '@types/jest': 29.2.5
+      '@types/jest': 29.2.6
       '@types/js-yaml': 4.0.5
       '@types/jsdom': 20.0.1
       '@types/jsonld': 1.5.8
@@ -366,11 +366,11 @@ importers:
       '@types/web-push': 3.3.2
       '@types/websocket': 1.0.5
       '@types/ws': 8.5.4
-      '@typescript-eslint/eslint-plugin': 5.48.1_3jon24igvnqaqexgwtxk6nkpse
-      '@typescript-eslint/parser': 5.48.1_iukboom6ndih5an6iafl45j2fe
+      '@typescript-eslint/eslint-plugin': 5.48.2_caon6io6stgpr7lz2rtbhekxqy
+      '@typescript-eslint/parser': 5.48.2_7uibuqfxkfaozanbtbziikiqje
       cross-env: 7.0.3
-      eslint: 8.31.0
-      eslint-plugin-import: 2.27.4_qdjeohovcytra7xto5vgmxssaq
+      eslint: 8.32.0
+      eslint-plugin-import: 2.27.5_2l6piu6guil2f63lj3qmhzbnn4
       execa: 6.1.0
       jest: 29.3.1_@types+node@18.11.18
       jest-mock: 29.3.1
@@ -379,13 +379,13 @@ importers:
   packages/frontend:
     specifiers:
       '@discordapp/twemoji': 14.0.2
-      '@rollup/plugin-alias': 4.0.2
+      '@rollup/plugin-alias': 4.0.3
       '@rollup/plugin-json': 6.0.0
       '@rollup/pluginutils': 5.0.2
       '@syuilo/aiscript': 0.12.2
       '@tabler/icons': ^1.118.0
       '@types/escape-regexp': 0.0.1
-      '@types/glob': 8.0.0
+      '@types/glob': 8.0.1
       '@types/gulp': 4.0.10
       '@types/gulp-rename': 2.0.1
       '@types/matter-js': 0.18.2
@@ -398,18 +398,18 @@ importers:
       '@types/uuid': 9.0.0
       '@types/websocket': 1.0.5
       '@types/ws': 8.5.4
-      '@typescript-eslint/eslint-plugin': 5.48.1
-      '@typescript-eslint/parser': 5.48.1
+      '@typescript-eslint/eslint-plugin': 5.48.2
+      '@typescript-eslint/parser': 5.48.2
       '@vitejs/plugin-vue': 4.0.0
       '@vue/compiler-sfc': 3.2.45
       '@vue/runtime-core': 3.2.45
       autobind-decorator: 2.4.0
       autosize: 5.0.2
       blurhash: 2.0.4
-      broadcast-channel: 4.20.1
+      broadcast-channel: 4.20.2
       browser-image-resizer: git+https://github.com/misskey-dev/browser-image-resizer#v2.2.1-misskey.3
       canvas-confetti: ^1.6.0
-      chart.js: 4.1.2
+      chart.js: 4.2.0
       chartjs-adapter-date-fns: 3.0.0
       chartjs-chart-matrix: ^1.3.0
       chartjs-plugin-gradient: 0.6.1
@@ -420,8 +420,8 @@ importers:
       cypress: 12.3.0
       date-fns: 2.29.3
       escape-regexp: 0.0.1
-      eslint: 8.31.0
-      eslint-plugin-import: 2.27.4
+      eslint: 8.32.0
+      eslint-plugin-import: 2.27.5
       eslint-plugin-vue: 9.9.0
       eventemitter3: 5.0.0
       gsap: ^3.11.4
@@ -434,10 +434,10 @@ importers:
       misskey-js: 0.0.14
       photoswipe: 5.3.4
       prismjs: 1.29.0
-      punycode: 2.2.0
+      punycode: 2.3.0
       querystring: 0.2.1
       rndstr: 1.0.0
-      rollup: 3.10.0
+      rollup: 3.10.1
       s-age: 1.1.2
       sanitize-html: ^2.8.1
       sass: 1.57.1
@@ -464,9 +464,9 @@ importers:
       vuedraggable: next
     dependencies:
       '@discordapp/twemoji': 14.0.2
-      '@rollup/plugin-alias': 4.0.2_rollup@3.10.0
-      '@rollup/plugin-json': 6.0.0_rollup@3.10.0
-      '@rollup/pluginutils': 5.0.2_rollup@3.10.0
+      '@rollup/plugin-alias': 4.0.3_rollup@3.10.1
+      '@rollup/plugin-json': 6.0.0_rollup@3.10.1
+      '@rollup/pluginutils': 5.0.2_rollup@3.10.1
       '@syuilo/aiscript': 0.12.2
       '@tabler/icons': 1.119.0
       '@vitejs/plugin-vue': 4.0.0_vite@4.0.4+vue@3.2.45
@@ -474,14 +474,14 @@ importers:
       autobind-decorator: 2.4.0
       autosize: 5.0.2
       blurhash: 2.0.4
-      broadcast-channel: 4.20.1
+      broadcast-channel: 4.20.2
       browser-image-resizer: github.com/misskey-dev/browser-image-resizer/0227e860621e55cbed0aabe6dc601096a7748c4a
       canvas-confetti: 1.6.0
-      chart.js: 4.1.2
-      chartjs-adapter-date-fns: 3.0.0_kluv2ktejb2igagp3yc56zuwiy
-      chartjs-chart-matrix: 1.3.0_chart.js@4.1.2
-      chartjs-plugin-gradient: 0.6.1_chart.js@4.1.2
-      chartjs-plugin-zoom: 2.0.0_chart.js@4.1.2
+      chart.js: 4.2.0
+      chartjs-adapter-date-fns: 3.0.0_n6szoxj4ax2zhp2sxsxxj6zdla
+      chartjs-chart-matrix: 1.3.0_chart.js@4.2.0
+      chartjs-plugin-gradient: 0.6.1_chart.js@4.2.0
+      chartjs-plugin-zoom: 2.0.0_chart.js@4.2.0
       compare-versions: 5.0.1
       cropperjs: 2.0.0-beta.2
       date-fns: 2.29.3
@@ -497,10 +497,10 @@ importers:
       misskey-js: 0.0.14
       photoswipe: 5.3.4
       prismjs: 1.29.0
-      punycode: 2.2.0
+      punycode: 2.3.0
       querystring: 0.2.1
       rndstr: 1.0.0
-      rollup: 3.10.0
+      rollup: 3.10.1
       s-age: 1.1.2
       sanitize-html: 2.8.1
       sass: 1.57.1
@@ -524,7 +524,7 @@ importers:
       vuedraggable: 4.1.0_vue@3.2.45
     devDependencies:
       '@types/escape-regexp': 0.0.1
-      '@types/glob': 8.0.0
+      '@types/glob': 8.0.1
       '@types/gulp': 4.0.10
       '@types/gulp-rename': 2.0.1
       '@types/matter-js': 0.18.2
@@ -537,16 +537,16 @@ importers:
       '@types/uuid': 9.0.0
       '@types/websocket': 1.0.5
       '@types/ws': 8.5.4
-      '@typescript-eslint/eslint-plugin': 5.48.1_3jon24igvnqaqexgwtxk6nkpse
-      '@typescript-eslint/parser': 5.48.1_iukboom6ndih5an6iafl45j2fe
+      '@typescript-eslint/eslint-plugin': 5.48.2_caon6io6stgpr7lz2rtbhekxqy
+      '@typescript-eslint/parser': 5.48.2_7uibuqfxkfaozanbtbziikiqje
       '@vue/runtime-core': 3.2.45
       cross-env: 7.0.3
       cypress: 12.3.0
-      eslint: 8.31.0
-      eslint-plugin-import: 2.27.4_qdjeohovcytra7xto5vgmxssaq
-      eslint-plugin-vue: 9.9.0_eslint@8.31.0
+      eslint: 8.32.0
+      eslint-plugin-import: 2.27.5_2l6piu6guil2f63lj3qmhzbnn4
+      eslint-plugin-vue: 9.9.0_eslint@8.32.0
       start-server-and-test: 1.15.2
-      vue-eslint-parser: 9.1.0_eslint@8.31.0
+      vue-eslint-parser: 9.1.0_eslint@8.32.0
       vue-tsc: 1.0.24_typescript@4.9.4
 
   packages/sw:
@@ -1077,7 +1077,7 @@ packages:
     dependencies:
       ky: 0.30.0
       ky-universal: 0.10.1_ky@0.30.0
-      undici: 5.15.0
+      undici: 5.15.1
     transitivePeerDependencies:
       - web-streams-polyfill
     dev: false
@@ -1402,7 +1402,7 @@ packages:
       fastify-plugin: 4.5.0
       pump: 3.0.0
       tiny-lru: 10.0.1
-      undici: 5.15.0
+      undici: 5.15.1
     dev: false
 
   /@fastify/send/1.0.0:
@@ -2059,8 +2059,8 @@ packages:
       - encoding
     dev: true
 
-  /@rollup/plugin-alias/4.0.2_rollup@3.10.0:
-    resolution: {integrity: sha512-1hv7dBOZZwo3SEupxn4UA2N0EDThqSSS+wI1St1TNTBtOZvUchyIClyHcnDcjjrReTPZ47Faedrhblv4n+T5UQ==}
+  /@rollup/plugin-alias/4.0.3_rollup@3.10.1:
+    resolution: {integrity: sha512-ZuDWE1q4PQDhvm/zc5Prun8sBpLJy41DMptYrS6MhAy9s9kL/doN1613BWfEchGVfKxzliJ3BjbOPizXX38DbQ==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       rollup: ^1.20.0||^2.0.0||^3.0.0
@@ -2068,11 +2068,11 @@ packages:
       rollup:
         optional: true
     dependencies:
-      rollup: 3.10.0
+      rollup: 3.10.1
       slash: 4.0.0
     dev: false
 
-  /@rollup/plugin-json/6.0.0_rollup@3.10.0:
+  /@rollup/plugin-json/6.0.0_rollup@3.10.1:
     resolution: {integrity: sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -2081,11 +2081,11 @@ packages:
       rollup:
         optional: true
     dependencies:
-      '@rollup/pluginutils': 5.0.2_rollup@3.10.0
-      rollup: 3.10.0
+      '@rollup/pluginutils': 5.0.2_rollup@3.10.1
+      rollup: 3.10.1
     dev: false
 
-  /@rollup/pluginutils/5.0.2_rollup@3.10.0:
+  /@rollup/pluginutils/5.0.2_rollup@3.10.1:
     resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -2097,7 +2097,7 @@ packages:
       '@types/estree': 1.0.0
       estree-walker: 2.0.2
       picomatch: 2.3.1
-      rollup: 3.10.0
+      rollup: 3.10.1
     dev: false
 
   /@sideway/address/4.1.4:
@@ -2161,7 +2161,7 @@ packages:
     resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
     dev: false
 
-  /@swc/cli/0.1.59_cr4os3zuq4gmhe2qzzjtw2pxeu:
+  /@swc/cli/0.1.59_2w2rsb5d2wh3txrlxuiknf4vra:
     resolution: {integrity: sha512-BlX3wIxYTwdtR22dIqZ3FEIOJPqnlByAp4JY46OMZi2UXMB3ZbOzefawD2ZlLafRUWyy5NtiZZty5waKzaYRnA==}
     engines: {node: '>= 12.13'}
     hasBin: true
@@ -2172,7 +2172,7 @@ packages:
       chokidar:
         optional: true
     dependencies:
-      '@swc/core': 1.3.26
+      '@swc/core': 1.3.27
       bin-wrapper: 4.1.0
       chokidar: 3.5.3
       commander: 7.2.0
@@ -2182,8 +2182,8 @@ packages:
       source-map: 0.7.4
     dev: true
 
-  /@swc/core-darwin-arm64/1.3.26:
-    resolution: {integrity: sha512-FWWflBfKRYrUJtko2xiedC5XCa31O75IZZqnTWuLpe9g3C5tnUuF3M8LSXZS/dn6wprome1MhtG9GMPkSYkhkg==}
+  /@swc/core-darwin-arm64/1.3.27:
+    resolution: {integrity: sha512-IKlxkhEy99CnP9nduaf5IJWIFcr6D5cZCjYmCs7nWkjMV+aAieyDO9AX4LT8AcHy6CF7ByOX7SKoqk+gVMAaKw==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [darwin]
@@ -2191,8 +2191,8 @@ packages:
     dev: true
     optional: true
 
-  /@swc/core-darwin-x64/1.3.26:
-    resolution: {integrity: sha512-0uQeebAtsewqJ2b35aPZstGrylwd6oJjUyAJOfVJNbremFSJ5JzytB3NoDCIw7CT5UQrSRpvD3mU95gfdQjDGA==}
+  /@swc/core-darwin-x64/1.3.27:
+    resolution: {integrity: sha512-MtabZIhFf/dL3vs6UMbd+vJsjIkm2NaFqulGV0Jofy2bfVZPTj/b5pXeOlUsTWy7JcH1uixjdx4RvJRyvqJxQA==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [darwin]
@@ -2200,8 +2200,8 @@ packages:
     dev: true
     optional: true
 
-  /@swc/core-linux-arm-gnueabihf/1.3.26:
-    resolution: {integrity: sha512-06T+LbVFlyciQtwrUB5/a16A1ju1jFoYvd/hq9TWhf7GrtL43U7oJIgqMOPHx2j0+Ps2R3S6R/UUN5YXu618zA==}
+  /@swc/core-linux-arm-gnueabihf/1.3.27:
+    resolution: {integrity: sha512-XELMoGcUTAkk+G4buwIIhu6AIr1U418Odt22HUW8+ZvV+Wty2ICgR/myOIhM3xMb6U2L8ay+evMqoVNMQ0RRTg==}
     engines: {node: '>=10'}
     cpu: [arm]
     os: [linux]
@@ -2209,8 +2209,8 @@ packages:
     dev: true
     optional: true
 
-  /@swc/core-linux-arm64-gnu/1.3.26:
-    resolution: {integrity: sha512-2NT/0xALPfK+U01qIlHxjkGdIj6F0txhu1U2v6B0YP2+k0whL2gCgYeg9QUvkYEXSD5r1Yx+vcb2R/vaSCSClg==}
+  /@swc/core-linux-arm64-gnu/1.3.27:
+    resolution: {integrity: sha512-O6vtT6bnrVR9PzEIuA5U7tIfYo7bv97H9K9Vqy2oyHNeGN0H36DKwS4UqPreHtziXNF5+7ubdUYUkrG/j8UnUQ==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
@@ -2218,8 +2218,8 @@ packages:
     dev: true
     optional: true
 
-  /@swc/core-linux-arm64-musl/1.3.26:
-    resolution: {integrity: sha512-64KrTay9hC0mTvZ1AmEFmNEwV5QDjw9U7PJU5riotSc28I+Q/ZoM0qcSFW9JRRa6F2Tr+IfMtyv8+eB2//BQ5g==}
+  /@swc/core-linux-arm64-musl/1.3.27:
+    resolution: {integrity: sha512-Oa0E1i7dOTWpaEZumKoNbTE/Ap+da6nlhqKVUdYrFDrOBi25tz76SdxZIyvAszzmgY89b5yd1naourKmkPXpww==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
@@ -2227,8 +2227,8 @@ packages:
     dev: true
     optional: true
 
-  /@swc/core-linux-x64-gnu/1.3.26:
-    resolution: {integrity: sha512-Te8G13l3dcRM1Mf3J4JzGUngzNXLKnMYlUmBOYN/ORsx7e+VNelR3zsTLHC0+0jGqELDgqvMyzDfk+dux/C/bQ==}
+  /@swc/core-linux-x64-gnu/1.3.27:
+    resolution: {integrity: sha512-S3v9H8oL2a8Ur6AjQyhkC6HfBVPOxKMdBhcZmdNuVgEUHbHdbf/Lka85F9IOYXEarMn0FtQw3ywowS22O9L5Uw==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
@@ -2236,8 +2236,8 @@ packages:
     dev: true
     optional: true
 
-  /@swc/core-linux-x64-musl/1.3.26:
-    resolution: {integrity: sha512-nqQWuSM6OTKepUiQ9+rXgERq/JiO72RBOpXKO2afYppsL96sngjIRewV74v5f6IAfyzw+k+AhC5pgRA4Xu/Jkg==}
+  /@swc/core-linux-x64-musl/1.3.27:
+    resolution: {integrity: sha512-6DDkdXlOADpwICFZTRphCR+cIeS8aEYh4NlyzBito0mOWwIIdfCgALzhkTQOzTOkcD42bP97CIoZ97hqV/puOg==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
@@ -2245,8 +2245,8 @@ packages:
     dev: true
     optional: true
 
-  /@swc/core-win32-arm64-msvc/1.3.26:
-    resolution: {integrity: sha512-xx34mx+9IBV1sun7sxoNFiqNom9wiOuvsQFJUyQptCnZHgYwOr9OI204LBF95dCcBCZsTm2hT1wBnySJOeimYw==}
+  /@swc/core-win32-arm64-msvc/1.3.27:
+    resolution: {integrity: sha512-baxfH4AbEcaTNo08wxV0W6hiMXwVCxPS4qc0amHpXPti92unvSqeDR1W3C9GjHqzXlWtmCRsq8Ww1pal6ZVLrw==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [win32]
@@ -2254,8 +2254,8 @@ packages:
     dev: true
     optional: true
 
-  /@swc/core-win32-ia32-msvc/1.3.26:
-    resolution: {integrity: sha512-48LZ/HKNuU9zl8c7qG6IQKb5rBCwmJgysGOmEGzTRBYxAf/x6Scmt0aqxCoV4J02HOs2WduCBDnhUKsSQ2kcXQ==}
+  /@swc/core-win32-ia32-msvc/1.3.27:
+    resolution: {integrity: sha512-7iLJnH71k5qCwxv9NcM/P7nIEzTsC7r1sIiQW6bu+CpC8qZvwl0PS+XvQRlLly2gCZM+Le98tksYG14MEh+Hrw==}
     engines: {node: '>=10'}
     cpu: [ia32]
     os: [win32]
@@ -2263,8 +2263,8 @@ packages:
     dev: true
     optional: true
 
-  /@swc/core-win32-x64-msvc/1.3.26:
-    resolution: {integrity: sha512-UPe7S+MezD/S6cKBIc50TduGzmw6PBz1Ms5p+5wDLOKYNS/LSEM4iRmLwvePzP5X8mOyesXrsbwxLy8KHP65Yw==}
+  /@swc/core-win32-x64-msvc/1.3.27:
+    resolution: {integrity: sha512-mFM907PDw/jrQ44+TRjIVGEOy2Mu06mMMz0HPMFuRsBzl5t0Kajp3vmn8FkkpS9wH5982VPi6hPYVTb7QJo5Qg==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [win32]
@@ -2272,31 +2272,31 @@ packages:
     dev: true
     optional: true
 
-  /@swc/core/1.3.26:
-    resolution: {integrity: sha512-U7vEsaLn3IGg0XCRLJX/GTkK9WIfFHUX5USdrp1L2QD29sWPe25HqNndXmUR9KytzKmpDMNoUuHyiuhpVrnNeQ==}
+  /@swc/core/1.3.27:
+    resolution: {integrity: sha512-praRNgpeYGvwDIm/Cl6JU+yHMvwVraL0U6ejMgGyzvpcm1FVsZd1/EYXGqzbBJ0ALv7Gx4eK56h4GnwV6d4L0w==}
     engines: {node: '>=10'}
     requiresBuild: true
     optionalDependencies:
-      '@swc/core-darwin-arm64': 1.3.26
-      '@swc/core-darwin-x64': 1.3.26
-      '@swc/core-linux-arm-gnueabihf': 1.3.26
-      '@swc/core-linux-arm64-gnu': 1.3.26
-      '@swc/core-linux-arm64-musl': 1.3.26
-      '@swc/core-linux-x64-gnu': 1.3.26
-      '@swc/core-linux-x64-musl': 1.3.26
-      '@swc/core-win32-arm64-msvc': 1.3.26
-      '@swc/core-win32-ia32-msvc': 1.3.26
-      '@swc/core-win32-x64-msvc': 1.3.26
+      '@swc/core-darwin-arm64': 1.3.27
+      '@swc/core-darwin-x64': 1.3.27
+      '@swc/core-linux-arm-gnueabihf': 1.3.27
+      '@swc/core-linux-arm64-gnu': 1.3.27
+      '@swc/core-linux-arm64-musl': 1.3.27
+      '@swc/core-linux-x64-gnu': 1.3.27
+      '@swc/core-linux-x64-musl': 1.3.27
+      '@swc/core-win32-arm64-msvc': 1.3.27
+      '@swc/core-win32-ia32-msvc': 1.3.27
+      '@swc/core-win32-x64-msvc': 1.3.27
     dev: true
 
-  /@swc/jest/0.2.24_@swc+core@1.3.26:
+  /@swc/jest/0.2.24_@swc+core@1.3.27:
     resolution: {integrity: sha512-fwgxQbM1wXzyKzl1+IW0aGrRvAA8k0Y3NxFhKigbPjOJ4mCKnWEcNX9HQS3gshflcxq8YKhadabGUVfdwjCr6Q==}
     engines: {npm: '>= 7.0.0'}
     peerDependencies:
       '@swc/core': '*'
     dependencies:
       '@jest/create-cache-key-function': 27.5.1
-      '@swc/core': 1.3.26
+      '@swc/core': 1.3.27
       jsonc-parser: 3.2.0
     dev: true
 
@@ -2583,7 +2583,7 @@ packages:
   /@types/glob-stream/6.1.1:
     resolution: {integrity: sha512-AGOUTsTdbPkRS0qDeyeS+6KypmfVpbT5j23SN8UPG63qjKXNKjXn6V9wZUr8Fin0m9l8oGYaPK8b2WUMF8xI1A==}
     dependencies:
-      '@types/glob': 8.0.0
+      '@types/glob': 8.0.1
       '@types/node': 18.11.18
     dev: true
 
@@ -2594,6 +2594,13 @@ packages:
       '@types/node': 18.11.18
     dev: true
 
+  /@types/glob/8.0.1:
+    resolution: {integrity: sha512-8bVUjXZvJacUFkJXHdyZ9iH1Eaj5V7I8c4NdH5sQJsdXkqT4CA5Dhb4yb4VE/3asyx4L9ayZr1NIhTsWHczmMw==}
+    dependencies:
+      '@types/minimatch': 5.1.2
+      '@types/node': 18.11.18
+    dev: true
+
   /@types/graceful-fs/4.1.6:
     resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==}
     dependencies:
@@ -2641,8 +2648,8 @@ packages:
       '@types/istanbul-lib-report': 3.0.0
     dev: true
 
-  /@types/jest/29.2.5:
-    resolution: {integrity: sha512-H2cSxkKgVmqNHXP7TC2L/WUorrZu8ZigyRywfVzv6EyBlxj39n4C00hjXYQWsbwqgElaj/CiAeSRmk5GoaKTgw==}
+  /@types/jest/29.2.6:
+    resolution: {integrity: sha512-XEUC/Tgw3uMh6Ho8GkUtQ2lPhY5Fmgyp3TdlkTJs1W9VgNxs+Ow/x3Elh8lHQKqCbZL0AubQuqWjHVT033Hhrw==}
     dependencies:
       expect: 29.3.1
       pretty-format: 29.3.1
@@ -2949,8 +2956,8 @@ packages:
     dev: true
     optional: true
 
-  /@typescript-eslint/eslint-plugin/5.48.1_3jon24igvnqaqexgwtxk6nkpse:
-    resolution: {integrity: sha512-9nY5K1Rp2ppmpb9s9S2aBiF3xo5uExCehMDmYmmFqqyxgenbHJ3qbarcLt4ITgaD6r/2ypdlcFRdcuVPnks+fQ==}
+  /@typescript-eslint/eslint-plugin/5.48.2_caon6io6stgpr7lz2rtbhekxqy:
+    resolution: {integrity: sha512-sR0Gja9Ky1teIq4qJOl0nC+Tk64/uYdX+mi+5iB//MH8gwyx8e3SOyhEzeLZEFEEfCaLf8KJq+Bd/6je1t+CAg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       '@typescript-eslint/parser': ^5.0.0
@@ -2960,13 +2967,13 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.48.1_iukboom6ndih5an6iafl45j2fe
-      '@typescript-eslint/scope-manager': 5.48.1
-      '@typescript-eslint/type-utils': 5.48.1_iukboom6ndih5an6iafl45j2fe
-      '@typescript-eslint/utils': 5.48.1_iukboom6ndih5an6iafl45j2fe
+      '@typescript-eslint/parser': 5.48.2_7uibuqfxkfaozanbtbziikiqje
+      '@typescript-eslint/scope-manager': 5.48.2
+      '@typescript-eslint/type-utils': 5.48.2_7uibuqfxkfaozanbtbziikiqje
+      '@typescript-eslint/utils': 5.48.2_7uibuqfxkfaozanbtbziikiqje
       debug: 4.3.4
-      eslint: 8.31.0
-      ignore: 5.2.1
+      eslint: 8.32.0
+      ignore: 5.2.4
       natural-compare-lite: 1.4.0
       regexpp: 3.2.0
       semver: 7.3.8
@@ -2996,6 +3003,26 @@ packages:
       - supports-color
     dev: true
 
+  /@typescript-eslint/parser/5.48.2_7uibuqfxkfaozanbtbziikiqje:
+    resolution: {integrity: sha512-38zMsKsG2sIuM5Oi/olurGwYJXzmtdsHhn5mI/pQogP+BjYVkK5iRazCQ8RGS0V+YLk282uWElN70zAAUmaYHw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/scope-manager': 5.48.2
+      '@typescript-eslint/types': 5.48.2
+      '@typescript-eslint/typescript-estree': 5.48.2_typescript@4.9.4
+      debug: 4.3.4
+      eslint: 8.32.0
+      typescript: 4.9.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@typescript-eslint/scope-manager/5.48.1:
     resolution: {integrity: sha512-S035ueRrbxRMKvSTv9vJKIWgr86BD8s3RqoRZmsSh/s8HhIs90g6UlK8ZabUSjUZQkhVxt7nmZ63VJ9dcZhtDQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -3004,8 +3031,16 @@ packages:
       '@typescript-eslint/visitor-keys': 5.48.1
     dev: true
 
-  /@typescript-eslint/type-utils/5.48.1_iukboom6ndih5an6iafl45j2fe:
-    resolution: {integrity: sha512-Hyr8HU8Alcuva1ppmqSYtM/Gp0q4JOp1F+/JH5D1IZm/bUBrV0edoewQZiEc1r6I8L4JL21broddxK8HAcZiqQ==}
+  /@typescript-eslint/scope-manager/5.48.2:
+    resolution: {integrity: sha512-zEUFfonQid5KRDKoI3O+uP1GnrFd4tIHlvs+sTJXiWuypUWMuDaottkJuR612wQfOkjYbsaskSIURV9xo4f+Fw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.48.2
+      '@typescript-eslint/visitor-keys': 5.48.2
+    dev: true
+
+  /@typescript-eslint/type-utils/5.48.2_7uibuqfxkfaozanbtbziikiqje:
+    resolution: {integrity: sha512-QVWx7J5sPMRiOMJp5dYshPxABRoZV1xbRirqSk8yuIIsu0nvMTZesKErEA3Oix1k+uvsk8Cs8TGJ6kQ0ndAcew==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: '*'
@@ -3014,10 +3049,10 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/typescript-estree': 5.48.1_typescript@4.9.4
-      '@typescript-eslint/utils': 5.48.1_iukboom6ndih5an6iafl45j2fe
+      '@typescript-eslint/typescript-estree': 5.48.2_typescript@4.9.4
+      '@typescript-eslint/utils': 5.48.2_7uibuqfxkfaozanbtbziikiqje
       debug: 4.3.4
-      eslint: 8.31.0
+      eslint: 8.32.0
       tsutils: 3.21.0_typescript@4.9.4
       typescript: 4.9.4
     transitivePeerDependencies:
@@ -3029,6 +3064,11 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
+  /@typescript-eslint/types/5.48.2:
+    resolution: {integrity: sha512-hE7dA77xxu7ByBc6KCzikgfRyBCTst6dZQpwaTy25iMYOnbNljDT4hjhrGEJJ0QoMjrfqrx+j1l1B9/LtKeuqA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
   /@typescript-eslint/typescript-estree/5.48.1_typescript@4.9.4:
     resolution: {integrity: sha512-Hut+Osk5FYr+sgFh8J/FHjqX6HFcDzTlWLrFqGoK5kVUN3VBHF/QzZmAsIXCQ8T/W9nQNBTqalxi1P3LSqWnRA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -3050,20 +3090,41 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils/5.48.1_iukboom6ndih5an6iafl45j2fe:
-    resolution: {integrity: sha512-SmQuSrCGUOdmGMwivW14Z0Lj8dxG1mOFZ7soeJ0TQZEJcs3n5Ndgkg0A4bcMFzBELqLJ6GTHnEU+iIoaD6hFGA==}
+  /@typescript-eslint/typescript-estree/5.48.2_typescript@4.9.4:
+    resolution: {integrity: sha512-bibvD3z6ilnoVxUBFEgkO0k0aFvUc4Cttt0dAreEr+nrAHhWzkO83PEVVuieK3DqcgL6VAK5dkzK8XUVja5Zcg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/types': 5.48.2
+      '@typescript-eslint/visitor-keys': 5.48.2
+      debug: 4.3.4
+      globby: 11.1.0
+      is-glob: 4.0.3
+      semver: 7.3.8
+      tsutils: 3.21.0_typescript@4.9.4
+      typescript: 4.9.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/utils/5.48.2_7uibuqfxkfaozanbtbziikiqje:
+    resolution: {integrity: sha512-2h18c0d7jgkw6tdKTlNaM7wyopbLRBiit8oAxoP89YnuBOzCZ8g8aBCaCqq7h208qUTroL7Whgzam7UY3HVLow==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
       '@types/json-schema': 7.0.11
       '@types/semver': 7.3.13
-      '@typescript-eslint/scope-manager': 5.48.1
-      '@typescript-eslint/types': 5.48.1
-      '@typescript-eslint/typescript-estree': 5.48.1_typescript@4.9.4
-      eslint: 8.31.0
+      '@typescript-eslint/scope-manager': 5.48.2
+      '@typescript-eslint/types': 5.48.2
+      '@typescript-eslint/typescript-estree': 5.48.2_typescript@4.9.4
+      eslint: 8.32.0
       eslint-scope: 5.1.1
-      eslint-utils: 3.0.0_eslint@8.31.0
+      eslint-utils: 3.0.0_eslint@8.32.0
       semver: 7.3.8
     transitivePeerDependencies:
       - supports-color
@@ -3078,6 +3139,14 @@ packages:
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@typescript-eslint/visitor-keys/5.48.2:
+    resolution: {integrity: sha512-z9njZLSkwmjFWUelGEwEbdf4NwKvfHxvGC0OcGN1Hp/XNDIcJ7D5DpPNPv6x6/mFvc1tQHsaWmpD/a4gOvvCJQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.48.2
+      eslint-visitor-keys: 3.3.0
+    dev: true
+
   /@vitejs/plugin-vue/4.0.0_vite@4.0.4+vue@3.2.45:
     resolution: {integrity: sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -4039,8 +4108,8 @@ packages:
     dependencies:
       fill-range: 7.0.1
 
-  /broadcast-channel/4.20.1:
-    resolution: {integrity: sha512-ob5xyUEMWJRBOggwVGEZpKCXK/Pkfe3LkrokNTwgywhKXFNETRkD5IanLqmpY/roy7bqBsijb7lMEDyc1qlnHQ==}
+  /broadcast-channel/4.20.2:
+    resolution: {integrity: sha512-v0lJgMzC+MX4e2KCFWYXChZ2mKTqm5mnJGId6tqJp3NfylggbNd8c2uKeP4MQxD2ucKOesY68aN98zwl9d6Tvg==}
     dependencies:
       '@babel/runtime': 7.20.7
       oblivious-set: 1.1.1
@@ -4403,45 +4472,45 @@ packages:
       is-regex: 1.1.4
     dev: false
 
-  /chart.js/4.1.2:
-    resolution: {integrity: sha512-9L1w6WLPq6ztiWVVOYtDtpo0CUsBKDWPrUEdwChAyzczaikqeSwNKEv3QpJ7EO4ICcLSi6UDVhgvcnUhRJidRA==}
+  /chart.js/4.2.0:
+    resolution: {integrity: sha512-wbtcV+QKeH0F7gQZaCJEIpsNriFheacouJQTVIjITi3eQA8bTlIBoknz0+dgV79aeKLNMAX+nDslIVE/nJ3rzA==}
     engines: {pnpm: ^7.0.0}
     dependencies:
       '@kurkle/color': 0.3.2
     dev: false
 
-  /chartjs-adapter-date-fns/3.0.0_kluv2ktejb2igagp3yc56zuwiy:
+  /chartjs-adapter-date-fns/3.0.0_n6szoxj4ax2zhp2sxsxxj6zdla:
     resolution: {integrity: sha512-Rs3iEB3Q5pJ973J93OBTpnP7qoGwvq3nUnoMdtxO+9aoJof7UFcRbWcIDteXuYd1fgAvct/32T9qaLyLuZVwCg==}
     peerDependencies:
       chart.js: '>=2.8.0'
       date-fns: '>=2.0.0'
     dependencies:
-      chart.js: 4.1.2
+      chart.js: 4.2.0
       date-fns: 2.29.3
     dev: false
 
-  /chartjs-chart-matrix/1.3.0_chart.js@4.1.2:
+  /chartjs-chart-matrix/1.3.0_chart.js@4.2.0:
     resolution: {integrity: sha512-oPmyxY60tJDBFbnhXcmcJujs+F1a2uMvb9HOhSeV2/5k8L9LApWtyRJzwNWawMl8vDbWdhAfobq06b4AcdwE3Q==}
     peerDependencies:
       chart.js: '>=3.0.0'
     dependencies:
-      chart.js: 4.1.2
+      chart.js: 4.2.0
     dev: false
 
-  /chartjs-plugin-gradient/0.6.1_chart.js@4.1.2:
+  /chartjs-plugin-gradient/0.6.1_chart.js@4.2.0:
     resolution: {integrity: sha512-TGHNIh8KqQMLdb+UfY80cBHYRyOC47eeokmgkeajRdKGbFt462lJiyiq4ZJ25fiM7BGsmzoBLhmVyEw4B3gQxw==}
     peerDependencies:
       chart.js: '>=2.6.0'
     dependencies:
-      chart.js: 4.1.2
+      chart.js: 4.2.0
     dev: false
 
-  /chartjs-plugin-zoom/2.0.0_chart.js@4.1.2:
+  /chartjs-plugin-zoom/2.0.0_chart.js@4.2.0:
     resolution: {integrity: sha512-bqpi7DGy9a5hX7ThKl/xQaLzXvneSwhS0w/lNimZ8AJaoRVMKz5JfUoqwciJYV5ixKXJbgyvwC9HcJnyVsYmjg==}
     peerDependencies:
       chart.js: '>=3.2.0'
     dependencies:
-      chart.js: 4.1.2
+      chart.js: 4.2.0
       hammerjs: 2.0.8
     dev: false
 
@@ -6040,6 +6109,35 @@ packages:
       - supports-color
     dev: true
 
+  /eslint-module-utils/2.7.4_kvyj4idustix6trhy5lyssy2sq:
+    resolution: {integrity: sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: '*'
+      eslint-import-resolver-node: '*'
+      eslint-import-resolver-typescript: '*'
+      eslint-import-resolver-webpack: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+      eslint:
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+      eslint-import-resolver-typescript:
+        optional: true
+      eslint-import-resolver-webpack:
+        optional: true
+    dependencies:
+      '@typescript-eslint/parser': 5.48.2_7uibuqfxkfaozanbtbziikiqje
+      debug: 3.2.7
+      eslint: 8.32.0
+      eslint-import-resolver-node: 0.3.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /eslint-module-utils/2.7.4_sqt5xxn4ciiurbqrzlaarm6ama:
     resolution: {integrity: sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==}
     engines: {node: '>=4'}
@@ -6102,19 +6200,52 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-vue/9.9.0_eslint@8.31.0:
+  /eslint-plugin-import/2.27.5_2l6piu6guil2f63lj3qmhzbnn4:
+    resolution: {integrity: sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+    dependencies:
+      '@typescript-eslint/parser': 5.48.2_7uibuqfxkfaozanbtbziikiqje
+      array-includes: 3.1.6
+      array.prototype.flat: 1.3.1
+      array.prototype.flatmap: 1.3.1
+      debug: 3.2.7
+      doctrine: 2.1.0
+      eslint: 8.32.0
+      eslint-import-resolver-node: 0.3.7
+      eslint-module-utils: 2.7.4_kvyj4idustix6trhy5lyssy2sq
+      has: 1.0.3
+      is-core-module: 2.11.0
+      is-glob: 4.0.3
+      minimatch: 3.1.2
+      object.values: 1.1.6
+      resolve: 1.22.1
+      semver: 6.3.0
+      tsconfig-paths: 3.14.1
+    transitivePeerDependencies:
+      - eslint-import-resolver-typescript
+      - eslint-import-resolver-webpack
+      - supports-color
+    dev: true
+
+  /eslint-plugin-vue/9.9.0_eslint@8.32.0:
     resolution: {integrity: sha512-YbubS7eK0J7DCf0U2LxvVP7LMfs6rC6UltihIgval3azO3gyDwEGVgsCMe1TmDiEkl6GdMKfRpaME6QxIYtzDQ==}
     engines: {node: ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.2.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      eslint: 8.31.0
-      eslint-utils: 3.0.0_eslint@8.31.0
+      eslint: 8.32.0
+      eslint-utils: 3.0.0_eslint@8.32.0
       natural-compare: 1.4.0
       nth-check: 2.1.1
       postcss-selector-parser: 6.0.11
       semver: 7.3.8
-      vue-eslint-parser: 9.1.0_eslint@8.31.0
+      vue-eslint-parser: 9.1.0_eslint@8.32.0
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
       - supports-color
@@ -6146,6 +6277,16 @@ packages:
       eslint-visitor-keys: 2.1.0
     dev: true
 
+  /eslint-utils/3.0.0_eslint@8.32.0:
+    resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
+    engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
+    peerDependencies:
+      eslint: '>=5'
+    dependencies:
+      eslint: 8.32.0
+      eslint-visitor-keys: 2.1.0
+    dev: true
+
   /eslint-visitor-keys/2.1.0:
     resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}
     engines: {node: '>=10'}
@@ -6204,6 +6345,54 @@ packages:
       - supports-color
     dev: true
 
+  /eslint/8.32.0:
+    resolution: {integrity: sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    hasBin: true
+    dependencies:
+      '@eslint/eslintrc': 1.4.1
+      '@humanwhocodes/config-array': 0.11.8
+      '@humanwhocodes/module-importer': 1.0.1
+      '@nodelib/fs.walk': 1.2.8
+      ajv: 6.12.6
+      chalk: 4.1.2
+      cross-spawn: 7.0.3
+      debug: 4.3.4
+      doctrine: 3.0.0
+      escape-string-regexp: 4.0.0
+      eslint-scope: 7.1.1
+      eslint-utils: 3.0.0_eslint@8.32.0
+      eslint-visitor-keys: 3.3.0
+      espree: 9.4.1
+      esquery: 1.4.0
+      esutils: 2.0.3
+      fast-deep-equal: 3.1.3
+      file-entry-cache: 6.0.1
+      find-up: 5.0.0
+      glob-parent: 6.0.2
+      globals: 13.19.0
+      grapheme-splitter: 1.0.4
+      ignore: 5.2.4
+      import-fresh: 3.3.0
+      imurmurhash: 0.1.4
+      is-glob: 4.0.3
+      is-path-inside: 3.0.3
+      js-sdsl: 4.2.0
+      js-yaml: 4.1.0
+      json-stable-stringify-without-jsonify: 1.0.1
+      levn: 0.4.1
+      lodash.merge: 4.6.2
+      minimatch: 3.1.2
+      natural-compare: 1.4.0
+      optionator: 0.9.1
+      regexpp: 3.2.0
+      strip-ansi: 6.0.1
+      strip-json-comments: 3.1.1
+      text-table: 0.2.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /espree/9.4.1:
     resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -6501,6 +6690,10 @@ packages:
       time-stamp: 1.1.0
     dev: false
 
+  /fast-content-type-parse/1.0.0:
+    resolution: {integrity: sha512-Xbc4XcysUXcsP5aHUU7Nq3OwvHq97C+WnbkeIefpeYLX+ryzFJlU6OStFJhs6Ol0LkUGpcK+wL0JwfM+FCU5IA==}
+    dev: false
+
   /fast-decode-uri-component/1.0.1:
     resolution: {integrity: sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg==}
     dev: false
@@ -6569,15 +6762,15 @@ packages:
     resolution: {integrity: sha512-79ak0JxddO0utAXAQ5ccKhvs6vX2MGyHHMMsmZkBANrq3hXc1CHzvNPHOcvTsVMEPl5I+NT+RO4YKMGehOfSIg==}
     dev: false
 
-  /fastify/4.11.0:
-    resolution: {integrity: sha512-JteZ8pjEqd+6n+azQnQfSJV8MUMxAmxbvC2Dx/Mybj039Lf/u3kda9Kq84uy/huCpqCzZoyHIZS5JFGF3wLztw==}
+  /fastify/4.12.0:
+    resolution: {integrity: sha512-Hh2GCsOCqnOuewWSvqXlpq5V/9VA+/JkVoooQWUhrU6gryO9+/UGOoF/dprGcKSDxkM/9TkMXSffYp8eA/YhYQ==}
     dependencies:
       '@fastify/ajv-compiler': 3.5.0
       '@fastify/error': 3.2.0
       '@fastify/fast-json-stringify-compiler': 4.2.0
       abstract-logging: 2.0.1
       avvio: 8.2.0
-      content-type: 1.0.4
+      fast-content-type-parse: 1.0.0
       find-my-way: 7.4.0
       light-my-request: 5.8.0
       pino: 8.8.0
@@ -6636,8 +6829,8 @@ packages:
       flat-cache: 3.0.4
     dev: true
 
-  /file-type/18.1.0:
-    resolution: {integrity: sha512-FqjmVvHjX5C/EnibCENAsCMIg7HgUYO0vDypt5V8RmtKDk7eUa+/6mEWSrY4PStFhUt0K3CoE8stjLJCcMsJFQ==}
+  /file-type/18.2.0:
+    resolution: {integrity: sha512-M3RQMWY3F2ykyWZ+IHwNCjpnUmukYhtdkGGC1ZVEUb0ve5REGF7NNJ4Q9ehCUabtQKtSVFOMbFTXgJlFb0DQIg==}
     engines: {node: '>=14.16'}
     dependencies:
       readable-web-to-node-stream: 3.0.2
@@ -7778,11 +7971,6 @@ packages:
   /ieee754/1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
-  /ignore/5.2.1:
-    resolution: {integrity: sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==}
-    engines: {node: '>= 4'}
-    dev: true
-
   /ignore/5.2.4:
     resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
     engines: {node: '>= 4'}
@@ -11415,8 +11603,8 @@ packages:
     resolution: {integrity: sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==}
     dev: false
 
-  /punycode/2.2.0:
-    resolution: {integrity: sha512-LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw==}
+  /punycode/2.3.0:
+    resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==}
     engines: {node: '>=6'}
 
   /pureimage/0.3.15:
@@ -11971,8 +12159,8 @@ packages:
       seedrandom: 2.4.2
     dev: false
 
-  /rollup/3.10.0:
-    resolution: {integrity: sha512-JmRYz44NjC1MjVF2VKxc0M1a97vn+cDxeqWmnwyAF4FvpjK8YFdHpaqvQB+3IxCvX05vJxKZkoMDU8TShhmJVA==}
+  /rollup/3.10.1:
+    resolution: {integrity: sha512-3Er+yel3bZbZX1g2kjVM+FW+RUWDxbG87fcqFM5/9HbPCTpbVp6JOLn7jlxnNlbu7s/N/uDA4EV/91E2gWnxzw==}
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
@@ -13065,14 +13253,14 @@ packages:
     engines: {node: '>=0.8'}
     dependencies:
       psl: 1.9.0
-      punycode: 2.2.0
+      punycode: 2.3.0
 
   /tough-cookie/4.1.2:
     resolution: {integrity: sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==}
     engines: {node: '>=6'}
     dependencies:
       psl: 1.9.0
-      punycode: 2.2.0
+      punycode: 2.3.0
       universalify: 0.2.0
       url-parse: 1.5.10
     dev: false
@@ -13084,7 +13272,7 @@ packages:
     resolution: {integrity: sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==}
     engines: {node: '>=12'}
     dependencies:
-      punycode: 2.2.0
+      punycode: 2.3.0
     dev: false
 
   /trace-redirect/1.0.6:
@@ -13353,8 +13541,8 @@ packages:
       undertaker-registry: 1.0.1
     dev: false
 
-  /undici/5.15.0:
-    resolution: {integrity: sha512-wCAZJDyjw9Myv+Ay62LAoB+hZLPW9SmKbQkbHIhMw/acKSlpn7WohdMUc/Vd4j1iSMBO0hWwU8mjB7a5p5bl8g==}
+  /undici/5.15.1:
+    resolution: {integrity: sha512-XLk8g0WAngdvFqTI+VKfBtM4YWXgdxkf1WezC771Es0Dd+Pm1KmNx8t93WTC+Hh9tnghmVxkclU1HN+j+CvIUA==}
     engines: {node: '>=12.18'}
     dependencies:
       busboy: 1.6.0
@@ -13460,7 +13648,7 @@ packages:
   /uri-js/4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
     dependencies:
-      punycode: 2.2.0
+      punycode: 2.3.0
 
   /urix/0.1.0:
     resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==}
@@ -13675,7 +13863,7 @@ packages:
       esbuild: 0.16.17
       postcss: 8.4.21
       resolve: 1.22.1
-      rollup: 3.10.0
+      rollup: 3.10.1
       sass: 1.57.1
     optionalDependencies:
       fsevents: 2.3.2
@@ -13686,14 +13874,14 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /vue-eslint-parser/9.1.0_eslint@8.31.0:
+  /vue-eslint-parser/9.1.0_eslint@8.32.0:
     resolution: {integrity: sha512-NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ==}
     engines: {node: ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: '>=6.0.0'
     dependencies:
       debug: 4.3.4
-      eslint: 8.31.0
+      eslint: 8.32.0
       eslint-scope: 7.1.1
       eslint-visitor-keys: 3.3.0
       espree: 9.4.1

From ead931211c6783975d01928fa4636e42208689a1 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 04:24:38 +0900
Subject: [PATCH 052/177] =?UTF-8?q?fix(client):=20=E5=AE=9F=E7=B8=BE?=
 =?UTF-8?q?=E8=A7=A3=E9=99=A4=E3=83=AA=E3=82=AF=E3=82=A8=E3=82=B9=E3=83=88?=
 =?UTF-8?q?=E3=81=AE=E9=96=93=E9=9A=94=E3=82=92=E3=81=82=E3=81=91=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #9674
---
 packages/frontend/src/scripts/achievements.ts | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/scripts/achievements.ts b/packages/frontend/src/scripts/achievements.ts
index 8f484f892..c97358e88 100644
--- a/packages/frontend/src/scripts/achievements.ts
+++ b/packages/frontend/src/scripts/achievements.ts
@@ -433,16 +433,22 @@ export const ACHIEVEMENT_BADGES = {
 
 export const claimedAchievements = ($i && $i.achievements) ? $i.achievements.map(x => x.name) : [];
 
-export function claimAchievement(type: typeof ACHIEVEMENT_TYPES[number]) {
+const claimingQueue = new Set<string>();
+
+export async function claimAchievement(type: typeof ACHIEVEMENT_TYPES[number]) {
 	if (claimedAchievements.includes(type)) return;
-	os.api('i/claim-achievement', { name: type });
+	claimingQueue.add(type);
 	claimedAchievements.push(type);
+	await new Promise(resolve => setTimeout(resolve, (claimingQueue.size - 1) * 500));
+	window.setTimeout(() => {
+		claimingQueue.delete(type);
+	}, 500);
+	os.api('i/claim-achievement', { name: type });
 }
 
 if (_DEV_) {
-	(window as any).unlockAllAchievements = async () => {
+	(window as any).unlockAllAchievements = () => {
 		for (const t of ACHIEVEMENT_TYPES) {
-			await new Promise(resolve => setTimeout(resolve, 100));
 			claimAchievement(t);
 		}
 	};

From d6ff50a30b8ec6e1875a539438a116f80b538490 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 04:28:19 +0900
Subject: [PATCH 053/177] New Crowdin updates (#9676)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Russian)
---
 locales/de-DE.yml | 229 ++++++++++++++++++++++++++++++++++++++++++++++
 locales/en-US.yml | 197 ++++++++++++++++++++++++++++++++++++++-
 locales/ko-KR.yml |  13 +++
 locales/ru-RU.yml | 225 +++++++++++++++++++++++++++++++++++++++++++++
 locales/zh-CN.yml |  77 ++++++++++++++++
 locales/zh-TW.yml | 106 ++++++++++++++++++++-
 6 files changed, 845 insertions(+), 2 deletions(-)

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index f6095e4db..ecead98c3 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -938,6 +938,234 @@ cannotPerformTemporary: "Vorübergehend nicht verfügbar"
 cannotPerformTemporaryDescription: "Diese Aktion ist wegen des Überschreitenes des Ausführungslimits temporär nicht verfügbar. Bitte versuche es nach einiger Zeit erneut."
 preset: "Vorlage"
 selectFromPresets: "Aus Vorlagen wählen"
+achievements: "Errungenschaften"
+_achievements:
+  earnedAt: "Freigeschaltet am"
+  _types:
+    _notes1:
+      title: "Hallo Misskey!"
+      description: "Sende deine erste Notiz"
+      flavor: "Hab eine schöne Zeit mit Misskey!"
+    _notes10:
+      title: "Ein paar Notizen"
+      description: "10 Notizen gesendet"
+    _notes100:
+      title: "Viele Notizen"
+      description: "100 Notizen gesendet"
+    _notes500:
+      title: "Überschüttet mit Notizen"
+      description: "500 Notizen gesendet"
+    _notes1000:
+      title: "Berg an Notizen"
+      description: "1.000 Notizen gesendet"
+    _notes5000:
+      title: "Überquellende Notizen"
+      description: "5.000 Notizen gesendet"
+    _notes10000:
+      title: "Supernotiz"
+      description: "10.000 Notizen gesendet"
+    _notes20000:
+      title: "Brauche... mehr... Notizen"
+      description: "20.000 Notizen gesendet"
+    _notes30000:
+      title: "Notizen, Notizen, Notizen"
+      description: "30.000 Notizen gesendet"
+    _notes40000:
+      title: "Notizfabrik"
+      description: "40.000 Notizen gesendet"
+    _notes50000:
+      title: "Planet der Notizen"
+      description: "50.000 Notizen gesendet"
+    _notes60000:
+      title: "Notizquasar"
+      description: "60.000 Notizen gesendet"
+    _notes70000:
+      title: "Schwarzes Notizloch"
+      description: "70.000 Notizen gesendet"
+    _notes80000:
+      title: "Notizgalaxie"
+      description: "80.000 Notizen gesendet"
+    _notes90000:
+      title: "Notizversum"
+      description: "90.000 Notizen gesendet"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "100.000 Notizen gesendet"
+      flavor: "Du hast wirklich viel zu sagen."
+    _login3:
+      title: "Anfänger Ⅰ"
+      description: "An 3 Tagen eingeloggt"
+      flavor: "Nenn' mich ab heute Misskist"
+    _login7:
+      title: "Anfänger Ⅱ"
+      description: "An 7 Tagen eingeloggt"
+      flavor: "Na, eingewöht?"
+    _login15:
+      title: "Anfänger Ⅲ"
+      description: "An 15 Tagen eingeloggt"
+    _login30:
+      title: "Misskist Ⅰ"
+      description: "An 30 Tagen eingeloggt"
+    _login60:
+      title: "Misskist Ⅱ"
+      description: "An 60 Tagen eingeloggt"
+    _login100:
+      title: "Misskist Ⅲ"
+      description: "An 100 Tagen eingeloggt"
+      flavor: "Violent Misskist"
+    _login200:
+      title: "Stammbesucher Ⅰ"
+      description: "An 200 Tagen eingeloggt"
+    _login300:
+      title: "Stammbesucher Ⅱ"
+      description: "An 300 Tagen eingeloggt"
+    _login400:
+      title: "Stammbesucher Ⅲ"
+      description: "An 400 Tagen eingeloggt"
+    _login500:
+      title: "Veteran Ⅰ"
+      description: "An 500 Tagen eingeloggt"
+      flavor: "Meine Kameraden, ich liebe sie, die Notizen."
+    _login600:
+      title: "Veteran Ⅱ"
+      description: "An 600 Tagen eingeloggt"
+    _login700:
+      title: "Veteran Ⅲ"
+      description: "An 700 Tagen eingeloggt"
+    _login800:
+      title: "Meister der Notizen Ⅰ"
+      description: "An 800 Tagen eingeloggt"
+    _login900:
+      title: "Meister der Notizen Ⅱ"
+      description: "An 900 Tagen eingeloggt"
+    _login1000:
+      title: "Meister der Notizen Ⅲ"
+      description: "An 1000 Tagen eingeloggt"
+      flavor: "Danke, dass du Misskey nutzt!"
+    _noteClipped1:
+      title: "Muss... clippen..."
+      description: "Die erste Notiz geclippt"
+    _noteFavorited1:
+      title: "Sternengucker"
+      description: "Eine Notiz als Favorit markiert"
+    _profileFilled:
+      title: "Perfekte Vorbereitung"
+      description: "Fülle dein Profil aus"
+    _markedAsCat:
+      title: "Ich der Kater"
+      description: "Markiere dein Konto als Katze"
+      flavor: "Einen Namen bekommst du später. "
+    _following1:
+      title: "Das Folgen beginnt"
+      description: "Du folgst deiner ersten Person"
+    _following10:
+      title: "Folge ihnen... folge ihnen..."
+      description: "Du folgst über 10 Leuten"
+    _following50:
+      title: "Viele Freunde"
+      description: "Du folgst über 50 Leuten"
+    _following100:
+      title: "100 Freunde"
+      description: "Du folgst über 100 Leuten"
+    _following300:
+      title: "Freundeüberschuss"
+      description: "Du folgst über 300 Leuten"
+    _followers1:
+      title: "Der erste Follower"
+      description: "Du hast deinen ersten Follower erhalten"
+    _followers10:
+      title: "Mir nach!"
+      description: "Die Anzahl deiner Follower hat 10 überschritten"
+    _followers50:
+      title: "Wirrwarr"
+      description: "Die Anzahl deiner Follower hat 50 überschritten"
+    _followers100:
+      title: "Beliebt"
+      description: "Die Anzahl deiner Follower hat 100 überschritten"
+    _followers300:
+      title: "Stellt euch bitte in einer Reihe auf"
+      description: "Die Anzahl deiner Follower hat 300 überschritten"
+    _followers500:
+      title: "Funkmast"
+      description: "Die Anzahl deiner Follower hat 500 überschritten"
+    _followers1000:
+      title: "Influencer"
+      description: "Die Anzahl deiner Follower hat 1000 überschritten"
+    _collectAchievements30:
+      title: "Sammler der Errungenschaften"
+      description: "Schalte 30 Errungenschaften frei"
+    _viewAchievements3min:
+      title: "Fan von Errungenschaften"
+      description: "Schau dir die Liste deiner Errungenschaften für mindestens 3 Minuten an"
+    _iLoveMisskey:
+      title: "I Love Misskey"
+      description: "Sende \"I ❤ #Misskey\""
+      flavor: "Danke, dass du Misskey verwendest! - vom Entwicklerteam"
+    _client30min:
+      title: "Kleine Pause"
+      description: "Seit dem Öffnen deines Clients sind 30 Minuten vergangen"
+    _noteDeletedWithin1min:
+      title: "Ups"
+      description: "Lösche eine Notiz innerhalb von 1 Minute nachdem sie gesendet wurde"
+    _postedAtLateNight:
+      title: "Nachtaktiv"
+      description: "Sende mitten in der Nacht eine Notiz"
+      flavor: "Geh bald schlafen."
+    _postedAt0min0sec:
+      title: "Zeitansage"
+      description: "Sende um 00:00 eine Notiz"
+      flavor: "Klick Klick Klick Dooong"
+    _selfQuote:
+      title: "Selbstzitat"
+      description: "Zitiere eine eigene Notiz"
+    _htl20npm:
+      title: "Fließende Chronik"
+      description: "Deine Startseitenchronik erreicht eine Geschwindigkeit von 20 npm (Notizen pro Minute)"
+    _outputHelloWorldOnScratchpad:
+      title: "Hallo Welt!"
+      description: "Gib \"hello world\" in der Testumgebung aus"
+    _open3windows:
+      title: "Splitscreen"
+      description: "Habe zur gleichen Zeit mindestens 3 Fenster offen"
+    _driveFolderCircularReference:
+      title: "Zyklischer Verweis"
+      description: "Versuche, in Drive einen Zirkelbezug von Ordnern herzustellen"
+    _reactWithoutRead:
+      title: "Hast du das wirklich gelesen?"
+      description: "Reagiere auf eine Notiz mit mindestens 100 Zeichen innerhalb von 3 Sekunden der Erstellung der Notiz"
+    _clickedClickHere:
+      title: "Klicke hier"
+      description: "Du hast hier geklickt"
+    _justPlainLucky:
+      title: "Pures Glück"
+      description: "Kann alle 10 Sekunden mit einer Warscheinlichkeit von 0.01% erhalten werden"
+    _setNameToSyuilo:
+      title: "Gottkomplex"
+      description: "Setze deinen Namen auf \"syuilo\""
+    _passedSinceAccountCreated1:
+      title: "Einjahresjubiläum"
+      description: "Seit der Erstellung deines Kontos ist 1 Jahr vergangen"
+    _passedSinceAccountCreated2:
+      title: "Zweijahresjubiläum"
+      description: "Seit der Erstellung deines Kontos sind 2 Jahre vergangen"
+    _passedSinceAccountCreated3:
+      title: "Dreijahresjubiläum"
+      description: "Seit der Erstellung deines Kontos sind 3 Jahre vergangen"
+    _loggedInOnBirthday:
+      title: "Alles Gute Zum Geburtstag"
+      description: "Logge dich an deinem Geburtstag ein"
+    _loggedInOnNewYearsDay:
+      title: "Frohes Neujahr"
+      description: "Logge dich am Neujahrstag ein"
+      flavor: "Auf ein weiteres tolles Jahr in dieser Instanz"
+    _cookieClicked:
+      title: "Ein Spiel, in dem du auf einen Keks klickst"
+      description: "Den Keks geklickt"
+      flavor: "Bist du hier richtig?"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "Sende den Link zu Brain Diver"
+      flavor: "Misskey-Misskey La-Tu-Ma"
 _role:
   new: "Rolle erstellen"
   edit: "Rolle bearbeiten"
@@ -1587,6 +1815,7 @@ _notification:
   pollEnded: "Umfrageergebnisse sind verfügbar"
   unreadAntennaNote: "Antenne {name}"
   emptyPushNotificationMessage: "Push-Benachrichtigungen wurden aktualisiert"
+  achievementEarned: "Errungenschaft freigeschaltet"
   _types:
     all: "Alle"
     follow: "Neue Follower"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index b9f1603d2..e398f1fd5 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -938,8 +938,198 @@ cannotPerformTemporary: "Temporarily unavailable"
 cannotPerformTemporaryDescription: "This action cannot be performed temporarily due to exceeding the execution limit. Please wait for a while and then try again."
 preset: "Preset"
 selectFromPresets: "Choose from presets"
+achievements: "Achievements"
 _achievements:
+  earnedAt: "Unlocked at"
   _types:
+    _notes1:
+      title: "just setting up my msky"
+      description: "Post your first note"
+      flavor: "Have a good Misskey life!"
+    _notes10:
+      title: "Some notes"
+      description: "Post 10 notes"
+    _notes100:
+      title: "A lot of notes"
+      description: "Post 100 notes"
+    _notes500:
+      title: "Covered in notes"
+      description: "Post 500 notes"
+    _notes1000:
+      title: "A mountain of notes"
+      description: "Post 1,000 notes"
+    _notes5000:
+      title: "Overflowing notes"
+      description: "Post 5,000 notes"
+    _notes10000:
+      title: "Supernote"
+      description: "Post 10,000 notes"
+    _notes20000:
+      title: "Need... more... notes..."
+      description: "Post 20,000 notes"
+    _notes30000:
+      title: "Notes notes notes!"
+      description: "Post 30,000 notes"
+    _notes40000:
+      title: "Note factory"
+      description: "Post 40,000 notes"
+    _notes50000:
+      title: "Planet of notes"
+      description: "Post 50,000 notes"
+    _notes60000:
+      title: "Note quasar"
+      description: "Post 60,000 notes"
+    _notes70000:
+      title: "Note black hole"
+      description: "Post 70,000 notes"
+    _notes80000:
+      title: "Note galaxy"
+      description: "Post 80,000 notes"
+    _notes90000:
+      title: "Note universe"
+      description: "Post 90,000 notes"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "Post 100,000 notes"
+      flavor: "You sure have a lot to say."
+    _login3:
+      title: "Beginner I"
+      description: "Log in for a total of 3 days"
+      flavor: "Starting today, just call me Misskist"
+    _login7:
+      title: "Beginner II"
+      description: "Log in for a total of 7 days"
+      flavor: "Feel like you've gotten the hang of things yet?"
+    _login15:
+      title: "Beginner III"
+      description: "Log in for a total of 15 days"
+    _login30:
+      title: "Misskist I"
+      description: "Log in for a total of 30 days"
+    _login60:
+      title: "Misskist II"
+      description: "Log in for a total of 60 days"
+    _login100:
+      title: "Misskist III"
+      description: "Log in for a total of 100 days"
+      flavor: "Violent Misskist"
+    _login200:
+      title: "Regular I"
+      description: "Log in for a total of 200 days"
+    _login300:
+      title: "Regular II"
+      description: "Log in for a total of 300 days"
+    _login400:
+      title: "Regular III"
+      description: "Log in for a total of 400 days"
+    _login500:
+      title: "Expert I"
+      description: "Log in for a total of 500 days"
+      flavor: "My friends, it has often been said that I like notes"
+    _login600:
+      title: "Expert II"
+      description: "Log in for a total of 600 days"
+    _login700:
+      title: "Expert III"
+      description: "Log in for a total of 700 days"
+    _login800:
+      title: "Master of Notes I"
+      description: "Log in for a total of 800 days"
+    _login900:
+      title: "Master of Notes II"
+      description: "Log in for a total of 900 days"
+    _login1000:
+      title: "Master of Notes III"
+      description: "Log in for a total of 1,000 days"
+      flavor: "Thank you for using Misskey!"
+    _noteClipped1:
+      title: "Must... clip..."
+      description: "Clip your first note"
+    _noteFavorited1:
+      title: "Stargazer"
+      description: "Favorite your first note"
+    _profileFilled:
+      title: "Well-prepared"
+      description: "Set up your profile"
+    _markedAsCat:
+      title: "I Am a Cat"
+      description: "Mark your account as a cat"
+      flavor: "I'll give you a name later."
+    _following1:
+      title: "Following your first user"
+      description: "Follow a user"
+    _following10:
+      title: "Keep up... keep up..."
+      description: "Follow 10 users"
+    _following50:
+      title: "Lots of friends"
+      description: "Follow 50 accounts"
+    _following100:
+      title: "100 Friends"
+      description: "Follow 100 accounts"
+    _following300:
+      title: "Friend overload"
+      description: "Follow 300 accounts"
+    _followers1:
+      title: "First follower"
+      description: "Gain 1 follower"
+    _followers10:
+      title: "Follow me!"
+      description: "Gain 10 followers"
+    _followers50:
+      title: "Coming in crowds"
+      description: "Gain 50 followers"
+    _followers100:
+      title: "Popular"
+      description: "Gain 100 followers"
+    _followers300:
+      title: "Please form a single line"
+      description: "Gain 300 followers"
+    _followers500:
+      title: "Radio Tower"
+      description: "Gain 500 followers"
+    _followers1000:
+      title: "Influencer"
+      description: "Gain 1,000 followers"
+    _collectAchievements30:
+      title: "Achievement Collector"
+      description: "Earn 30 achievements"
+    _viewAchievements3min:
+      title: "Likes Achievements"
+      description: "Look at your list of achievements for at least 3 minutes"
+    _iLoveMisskey:
+      title: "I Love Misskey"
+      description: "Post \"I ❤ #Misskey\""
+      flavor: "Misskey's development team greatly appreciates your support!"
+    _client30min:
+      title: "Short break"
+      description: "Spend 30 minutes on Misskey"
+    _noteDeletedWithin1min:
+      title: "Nevermind"
+      description: "Delete a note within a minute of posting it"
+    _postedAtLateNight:
+      title: "Nocturnal"
+      description: "Post a note late at night"
+      flavor: "It's about time to go to bed."
+    _postedAt0min0sec:
+      title: "Speaking Clock"
+      description: "Post a note at 00:00"
+      flavor: "Click Click Click Claaang"
+    _selfQuote:
+      title: "Self-Reference"
+      description: "Quote your own note"
+    _htl20npm:
+      title: "Flowing Timeline"
+      description: "Have the speed of your home timeline exceed 20 npm (notes per minute)"
+    _outputHelloWorldOnScratchpad:
+      title: "Hello, world!"
+      description: "Output \"hello world\" in the Scratchpad"
+    _open3windows:
+      title: "Multi-Window"
+      description: "Have at least 3 windows open at the same time"
+    _driveFolderCircularReference:
+      title: "Circular Reference"
+      description: "Attempt to create a recursively nested folder in Drive"
     _reactWithoutRead:
       title: "Did you really read that?"
       description: "React on a note that's over 100 characters long within 3 seconds of it being posted"
@@ -963,10 +1153,15 @@ _achievements:
       description: "Three years have passed since your account was created"
     _loggedInOnBirthday:
       title: "Happy Birthday"
-      description: "Logged in on your birthday"
+      description: "Log in on your birthday"
+    _loggedInOnNewYearsDay:
+      title: "Happy New Year!"
+      description: "Logged in on the first day of the year"
+      flavor: "To another great year on this instance"
     _cookieClicked:
       title: "A game in which you click cookies"
       description: "Clicked the cookie"
+      flavor: "Wait, are you on the correct website?"
     _brainDiver:
       title: "Brain Diver"
       description: "Post the link to Brain Diver"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 3e6ab5a2f..bf747e3cb 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1094,6 +1094,9 @@ _achievements:
     _collectAchievements30:
       title: "도전과제 콜렉터"
       description: "30개의 도전과제를 획득했습니다"
+    _viewAchievements3min:
+      title: "저 도전과제 좋아해요"
+      description: "도전과제 목록을 3분 이상 보세요"
     _iLoveMisskey:
       title: "I Love Misskey"
       description: "\"I ❤ #Misskey\"를 포스트했습니다"
@@ -1118,6 +1121,12 @@ _achievements:
     _htl20npm:
       title: "타임라인 폭주 중"
       description: "1분 사이에 홈 타임라인에 노트가 20개 넘게 생성되었습니다"
+    _outputHelloWorldOnScratchpad:
+      title: "Hello, world!"
+      description: "스크래치패드에서 hello world를 출력하세요"
+    _open3windows:
+      title: "멀티 윈도우"
+      description: "3개 이상의 창을 여세요"
     _driveFolderCircularReference:
       title: "순환 참조"
       description: "드라이브 폴더를 자신을 가리키도록 만드려 시도했습니다"
@@ -1145,6 +1154,10 @@ _achievements:
     _loggedInOnBirthday:
       title: "생일 축하합니다!"
       description: "설정한 생일에 로그인했습니다"
+    _loggedInOnNewYearsDay:
+      title: "새해 복 많이 받으세요"
+      description: "새해 첫 날에 로그인했습니다"
+      flavor: "올해에도 저희 인스턴스에 관심을 가져 주셔서 감사합니다"
     _cookieClicked:
       title: "쿠키 클리커 게임"
       description: "쿠키를 클릭했습니다"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index d7aca1c9f..133169e8d 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -2,6 +2,7 @@
 _lang_: "Русский"
 headlineMisskey: "Сеть, сплетённая из заметок"
 introMisskey: "Добро пожаловать! Misskey — это децентрализованный сервис микроблогов с открытым исходным кодом.\nПишите «заметки» — делитесь со всеми происходящим вокруг или рассказывайте о себе 📡\nСтавьте «реакции» — выражайте свои чувства и эмоции от заметок других 👍\nОткройте для себя новый мир 🚀"
+poweredByMisskeyDescription: "{name} – один из инстансов (также называемый экземпляром Misskey), использующий платформу с открытым исходным кодом <b>Misskey</b>."
 monthAndDay: "{day}.{month}"
 search: "Поиск"
 notifications: "Уведомления"
@@ -12,6 +13,7 @@ fetchingAsApObject: "Приём с других сайтов"
 ok: "Окей"
 gotIt: "Ясно!"
 cancel: "Отмена"
+noThankYou: "Нет, спасибо"
 enterUsername: "Введите имя пользователя"
 renotedBy: "{user} делится"
 noNotes: "Нет ни одной заметки"
@@ -47,6 +49,7 @@ deleteAndEdit: "Удалить и отредактировать"
 deleteAndEditConfirm: "Удалить эту заметку и создать отредактированную? Все реакции, ссылки и ответы на существующую будут будут потеряны."
 addToList: "Добавить в список"
 sendMessage: "Отправить сообщение"
+copyRSS: "Скопировать RSS"
 copyUsername: "Скопировать имя пользователя"
 searchUser: "Поиск людей"
 reply: "Ответить"
@@ -452,6 +455,7 @@ language: "Язык"
 uiLanguage: "Язык интерфейса"
 groupInvited: "Приглашение в группу"
 aboutX: "Описание {x}"
+emojiStyle: "Стиль эмодзи"
 disableDrawer: "Не использовать выдвижные меню"
 youHaveNoGroups: "У вас нет ни одной группы"
 joinOrCreateGroup: "Получайте приглашения в группы или создавайте свои собственные"
@@ -709,6 +713,7 @@ accentColor: "Акцент"
 textColor: "Текст"
 saveAs: "Сохранить под названием…"
 advanced: "Для продвинутых"
+advancedSettings: "Расширенные настройки "
 value: "Значения"
 createdAt: "Создано"
 updatedAt: "Обновлено"
@@ -840,34 +845,254 @@ numberOfColumn: "Количество столбцов"
 searchByGoogle: "Поиск"
 instanceDefaultLightTheme: "Светлая тема по умолчанию"
 instanceDefaultDarkTheme: "Темная тема по умолчанию"
+instanceDefaultThemeDescription: "Описание темы по умолчанию для инстанса"
 mutePeriod: "Продолжительность скрытия"
 indefinitely: "вечно"
 tenMinutes: "10 минут"
 oneHour: "1 час"
 oneDay: "1 день"
 oneWeek: "1 неделя"
+reflectMayTakeTime: "Изменения могут занять время для отображения"
+failedToFetchAccountInformation: "Не удалось получить информацию об аккаунте"
 cropImage: "Кадрирование"
 cropImageAsk: "Нужно ли кадрировать изображение?"
 file: "Файлы"
 recentNHours: "Последние {n} ч"
 recentNDays: "Последние {n} сут"
+noEmailServerWarning: "Почтовый сервер не установлен "
+thereIsUnresolvedAbuseReportWarning: "Остались нерешённые жалобы"
 recommended: "Рекомендуем"
 check: "Проверить"
 driveCapOverrideLabel: "Изменение лимита дискового пространства для этого пользователя"
+driveCapOverrideCaption: "Укажите меньше или равное нулю для отмены"
+requireAdminForView: "Для просмотра необходимо иметь аккаунт администратора"
+isSystemAccount: "Данная учётная запись создана автоматически и управляется системой"
+typeToConfirm: "Введите {x} для продолжения"
 deleteAccount: "Удаление учётной записи"
+document: "Документ"
+numberOfPageCache: "Количество сохранённых страниц в кэше"
+numberOfPageCacheDescription: "Описание количества страниц в кэше"
+logoutConfirm: "Вы хотите выйти из аккаунта?"
+lastActiveDate: "Последняя дата использования"
+statusbar: "Статусбар"
+pleaseSelect: "Пожалуйста, выберите"
 reverse: "Переворот"
 colored: "Выделена цветом"
+refreshInterval: "Интервал перезагрузки"
 label: "Метка"
+type: "Тип"
+speed: "Скорость"
+sensitiveMediaDetection: "Определение содержимого деликатного характера"
 localOnly: "Локально"
+remoteOnly: "Только удалённо"
+failedToUpload: "Сбой выгрузки"
+cannotUploadBecauseInappropriate: "Файл не может быть загружен, так как было установлено, что он может содержать неприемлемое содержимое."
+cannotUploadBecauseNoFreeSpace: "Файл не может быть загружен, так как не осталось места на диске"
 beta: "Бета"
 enableAutoSensitive: "Автоматическое определение NSFW"
 enableAutoSensitiveDescription: "Если доступно, используйте машинное обучение для автоматической установки флага NSFW на носителе. Даже если эта функция отключена, она может быть установлена ​​автоматически в зависимости от инстанта."
 account: "Учётные записи"
 windowMaximize: "Развернуть"
 windowRestore: "Восстановить"
+loggedInAsBot: "Вы под аккаунтом бота!"
 like: "Нравится!"
+unlike: "Отменить «нравится»"
 show: "Отображение"
+pleaseDonate: "Сайт {host} работает на Misskey. Это бесплатное программное обеспечение, и ваши пожертвования очень бы помогли продолжать его разработку!"
 color: "Цвет"
+_achievements:
+  _types:
+    _notes1:
+      title: "Первые шаги в Misskey"
+      description: "Опубликована первая заметка"
+    _notes10:
+      title: "Несколько заметок"
+      description: "Опубликовано 10 заметок"
+    _notes100:
+      title: "Много заметок"
+      description: "Опубликовано 100 заметок"
+    _notes500:
+      title: "Всё в заметках"
+      description: "Опубликовано 500 заметок"
+    _notes1000:
+      title: "Гора заметок"
+      description: "Опубликовано 1000 заметок"
+    _notes5000:
+      title: "Заметки льются рекой"
+      description: "Опубликовано 5000 заметок"
+    _notes10000:
+      title: "Превосходство в заметках"
+      description: "Опубликовано 10 000 заметок"
+    _notes20000:
+      title: "Нужно больше заметок!"
+      description: "Опубликовано 20 000 заметок"
+    _notes30000:
+      title: "Заметки, заметки, заметки"
+      description: "Опубликовано 30 000 заметок"
+    _notes40000:
+      title: "Фабрика заметок"
+      description: "Опубликовано 40 000 заметок"
+    _notes50000:
+      title: "Планета заметок"
+      description: "Опубликовано 50 000 заметок"
+    _notes60000:
+      title: "Замет-квазар"
+      description: "Опубликовано 60 000 заметок"
+    _notes70000:
+      title: "Чёрная дыра из заметок"
+      description: "Опубликовано 70 000 заметок"
+    _notes80000:
+      title: "Галактика заметок"
+      description: "Опубликовано 80 000 заметок"
+    _notes90000:
+      title: "Вселенная заметок"
+      description: "Опубликовано 90 000 заметок"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "Опубликовано 100 000 заметок"
+    _login3:
+      title: "Новичок Ⅰ"
+      description: "3 дня на сайте"
+    _login7:
+      title: "Новичок Ⅱ"
+      description: "Неделя на сайте"
+      flavor: "Кажется, вы начали свыкаться с этим, нет?"
+    _login15:
+      title: "Новичок Ⅲ"
+      description: "15 дней на сайте"
+    _login30:
+      title: "Мискиец Ⅰ"
+      description: "30 дней на сайте"
+    _login60:
+      title: "Мискиец Ⅱ"
+      description: "60 дней на сайте"
+    _login100:
+      title: "Мискиец Ⅲ"
+      description: "100 дней на сайте"
+    _login200:
+      title: "Завсегдатай Ⅰ"
+      description: "200 дней на сайте"
+    _login300:
+      title: "Завсегдатай Ⅱ"
+      description: "300 дней на сайте"
+    _login400:
+      title: "Завсегдатай Ⅲ"
+      description: "400 дней на сайте"
+    _login500:
+      title: "Ветеран Ⅰ"
+      description: "500 дней на сайте"
+    _login600:
+      title: "Ветеран Ⅱ"
+      description: "600 дней на сайте"
+    _login700:
+      title: "Ветеран Ⅲ"
+      description: "700 дней на сайте"
+    _login800:
+      title: "Повелитель заметок Ⅰ"
+      description: "800 дней на сайте"
+    _login900:
+      title: "Повелитель заметок Ⅱ"
+      description: "900 дней на сайте"
+    _login1000:
+      title: "Повелитель заметок Ⅲ"
+      description: "1000 дней на сайте"
+    _noteClipped1:
+      title: "Нельзя не сохранить"
+      description: "Первая заметка в подборке"
+    _noteFavorited1:
+      title: "Смотрящий на звёзды"
+      description: "Первое добавление в избранное"
+    _profileFilled:
+      title: "Приготовления закончены"
+      description: "Заполнен профиль"
+    _markedAsCat:
+      description: "Включена опция «Аккаунт кота»"
+    _followers50:
+      title: "Один за другим"
+      description: "Подписчиков больше 50"
+    _followers100:
+      title: "Всеобщий любимец"
+      description: "Подписчиков больше 100"
+    _followers300:
+      title: "В очередь!"
+      description: "Подписчиков больше 300"
+    _followers500:
+      title: "Радиостанция"
+      description: "Подписчиков больше 300"
+    _followers1000:
+      title: "Авторитет"
+      description: "Подписчиков больше 1000"
+    _collectAchievements30:
+      title: "Достигатор"
+      description: "Получено 30 достижений"
+    _viewAchievements3min:
+      title: "Любовь к успехам"
+      description: "Более 3 минут любования достижениями"
+    _iLoveMisskey:
+      title: "Я люблю Misskey"
+      description: "Написана заметка «I ❤ #Misskey»"
+    _client30min:
+      title: "Перерыв на обед"
+      description: "Прошло 30 минут с момента запуска клиента"
+    _noteDeletedWithin1min:
+      title: "Ой, нет!"
+      description: "Заметка удалена через минуту после публикации"
+    _postedAtLateNight:
+      title: "Житель ночи"
+      description: "Заметка опубликована в глухую ночь"
+    _postedAt0min0sec:
+      title: "Говорящие часы"
+      description: "Заметка опубликована ровно в 0 минут 0 секунд"
+      flavor: "Дин-дон дин-дон"
+    _selfQuote:
+      title: "Самовоспроизведение"
+      description: "Процитирована собственная заметка"
+    _htl20npm:
+      title: "В потоке"
+      description: "Достигнута скорость домашней ленты в 20 з/мин (заметок минуту)"
+    _outputHelloWorldOnScratchpad:
+      title: "Привет, мир!"
+      description: "Выведен текст «hello world» в Когтеточке"
+    _open3windows:
+      title: "Многооконный"
+      description: "Открыто одновременно 3 окна"
+    _driveFolderCircularReference:
+      description: "Попытка создать на «диске» рекурсивно вложенную папку"
+    _reactWithoutRead:
+      title: "Не читай @ отвечай!"
+      description: "На заметку более чем 100 знаков написан ответ в первые же 3 секунды с её появления."
+    _clickedClickHere:
+      title: "Нажмите здесь"
+      description: "Нажато здесь"
+    _justPlainLucky:
+      title: "Чистая удача"
+      description: "Может достаться с вероятностью 0,01% каждые 10 секунд."
+    _setNameToSyuilo:
+      title: "Комплекс бога"
+      description: "Установлено «syuilo» в качестве имени"
+    _passedSinceAccountCreated1:
+      title: "Первая годовщина"
+      description: "Прошёл 1 год с момента регистрации"
+    _passedSinceAccountCreated2:
+      title: "Вторая годовщина"
+      description: "Прошло 2 года с момента регистрации"
+    _passedSinceAccountCreated3:
+      title: "Третья годовщина"
+      description: "Прошло 3 года с момента регистрации"
+    _loggedInOnBirthday:
+      title: "С днём рождения!"
+      description: "Вход на сайт в свой день рождения"
+    _loggedInOnNewYearsDay:
+      title: "С Новым годом!"
+      description: "Вход на сайт в первый день года"
+    _cookieClicked:
+      title: "Игра, в которой вы щёлкаете по печенькам"
+      description: "Нажато печенье"
+      flavor: "Стоп, вы вообще на том сайте-то?"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "Опубликована ссылка на песню «Brain Diver»"
+      flavor: "Мисски-Мисски Ла-Ту-Ма"
 _role:
   priority: "Приоритет"
   _priority:
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 817fc6946..33127264b 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -938,6 +938,82 @@ cannotPerformTemporary: "暂时不可用"
 cannotPerformTemporaryDescription: "因操作过于频繁，暂时不可用，请稍后再试。"
 preset: "預設值"
 selectFromPresets: "從預設值中選擇"
+achievements: "成就"
+_achievements:
+  earnedAt: "达成时间"
+  _types:
+    _notes1:
+      title: "初来乍到"
+      description: "第一次发帖"
+      flavor: "祝您在Misskey玩的愉快～"
+    _notes10:
+      title: "一些帖子"
+      description: "发布了10篇帖子"
+    _notes100:
+      title: "很多帖子"
+      description: "发布了100篇帖子"
+    _notes500:
+      title: "满是帖子"
+      description: "发布了500篇帖子"
+    _notes1000:
+      title: "帖子成山"
+      description: "发布了1,000篇帖子"
+    _notes5000:
+      title: "帖如泉涌"
+      description: "发布了5,000篇帖子"
+    _notes10000:
+      title: "超级帖"
+      description: "发布了10,000篇帖子"
+    _notes20000:
+      title: "还想要更多帖子"
+      description: "发布了20,000篇帖子"
+    _notes30000:
+      title: "帖子帖子帖子"
+      description: "发布了30,000篇帖子"
+    _notes40000:
+      title: "帖子工厂"
+      description: "发布了40,000篇帖子"
+    _notes50000:
+      title: "帖子星球"
+      description: "发布了50,000篇帖子"
+    _notes60000:
+      title: "帖子类星体"
+      description: "发布了60,000篇帖子"
+    _notes70000:
+      title: "帖子黑洞"
+      description: "发布了70,000篇帖子"
+    _notes80000:
+      title: "帖子星系"
+      description: "发布了80,000篇帖子"
+    _notes90000:
+      title: "帖子起源"
+      description: "发布了90,000篇帖子"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "发布了100,000篇帖子"
+      flavor: "真的有那么多可以写的东西吗？"
+    _login1000:
+      flavor: "感谢您使用Misskey！"
+    _noteFavorited1:
+      title: "观星者"
+    _markedAsCat:
+      title: "我是猫"
+    _following50:
+      title: "我的朋友很多"
+    _viewAchievements3min:
+      description: "盯着成就看三分钟"
+    _iLoveMisskey:
+      title: "I Love Misskey"
+      description: "发布\"I ❤ #Misskey\"帖子"
+      flavor: "感谢您使用 Misskey ！ by 开发团队"
+    _outputHelloWorldOnScratchpad:
+      title: "Hello, world!"
+    _loggedInOnBirthday:
+      title: "生日快乐"
+      description: "在生日当天登录"
+    _loggedInOnNewYearsDay:
+      title: "恭贺新禧"
+      description: "在元旦登入"
 _role:
   new: "创建角色"
   edit: "编辑角色"
@@ -1587,6 +1663,7 @@ _notification:
   pollEnded: "问卷调查结果已生成。"
   unreadAntennaNote: "天线 {name}"
   emptyPushNotificationMessage: "推送通知已更新"
+  achievementEarned: "获得成就"
   _types:
     all: "全部"
     follow: "关注中"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 025a4c3e5..b88cfd91a 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -989,11 +989,115 @@ _achievements:
       title: "貼文宇宙"
       description: "發表了90000則貼文"
     _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
       description: "發表了100,000則貼文"
       flavor: "有這麼多東西要寫嗎？"
     _login3:
-      title: "初學者 I"
+      title: "初學者Ⅰ"
       description: "總登入天數為3天"
+      flavor: "從今天開始，我就是Misskeyist"
+    _login7:
+      title: "初學者ⅠⅠ"
+      description: "總登入天數為7天"
+      flavor: "您開始習慣了嗎？"
+    _login15:
+      title: "初學者III"
+      description: "總登入天數為15天"
+    _login30:
+      title: "Misskeyist Ⅰ"
+      description: "總登入天數為30天"
+    _login60:
+      title: "Misskeyist ⅠⅠ"
+      description: "總登入天數為60天"
+    _login100:
+      title: "Misskeyist ⅠⅠⅠ"
+      description: "總登入天數為100天"
+      flavor: "辣個 Misskeyist 用戶"
+    _login200:
+      title: "普通Ⅰ"
+      description: "總登入天數為200天"
+    _login300:
+      title: "普通IⅠ"
+      description: "總登入天數為300天"
+    _login400:
+      title: "普通IIⅠ"
+      description: "總登入天數為400天"
+    _login500:
+      title: "老兵Ⅰ"
+      description: "總登入天數為500天"
+      flavor: "諸君，我喜歡貼文"
+    _login600:
+      title: "老兵ⅠⅠ"
+      description: "總登入天數為600天"
+    _login700:
+      title: "老兵ⅠⅠⅠ"
+      description: "總登入天數為700天"
+    _login800:
+      title: "貼文大師Ⅰ"
+      description: "總登入天數為800天"
+    _login900:
+      title: "貼文大師ⅠⅠ"
+      description: "總登入天數為900天"
+    _login1000:
+      title: "貼文大師ⅠⅠⅠ"
+      description: "總登入天數為1,000天"
+      flavor: "感謝您使用Misskey！"
+    _followers500:
+      title: "基站"
+      description: "超過500名追隨者"
+    _followers1000:
+      title: "影響者"
+      description: "超過1000名追隨者"
+    _collectAchievements30:
+      title: "成就收藏家"
+      description: "獲得30個以上的成就"
+    _viewAchievements3min:
+      title: "喜愛成就"
+      description: "看成就列表要花了3分鐘以上"
+    _iLoveMisskey:
+      title: "I Love Misskey"
+      description: "發布「I ❤ #Misskey」"
+      flavor: "感謝您使用Misskey！ by 開發團隊"
+    _client30min:
+      title: "休息一下"
+      description: "用戶端啟動已超過30分鐘"
+    _noteDeletedWithin1min:
+      title: "現在沒有"
+      description: "發文後1分鐘內刪文"
+    _postedAtLateNight:
+      title: "夜行性"
+      description: "在深夜發佈貼文"
+      flavor: "該去睡覺了。"
+    _postedAt0min0sec:
+      title: "報時"
+      description: "在0分0秒發佈貼文"
+    _selfQuote:
+      title: "自我引用"
+      description: "引用了自己的貼文"
+    _htl20npm:
+      title: "流動的TL"
+      description: "在首頁時間軸的流速超過20npm"
+    _outputHelloWorldOnScratchpad:
+      title: "Hello world!"
+      description: "在暫存記憶體輸出了 hello world"
+    _open3windows:
+      title: "多重視窗"
+      description: "開啟3個以上的視窗"
+    _driveFolderCircularReference:
+      title: "循環引用"
+      description: "試圖遞迴套入雲端硬碟資料夾"
+    _reactWithoutRead:
+      title: "有好好讀過嗎？"
+      description: "對包含100字以上內容的貼文做出情感反應"
+    _clickedClickHere:
+      title: "點擊這裡"
+      description: "已點擊這裡了"
+    _justPlainLucky:
+      title: "只是運氣好"
+      description: "每10秒有0.01%的機率獲得"
+    _setNameToSyuilo:
+      title: "神的情結"
+      description: "將名稱設定為 syuilo"
 _role:
   new: "建立角色"
   edit: "編輯角色"

From 7800a12e526f839ce3e0b5248e521b67cb51d347 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 04:28:43 +0900
Subject: [PATCH 054/177] 13.1.1

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca8379bcf..1841be3fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,15 @@
 You should also include the user name that made the change.
 -->
 
+## 13.1.1 (2023/01/22)
+
+### Improvements
+- ローカルのカスタム絵文字を表示する際のパフォーマンスを改善
+- Client: 瞬間的に大量の実績を解除した際の挙動を改善
+
+### Bugfixes
+- Client: アップデート時にローカリゼーションデータが更新されないことがあるのを修正
+
 ## 13.1.0 (2023/01/21)
 
 ### Improvements

From 363d727c55c94edb3a6407693ecb1753e63b0798 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 05:33:26 +0900
Subject: [PATCH 055/177] refactor

---
 packages/frontend/src/components/global/MkEmoji.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/global/MkEmoji.vue b/packages/frontend/src/components/global/MkEmoji.vue
index aaad81c65..a6594a526 100644
--- a/packages/frontend/src/components/global/MkEmoji.vue
+++ b/packages/frontend/src/components/global/MkEmoji.vue
@@ -35,7 +35,7 @@ const url = computed(() => {
 		const found = customEmojis.find(x => x.name === customEmojiName);
 		return found ? found.url : null;
 	} else {
-		const rawUrl = props.host ? `/emoji/${customEmojiName}@${props.host}.webp` : `/emoji/${customEmojiName}.webp`;
+		const rawUrl = `/emoji/${customEmojiName}@${props.host}.webp`;
 		return defaultStore.state.disableShowingAnimatedImages
 			? getStaticImageUrl(rawUrl)
 			: rawUrl;

From 957eff0e63771427f3756cf6aa536a4c1cc0a426 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 05:39:33 +0900
Subject: [PATCH 056/177] =?UTF-8?q?fix(client):=20=E3=83=AA=E3=82=A2?=
 =?UTF-8?q?=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AE=E3=82=AB=E3=82=B9?=
 =?UTF-8?q?=E3=82=BF=E3=83=A0=E7=B5=B5=E6=96=87=E5=AD=97=E3=81=8C=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E3=81=AE=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #9682
---
 packages/frontend/src/components/global/MkEmoji.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/global/MkEmoji.vue b/packages/frontend/src/components/global/MkEmoji.vue
index a6594a526..f16e25624 100644
--- a/packages/frontend/src/components/global/MkEmoji.vue
+++ b/packages/frontend/src/components/global/MkEmoji.vue
@@ -25,7 +25,7 @@ const props = defineProps<{
 const char2path = defaultStore.state.emojiStyle === 'twemoji' ? char2twemojiFilePath : char2fluentEmojiFilePath;
 
 const isCustom = computed(() => props.emoji.startsWith(':'));
-const customEmojiName = props.emoji.substr(1, props.emoji.length - 2);
+const customEmojiName = props.emoji.substr(1, props.emoji.length - 2).replace('@.', '');
 const char = computed(() => isCustom.value ? undefined : props.emoji);
 const useOsNativeEmojis = computed(() => defaultStore.state.emojiStyle === 'native' && !props.isReaction);
 const url = computed(() => {

From ccb22539e1f90d2eb7e380fcdb8c69639d381c63 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 05:40:48 +0900
Subject: [PATCH 057/177] 13.1.2

---
 CHANGELOG.md | 5 +++++
 package.json | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1841be3fb..b01698687 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,11 @@
 You should also include the user name that made the change.
 -->
 
+## 13.1.2 (2023/01/22)
+
+### Bugfixes
+- Client: リアクションのカスタム絵文字の表示の問題を修正
+
 ## 13.1.1 (2023/01/22)
 
 ### Improvements
diff --git a/package.json b/package.json
index d30ea8eea..435ef58a3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.1.0",
+	"version": "13.1.2",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From aa339be2ab83d447b925ca956ed3fda20abcdaa9 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 07:04:20 +0900
Subject: [PATCH 058/177] =?UTF-8?q?fix(client):=20=E3=83=AA=E3=82=A2?=
 =?UTF-8?q?=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AE=E3=82=AB=E3=82=B9?=
 =?UTF-8?q?=E3=82=BF=E3=83=A0=E7=B5=B5=E6=96=87=E5=AD=97=E3=81=8C=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E3=81=93=E3=81=A8?=
 =?UTF-8?q?=E3=81=8C=E3=81=82=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #9683
---
 packages/frontend/src/components/global/MkEmoji.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/global/MkEmoji.vue b/packages/frontend/src/components/global/MkEmoji.vue
index f16e25624..93f50da20 100644
--- a/packages/frontend/src/components/global/MkEmoji.vue
+++ b/packages/frontend/src/components/global/MkEmoji.vue
@@ -31,11 +31,11 @@ const useOsNativeEmojis = computed(() => defaultStore.state.emojiStyle === 'nati
 const url = computed(() => {
 	if (char.value) {
 		return char2path(char.value);
-	} else if (props.host == null) {
+	} else if (props.host == null && !customEmojiName.includes('@')) {
 		const found = customEmojis.find(x => x.name === customEmojiName);
 		return found ? found.url : null;
 	} else {
-		const rawUrl = `/emoji/${customEmojiName}@${props.host}.webp`;
+		const rawUrl = props.host ? `/emoji/${customEmojiName}@${props.host}.webp` : `/emoji/${customEmojiName}.webp`;
 		return defaultStore.state.disableShowingAnimatedImages
 			? getStaticImageUrl(rawUrl)
 			: rawUrl;

From 7d7167df6dfb7673bfd90534c79ca895117ce44e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 07:04:30 +0900
Subject: [PATCH 059/177] New Crowdin updates (#9680)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Russian)
---
 locales/it-IT.yml | 158 +++++++++++++++++++++++++++++++++++++++++++++-
 locales/ru-RU.yml |  57 +++++++++++++++--
 2 files changed, 209 insertions(+), 6 deletions(-)

diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index e215b9f79..cc93891bc 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -938,6 +938,161 @@ cannotPerformTemporary: "Indisponibilità temporanea"
 cannotPerformTemporaryDescription: "L'attività non può essere svolta, poiché si è raggiunto il limite di esecuzioni possibili. Per favore, riprova più tardi."
 preset: "Preimpostato"
 selectFromPresets: "Seleziona preimpostato"
+achievements: "Obiettivi raggiunti"
+_achievements:
+  earnedAt: "Data di conseguimento"
+  _types:
+    _notes1:
+      title: "Ho iniziato a usare Misskey"
+      description: "Ho pubblicato la mia prima Nota"
+      flavor: "Goditi la vita su Misskey!"
+    _notes10:
+      title: "Alcune Note"
+      description: "Ho inserito 10 Note"
+    _notes100:
+      title: "Un po' di Note"
+      description: "Ho inserito 100 Note"
+    _notes500:
+      title: "Un bel po' di Note"
+      description: "Ho inserito 500 Note"
+    _notes1000:
+      title: "Una montagna di Note"
+      description: "Ho inserito 1.000 Note"
+    _notes5000:
+      title: "Un sovraccarico di Note!"
+      description: "Ho inserito 5.000 Note"
+    _notes10000:
+      title: "SuperNote!"
+      description: "Ho inserito 10.000 Note"
+    _notes20000:
+      title: "Voglio più... Note!"
+      description: "Ho inserito 20.000 Note"
+    _notes30000:
+      title: "Note, Note, Note!"
+      description: "Ho inserito 30.000 Note"
+    _notes40000:
+      title: "Una fabbrica di Note"
+      description: "Ho inserito 40.000 Note"
+    _notes50000:
+      title: "Un pianeta di Note"
+      description: "Ho inserito 50.000 Note"
+    _notes60000:
+      title: "Un quasar di Note"
+      description: "Ho inserito 60.000 Note"
+    _notes70000:
+      title: "Un buco nero supermassiccio di Note"
+      description: "Ho inserito 70.000 Note"
+    _notes80000:
+      title: "Una galassia di Note"
+      description: "Ho inserito 80.000 Note"
+    _notes90000:
+      title: "Un universo di Note!"
+      description: "Ho inserito 90.000 Note"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "Ho inserito 100.000 Note"
+      flavor: "Hai molto da scrivere?"
+    _login3:
+      title: "Principiante I"
+      description: "Accedi per 3 giorni di fila"
+      flavor: "Da oggi, chiamatemi Misskist"
+    _login7:
+      title: "Principiante II"
+      description: "Accedi per 7 giorni di fila"
+      flavor: "Ti sembra di avere la situazione sotto controllo?"
+    _login15:
+      title: "Principiante III"
+      description: "Accedi per 15 giorni di fila"
+    _login30:
+      title: "Misskist I"
+      description: "Accedi per 30 giorni di fila"
+    _login60:
+      title: "Misskeist II"
+      description: "Accedi per 60 giorni di fila"
+    _login100:
+      title: "Misskeist III"
+      description: "Accedi per 100 giorni di fila"
+      flavor: "Violent Misskeist"
+    _login200:
+      title: "Regolare I"
+      description: "Accedi per 200 giorni totali"
+    _login300:
+      title: "Regolare II"
+      description: "Accedi per un totale di 300 giorni"
+    _login400:
+      title: "Regolare III"
+      description: "Accedi per un totale di 400 giorni"
+    _login500:
+      title: "Professionista I"
+      description: "Accedi per un totale di 500 giorni"
+      flavor: "Amici cari, mi piacciono le Note"
+    _login600:
+      title: "Professionista II"
+      description: "Accedi per un totale di 600 giorni"
+    _login700:
+      title: "Professionista III"
+      description: "Accedi per un totale di 700 giorni"
+    _login800:
+      title: "Maestro di Note I"
+      description: "Accedi per un totale di 800 giorni"
+    _login900:
+      title: "Maestro di Note II"
+      description: "Accedi per un totale di 900 giorni"
+    _login1000:
+      title: "Maestro di Note III"
+      description: "Accedi per un totale di 1.000 giorni"
+      flavor: "Grazie per aver usato Misskey!"
+    _noteClipped1:
+      title: "Devo clippare!"
+      description: "Ho raccolto in Clip la prima Nota"
+    _noteFavorited1:
+      title: "Guarda le stelle"
+      description: "Aggiungi una Nota ai preferiti per la prima volta"
+    _profileFilled:
+      title: "Perfettamente"
+      description: "Imposta il tuo profilo"
+    _markedAsCat:
+      title: "Io sono un gatto"
+      description: "Aggiungi le orecchie da gatto al tuo profilo"
+      flavor: "Ti chiamerò..."
+    _following1:
+      title: "Hai seguito il tuo primo profilo"
+      description: "Il tuo primo profilo Follower"
+    _following10:
+      title: "Segui, segui!"
+      description: "Hai seguito 10 profili"
+    _following50:
+      title: "Tanti amici"
+      description: "Hai seguito 50 profili"
+    _following100:
+      title: "Cento amici"
+      description: "Hai seguito 100 profili"
+    _following300:
+      title: "Sovraccarico di amici"
+      description: "Hai seguito 300 profili"
+    _followers1:
+      title: "Primo Follower"
+      description: "Hai ottenuto un Follower"
+    _followers10:
+      title: "Follow me!"
+      description: "Hai ottenuto 10 Follower"
+    _followers50:
+      title: "Follower a frotte"
+      description: "Hai ottenuto 50 Follower"
+    _followers100:
+      title: "Popolare"
+      description: "Hai ottenuto 100 Follower"
+    _followers300:
+      title: "Mettetevi in fila"
+      description: "Hai ottenuto 300 Follower"
+    _followers500:
+      title: "Trasmettitore"
+      description: "Hai ottenuto 500 Follower"
+    _followers1000:
+      title: "Influenzer"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "Pubblica un link a Brain Diver"
 _role:
   new: "Nuovo ruolo"
   edit: "Modifica ruolo"
@@ -1293,7 +1448,7 @@ _tutorial:
   step3_1: "Hai finito di impostare il tuo profilo?"
   step3_2: "Ora puoi pubblicare una «Nota». Proviamo subito! Premi il bottone con l'icona «penna» per iniziare a scrivere in una finestra di dialogo.  "
   step3_3: "Scritto il testo della nota, puoi pubblicarla premendo il pulsante nella parte superiore destra della finestra di dialogo."
-  step3_4: "Non ti viene niente in mente? Perché non scrivi semplicemente \"Ho appena cominciato a usare Misskey\"?"
+  step3_4: "Non ti viene niente in mente? Perché non scrivi semplicemente \"Ho appena iniziato a usare Misskey\"?"
   step4_1: "Hai pubblicato qualcosa?"
   step4_2: "Se puoi visualizzare la tua nota sulla timeline, ce l'hai fatta!"
   step5_1: "Adesso, cerca di seguire altre persone per vivacizzare la tua timeline. "
@@ -1587,6 +1742,7 @@ _notification:
   pollEnded: "Risultati del sondaggio."
   unreadAntennaNote: "Antenna {name}"
   emptyPushNotificationMessage: "Le notifiche push sono state aggiornate."
+  achievementEarned: "Obiettivo raggiunto"
   _types:
     all: "Tutto"
     follow: "Novità follower"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index 133169e8d..f22a093ca 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -899,12 +899,16 @@ like: "Нравится!"
 unlike: "Отменить «нравится»"
 show: "Отображение"
 pleaseDonate: "Сайт {host} работает на Misskey. Это бесплатное программное обеспечение, и ваши пожертвования очень бы помогли продолжать его разработку!"
+roles: "Роли"
+role: "Роль"
 color: "Цвет"
+achievements: "Достижения"
 _achievements:
   _types:
     _notes1:
       title: "Первые шаги в Misskey"
       description: "Опубликована первая заметка"
+      flavor: "Приятных дней с Misskey!"
     _notes10:
       title: "Несколько заметок"
       description: "Опубликовано 10 заметок"
@@ -950,9 +954,11 @@ _achievements:
     _notes100000:
       title: "ALL YOUR NOTE ARE BELONG TO US"
       description: "Опубликовано 100 000 заметок"
+      flavor: "Вам правда нужно столько писать?"
     _login3:
       title: "Новичок Ⅰ"
       description: "3 дня на сайте"
+      flavor: "С сегодняшнего дня зовите меня просто мискиец"
     _login7:
       title: "Новичок Ⅱ"
       description: "Неделя на сайте"
@@ -981,6 +987,7 @@ _achievements:
     _login500:
       title: "Ветеран Ⅰ"
       description: "500 дней на сайте"
+      flavor: "Господа, я люблю заметки"
     _login600:
       title: "Ветеран Ⅱ"
       description: "600 дней на сайте"
@@ -996,6 +1003,7 @@ _achievements:
     _login1000:
       title: "Повелитель заметок Ⅲ"
       description: "1000 дней на сайте"
+      flavor: "Спасибо, что пользуетесь Misskey!"
     _noteClipped1:
       title: "Нельзя не сохранить"
       description: "Первая заметка в подборке"
@@ -1006,22 +1014,45 @@ _achievements:
       title: "Приготовления закончены"
       description: "Заполнен профиль"
     _markedAsCat:
+      title: "Ваш покорный слуга кот"
       description: "Включена опция «Аккаунт кота»"
+      flavor: "Позвольте представиться: я — кот, просто кот, у меня еще нет имени."
+    _following1:
+      title: "Я не один"
+      description: "Сделана первая подписка"
+    _following10:
+      title: "Не останавливайся… Не останавливайся…"
+      description: "Количество подписок достигло 10"
+    _following50:
+      title: "Много друзей"
+      description: "Количество подписок достигло 50"
+    _following100:
+      title: "Сотня друзей"
+      description: "Количество подписок достигло 100"
+    _following300:
+      title: "Друзья в избытке"
+      description: "Количество подписок достигло 300"
+    _followers1:
+      title: "Первый подписчик"
+      description: "Появился 1 подписчик"
+    _followers10:
+      title: "Следуй за мной!"
+      description: "Количество подписчиков достигло 10"
     _followers50:
       title: "Один за другим"
-      description: "Подписчиков больше 50"
+      description: "Количество подписчиков достигло 50"
     _followers100:
       title: "Всеобщий любимец"
-      description: "Подписчиков больше 100"
+      description: "Количество подписчиков достигло 100"
     _followers300:
       title: "В очередь!"
-      description: "Подписчиков больше 300"
+      description: "Количество подписчиков достигло 300"
     _followers500:
       title: "Радиостанция"
-      description: "Подписчиков больше 300"
+      description: "Количество подписчиков достигло 500"
     _followers1000:
       title: "Авторитет"
-      description: "Подписчиков больше 1000"
+      description: "Количество подписчиков достигло 1000"
     _collectAchievements30:
       title: "Достигатор"
       description: "Получено 30 достижений"
@@ -1031,6 +1062,7 @@ _achievements:
     _iLoveMisskey:
       title: "Я люблю Misskey"
       description: "Написана заметка «I ❤ #Misskey»"
+      flavor: "Спасибо за поддержку Misskey! Ваша команда разработчиков"
     _client30min:
       title: "Перерыв на обед"
       description: "Прошло 30 минут с момента запуска клиента"
@@ -1040,6 +1072,7 @@ _achievements:
     _postedAtLateNight:
       title: "Житель ночи"
       description: "Заметка опубликована в глухую ночь"
+      flavor: "Вроде бы пора спать"
     _postedAt0min0sec:
       title: "Говорящие часы"
       description: "Заметка опубликована ровно в 0 минут 0 секунд"
@@ -1057,6 +1090,7 @@ _achievements:
       title: "Многооконный"
       description: "Открыто одновременно 3 окна"
     _driveFolderCircularReference:
+      title: "Циклическая ссылка"
       description: "Попытка создать на «диске» рекурсивно вложенную папку"
     _reactWithoutRead:
       title: "Не читай @ отвечай!"
@@ -1085,6 +1119,7 @@ _achievements:
     _loggedInOnNewYearsDay:
       title: "С Новым годом!"
       description: "Вход на сайт в первый день года"
+      flavor: "Желаем отличного года на нашем сайте!"
     _cookieClicked:
       title: "Игра, в которой вы щёлкаете по печенькам"
       description: "Нажато печенье"
@@ -1094,6 +1129,17 @@ _achievements:
       description: "Опубликована ссылка на песню «Brain Diver»"
       flavor: "Мисски-Мисски Ла-Ту-Ма"
 _role:
+  new: "Новая роль"
+  name: "Название роли"
+  description: "Описание роли"
+  permission: "Ролевые полномочия"
+  assignTarget: "Метод присвоения"
+  manual: "Вручную"
+  conditional: "По условию"
+  isPublic: "Общедоступная роль"
+  descriptionOfIsPublic: "Список тех, кому назначена эта роль будет доступен всем. Кроме того эта роль будет отмечена у каждого в профиле."
+  canEditMembersByModerator: "Могут назначать модераторы"
+  descriptionOfCanEditMembersByModerator: "Если включено, на эту роль могут назначать пользователей как администраторы, так и модераторы. Если выключено, назначать могут только администраторы."
   priority: "Приоритет"
   _priority:
     low: "Низкий"
@@ -1641,6 +1687,7 @@ _notification:
   youReceivedFollowRequest: "У вас новый запрос на подписку."
   yourFollowRequestAccepted: "Ваш запрос на подписку одобрен."
   youWereInvitedToGroup: "Вы приглашены в группу."
+  achievementEarned: "Получено достижение"
   _types:
     all: "Все"
     follow: "Подписки"

From 7fdf298bd470ab4ed739f85a23ac3a07956777c1 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 07:04:58 +0900
Subject: [PATCH 060/177] 13.1.3

---
 CHANGELOG.md | 5 +++++
 package.json | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b01698687..970a862cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,11 @@
 You should also include the user name that made the change.
 -->
 
+## 13.1.3 (2023/01/22)
+
+### Bugfixes
+- Client: リアクションのカスタム絵文字の表示の問題を修正
+
 ## 13.1.2 (2023/01/22)
 
 ### Bugfixes
diff --git a/package.json b/package.json
index 435ef58a3..e48eea7d7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.1.2",
+	"version": "13.1.3",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From 26ae2dfc0f494c377abd878c00044049fcd2bf37 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 08:00:42 +0900
Subject: [PATCH 061/177] add achievement

---
 locales/ja-JP.yml                                           | 3 +++
 packages/backend/src/core/AchievementService.ts             | 3 ++-
 .../src/server/api/endpoints/notes/favorites/create.ts      | 6 ++++++
 packages/frontend/src/scripts/achievements.ts               | 6 ++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 898ae01e7..57296b985 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1049,6 +1049,9 @@ _achievements:
     _noteFavorited1:
       title: "星をみるひと"
       description: "初めてノートをお気に入りに登録した"
+    _myNoteFavorited1:
+      title: "星が欲しい"
+      description: "自分のノートが他の人からお気に入りに登録された"
     _profileFilled:
       title: "準備万端"
       description: "プロフィール設定を行った"
diff --git a/packages/backend/src/core/AchievementService.ts b/packages/backend/src/core/AchievementService.ts
index 26dd356d3..be763e462 100644
--- a/packages/backend/src/core/AchievementService.ts
+++ b/packages/backend/src/core/AchievementService.ts
@@ -44,6 +44,7 @@ const ACHIEVEMENT_TYPES = [
 	'loggedInOnNewYearsDay',
 	'noteClipped1',
 	'noteFavorited1',
+	'myNoteFavorited1',
 	'profileFilled',
 	'markedAsCat',
 	'following1',
@@ -94,7 +95,7 @@ export class AchievementService {
 	@bindThis
 	public async create(
 		userId: User['id'],
-		type: string,
+		type: typeof ACHIEVEMENT_TYPES[number],
 	): Promise<void> {
 		if (!ACHIEVEMENT_TYPES.includes(type)) return;
 
diff --git a/packages/backend/src/server/api/endpoints/notes/favorites/create.ts b/packages/backend/src/server/api/endpoints/notes/favorites/create.ts
index acf22a5ad..e423f0f10 100644
--- a/packages/backend/src/server/api/endpoints/notes/favorites/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/favorites/create.ts
@@ -6,6 +6,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js';
 import { GetterService } from '@/server/api/GetterService.js';
 import { DI } from '@/di-symbols.js';
 import { ApiError } from '../../../error.js';
+import { AchievementService } from '@/core/AchievementService.js';
 
 export const meta = {
 	tags: ['notes', 'favorites'],
@@ -51,6 +52,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 		private idService: IdService,
 		private getterService: GetterService,
+		private achievementService: AchievementService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			// Get favoritee
@@ -76,6 +78,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				noteId: note.id,
 				userId: me.id,
 			});
+
+			if (note.userHost == null) {
+				this.achievementService.create(note.userId, 'myNoteFavorited1');
+			}
 		});
 	}
 }
diff --git a/packages/frontend/src/scripts/achievements.ts b/packages/frontend/src/scripts/achievements.ts
index c97358e88..f511fce3e 100644
--- a/packages/frontend/src/scripts/achievements.ts
+++ b/packages/frontend/src/scripts/achievements.ts
@@ -40,6 +40,7 @@ export const ACHIEVEMENT_TYPES = [
 	'loggedInOnNewYearsDay',
 	'noteClipped1',
 	'noteFavorited1',
+	'myNoteFavorited1',
 	'profileFilled',
 	'markedAsCat',
 	'following1',
@@ -240,6 +241,11 @@ export const ACHIEVEMENT_BADGES = {
 		bg: null,
 		frame: 'bronze',
 	},
+	'myNoteFavorited1': {
+		img: '/fluent-emoji/1f320.png',
+		bg: null,
+		frame: 'silver',
+	},
 	'profileFilled': {
 		img: '/fluent-emoji/1f44c.png',
 		bg: 'linear-gradient(0deg, rgb(187 183 59), rgb(255 143 77))',

From 9dacf11702dc9f71447bc15f1b98ab5532e46f27 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 16:52:15 +0900
Subject: [PATCH 062/177] =?UTF-8?q?fix(client):=20=E3=83=AD=E3=83=BC?=
 =?UTF-8?q?=E3=82=AB=E3=83=AA=E3=82=BC=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=99=82=E3=81=AB=E3=83=AA=E3=83=AD=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E3=81=8C=E7=B9=B0=E3=82=8A=E8=BF=94=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=82=8B=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82=E3=82=8B=E3=81=AE?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/config.ts |  6 +++++-
 packages/frontend/src/i18n.ts   |  4 ++++
 packages/frontend/src/init.ts   | 11 +++++++----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/packages/frontend/src/config.ts b/packages/frontend/src/config.ts
index 4b084d365..073b21a0a 100644
--- a/packages/frontend/src/config.ts
+++ b/packages/frontend/src/config.ts
@@ -10,8 +10,12 @@ export const apiUrl = url + '/api';
 export const wsUrl = url.replace('http://', 'ws://').replace('https://', 'wss://') + '/streaming';
 export const lang = miLocalStorage.getItem('lang');
 export const langs = _LANGS_;
-export const locale = JSON.parse(miLocalStorage.getItem('locale'));
+export let locale = JSON.parse(miLocalStorage.getItem('locale'));
 export const version = _VERSION_;
 export const instanceName = siteName === 'Misskey' ? host : siteName;
 export const ui = miLocalStorage.getItem('ui');
 export const debug = miLocalStorage.getItem('debug') === 'true';
+
+export function updateLocale(newLocale) {
+	locale = newLocale;
+}
diff --git a/packages/frontend/src/i18n.ts b/packages/frontend/src/i18n.ts
index 31e066960..220c6210c 100644
--- a/packages/frontend/src/i18n.ts
+++ b/packages/frontend/src/i18n.ts
@@ -3,3 +3,7 @@ import { locale } from '@/config';
 import { I18n } from '@/scripts/i18n';
 
 export const i18n = markRaw(new I18n(locale));
+
+export function updateI18n(newLocale) {
+	i18n.ts = newLocale;
+}
diff --git a/packages/frontend/src/init.ts b/packages/frontend/src/init.ts
index 079003ee8..36897545e 100644
--- a/packages/frontend/src/init.ts
+++ b/packages/frontend/src/init.ts
@@ -25,10 +25,10 @@ import JSON5 from 'json5';
 import widgets from '@/widgets';
 import directives from '@/directives';
 import components from '@/components';
-import { version, ui, lang, host } from '@/config';
+import { version, ui, lang, host, updateLocale } from '@/config';
 import { applyTheme } from '@/scripts/theme';
 import { isDeviceDarkmode } from '@/scripts/is-device-darkmode';
-import { i18n } from '@/i18n';
+import { i18n, updateI18n } from '@/i18n';
 import { confirm, alert, post, popup, toast } from '@/os';
 import { stream } from '@/stream';
 import * as sound from '@/scripts/sound';
@@ -87,9 +87,12 @@ import { fetchCustomEmojis } from './custom-emojis';
 	if (localeOutdated) {
 		const res = await window.fetch(`/assets/locales/${lang}.${version}.json`);
 		if (res.status === 200) {
-			miLocalStorage.setItem('locale', await res.text());
+			const newLocale = await res.text();
+			const parsedNewLocale = JSON.parse(newLocale);
+			miLocalStorage.setItem('locale', newLocale);
 			miLocalStorage.setItem('localeVersion', version);
-			location.reload();
+			updateLocale(parsedNewLocale);
+			updateI18n(parsedNewLocale);
 		}
 	}
 	//#endregion

From bd8b624bae31f2eea5a7c414f29aafdfeb96fa10 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 17:04:51 +0900
Subject: [PATCH 063/177] tweak bootstrap of client

---
 packages/backend/src/server/web/boot.js | 78 ++++++++-----------------
 1 file changed, 23 insertions(+), 55 deletions(-)

diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js
index a4513696a..3d6dabe57 100644
--- a/packages/backend/src/server/web/boot.js
+++ b/packages/backend/src/server/web/boot.js
@@ -22,18 +22,13 @@
 		renderError('SOMETHING_HAPPENED_IN_PROMISE', e);
 	};
 
-	const v = localStorage.getItem('v') || VERSION;
-
 	let forceError = localStorage.getItem('forceError');
 	if (forceError != null) {
 		renderError('FORCED_ERROR', 'This error is forced by having forceError in local storage.')
 	}
 
 	//#region Detect language & fetch translations
-	const localeVersion = localStorage.getItem('localeVersion');
-	const localeOutdated = (localeVersion == null || localeVersion !== v);
-
-	if (!localStorage.hasOwnProperty('locale') || localeOutdated) {
+	if (!localStorage.hasOwnProperty('locale')) {
 		const supportedLangs = LANGS;
 		let lang = localStorage.getItem('lang');
 		if (lang == null || !supportedLangs.includes(lang)) {
@@ -47,13 +42,31 @@
 			}
 		}
 
-		const res = await window.fetch(`/assets/locales/${lang}.${v}.json`);
-		if (res.status === 200) {
+		const metaRes = await window.fetch('/api/meta', {
+			method: 'POST',
+			body: JSON.stringify({}),
+			credentials: 'omit',
+			cache: 'no-cache',
+			headers: {
+				'Content-Type': 'application/json',
+			},
+		});
+		if (metaRes.status !== 200) {
+			renderError('META_FETCH');
+			return;
+		}
+		const meta = await res.json();
+		const v = meta.version;
+		if (v == null) {
+			renderError('META_FETCH_V');
+			return;
+		}
+		const localRes = await window.fetch(`/assets/locales/${lang}.${v}.json`);
+		if (localRes.status === 200) {
 			localStorage.setItem('lang', lang);
-			localStorage.setItem('locale', await res.text());
+			localStorage.setItem('locale', await localRes.text());
 			localStorage.setItem('localeVersion', v);
 		} else {
-			await checkUpdate();
 			renderError('LOCALE_FETCH');
 			return;
 		}
@@ -64,7 +77,6 @@
 	function importAppScript() {
 		import(`/vite/${CLIENT_ENTRY}`)
 			.catch(async e => {
-				await checkUpdate();
 				console.error(e);
 				renderError('APP_IMPORT', e);
 			});
@@ -291,48 +303,4 @@
 			}
 		`)
 	}
-
-	// eslint-disable-next-line no-inner-declarations
-	async function checkUpdate() {
-		try {
-			const res = await window.fetch('/api/meta', {
-				method: 'POST',
-				cache: 'no-cache',
-				body: '{}',
-				headers: {
-					'Content-Type': 'application/json',
-				},
-			});
-
-			const meta = await res.json();
-
-			if (meta.version == null) {
-				throw new Error('failed to fetch instance metadata');
-			}
-
-			if (meta.version != v) {
-				localStorage.setItem('v', meta.version);
-				refresh();
-			}
-		} catch (e) {
-			console.error(e);
-			renderError('UPDATE_CHECK', e);
-			throw e;
-		}
-	}
-
-	// eslint-disable-next-line no-inner-declarations
-	function refresh() {
-		// Clear cache (service worker)
-		try {
-			navigator.serviceWorker.controller.postMessage('clear');
-			navigator.serviceWorker.getRegistrations().then(registrations => {
-				registrations.forEach(registration => registration.unregister());
-			});
-		} catch (e) {
-			console.error(e);
-		}
-
-		location.reload();
-	}
 })();

From 492fb9a115fe10f6aa410f5efdf1f63bd6b43bd6 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 17:06:18 +0900
Subject: [PATCH 064/177] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 970a862cb..feb2cb1f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,7 @@ You should also include the user name that made the change.
 - Node.js 18.x or later is required
 - PostgreSQL 15.x is required
 	- Misskey not using 15 specific features at 13.0.0, but may do so in the future.
+	- Docker環境でPostgreSQLのアップデートを行う際のガイドはこちら: https://github.com/misskey-dev/misskey/pull/9641#issue-1536336620
 - Elasticsearchのサポートが削除されました
 	- 代わりに今後任意の検索プロバイダを設定できる仕組みを構想しています。その仕組みを使えば今まで通りElasticsearchも利用できます
 - Yarnからpnpmに移行されました

From 468ec36830e99a7012d9a58c38cf18f81bd8d0f4 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 17:09:26 +0900
Subject: [PATCH 065/177] New Crowdin updates (#9685)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Chinese Traditional)
---
 locales/de-DE.yml |   3 ++
 locales/en-US.yml |   3 ++
 locales/it-IT.yml | 123 ++++++++++++++++++++++++++++++++++++----------
 locales/ru-RU.yml |  50 +++++++++++++++++++
 locales/zh-CN.yml |  31 ++++++++++++
 locales/zh-TW.yml |  12 +++++
 6 files changed, 197 insertions(+), 25 deletions(-)

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index ecead98c3..e81f7579c 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -1048,6 +1048,9 @@ _achievements:
     _noteFavorited1:
       title: "Sternengucker"
       description: "Eine Notiz als Favorit markiert"
+    _myNoteFavorited1:
+      title: "Sternensucher"
+      description: "Ein anderer Benutzer hat eine deiner Notizen als Favoriten markiert"
     _profileFilled:
       title: "Perfekte Vorbereitung"
       description: "Fülle dein Profil aus"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index e398f1fd5..6a43d4569 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1048,6 +1048,9 @@ _achievements:
     _noteFavorited1:
       title: "Stargazer"
       description: "Favorite your first note"
+    _myNoteFavorited1:
+      title: "Seeking Stars"
+      description: "Have somebody else favorite one of your notes"
     _profileFilled:
       title: "Well-prepared"
       description: "Set up your profile"
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index cc93891bc..c5d89a0f5 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Italiano"
 headlineMisskey: "Rete collegata tramite note"
-introMisskey: "Eccoci! Misskey è un servizio di microblogging decentralizzato, libero e aperto. \n📡 Puoi pubblicare «Note» per condividere ciò che sta succedendo o per dire a tutti qualcosa su di te. \n👍 Puoi reagire inviando emoji rapidi alle «Note» provenienti da altri profili nel Fediverso.\n🚀 Esplora un nuovo mondo insieme a noi!"
+introMisskey: "Eccoci! Misskey è un servizio di microblogging decentralizzato, libero e aperto. \n\n📡 Puoi pubblicare «Note» per condividere ciò che sta succedendo o per dire a tutti qualcosa su di te. \n\n👍 Puoi reagire inviando emoji rapidi alle «Note» provenienti da altri profili nel Fediverso.\n\n🚀 Esplora un nuovo mondo insieme a noi!"
 poweredByMisskeyDescription: "{name} è uno dei servizi (chiamati istanze) che utilizzano la piattaforma open source <b>Misskey</b>."
 monthAndDay: "{day}/{month}"
 search: "Cerca"
@@ -943,79 +943,79 @@ _achievements:
   earnedAt: "Data di conseguimento"
   _types:
     _notes1:
-      title: "Ho iniziato a usare Misskey"
-      description: "Ho pubblicato la mia prima Nota"
+      title: "Hai iniziato a usare Misskey"
+      description: "Hai pubblicato la prima Nota"
       flavor: "Goditi la vita su Misskey!"
     _notes10:
       title: "Alcune Note"
-      description: "Ho inserito 10 Note"
+      description: "Hai inserito 10 Note"
     _notes100:
       title: "Un po' di Note"
-      description: "Ho inserito 100 Note"
+      description: "Hai inserito 100 Note"
     _notes500:
       title: "Un bel po' di Note"
-      description: "Ho inserito 500 Note"
+      description: "Hai inserito 500 Note"
     _notes1000:
       title: "Una montagna di Note"
-      description: "Ho inserito 1.000 Note"
+      description: "Hai inserito 1.000 Note"
     _notes5000:
       title: "Un sovraccarico di Note!"
-      description: "Ho inserito 5.000 Note"
+      description: "Hai inserito 5.000 Note"
     _notes10000:
       title: "SuperNote!"
-      description: "Ho inserito 10.000 Note"
+      description: "Hai inserito 10.000 Note"
     _notes20000:
       title: "Voglio più... Note!"
-      description: "Ho inserito 20.000 Note"
+      description: "Hai inserito 20.000 Note"
     _notes30000:
       title: "Note, Note, Note!"
-      description: "Ho inserito 30.000 Note"
+      description: "Hai inserito 30.000 Note"
     _notes40000:
       title: "Una fabbrica di Note"
-      description: "Ho inserito 40.000 Note"
+      description: "Hai inserito 40.000 Note"
     _notes50000:
       title: "Un pianeta di Note"
-      description: "Ho inserito 50.000 Note"
+      description: "Hai inserito 50.000 Note"
     _notes60000:
       title: "Un quasar di Note"
-      description: "Ho inserito 60.000 Note"
+      description: "Hai inserito 60.000 Note"
     _notes70000:
       title: "Un buco nero supermassiccio di Note"
-      description: "Ho inserito 70.000 Note"
+      description: "Hai inserito 70.000 Note"
     _notes80000:
       title: "Una galassia di Note"
-      description: "Ho inserito 80.000 Note"
+      description: "Hai inserito 80.000 Note"
     _notes90000:
       title: "Un universo di Note!"
-      description: "Ho inserito 90.000 Note"
+      description: "Hai inserito 90.000 Note"
     _notes100000:
       title: "ALL YOUR NOTE ARE BELONG TO US"
-      description: "Ho inserito 100.000 Note"
+      description: "Hai inserito 100.000 Note"
       flavor: "Hai molto da scrivere?"
     _login3:
       title: "Principiante I"
-      description: "Accedi per 3 giorni di fila"
+      description: "Accedi per un totale di 3 giorni"
       flavor: "Da oggi, chiamatemi Misskist"
     _login7:
       title: "Principiante II"
-      description: "Accedi per 7 giorni di fila"
+      description: "Accedi per un totale di 7 giorni"
       flavor: "Ti sembra di avere la situazione sotto controllo?"
     _login15:
       title: "Principiante III"
-      description: "Accedi per 15 giorni di fila"
+      description: "Accedi per un totale di 15 giorni"
     _login30:
       title: "Misskist I"
-      description: "Accedi per 30 giorni di fila"
+      description: "Accedi per un totale di 30 giorni"
     _login60:
       title: "Misskeist II"
-      description: "Accedi per 60 giorni di fila"
+      description: "Accedi per un totale di 60 giorni"
     _login100:
       title: "Misskeist III"
-      description: "Accedi per 100 giorni di fila"
+      description: "Accedi per un totale di 100 giorni"
       flavor: "Violent Misskeist"
     _login200:
       title: "Regolare I"
-      description: "Accedi per 200 giorni totali"
+      description: "Accedi per un totale di 200 giorni"
     _login300:
       title: "Regolare II"
       description: "Accedi per un totale di 300 giorni"
@@ -1090,9 +1090,82 @@ _achievements:
       description: "Hai ottenuto 500 Follower"
     _followers1000:
       title: "Influenzer"
+      description: "Hai superato i 1.000 Follower"
+    _collectAchievements30:
+      title: "Collezionista di successi"
+      description: "Hai raggiunto 30 obiettivi"
+    _viewAchievements3min:
+      title: "Mi piacciono i risultati"
+      description: "Guarda la tua collezione di obiettivi per almeno 3 minuti"
+    _iLoveMisskey:
+      title: "I LOVE Misskey"
+      description: "Pubblica «I ♥ #Misskey»"
+      flavor: "Grazie per aver utilizzato Misskey! Dal team di sviluppo"
+    _client30min:
+      title: "Piccola pausa"
+      description: "Hai passato più di 30 minuti di fila su Misskey"
+    _noteDeletedWithin1min:
+      title: "Ooops!"
+      description: "Hai eliminato una nota entro un minuto dalla sua pubblicazione"
+    _postedAtLateNight:
+      title: "Biassanot!"
+      description: "Hai pubblicato una nota in tarda notte"
+      flavor: "Andiamo a dormire presto"
+    _postedAt0min0sec:
+      title: "Mezzanotte"
+      description: "Hai pubblicato una Nota a mezzanotte in punto"
+      flavor: "tic, tac, tic, tac! Gong!"
+    _selfQuote:
+      title: "Autoreferenziale"
+      description: "Hai citato una delle tue Note"
+    _htl20npm:
+      title: "Timeline scorrevole"
+      description: "La tua Timeline personale ha superato la velocità di 20 Note orarie (Note al minuto)"
+    _outputHelloWorldOnScratchpad:
+      title: "Hello, world!"
+      description: "Hai scritto «Hello world» nel blocco appunti"
+    _open3windows:
+      title: "Finestrato"
+      description: "Hai aperto almeno 3 finestre contemporaneamente"
+    _driveFolderCircularReference:
+      title: "Riferimento circolare"
+      description: "Hai provato a nidificare in modo ricorsivo le cartelle del Drive"
+    _reactWithoutRead:
+      title: "Hai letto bene?"
+      description: "Hai reagito ad una Nota più lunga di 100 caratteri entro 3 secondi dalla sua pubblicazione"
+    _clickedClickHere:
+      title: "Clicca qui"
+      description: "Hai cliccato qui"
+    _justPlainLucky:
+      title: "Proprio fortunato"
+      description: "Ottenuto con una probabilità dello 0,01% ogni 10 secondi"
+    _setNameToSyuilo:
+      title: "Complesso divino"
+      description: "Hai impostati il tuo nome in «syuilo»"
+    _passedSinceAccountCreated1:
+      title: "Primo Anniversario"
+      description: "È passato un anno da quando hai creato il profilo"
+    _passedSinceAccountCreated2:
+      title: "Secondo Anniversario"
+      description: "Sono passati due anni da quando hai creato il profilo"
+    _passedSinceAccountCreated3:
+      title: "Terzo Anniversario"
+      description: "Sono passati tre anni da quando hai creato il profilo"
+    _loggedInOnBirthday:
+      title: "Buon compleanno!"
+      description: "Hai effettuato l'accesso il giorno del tuo compleanno"
+    _loggedInOnNewYearsDay:
+      title: "Buon anno nuovo!"
+      description: "Hai usato effettuato l'accesso il giorno di capodanno"
+      flavor: "Anche quest'anno, grazie per il tuo continuo supporto a questa istanza"
+    _cookieClicked:
+      title: "Clicca il biscotto"
+      description: "Hai giocato a cliccare il cookie"
+      flavor: "Hai autorizzato i cookie?"
     _brainDiver:
       title: "Brain Diver"
       description: "Pubblica un link a Brain Diver"
+      flavor: "Sulle note di Brain Diver"
 _role:
   new: "Nuovo ruolo"
   edit: "Modifica ruolo"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index f22a093ca..541941398 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -891,19 +891,48 @@ cannotUploadBecauseNoFreeSpace: "Файл не может быть загруж
 beta: "Бета"
 enableAutoSensitive: "Автоматическое определение NSFW"
 enableAutoSensitiveDescription: "Если доступно, используйте машинное обучение для автоматической установки флага NSFW на носителе. Даже если эта функция отключена, она может быть установлена ​​автоматически в зависимости от инстанта."
+navbar: "Панель навигации"
+shuffle: "Перемешать"
 account: "Учётные записи"
+move: "Переместить"
+pushNotification: "Push-уведомления"
+subscribePushNotification: "Включить push-уведомления"
+unsubscribePushNotification: "Выключить push-уведомления"
+pushNotificationAlreadySubscribed: "Push-уведомления уже включены"
+pushNotificationNotSupported: "Push-уведмления не поддерживаются инстансом или браузером"
+sendPushNotificationReadMessage: "Удалять push-уведомления когда сообщение или прочитано"
+sendPushNotificationReadMessageCaption: "На мгновение появится уведомление \"{emptyPushNotificationMessage}\". Расход заряда батареи может увеличиться "
 windowMaximize: "Развернуть"
 windowRestore: "Восстановить"
+caption: "Подпись (Automatic Translation)"
 loggedInAsBot: "Вы под аккаунтом бота!"
+tools: "Инструменты"
+cannotLoad: "Не удалось загрузить"
+numberOfProfileView: "Количество профилей для просмотра"
 like: "Нравится!"
 unlike: "Отменить «нравится»"
+numberOfLikes: "Количество лайков"
 show: "Отображение"
+neverShow: "Больше не показывать"
+remindMeLater: "Напомнить позже"
+didYouLikeMisskey: "Вам нравится Misskey?"
 pleaseDonate: "Сайт {host} работает на Misskey. Это бесплатное программное обеспечение, и ваши пожертвования очень бы помогли продолжать его разработку!"
 roles: "Роли"
 role: "Роль"
+normalUser: "Обычный пользователь"
+undefined: "неопределён"
+assign: "Назначить"
+unassign: "Отменить назначение"
 color: "Цвет"
+manageCustomEmojis: "Управлять пользовательскими эмодзи"
+youCannotCreateAnymore: "Вы достигли лимита создания."
+cannotPerformTemporary: "Временно недоступен"
+cannotPerformTemporaryDescription: "Это действие временно невозможно выполнить из-за превышения лимита выполнения."
+preset: "Шаблоны"
+selectFromPresets: "Выбрать из шаблонов"
 achievements: "Достижения"
 _achievements:
+  earnedAt: "Разблокировано в"
   _types:
     _notes1:
       title: "Первые шаги в Misskey"
@@ -975,6 +1004,7 @@ _achievements:
     _login100:
       title: "Мискиец Ⅲ"
       description: "100 дней на сайте"
+      flavor: "Жестокий Misskist "
     _login200:
       title: "Завсегдатай Ⅰ"
       description: "200 дней на сайте"
@@ -1010,6 +1040,9 @@ _achievements:
     _noteFavorited1:
       title: "Смотрящий на звёзды"
       description: "Первое добавление в избранное"
+    _myNoteFavorited1:
+      title: "В поиске звёзд"
+      description: "Кому-то понравилась ваша заметка"
     _profileFilled:
       title: "Приготовления закончены"
       description: "Заполнен профиль"
@@ -1130,14 +1163,24 @@ _achievements:
       flavor: "Мисски-Мисски Ла-Ту-Ма"
 _role:
   new: "Новая роль"
+  edit: "Изменить роль"
   name: "Название роли"
   description: "Описание роли"
   permission: "Ролевые полномочия"
+  descriptionOfPermission: "<b>Модераторы</b> могут изменять базовые операции для модераторов.\n<b>Администраторы</b> могут изменять полностью настройки инстанса."
   assignTarget: "Метод присвоения"
+  descriptionOfAssignTarget: "<b>Вручную</b> чтобы указать кому выдавать роль, а кому нет.\n<b>По условию<b> чтобы автоматически выдавать и удалять роль при условиях."
   manual: "Вручную"
   conditional: "По условию"
+  condition: "Условия"
+  isConditionalRole: "Эта роль выдаётся по условию."
   isPublic: "Общедоступная роль"
   descriptionOfIsPublic: "Список тех, кому назначена эта роль будет доступен всем. Кроме того эта роль будет отмечена у каждого в профиле."
+  options: "Настройки ролей"
+  policies: "Политики"
+  baseRole: "Шаблон роли"
+  useBaseValue: "Использовать значение из шаблона"
+  chooseRoleToAssign: "Выберите роль, которую хотите выдать"
   canEditMembersByModerator: "Могут назначать модераторы"
   descriptionOfCanEditMembersByModerator: "Если включено, на эту роль могут назначать пользователей как администраторы, так и модераторы. Если выключено, назначать могут только администраторы."
   priority: "Приоритет"
@@ -1145,6 +1188,8 @@ _role:
     low: "Низкий"
     middle: "Средне"
     high: "Высокий"
+  _options:
+    canManageCustomEmojis: "Управлять пользовательскими эмодзи"
 _sensitiveMediaDetection:
   description: "Машинное обучение может быть использовано для автоматического обнаружения чувствительных медиа для модерации. Нагрузка на сервер увеличивается незначительно."
   setSensitiveFlagAutomatically: "Установить флаг NSFW"
@@ -1191,6 +1236,11 @@ _plugin:
   install: "Установка расширений"
   installWarn: "Пожалуйста, не устанавливайте расширения, которым не доверяете."
   manage: "Управление расширениями"
+_preferencesBackups:
+  saveConfirm: "Сохранить бэкап как {name}?"
+  deleteConfirm: "Удалить резервную копию {name}?"
+  renameConfirm: "Переименовать резервную копию с \"{old}\" на \"{new}\"?"
+  noBackups: "Резервной копии не существует. Вы можете создать резервную копию в настройках на этом инстансе с помощью \"Создать новую резервную копию\"."
 _registry:
   scope: "Область"
   key: "Ключ"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 33127264b..22c45f516 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -992,22 +992,53 @@ _achievements:
       title: "ALL YOUR NOTE ARE BELONG TO US"
       description: "发布了100,000篇帖子"
       flavor: "真的有那么多可以写的东西吗？"
+    _login3:
+      title: "初学者 I"
+      description: "连续登录3天"
+    _login7:
+      description: "连续登录7天"
+    _login15:
+      description: "连续登录15天"
+    _login30:
+      description: "连续登录30天"
+    _login60:
+      description: "连续登录60天"
     _login1000:
       flavor: "感谢您使用Misskey！"
     _noteFavorited1:
       title: "观星者"
     _markedAsCat:
       title: "我是猫"
+      description: "将账户设定为一只猫"
+    _following10:
+      title: "关注，跟随"
     _following50:
       title: "我的朋友很多"
+    _following300:
+      description: "关注数超过300"
+    _followers100:
+      title: "胜友如云"
+    _collectAchievements30:
+      description: "获得超过30个成就"
     _viewAchievements3min:
       description: "盯着成就看三分钟"
     _iLoveMisskey:
       title: "I Love Misskey"
       description: "发布\"I ❤ #Misskey\"帖子"
       flavor: "感谢您使用 Misskey ！ by 开发团队"
+    _noteDeletedWithin1min:
+      description: "发帖后一分钟内就将其删除"
+    _postedAtLateNight:
+      title: "夜行者"
+      description: "深夜发布帖子"
     _outputHelloWorldOnScratchpad:
       title: "Hello, world!"
+    _passedSinceAccountCreated1:
+      description: "账户创建时间超过1年"
+    _passedSinceAccountCreated2:
+      description: "账户创建时间超过2年"
+    _passedSinceAccountCreated3:
+      description: "账户创建时间超过3年"
     _loggedInOnBirthday:
       title: "生日快乐"
       description: "在生日当天登录"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index b88cfd91a..4c7e5fb19 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1042,6 +1042,18 @@ _achievements:
       title: "貼文大師ⅠⅠⅠ"
       description: "總登入天數為1,000天"
       flavor: "感謝您使用Misskey！"
+    _noteClipped1:
+      title: "忍不住要收進摘錄裡"
+      description: "第一次將貼文收進摘錄"
+    _noteFavorited1:
+      title: "觀星者"
+      description: "第一次將貼文收進我的最愛"
+    _profileFilled:
+      title: "有備而來"
+      description: "設定了個人檔案"
+    _markedAsCat:
+      title: "我是貓"
+      description: "已將帳戶設定為貓"
     _followers500:
       title: "基站"
       description: "超過500名追隨者"

From da32be3ef33aeda1c24899a1e7d338062d523e48 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 17:10:49 +0900
Subject: [PATCH 066/177] 13.1.4

---
 CHANGELOG.md | 8 ++++++++
 package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index feb2cb1f8..c1ff53fd0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,14 @@
 You should also include the user name that made the change.
 -->
 
+## 13.1.4 (2023/01/22)
+
+### Improvements
+- 新たな実績を追加
+
+### Bugfixes
+- Client: ローカリゼーション更新時にリロードが繰り返されることがあるのを修正
+
 ## 13.1.3 (2023/01/22)
 
 ### Bugfixes
diff --git a/package.json b/package.json
index e48eea7d7..3f145c5f0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.1.3",
+	"version": "13.1.4",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From 19c93151ce89d11ad0ac2b2ce43fb176a0e848a2 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 17:18:39 +0900
Subject: [PATCH 067/177] tweak boot.js

---
 packages/backend/src/server/web/boot.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js
index 3d6dabe57..e635959fc 100644
--- a/packages/backend/src/server/web/boot.js
+++ b/packages/backend/src/server/web/boot.js
@@ -55,7 +55,7 @@
 			renderError('META_FETCH');
 			return;
 		}
-		const meta = await res.json();
+		const meta = await metaRes.json();
 		const v = meta.version;
 		if (v == null) {
 			renderError('META_FETCH_V');

From 97d6c1ee862bf1277d69b8bd8658a4c16ad76d5b Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 17:19:03 +0900
Subject: [PATCH 068/177] 13.1.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3f145c5f0..b0a64b035 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.1.4",
+	"version": "13.1.5",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From 7a6534f30bae2f3321c20b853853da4fb97d8d6e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 17:29:31 +0900
Subject: [PATCH 069/177] =?UTF-8?q?=E3=82=AB=E3=82=B9=E3=82=BF=E3=83=A0?=
 =?UTF-8?q?=E7=B5=B5=E6=96=87=E5=AD=97=E3=81=AEURL=E3=81=8C=E7=A9=BA?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E5=88=97=E3=81=AB=E3=81=AA=E3=82=8B=E5=A0=B4?=
 =?UTF-8?q?=E5=90=88=E3=81=8C=E3=81=82=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/entities/EmojiEntityService.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/entities/EmojiEntityService.ts b/packages/backend/src/core/entities/EmojiEntityService.ts
index cee85a568..611552d89 100644
--- a/packages/backend/src/core/entities/EmojiEntityService.ts
+++ b/packages/backend/src/core/entities/EmojiEntityService.ts
@@ -32,8 +32,8 @@ export class EmojiEntityService {
 			name: emoji.name,
 			category: emoji.category,
 			host: opts.omitHost ? undefined : emoji.host,
-			// ?? emoji.originalUrl してるのは後方互換性のため
-			url: opts.withUrl ? (emoji.publicUrl ?? emoji.originalUrl) : undefined,
+			// || emoji.originalUrl してるのは後方互換性のため（publicUrlはstringなので??はだめ）
+			url: opts.withUrl ? (emoji.publicUrl || emoji.originalUrl) : undefined,
 		};
 	}
 

From 80a400a67ca0f602e07edb089deb9c41e463dfb8 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 17:30:04 +0900
Subject: [PATCH 070/177] 13.1.6

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b0a64b035..7c1db9cc6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.1.5",
+	"version": "13.1.6",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From 42f3d9188bb1428ed4978ca0974f49e754d7f7d1 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 20:22:38 +0900
Subject: [PATCH 071/177] add a secret achievement

---
 locales/ja-JP.yml                             |   3 +
 .../backend/src/core/AchievementService.ts    |   1 +
 packages/frontend/src/pages/about-misskey.vue | 122 +++++++++++-------
 packages/frontend/src/scripts/achievements.ts |   8 +-
 4 files changed, 88 insertions(+), 46 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 57296b985..cd4438fde 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1105,6 +1105,9 @@ _achievements:
       title: "I Love Misskey"
       description: "\"I ❤ #Misskey\"を投稿した"
       flavor: "Misskeyを使ってくださりありがとうございます！ by 開発チーム"
+    _foundTreasure:
+      title: "宝探し"
+      description: "隠されたお宝を発見した"
     _client30min:
       title: "ひとやすみ"
       description: "クライアントを起動してから30分以上経過した"
diff --git a/packages/backend/src/core/AchievementService.ts b/packages/backend/src/core/AchievementService.ts
index be763e462..2536ea34e 100644
--- a/packages/backend/src/core/AchievementService.ts
+++ b/packages/backend/src/core/AchievementService.ts
@@ -62,6 +62,7 @@ const ACHIEVEMENT_TYPES = [
 	'collectAchievements30',
 	'viewAchievements3min',
 	'iLoveMisskey',
+	'foundTreasure',
 	'client30min',
 	'noteDeletedWithin1min',
 	'postedAtLateNight',
diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index 1c3535a83..a6d4c6065 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -4,11 +4,14 @@
 	<div style="overflow: clip;">
 		<MkSpacer :content-max="600" :margin-min="20">
 			<div class="_gaps_m znqjceqz">
-				<div ref="containerEl" v-panel class="about" :class="{ playing: easterEggEngine != null }">
-					<img src="/client-assets/about-icon.png" alt="" class="icon" draggable="false" @load="iconLoaded" @click="gravity"/>
-					<div class="misskey">Misskey</div>
-					<div class="version">v{{ version }}</div>
-					<span v-for="emoji in easterEggEmojis" :key="emoji.id" class="emoji" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }"><MkEmoji class="emoji" :emoji="emoji.emoji" :is-reaction="false" :normal="true" :no-style="true"/></span>
+				<div v-panel class="about">
+					<div ref="containerEl" class="container" :class="{ playing: easterEggEngine != null }">
+						<img src="/client-assets/about-icon.png" alt="" class="icon" draggable="false" @load="iconLoaded" @click="gravity"/>
+						<div class="misskey">Misskey</div>
+						<div class="version">v{{ version }}</div>
+						<span v-for="emoji in easterEggEmojis" :key="emoji.id" class="emoji" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }"><MkEmoji class="emoji" :emoji="emoji.emoji" :is-reaction="false" :normal="true" :no-style="true"/></span>
+					</div>
+					<button v-if="thereIsTreasure" class="_button treasure" @click="getTreasure"><img src="/fluent-emoji/1f3c6.png" class="treasureImg"></button>
 				</div>
 				<div style="text-align: center;">
 					{{ i18n.ts._aboutMisskey.about }}<br><a href="https://misskey-hub.net/docs/misskey.html" target="_blank" class="_link">{{ i18n.ts.learnMore }}</a>
@@ -70,6 +73,8 @@ import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
 import * as os from '@/os';
 import { definePageMetadata } from '@/scripts/page-metadata';
+import { claimAchievement, claimedAchievements } from '@/scripts/achievements';
+import { $i } from '@/account';
 
 const patrons = [
 	'まっちゃとーにゅ',
@@ -152,6 +157,8 @@ const patrons = [
 	'pixeldesu',
 ];
 
+let thereIsTreasure = $ref($i && !claimedAchievements.includes('foundTreasure'));
+
 let easterEggReady = false;
 let easterEggEmojis = $ref([]);
 let easterEggEngine = $ref(null);
@@ -187,6 +194,11 @@ function iLoveMisskey() {
 	});
 }
 
+function getTreasure() {
+	thereIsTreasure = false;
+	claimAchievement('foundTreasure');
+}
+
 onBeforeUnmount(() => {
 	if (easterEggEngine) {
 		easterEggEngine.stop();
@@ -207,52 +219,72 @@ definePageMetadata({
 .znqjceqz {
 	> .about {
 		position: relative;
-		text-align: center;
-		padding: 16px;
 		border-radius: var(--radius);
 
-		&.playing {
-			&, * {
-				user-select: none;
-			}
-
-			* {
-				will-change: transform;
-			}
-
-			> .emoji {
-				visibility: visible;
-			}
-		}
-
-		> .icon {
-			display: block;
-			width: 80px;
-			margin: 0 auto;
-			border-radius: 16px;
-		}
-
-		> .misskey {
-			margin: 0.75em auto 0 auto;
-			width: max-content;
-		}
-
-		> .version {
-			margin: 0 auto;
-			width: max-content;
-			opacity: 0.5;
-		}
-
-		> .emoji {
+		> .treasure {
 			position: absolute;
-			top: 0;
+			top: 55px;
 			left: 0;
-			visibility: hidden;
+			right: 0;
+			margin: 0 auto;
+			width: min-content;
+
+			> .treasureImg {
+				width: 25px;
+				vertical-align: bottom;
+			}
+		}
+
+		> .container {
+			position: relative;
+			text-align: center;
+			padding: 16px;
+
+			&.playing {
+				&, * {
+					user-select: none;
+				}
+
+				* {
+					will-change: transform;
+				}
+
+				> .emoji {
+					visibility: visible;
+				}
+			}
+
+			> .icon {
+				display: block;
+				width: 80px;
+				margin: 0 auto;
+				border-radius: 16px;
+				position: relative;
+				z-index: 1;
+			}
+
+			> .misskey {
+				margin: 0.75em auto 0 auto;
+				width: max-content;
+			}
+
+			> .version {
+				margin: 0 auto;
+				width: max-content;
+				opacity: 0.5;
+			}
 
 			> .emoji {
-				pointer-events: none;
-				font-size: 24px;
-				width: 24px;
+				position: absolute;
+				top: 0;
+				left: 0;
+				visibility: hidden;
+
+				> .emoji {
+					pointer-events: none;
+					font-size: 24px;
+					width: 24px;
+				}
 			}
 		}
 	}
diff --git a/packages/frontend/src/scripts/achievements.ts b/packages/frontend/src/scripts/achievements.ts
index f511fce3e..53a921418 100644
--- a/packages/frontend/src/scripts/achievements.ts
+++ b/packages/frontend/src/scripts/achievements.ts
@@ -58,6 +58,7 @@ export const ACHIEVEMENT_TYPES = [
 	'collectAchievements30',
 	'viewAchievements3min',
 	'iLoveMisskey',
+	'foundTreasure',
 	'client30min',
 	'noteDeletedWithin1min',
 	'postedAtLateNight',
@@ -331,6 +332,11 @@ export const ACHIEVEMENT_BADGES = {
 		bg: 'linear-gradient(0deg, rgb(255 77 77), rgb(247 155 214))',
 		frame: 'silver',
 	},
+	'foundTreasure': {
+		img: '/fluent-emoji/1f3c6.png',
+		bg: 'linear-gradient(0deg, rgb(255 77 77), rgb(247 155 214))',
+		frame: 'gold',
+	},
 	'client30min': {
 		img: '/fluent-emoji/1f552.png',
 		bg: 'linear-gradient(0deg, rgb(220 223 225), rgb(172 192 207))',
@@ -437,7 +443,7 @@ export const ACHIEVEMENT_BADGES = {
 	frame: 'bronze' | 'silver' | 'gold' | 'platinum';
 }>;
 
-export const claimedAchievements = ($i && $i.achievements) ? $i.achievements.map(x => x.name) : [];
+export const claimedAchievements: typeof ACHIEVEMENT_TYPES[number][] = ($i && $i.achievements) ? $i.achievements.map(x => x.name) : [];
 
 const claimingQueue = new Set<string>();
 

From ede96eca28c670f67b225d6fdd691c6bc83e2ad4 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 20:25:10 +0900
Subject: [PATCH 072/177] :art:

---
 packages/frontend/src/pages/about-misskey.vue | 7 ++++++-
 packages/frontend/src/scripts/achievements.ts | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index a6d4c6065..82f4e30a4 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -223,7 +223,7 @@ definePageMetadata({
 
 		> .treasure {
 			position: absolute;
-			top: 55px;
+			top: 60px;
 			left: 0;
 			right: 0;
 			margin: 0 auto;
@@ -266,16 +266,21 @@ definePageMetadata({
 			> .misskey {
 				margin: 0.75em auto 0 auto;
 				width: max-content;
+				position: relative;
+				z-index: 1;
 			}
 
 			> .version {
 				margin: 0 auto;
 				width: max-content;
 				opacity: 0.5;
+				position: relative;
+				z-index: 1;
 			}
 
 			> .emoji {
 				position: absolute;
+				z-index: 1;
 				top: 0;
 				left: 0;
 				visibility: hidden;
diff --git a/packages/frontend/src/scripts/achievements.ts b/packages/frontend/src/scripts/achievements.ts
index 53a921418..8c59c92b1 100644
--- a/packages/frontend/src/scripts/achievements.ts
+++ b/packages/frontend/src/scripts/achievements.ts
@@ -334,7 +334,7 @@ export const ACHIEVEMENT_BADGES = {
 	},
 	'foundTreasure': {
 		img: '/fluent-emoji/1f3c6.png',
-		bg: 'linear-gradient(0deg, rgb(255 77 77), rgb(247 155 214))',
+		bg: 'linear-gradient(0deg, rgb(197 69 192), rgb(2 112 155))',
 		frame: 'gold',
 	},
 	'client30min': {

From b906ff3fedf2ec420a057a6d2c851df2b7b77495 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 20:30:56 +0900
Subject: [PATCH 073/177] add an achievement

---
 locales/ja-JP.yml                               | 3 +++
 packages/backend/src/core/AchievementService.ts | 1 +
 packages/frontend/src/pages/about.vue           | 9 ++++++++-
 packages/frontend/src/scripts/achievements.ts   | 7 +++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index cd4438fde..a241d54b4 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1128,6 +1128,9 @@ _achievements:
     _htl20npm:
       title: "流れるTL"
       description: "ホームタイムラインの流速が20npmを越す"
+    _viewInstanceChart:
+      title: "アナリスト"
+      description: "インスタンスのチャートを表示した"
     _outputHelloWorldOnScratchpad:
       title: "Hello, world!"
       description: "スクラッチパッドで hello world を出力した"
diff --git a/packages/backend/src/core/AchievementService.ts b/packages/backend/src/core/AchievementService.ts
index 2536ea34e..5fd9c451c 100644
--- a/packages/backend/src/core/AchievementService.ts
+++ b/packages/backend/src/core/AchievementService.ts
@@ -69,6 +69,7 @@ const ACHIEVEMENT_TYPES = [
 	'postedAt0min0sec',
 	'selfQuote',
 	'htl20npm',
+	'viewInstanceChart',
 	'outputHelloWorldOnScratchpad',
 	'open3windows',
 	'driveFolderCircularReference',
diff --git a/packages/frontend/src/pages/about.vue b/packages/frontend/src/pages/about.vue
index 4d971c5a9..e5b9aecc6 100644
--- a/packages/frontend/src/pages/about.vue
+++ b/packages/frontend/src/pages/about.vue
@@ -86,7 +86,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue';
+import { ref, computed, watch } from 'vue';
 import XEmojis from './about.emojis.vue';
 import XFederation from './about.federation.vue';
 import { version, instanceName, host } from '@/config';
@@ -100,6 +100,7 @@ import * as os from '@/os';
 import number from '@/filters/number';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
+import { claimAchievement } from '@/scripts/achievements';
 
 const props = withDefaults(defineProps<{
 	initialTab?: string;
@@ -110,6 +111,12 @@ const props = withDefaults(defineProps<{
 let stats = $ref(null);
 let tab = $ref(props.initialTab);
 
+watch($$(tab), () => {
+	if (tab === 'charts') {
+		claimAchievement('viewInstanceChart');
+	}
+});
+
 const initStats = () => os.api('stats', {
 }).then((res) => {
 	stats = res;
diff --git a/packages/frontend/src/scripts/achievements.ts b/packages/frontend/src/scripts/achievements.ts
index 8c59c92b1..c77f8e12d 100644
--- a/packages/frontend/src/scripts/achievements.ts
+++ b/packages/frontend/src/scripts/achievements.ts
@@ -65,6 +65,7 @@ export const ACHIEVEMENT_TYPES = [
 	'postedAt0min0sec',
 	'selfQuote',
 	'htl20npm',
+	'viewInstanceChart',
 	'outputHelloWorldOnScratchpad',
 	'open3windows',
 	'driveFolderCircularReference',
@@ -367,6 +368,11 @@ export const ACHIEVEMENT_BADGES = {
 		bg: 'linear-gradient(0deg, rgb(220 223 225), rgb(172 192 207))',
 		frame: 'bronze',
 	},
+	'viewInstanceChart': {
+		img: '/fluent-emoji/1f4ca.png',
+		bg: 'linear-gradient(0deg, rgb(58 231 198), rgb(37 194 255))',
+		frame: 'bronze',
+	},
 	'outputHelloWorldOnScratchpad': {
 		img: '/fluent-emoji/1f530.png',
 		bg: 'linear-gradient(0deg, rgb(58 231 198), rgb(37 194 255))',
@@ -448,6 +454,7 @@ export const claimedAchievements: typeof ACHIEVEMENT_TYPES[number][] = ($i && $i
 const claimingQueue = new Set<string>();
 
 export async function claimAchievement(type: typeof ACHIEVEMENT_TYPES[number]) {
+	if ($i == null) return;
 	if (claimedAchievements.includes(type)) return;
 	claimingQueue.add(type);
 	claimedAchievements.push(type);

From 313a489ba01de5aa8b3eae18ae78d57a0561b254 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 20:46:43 +0900
Subject: [PATCH 074/177] New Crowdin updates (#9689)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Ukrainian)
---
 locales/it-IT.yml |  5 +++-
 locales/uk-UA.yml |  9 ++++++
 locales/zh-CN.yml |  2 +-
 locales/zh-TW.yml | 70 +++++++++++++++++++++++++++++++++++++++++++----
 4 files changed, 79 insertions(+), 7 deletions(-)

diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index c5d89a0f5..1726a84ff 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -95,7 +95,7 @@ follow: "Segui"
 followRequest: "Richiesta di follow"
 followRequests: "Richieste di follow"
 unfollow: "Smetti di seguire"
-followRequestPending: "La richiesta di follow deve essere approvata"
+followRequestPending: "Richiesta in approvazione"
 enterEmoji: "Inserisci emoji"
 renote: "Rinota"
 unrenote: "Annulla rinota"
@@ -1048,6 +1048,9 @@ _achievements:
     _noteFavorited1:
       title: "Guarda le stelle"
       description: "Aggiungi una Nota ai preferiti per la prima volta"
+    _myNoteFavorited1:
+      title: "Fornitura stelline"
+      description: "Qualcuno ha preferito una delle tue Note"
     _profileFilled:
       title: "Perfettamente"
       description: "Imposta il tuo profilo"
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index 6ca8d7059..ddb13d875 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -899,6 +899,15 @@ unlike: "Не вподобати"
 numberOfLikes: "Вподобання"
 show: "Відображення"
 color: "Колір"
+achievements: "Досягнення"
+_achievements:
+  _types:
+    _notes1:
+      title: "налаштовую свій msky"
+      description: "Перша нотатка"
+      flavor: "Приємного часу з Misskey!"
+    _notes10:
+      title: "Декілька нотаток"
 _role:
   priority: "Пріоритет"
   _priority:
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 22c45f516..433af4c83 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -956,7 +956,7 @@ _achievements:
       title: "满是帖子"
       description: "发布了500篇帖子"
     _notes1000:
-      title: "帖子成山"
+      title: "积帖成山"
       description: "发布了1,000篇帖子"
     _notes5000:
       title: "帖如泉涌"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 4c7e5fb19..a8a06528d 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1047,25 +1047,59 @@ _achievements:
       description: "第一次將貼文收進摘錄"
     _noteFavorited1:
       title: "觀星者"
-      description: "第一次將貼文收進我的最愛"
+      description: "第一次將貼文收藏至我的最愛"
+    _myNoteFavorited1:
+      title: "想要星星"
+      description: "自己的貼文被他人收藏至「我的最愛」了"
     _profileFilled:
       title: "有備而來"
       description: "設定了個人檔案"
     _markedAsCat:
       title: "我是貓"
       description: "已將帳戶設定為貓"
+      flavor: "還沒有名字。"
+    _following1:
+      title: "首次追隨"
+      description: "首次追隨了"
+    _following10:
+      title: "跟著跟著"
+      description: "跟隨超過10人了"
+    _following50:
+      title: "朋友很多"
+      description: "跟隨超過50人了"
+    _following100:
+      title: "100位朋友"
+      description: "跟隨超過100人了"
+    _following300:
+      title: "朋友過多"
+      description: "跟隨超過300人了"
+    _followers1:
+      title: "第一個追隨者"
+      description: "第一次被追隨"
+    _followers10:
+      title: "Follow me!"
+      description: "跟隨者超過10人了"
+    _followers50:
+      title: "成群結隊"
+      description: "跟隨者超過50人了"
+    _followers100:
+      title: "紅人"
+      description: "跟隨者超過100人了"
+    _followers300:
+      title: "請排成一排"
+      description: "跟隨者超過300人了"
     _followers500:
       title: "基站"
-      description: "超過500名追隨者"
+      description: "超過500名追隨者了"
     _followers1000:
       title: "影響者"
-      description: "超過1000名追隨者"
+      description: "超過1000名追隨者了"
     _collectAchievements30:
       title: "成就收藏家"
       description: "獲得30個以上的成就"
     _viewAchievements3min:
       title: "喜愛成就"
-      description: "看成就列表要花了3分鐘以上"
+      description: "看成就列表要花3分鐘以上"
     _iLoveMisskey:
       title: "I Love Misskey"
       description: "發布「I ❤ #Misskey」"
@@ -1083,6 +1117,7 @@ _achievements:
     _postedAt0min0sec:
       title: "報時"
       description: "在0分0秒發佈貼文"
+      flavor: "啵．啵．啵．嗶ー"
     _selfQuote:
       title: "自我引用"
       description: "引用了自己的貼文"
@@ -1094,7 +1129,7 @@ _achievements:
       description: "在暫存記憶體輸出了 hello world"
     _open3windows:
       title: "多重視窗"
-      description: "開啟3個以上的視窗"
+      description: "開啟了3個以上的視窗"
     _driveFolderCircularReference:
       title: "循環引用"
       description: "試圖遞迴套入雲端硬碟資料夾"
@@ -1110,6 +1145,30 @@ _achievements:
     _setNameToSyuilo:
       title: "神的情結"
       description: "將名稱設定為 syuilo"
+    _passedSinceAccountCreated1:
+      title: "一周年"
+      description: "自建立帳戶開始過了1年"
+    _passedSinceAccountCreated2:
+      title: "二周年"
+      description: "自建立帳戶開始過了2年"
+    _passedSinceAccountCreated3:
+      title: "三周年"
+      description: "自建立帳戶開始過了3年"
+    _loggedInOnBirthday:
+      title: "生日快樂"
+      description: "在生日當天登入了"
+    _loggedInOnNewYearsDay:
+      title: "新年快樂"
+      description: "在元旦當天登入了"
+      flavor: "今年也請對敝實例多多指教"
+    _cookieClicked:
+      title: "點擊餅乾的遊戲"
+      description: "點擊了餅乾"
+      flavor: "是不是軟體有問題？"
+    _brainDiver:
+      title: "Brain Driver"
+      description: "發佈了Brain Driver的連結"
+      flavor: "Misskey-Misskey La-Tu-Ma"
 _role:
   new: "建立角色"
   edit: "編輯角色"
@@ -1759,6 +1818,7 @@ _notification:
   pollEnded: "問卷調查已產生結果"
   unreadAntennaNote: "天線 {name}"
   emptyPushNotificationMessage: "推送通知已更新"
+  achievementEarned: "獲得成就"
   _types:
     all: "全部 "
     follow: "追隨中"

From e6338a555d0829cd8c9b119c07f131db3637db3d Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 20:58:52 +0900
Subject: [PATCH 075/177] =?UTF-8?q?mfm=E3=81=ABscale=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resolve #9609
---
 packages/frontend/src/components/mfm.ts   | 6 ++++++
 packages/frontend/src/scripts/mfm-tags.ts | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/mfm.ts b/packages/frontend/src/components/mfm.ts
index 9421625c9..91875de9c 100644
--- a/packages/frontend/src/components/mfm.ts
+++ b/packages/frontend/src/components/mfm.ts
@@ -200,6 +200,12 @@ export default defineComponent({
 							style = `transform: translateX(${x}em) translateY(${y}em);`;
 							break;
 						}
+						case 'scale': {
+							const x = Math.min(parseInt(token.props.args.x ?? '1'), 5);
+							const y = Math.min(parseInt(token.props.args.y ?? '1'), 5);
+							style = `transform: scale(${x}, ${y});`;
+							break;
+						}
 						case 'fg': {
 							let color = token.props.args.color;
 							if (!/^[0-9a-f]{3,6}$/i.test(color)) color = 'f00';
diff --git a/packages/frontend/src/scripts/mfm-tags.ts b/packages/frontend/src/scripts/mfm-tags.ts
index be944a713..a84198282 100644
--- a/packages/frontend/src/scripts/mfm-tags.ts
+++ b/packages/frontend/src/scripts/mfm-tags.ts
@@ -1 +1 @@
-export const MFM_TAGS = ['tada', 'jelly', 'twitch', 'shake', 'spin', 'jump', 'bounce', 'flip', 'x2', 'x3', 'x4', 'position', 'fg', 'bg', 'font', 'blur', 'rainbow', 'sparkle', 'rotate'];
+export const MFM_TAGS = ['tada', 'jelly', 'twitch', 'shake', 'spin', 'jump', 'bounce', 'flip', 'x2', 'x3', 'x4', 'scale', 'position', 'fg', 'bg', 'font', 'blur', 'rainbow', 'sparkle', 'rotate'];

From 2e6d8c792b3ab268124b15d15b2ac49f8c1905f1 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 21:01:42 +0900
Subject: [PATCH 076/177] 13.1.7

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1ff53fd0..2b820f22c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,12 @@
 You should also include the user name that made the change.
 -->
 
+## 13.1.7 (2023/01/22)
+
+### Improvements
+- 新たな実績を追加
+- MFMにscaleタグを追加
+
 ## 13.1.4 (2023/01/22)
 
 ### Improvements
diff --git a/package.json b/package.json
index 7c1db9cc6..31033bafe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.1.6",
+	"version": "13.1.7",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From b19dba80f4339159353454b795bdb892c9036d07 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sun, 22 Jan 2023 12:25:55 +0000
Subject: [PATCH 077/177] Fix #9691

---
 packages/frontend/vite.config.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/frontend/vite.config.ts b/packages/frontend/vite.config.ts
index 0bf35ec1b..89b6dbde2 100644
--- a/packages/frontend/vite.config.ts
+++ b/packages/frontend/vite.config.ts
@@ -54,6 +54,8 @@ export default defineConfig(({ command, mode }) => {
 				'@/': __dirname + '/src/',
 				'/client-assets/': __dirname + '/assets/',
 				'/static-assets/': __dirname + '/../backend/assets/',
+				'/fluent-emojis/': __dirname + '/../../fluent-emojis/dist/',
+				'/fluent-emoji/': __dirname + '/../../fluent-emojis/dist/',
 			},
 		},
 

From 6c4c071ae94e1eca80393d64e685ed20beb292b4 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 21:28:34 +0900
Subject: [PATCH 078/177] New Crowdin updates (#9692)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Ukrainian)
---
 locales/ko-KR.yml |  3 +++
 locales/uk-UA.yml | 30 ++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index bf747e3cb..97708a86d 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1048,6 +1048,9 @@ _achievements:
     _noteFavorited1:
       title: "별을 바라보는 자"
       description: "처음으로 노트를 즐겨찾기했습니다"
+    _myNoteFavorited1:
+      title: "I wanna Star"
+      description: "다른 사람이 당신의 노트를 즐겨찾기했습니다"
     _profileFilled:
       title: "준비 완료"
       description: "프로필 설정을 완료했습니다"
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index ddb13d875..ee978b58d 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -908,6 +908,36 @@ _achievements:
       flavor: "Приємного часу з Misskey!"
     _notes10:
       title: "Декілька нотаток"
+      description: "10 нотаток відправлено"
+    _notes100:
+      description: "100 нотаток відправлено"
+    _notes500:
+      description: "500 нотаток відправлено"
+    _notes1000:
+      description: "1 000 нотаток відправлено"
+    _notes5000:
+      description: "5 000 нотаток відправлено"
+    _notes10000:
+      description: "10 000 нотаток відправлено"
+    _notes20000:
+      description: "20 000 нотаток відправлено"
+    _notes30000:
+      description: "30 000 нотаток відправлено"
+    _notes40000:
+      description: "40 000 нотаток відправлено"
+    _notes50000:
+      description: "50 000 нотаток відправлено"
+    _notes60000:
+      description: "60 000 нотаток відправлено"
+    _notes70000:
+      description: "70 000 нотаток відправлено"
+    _notes80000:
+      description: "80 000 нотаток відправлено"
+    _notes90000:
+      description: "90 000 нотаток відправлено"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "100 000 нотаток відправлено"
 _role:
   priority: "Пріоритет"
   _priority:

From 2c52655b17c2a30f5332579974374cdbfb5780b7 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 21:29:57 +0900
Subject: [PATCH 079/177] 13.1.8

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 31033bafe..be5b86669 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.1.7",
+	"version": "13.1.8",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From a5f54580a9a069d824ac0c52149682d34349ddfc Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sun, 22 Jan 2023 12:57:51 +0000
Subject: [PATCH 080/177] fix

---
 packages/frontend/src/components/global/MkEmoji.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/global/MkEmoji.vue b/packages/frontend/src/components/global/MkEmoji.vue
index 93f50da20..691392d73 100644
--- a/packages/frontend/src/components/global/MkEmoji.vue
+++ b/packages/frontend/src/components/global/MkEmoji.vue
@@ -32,7 +32,7 @@ const url = computed(() => {
 	if (char.value) {
 		return char2path(char.value);
 	} else if (props.host == null && !customEmojiName.includes('@')) {
-		const found = customEmojis.find(x => x.name === customEmojiName);
+		const found = customEmojis.value.find(x => x.name === customEmojiName);
 		return found ? found.url : null;
 	} else {
 		const rawUrl = props.host ? `/emoji/${customEmojiName}@${props.host}.webp` : `/emoji/${customEmojiName}.webp`;

From 2f6c45e11842cde64c2b724a45b2c316b09af57c Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sun, 22 Jan 2023 14:53:24 +0000
Subject: [PATCH 081/177] wip

---
 .../backend/src/core/CustomEmojiService.ts    |  8 ++++
 .../endpoints/admin/emoji/add-aliases-bulk.ts |  9 +++++
 .../server/api/endpoints/admin/emoji/add.ts   | 39 +++++--------------
 .../api/endpoints/admin/emoji/delete-bulk.ts  | 10 ++++-
 .../api/endpoints/admin/emoji/delete.ts       |  8 ++++
 .../admin/emoji/remove-aliases-bulk.ts        |  9 +++++
 .../endpoints/admin/emoji/set-aliases-bulk.ts |  9 +++++
 .../admin/emoji/set-category-bulk.ts          |  9 +++++
 .../api/endpoints/admin/emoji/update.ts       | 21 ++++++++++
 .../backend/src/server/api/stream/types.ts    | 10 +++++
 packages/frontend/src/custom-emojis.ts        | 14 ++++++-
 packages/frontend/src/init.ts                 |  5 ---
 12 files changed, 114 insertions(+), 37 deletions(-)

diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts
index 18b4067f6..1f0b21415 100644
--- a/packages/backend/src/core/CustomEmojiService.ts
+++ b/packages/backend/src/core/CustomEmojiService.ts
@@ -2,6 +2,8 @@ import { Inject, Injectable } from '@nestjs/common';
 import { DataSource, In, IsNull } from 'typeorm';
 import { DI } from '@/di-symbols.js';
 import { IdService } from '@/core/IdService.js';
+import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
 import type { DriveFile } from '@/models/entities/DriveFile.js';
 import type { Emoji } from '@/models/entities/Emoji.js';
 import type { EmojisRepository } from '@/models/index.js';
@@ -17,6 +19,8 @@ export class CustomEmojiService {
 		private emojisRepository: EmojisRepository,
 
 		private idService: IdService,
+		private emojiEntityService: EmojiEntityService,
+		private globalEventService: GlobalEventService,
 	) {
 	}
 
@@ -42,6 +46,10 @@ export class CustomEmojiService {
 
 		await this.db.queryResultCache!.remove(['meta_emojis']);
 
+		this.globalEventService.publishBroadcastStream('emojiAdded', {
+			emoji: await this.emojiEntityService.pack(emoji.id),
+		});
+
 		return emoji;
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts
index 9b6c774f0..c683cd24c 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts
@@ -3,6 +3,8 @@ import { DataSource, In } from 'typeorm';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { EmojisRepository } from '@/models/index.js';
 import { DI } from '@/di-symbols.js';
+import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -35,6 +37,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 		@Inject(DI.emojisRepository)
 		private emojisRepository: EmojisRepository,
+
+		private emojiEntityService: EmojiEntityService,
+		private globalEventService: GlobalEventService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const emojis = await this.emojisRepository.findBy({
@@ -49,6 +54,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			}
 
 			await this.db.queryResultCache!.remove(['meta_emojis']);
+
+			this.globalEventService.publishBroadcastStream('emojiUpdated', {
+				emojis: await this.emojiEntityService.packMany(ps.ids),
+			});
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
index abca1d169..1bb05c15c 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
@@ -2,12 +2,10 @@ import { Inject, Injectable } from '@nestjs/common';
 import rndstr from 'rndstr';
 import { DataSource } from 'typeorm';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { DriveFilesRepository, EmojisRepository } from '@/models/index.js';
-import { IdService } from '@/core/IdService.js';
+import type { DriveFilesRepository } from '@/models/index.js';
 import { DI } from '@/di-symbols.js';
-import { GlobalEventService } from '@/core/GlobalEventService.js';
+import { CustomEmojiService } from '@/core/CustomEmojiService.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
-import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js';
 import { ApiError } from '../../../error.js';
 
 export const meta = {
@@ -39,43 +37,26 @@ export const paramDef = {
 @Injectable()
 export default class extends Endpoint<typeof meta, typeof paramDef> {
 	constructor(
-		@Inject(DI.db)
-		private db: DataSource,
-
 		@Inject(DI.driveFilesRepository)
 		private driveFilesRepository: DriveFilesRepository,
 
-		@Inject(DI.emojisRepository)
-		private emojisRepository: EmojisRepository,
+		private customEmojiService: CustomEmojiService,
 
-		private emojiEntityService: EmojiEntityService,
-		private idService: IdService,
-		private globalEventService: GlobalEventService,
 		private moderationLogService: ModerationLogService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			const file = await this.driveFilesRepository.findOneBy({ id: ps.fileId });
+			const driveFile = await this.driveFilesRepository.findOneBy({ id: ps.fileId });
 
-			if (file == null) throw new ApiError(meta.errors.noSuchFile);
+			if (driveFile == null) throw new ApiError(meta.errors.noSuchFile);
 
-			const name = file.name.split('.')[0].match(/^[a-z0-9_]+$/) ? file.name.split('.')[0] : `_${rndstr('a-z0-9', 8)}_`;
+			const name = driveFile.name.split('.')[0].match(/^[a-z0-9_]+$/) ? driveFile.name.split('.')[0] : `_${rndstr('a-z0-9', 8)}_`;
 
-			const emoji = await this.emojisRepository.insert({
-				id: this.idService.genId(),
-				updatedAt: new Date(),
-				name: name,
+			const emoji = await this.customEmojiService.add({
+				driveFile,
+				name,
 				category: null,
-				host: null,
 				aliases: [],
-				originalUrl: file.url,
-				publicUrl: file.webpublicUrl ?? file.url,
-				type: file.webpublicType ?? file.type,
-			}).then(x => this.emojisRepository.findOneByOrFail(x.identifiers[0]));
-
-			await this.db.queryResultCache!.remove(['meta_emojis']);
-
-			this.globalEventService.publishBroadcastStream('emojiAdded', {
-				emoji: await this.emojiEntityService.pack(emoji.id),
+				host: null,
 			});
 
 			this.moderationLogService.insertModerationLog(me, 'addEmoji', {
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts
index ae45105b2..0c337237d 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts
@@ -4,6 +4,8 @@ import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { EmojisRepository } from '@/models/index.js';
 import { DI } from '@/di-symbols.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
+import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -35,6 +37,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 		private emojisRepository: EmojisRepository,
 
 		private moderationLogService: ModerationLogService,
+		private emojiEntityService: EmojiEntityService,
+		private globalEventService: GlobalEventService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const emojis = await this.emojisRepository.findBy({
@@ -43,13 +47,15 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 			for (const emoji of emojis) {
 				await this.emojisRepository.delete(emoji.id);
-	
 				await this.db.queryResultCache!.remove(['meta_emojis']);
-	
 				this.moderationLogService.insertModerationLog(me, 'deleteEmoji', {
 					emoji: emoji,
 				});
 			}
+
+			this.globalEventService.publishBroadcastStream('emojiDeleted', {
+				emojis: await this.emojiEntityService.packMany(emojis),
+			});
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts b/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts
index e237d87d3..c1a60a277 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts
@@ -5,6 +5,8 @@ import type { EmojisRepository } from '@/models/index.js';
 import { DI } from '@/di-symbols.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
 import { ApiError } from '../../../error.js';
+import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -42,6 +44,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 		private emojisRepository: EmojisRepository,
 
 		private moderationLogService: ModerationLogService,
+		private emojiEntityService: EmojiEntityService,
+		private globalEventService: GlobalEventService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const emoji = await this.emojisRepository.findOneBy({ id: ps.id });
@@ -52,6 +56,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 			await this.db.queryResultCache!.remove(['meta_emojis']);
 
+			this.globalEventService.publishBroadcastStream('emojiDeleted', {
+				emojis: [ await this.emojiEntityService.pack(emoji) ],
+			});
+
 			this.moderationLogService.insertModerationLog(me, 'deleteEmoji', {
 				emoji: emoji,
 			});
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts
index 5fc9e024b..065965f64 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts
@@ -3,6 +3,8 @@ import { DataSource, In } from 'typeorm';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { EmojisRepository } from '@/models/index.js';
 import { DI } from '@/di-symbols.js';
+import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -35,6 +37,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 		@Inject(DI.emojisRepository)
 		private emojisRepository: EmojisRepository,
+
+		private emojiEntityService: EmojiEntityService,
+		private globalEventService: GlobalEventService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const emojis = await this.emojisRepository.findBy({
@@ -49,6 +54,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			}
 
 			await this.db.queryResultCache!.remove(['meta_emojis']);
+		
+			this.globalEventService.publishBroadcastStream('emojiUpdated', {
+				emojis: await this.emojiEntityService.packMany(ps.ids),
+			});
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts
index 8b5ba8fbf..51c0f329a 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts
@@ -3,6 +3,8 @@ import { DataSource, In } from 'typeorm';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { EmojisRepository } from '@/models/index.js';
 import { DI } from '@/di-symbols.js';
+import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -35,6 +37,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 		@Inject(DI.emojisRepository)
 		private emojisRepository: EmojisRepository,
+
+		private emojiEntityService: EmojiEntityService,
+		private globalEventService: GlobalEventService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			await this.emojisRepository.update({
@@ -45,6 +50,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			});
 
 			await this.db.queryResultCache!.remove(['meta_emojis']);
+
+			this.globalEventService.publishBroadcastStream('emojiUpdated', {
+				emojis: await this.emojiEntityService.packMany(ps.ids),
+			});
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts
index 827b5ace7..3329cab7b 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts
@@ -3,6 +3,8 @@ import { DataSource, In } from 'typeorm';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { EmojisRepository } from '@/models/index.js';
 import { DI } from '@/di-symbols.js';
+import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -37,6 +39,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 		@Inject(DI.emojisRepository)
 		private emojisRepository: EmojisRepository,
+
+		private emojiEntityService: EmojiEntityService,
+		private globalEventService: GlobalEventService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			await this.emojisRepository.update({
@@ -47,6 +52,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			});
 
 			await this.db.queryResultCache!.remove(['meta_emojis']);
+
+			this.globalEventService.publishBroadcastStream('emojiUpdated', {
+				emojis: await this.emojiEntityService.packMany(ps.ids),
+			});
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
index fb0ef1287..6c4c8d0e6 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
@@ -4,6 +4,8 @@ import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { EmojisRepository } from '@/models/index.js';
 import { DI } from '@/di-symbols.js';
 import { ApiError } from '../../../error.js';
+import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -48,6 +50,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 		@Inject(DI.emojisRepository)
 		private emojisRepository: EmojisRepository,
+
+		private emojiEntityService: EmojiEntityService,
+		private globalEventService: GlobalEventService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const emoji = await this.emojisRepository.findOneBy({ id: ps.id });
@@ -62,6 +67,22 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			});
 
 			await this.db.queryResultCache!.remove(['meta_emojis']);
+
+			const updated = await this.emojiEntityService.pack(emoji.id);
+
+			if (emoji.name === ps.name) {
+				this.globalEventService.publishBroadcastStream('emojiUpdated', {
+					emojis: [ updated ],
+				});
+			} else {
+				this.globalEventService.publishBroadcastStream('emojiDeleted', {
+					emojis: [ emoji ],
+				});
+
+				this.globalEventService.publishBroadcastStream('emojiAdded', {
+					emoji: updated,
+				});	
+			}
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/stream/types.ts b/packages/backend/src/server/api/stream/types.ts
index a442529bb..9daaa4acf 100644
--- a/packages/backend/src/server/api/stream/types.ts
+++ b/packages/backend/src/server/api/stream/types.ts
@@ -49,6 +49,16 @@ export interface BroadcastTypes {
 	emojiAdded: {
 		emoji: Packed<'Emoji'>;
 	};
+	emojiUpdated: {
+		emojis: Packed<'Emoji'>[];
+	};
+	emojiDeleted: {
+		emojis: {
+			id?: string;
+			name: string;
+			[other: string]: any;
+		}[];
+	};
 }
 
 export interface UserStreamTypes {
diff --git a/packages/frontend/src/custom-emojis.ts b/packages/frontend/src/custom-emojis.ts
index 57842459b..5b13176cd 100644
--- a/packages/frontend/src/custom-emojis.ts
+++ b/packages/frontend/src/custom-emojis.ts
@@ -2,6 +2,7 @@ import { apiGet } from './os';
 import { miLocalStorage } from './local-storage';
 import { shallowRef, computed, markRaw } from 'vue';
 import * as Misskey from 'misskey-js';
+import { stream } from '@/stream';
 
 const storageCache = miLocalStorage.getItem('emojis');
 export const customEmojis = shallowRef<Misskey.entities.CustomEmoji[]>(storageCache ? JSON.parse(storageCache) : []);
@@ -14,7 +15,18 @@ export const customEmojiCategories = computed<string[]>(() => {
 });
 
 fetchCustomEmojis();
-window.setInterval(fetchCustomEmojis, 1000 * 60 * 10);
+
+stream.on('emojiAdded', emojiData => {
+	customEmojis.value = [ emojiData.emoji, ...customEmojis.value ]
+});
+
+stream.on('emojiUpdated', emojiData => {
+	customEmojis.value = customEmojis.value.map(item => emojiData.emojis.find(search => search.name === item.name) as Misskey.entities.CustomEmoji ?? item);
+});
+
+stream.on('emojiDeleted', emojiData => {
+	customEmojis.value = customEmojis.value.filter(item => !emojiData.emojis.some(search => search.name === item.name))
+});
 
 export async function fetchCustomEmojis() {
 	const now = Date.now();
diff --git a/packages/frontend/src/init.ts b/packages/frontend/src/init.ts
index 36897545e..2432b5f6f 100644
--- a/packages/frontend/src/init.ts
+++ b/packages/frontend/src/init.ts
@@ -338,11 +338,6 @@ import { fetchCustomEmojis } from './custom-emojis';
 		}
 	});
 
-	stream.on('emojiAdded', emojiData => {
-		// TODO
-		//store.commit('instance/set', );
-	});
-
 	for (const plugin of ColdDeviceStorage.get('plugins').filter(p => p.active)) {
 		import('./plugin').then(({ install }) => {
 			install(plugin);

From 0b2f945bb61fc5c3a33ab93d0134f4bfe3a05c9d Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sun, 22 Jan 2023 15:13:03 +0000
Subject: [PATCH 082/177] wip

---
 .../backend/src/server/api/endpoints/admin/emoji/update.ts  | 2 +-
 packages/frontend/src/custom-emojis.ts                      | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
index 6c4c8d0e6..22bedc710 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
@@ -76,7 +76,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				});
 			} else {
 				this.globalEventService.publishBroadcastStream('emojiDeleted', {
-					emojis: [ emoji ],
+					emojis: [ await this.emojiEntityService.pack(emoji) ],
 				});
 
 				this.globalEventService.publishBroadcastStream('emojiAdded', {
diff --git a/packages/frontend/src/custom-emojis.ts b/packages/frontend/src/custom-emojis.ts
index 5b13176cd..b080eca40 100644
--- a/packages/frontend/src/custom-emojis.ts
+++ b/packages/frontend/src/custom-emojis.ts
@@ -17,7 +17,9 @@ export const customEmojiCategories = computed<string[]>(() => {
 fetchCustomEmojis();
 
 stream.on('emojiAdded', emojiData => {
-	customEmojis.value = [ emojiData.emoji, ...customEmojis.value ]
+	setTimeout(() => {
+		customEmojis.value = [ emojiData.emoji, ...customEmojis.value ]
+	}, 100);
 });
 
 stream.on('emojiUpdated', emojiData => {
@@ -25,7 +27,7 @@ stream.on('emojiUpdated', emojiData => {
 });
 
 stream.on('emojiDeleted', emojiData => {
-	customEmojis.value = customEmojis.value.filter(item => !emojiData.emojis.some(search => search.name === item.name))
+	customEmojis.value = customEmojis.value.filter(item => !emojiData.emojis.some(search => search.name === item.name));
 });
 
 export async function fetchCustomEmojis() {

From 226e0c4714c2d02598141e3e408c4fb29d90354b Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sun, 22 Jan 2023 15:17:20 +0000
Subject: [PATCH 083/177] :v:

---
 .../src/pages/custom-emojis-manager.vue       | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/packages/frontend/src/pages/custom-emojis-manager.vue b/packages/frontend/src/pages/custom-emojis-manager.vue
index 20b6c32e8..87d205ed7 100644
--- a/packages/frontend/src/pages/custom-emojis-manager.vue
+++ b/packages/frontend/src/pages/custom-emojis-manager.vue
@@ -79,7 +79,6 @@ import { selectFile, selectFiles } from '@/scripts/select-file';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
-import { fetchCustomEmojis, customEmojis } from '@/custom-emojis';
 
 const emojisPaginationComponent = shallowRef<InstanceType<typeof MkPagination>>();
 
@@ -131,7 +130,6 @@ const add = async (ev: MouseEvent) => {
 	})));
 	promise.then(() => {
 		emojisPaginationComponent.value.reload();
-		fetchCustomEmojis();
 	});
 	os.promiseDialog(promise);
 };
@@ -146,26 +144,8 @@ const edit = (emoji) => {
 					...oldEmoji,
 					...result.updated,
 				}));
-
-				if (!customEmojis.value.some(e => e.name === emoji.name)) {
-					customEmojis.value = [
-						{
-							name: result.updated.name,
-							aliases: result.updated.aliases,
-							category: result.updated.category,
-						},
-						...customEmojis.value,
-					];
-				} else {
-					customEmojis.value = customEmojis.value.map(e => e.name !== emoji.name ? e : {
-						name: result.updated.name,
-						aliases: result.updated.aliases,
-						category: result.updated.category,
-					});
-				}
 			} else if (result.deleted) {
 				emojisPaginationComponent.value.removeItem((item) => item.id === emoji.id);
-				customEmojis.value = customEmojis.value.filter(e => e.name !== emoji.name);
 			}
 		},
 	}, 'closed');
@@ -240,7 +220,6 @@ const setCategoryBulk = async () => {
 		category: result,
 	});
 	emojisPaginationComponent.value.reload();
-	fetchCustomEmojis();
 };
 
 const addTagBulk = async () => {
@@ -253,7 +232,6 @@ const addTagBulk = async () => {
 		aliases: result.split(' '),
 	});
 	emojisPaginationComponent.value.reload();
-	fetchCustomEmojis();
 };
 
 const removeTagBulk = async () => {
@@ -266,7 +244,6 @@ const removeTagBulk = async () => {
 		aliases: result.split(' '),
 	});
 	emojisPaginationComponent.value.reload();
-	fetchCustomEmojis();
 };
 
 const setTagBulk = async () => {
@@ -279,7 +256,6 @@ const setTagBulk = async () => {
 		aliases: result.split(' '),
 	});
 	emojisPaginationComponent.value.reload();
-	fetchCustomEmojis();
 };
 
 const delBulk = async () => {
@@ -292,7 +268,6 @@ const delBulk = async () => {
 		ids: selectedEmojis.value,
 	});
 	emojisPaginationComponent.value.reload();
-	fetchCustomEmojis();
 };
 
 const headerActions = $computed(() => [{

From d347f0a087747d4ae19255372ced2d69f62fc00d Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sun, 22 Jan 2023 16:07:17 +0000
Subject: [PATCH 084/177] wip

---
 .../src/core/entities/EmojiEntityService.ts       |  4 +++-
 .../api/endpoints/admin/emoji/list-remote.ts      |  2 +-
 .../src/server/api/endpoints/admin/emoji/list.ts  |  2 +-
 .../frontend/src/components/global/MkEmoji.vue    | 15 ++++++++-------
 packages/frontend/src/custom-emojis.ts            | 10 +++++-----
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/packages/backend/src/core/entities/EmojiEntityService.ts b/packages/backend/src/core/entities/EmojiEntityService.ts
index 611552d89..7d248e634 100644
--- a/packages/backend/src/core/entities/EmojiEntityService.ts
+++ b/packages/backend/src/core/entities/EmojiEntityService.ts
@@ -22,8 +22,10 @@ export class EmojiEntityService {
 	@bindThis
 	public async pack(
 		src: Emoji['id'] | Emoji,
-		opts: { omitHost?: boolean; omitId?: boolean; withUrl?: boolean; } = {},
+		opts: { omitHost?: boolean; omitId?: boolean; withUrl?: boolean; } = { omitHost: true, omitId: true, withUrl: true },
 	): Promise<Packed<'Emoji'>> {
+		opts = { omitHost: true, omitId: true, withUrl: true, ...opts }
+
 		const emoji = typeof src === 'object' ? src : await this.emojisRepository.findOneByOrFail({ id: src });
 
 		return {
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts
index d9ce97194..8e0ea2e11 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts
@@ -101,7 +101,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.take(ps.limit)
 				.getMany();
 
-			return this.emojiEntityService.packMany(emojis);
+			return this.emojiEntityService.packMany(emojis, { omitHost: false, omitId: false, withUrl: false });
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
index 1a6096f36..1b1931f8e 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
@@ -98,7 +98,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				emojis = await q.take(ps.limit).getMany();
 			}
 
-			return this.emojiEntityService.packMany(emojis);
+			return this.emojiEntityService.packMany(emojis, { omitHost: false, omitId: false, withUrl: false });
 		});
 	}
 }
diff --git a/packages/frontend/src/components/global/MkEmoji.vue b/packages/frontend/src/components/global/MkEmoji.vue
index 691392d73..5eba8764b 100644
--- a/packages/frontend/src/components/global/MkEmoji.vue
+++ b/packages/frontend/src/components/global/MkEmoji.vue
@@ -1,6 +1,6 @@
 <template>
 <span v-if="isCustom && errored">:{{ customEmojiName }}:</span>
-<img v-else-if="isCustom" :class="[$style.root, $style.custom, { [$style.normal]: normal, [$style.noStyle]: noStyle }]" :src="url" :alt="alt" :title="alt" decoding="async" @error="errored = true"/>
+<img v-else-if="isCustom" :class="[$style.root, $style.custom, { [$style.normal]: normal, [$style.noStyle]: noStyle }]" :src="url" :alt="alt" :title="alt" decoding="async" @error="errored = true" @load="errored = false"/>
 <img v-else-if="char && !useOsNativeEmojis" :class="$style.root" :src="url" :alt="alt" decoding="async" @pointerenter="computeTitle"/>
 <span v-else-if="char && useOsNativeEmojis" :alt="alt" @pointerenter="computeTitle">{{ char }}</span>
 <span v-else>{{ emoji }}</span>
@@ -25,29 +25,30 @@ const props = defineProps<{
 const char2path = defaultStore.state.emojiStyle === 'twemoji' ? char2twemojiFilePath : char2fluentEmojiFilePath;
 
 const isCustom = computed(() => props.emoji.startsWith(':'));
-const customEmojiName = props.emoji.substr(1, props.emoji.length - 2).replace('@.', '');
+const customEmojiName = computed(() => props.emoji.substr(1, props.emoji.length - 2).replace('@.', ''));
 const char = computed(() => isCustom.value ? undefined : props.emoji);
 const useOsNativeEmojis = computed(() => defaultStore.state.emojiStyle === 'native' && !props.isReaction);
 const url = computed(() => {
 	if (char.value) {
 		return char2path(char.value);
-	} else if (props.host == null && !customEmojiName.includes('@')) {
-		const found = customEmojis.value.find(x => x.name === customEmojiName);
+	} else if (props.host == null && !customEmojiName.value.includes('@')) {
+		const found = customEmojis.value.find(x => x.name === customEmojiName.value);
+		console.log(found)
 		return found ? found.url : null;
 	} else {
-		const rawUrl = props.host ? `/emoji/${customEmojiName}@${props.host}.webp` : `/emoji/${customEmojiName}.webp`;
+		const rawUrl = props.host ? `/emoji/${customEmojiName.value}@${props.host}.webp` : `/emoji/${customEmojiName.value}.webp`;
 		return defaultStore.state.disableShowingAnimatedImages
 			? getStaticImageUrl(rawUrl)
 			: rawUrl;
 	}
 });
-const alt = computed(() => isCustom.value ? `:${customEmojiName}:` : char.value);
+const alt = computed(() => isCustom.value ? `:${customEmojiName.value}:` : char.value);
 let errored = $ref(isCustom.value && url.value == null);
 
 // Searching from an array with 2000 items for every emoji felt like too energy-consuming, so I decided to do it lazily on pointerenter
 function computeTitle(event: PointerEvent): void {
 	const title = isCustom.value
-		? `:${customEmojiName}:`
+		? `:${customEmojiName.value}:`
 		: (getEmojiName(char.value as string) ?? char.value as string);
 	(event.target as HTMLElement).title = title;
 }
diff --git a/packages/frontend/src/custom-emojis.ts b/packages/frontend/src/custom-emojis.ts
index b080eca40..33f006b2a 100644
--- a/packages/frontend/src/custom-emojis.ts
+++ b/packages/frontend/src/custom-emojis.ts
@@ -1,6 +1,6 @@
 import { apiGet } from './os';
 import { miLocalStorage } from './local-storage';
-import { shallowRef, computed, markRaw } from 'vue';
+import { shallowRef, computed, markRaw, watch } from 'vue';
 import * as Misskey from 'misskey-js';
 import { stream } from '@/stream';
 
@@ -14,12 +14,12 @@ export const customEmojiCategories = computed<string[]>(() => {
 	return markRaw(Array.from(categories));
 });
 
-fetchCustomEmojis();
+watch(customEmojis, (newVal) => {
+	console.log('new', newVal)
+});
 
 stream.on('emojiAdded', emojiData => {
-	setTimeout(() => {
-		customEmojis.value = [ emojiData.emoji, ...customEmojis.value ]
-	}, 100);
+	customEmojis.value = [ emojiData.emoji, ...customEmojis.value ];
 });
 
 stream.on('emojiUpdated', emojiData => {

From 8a6750278e58807a181aa6ad6ac7a85de919caf9 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sun, 22 Jan 2023 17:11:28 +0000
Subject: [PATCH 085/177] :v:

---
 packages/frontend/src/components/MkEmojiPicker.section.vue | 6 ++++--
 packages/frontend/src/components/MkEmojiPicker.vue         | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/components/MkEmojiPicker.section.vue b/packages/frontend/src/components/MkEmojiPicker.section.vue
index 8b0b7cf29..acced4479 100644
--- a/packages/frontend/src/components/MkEmojiPicker.section.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.section.vue
@@ -18,10 +18,10 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
+import { ref, computed, Ref } from 'vue';
 
 const props = defineProps<{
-	emojis: string[];
+	emojis: string[] | Ref<string[]>;
 	initialShown?: boolean;
 }>();
 
@@ -29,5 +29,7 @@ const emit = defineEmits<{
 	(ev: 'chosen', v: string, event: MouseEvent): void;
 }>();
 
+const emojis = computed(() => Array.isArray(props.emojis) ? props.emojis : props.emojis.value);
+
 const shown = ref(!!props.initialShown);
 </script>
diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue
index 3399124e8..b288cb22f 100644
--- a/packages/frontend/src/components/MkEmojiPicker.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.vue
@@ -60,7 +60,7 @@
 		</div>
 		<div v-once class="group">
 			<header class="_acrylic">{{ i18n.ts.customEmojis }}</header>
-			<XSection v-for="category in customEmojiCategories" :key="'custom:' + category" :initial-shown="false" :emojis="customEmojis.filter(e => e.category === category).map(e => ':' + e.name + ':')" @chosen="chosen">{{ category || i18n.ts.other }}</XSection>
+			<XSection v-for="category in customEmojiCategories" :key="'custom:' + category" :initial-shown="false" :emojis="computed(() => customEmojis.filter(e => e.category === category).map(e => ':' + e.name + ':'))" @chosen="chosen">{{ category || i18n.ts.other }}</XSection>
 		</div>
 		<div v-once class="group">
 			<header class="_acrylic">{{ i18n.ts.emoji }}</header>

From 0cffe60abc9a9e14f5815af472c100e630166c29 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sun, 22 Jan 2023 17:14:05 +0000
Subject: [PATCH 086/177] =?UTF-8?q?1=E6=99=82=E9=96=93=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/server/api/endpoints/emojis.ts | 4 ++--
 packages/frontend/src/custom-emojis.ts              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/emojis.ts b/packages/backend/src/server/api/endpoints/emojis.ts
index 9dfb12b76..77854afb3 100644
--- a/packages/backend/src/server/api/endpoints/emojis.ts
+++ b/packages/backend/src/server/api/endpoints/emojis.ts
@@ -11,7 +11,7 @@ export const meta = {
 
 	requireCredential: false,
 	allowGet: true,
-	cacheSec: 60,
+	cacheSec: 3600,
 
 	res: {
 		type: 'object',
@@ -77,7 +77,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				},
 				cache: {
 					id: 'meta_emojis',
-					milliseconds: 60000,	// 1 minute
+					milliseconds: 3600000,	// 1 hour
 				},
 			});
 
diff --git a/packages/frontend/src/custom-emojis.ts b/packages/frontend/src/custom-emojis.ts
index 33f006b2a..89b8887b2 100644
--- a/packages/frontend/src/custom-emojis.ts
+++ b/packages/frontend/src/custom-emojis.ts
@@ -33,7 +33,7 @@ stream.on('emojiDeleted', emojiData => {
 export async function fetchCustomEmojis() {
 	const now = Date.now();
 	const lastFetchedAt = miLocalStorage.getItem('lastEmojisFetchedAt');
-	if (lastFetchedAt && (now - parseInt(lastFetchedAt)) < 1000 * 60) return;
+	if (lastFetchedAt && (now - parseInt(lastFetchedAt)) < 1000 * 60 * 60) return;
 
 	const res = await apiGet('emojis', {});
 

From 0d44129ae34526503d391cbade18f26e9bba9c77 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sun, 22 Jan 2023 17:20:53 +0000
Subject: [PATCH 087/177] remove console.log

---
 packages/frontend/src/components/global/MkEmoji.vue | 1 -
 packages/frontend/src/custom-emojis.ts              | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/packages/frontend/src/components/global/MkEmoji.vue b/packages/frontend/src/components/global/MkEmoji.vue
index 5eba8764b..c489ab5fa 100644
--- a/packages/frontend/src/components/global/MkEmoji.vue
+++ b/packages/frontend/src/components/global/MkEmoji.vue
@@ -33,7 +33,6 @@ const url = computed(() => {
 		return char2path(char.value);
 	} else if (props.host == null && !customEmojiName.value.includes('@')) {
 		const found = customEmojis.value.find(x => x.name === customEmojiName.value);
-		console.log(found)
 		return found ? found.url : null;
 	} else {
 		const rawUrl = props.host ? `/emoji/${customEmojiName.value}@${props.host}.webp` : `/emoji/${customEmojiName.value}.webp`;
diff --git a/packages/frontend/src/custom-emojis.ts b/packages/frontend/src/custom-emojis.ts
index 89b8887b2..2cd088993 100644
--- a/packages/frontend/src/custom-emojis.ts
+++ b/packages/frontend/src/custom-emojis.ts
@@ -14,10 +14,6 @@ export const customEmojiCategories = computed<string[]>(() => {
 	return markRaw(Array.from(categories));
 });
 
-watch(customEmojis, (newVal) => {
-	console.log('new', newVal)
-});
-
 stream.on('emojiAdded', emojiData => {
 	customEmojis.value = [ emojiData.emoji, ...customEmojis.value ];
 });

From 93dd0638ade0ba896365f5f9cc1acba103db386e Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sun, 22 Jan 2023 17:33:20 +0000
Subject: [PATCH 088/177] better category null handling

---
 packages/frontend/src/components/MkEmojiPicker.vue | 10 +++++++++-
 packages/frontend/src/custom-emojis.ts             | 10 ++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue
index b288cb22f..479d8eb7f 100644
--- a/packages/frontend/src/components/MkEmojiPicker.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.vue
@@ -60,7 +60,15 @@
 		</div>
 		<div v-once class="group">
 			<header class="_acrylic">{{ i18n.ts.customEmojis }}</header>
-			<XSection v-for="category in customEmojiCategories" :key="'custom:' + category" :initial-shown="false" :emojis="computed(() => customEmojis.filter(e => e.category === category).map(e => ':' + e.name + ':'))" @chosen="chosen">{{ category || i18n.ts.other }}</XSection>
+			<XSection
+				v-for="category in customEmojiCategories"
+				:key="`custom:${category}`"
+				:initial-shown="false"
+				:emojis="computed(() => customEmojis.filter(e => category === null ? e.category == null || e.category === 'null' : e.category === category).map(e => `:${e.name}:`))"
+				@chosen="chosen"
+			>
+				{{ category || i18n.ts.other }}
+			</XSection>
 		</div>
 		<div v-once class="group">
 			<header class="_acrylic">{{ i18n.ts.emoji }}</header>
diff --git a/packages/frontend/src/custom-emojis.ts b/packages/frontend/src/custom-emojis.ts
index 2cd088993..4dd2e0909 100644
--- a/packages/frontend/src/custom-emojis.ts
+++ b/packages/frontend/src/custom-emojis.ts
@@ -1,17 +1,19 @@
 import { apiGet } from './os';
 import { miLocalStorage } from './local-storage';
-import { shallowRef, computed, markRaw, watch } from 'vue';
+import { shallowRef, computed, markRaw } from 'vue';
 import * as Misskey from 'misskey-js';
 import { stream } from '@/stream';
 
 const storageCache = miLocalStorage.getItem('emojis');
 export const customEmojis = shallowRef<Misskey.entities.CustomEmoji[]>(storageCache ? JSON.parse(storageCache) : []);
-export const customEmojiCategories = computed<string[]>(() => {
+export const customEmojiCategories = computed<[ ...string[], null ]>(() => {
 	const categories = new Set<string>();
 	for (const emoji of customEmojis.value) {
-		categories.add(emoji.category);
+		if (emoji.category && emoji.category !== 'null') {
+			categories.add(emoji.category);
+		}
 	}
-	return markRaw(Array.from(categories));
+	return markRaw([ ...Array.from(categories), null ]);
 });
 
 stream.on('emojiAdded', emojiData => {

From 26fbb3a5603096615ec304c1ca4b3da22ad6b456 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sun, 22 Jan 2023 17:39:11 +0000
Subject: [PATCH 089/177] fix

---
 packages/frontend/src/components/MkEmojiPicker.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue
index 479d8eb7f..f64cc6e9a 100644
--- a/packages/frontend/src/components/MkEmojiPicker.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.vue
@@ -64,7 +64,7 @@
 				v-for="category in customEmojiCategories"
 				:key="`custom:${category}`"
 				:initial-shown="false"
-				:emojis="computed(() => customEmojis.filter(e => category === null ? e.category == null || e.category === 'null' : e.category === category).map(e => `:${e.name}:`))"
+				:emojis="computed(() => customEmojis.filter(e => category === null ? (e.category === 'null' || !e.category) : e.category === category).map(e => `:${e.name}:`))"
 				@chosen="chosen"
 			>
 				{{ category || i18n.ts.other }}

From ed9facbb33e1baef41a154bbdef42d62d622d91e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 23 Jan 2023 12:53:44 +0900
Subject: [PATCH 090/177] fix(client): Aiscript: button is not defined

Fix #9704
---
 CHANGELOG.md                                 | 7 +++++++
 packages/frontend/src/scripts/aiscript/ui.ts | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b820f22c..61f7367c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,13 @@
 You should also include the user name that made the change.
 -->
 
+## 13.x.x (unreleased)
+
+### Improvements
+
+### Bugfixes
+- Aiscript: button is not defined
+
 ## 13.1.7 (2023/01/22)
 
 ### Improvements
diff --git a/packages/frontend/src/scripts/aiscript/ui.ts b/packages/frontend/src/scripts/aiscript/ui.ts
index b1895a5f3..fb73c0b4b 100644
--- a/packages/frontend/src/scripts/aiscript/ui.ts
+++ b/packages/frontend/src/scripts/aiscript/ui.ts
@@ -303,7 +303,7 @@ function getButtonOptions(def: values.Value | undefined, call: (fn: values.VFn,
 	if (primary) utils.assertBoolean(primary);
 	const rounded = def.value.get('rounded');
 	if (rounded) utils.assertBoolean(rounded);
-	const disabled = button.value.get('disabled');
+	const disabled = def.value.get('disabled');
 	if (disabled) utils.assertBoolean(disabled);
 
 	return {

From c1dfbe26233821e2068cae679c3acf6d42374c5f Mon Sep 17 00:00:00 2001
From: nexryai <61890205+nexryai@users.noreply.github.com>
Date: Mon, 23 Jan 2023 16:08:09 +0900
Subject: [PATCH 091/177] Hide the value of the object storage secret key input
 form in the control panel (#9706)

---
 packages/frontend/src/pages/admin/object-storage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/admin/object-storage.vue b/packages/frontend/src/pages/admin/object-storage.vue
index 54d7e0953..6a6af637e 100644
--- a/packages/frontend/src/pages/admin/object-storage.vue
+++ b/packages/frontend/src/pages/admin/object-storage.vue
@@ -38,7 +38,7 @@
 							<template #label>Access key</template>
 						</MkInput>
 
-						<MkInput v-model="objectStorageSecretKey">
+						<MkInput v-model="objectStorageSecretKey" type="password">
 							<template #prefix><i class="ti ti-key"></i></template>
 							<template #label>Secret key</template>
 						</MkInput>

From bd23522c767f97a669e5ecd5cacfa08ec0fbc608 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 23 Jan 2023 16:19:13 +0900
Subject: [PATCH 092/177] =?UTF-8?q?enhance(client):=20=E3=82=AB=E3=82=B9?=
 =?UTF-8?q?=E3=82=BF=E3=83=A0=E7=B5=B5=E6=96=87=E5=AD=97=E4=B8=80=E8=A6=A7?=
 =?UTF-8?q?=E3=81=AE=E3=83=91=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=B3?=
 =?UTF-8?q?=E3=82=B9=E3=82=92=E6=94=B9=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/emojis.emoji.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/pages/emojis.emoji.vue b/packages/frontend/src/pages/emojis.emoji.vue
index fb3bce570..0edc29080 100644
--- a/packages/frontend/src/pages/emojis.emoji.vue
+++ b/packages/frontend/src/pages/emojis.emoji.vue
@@ -1,6 +1,6 @@
 <template>
 <button class="zuvgdzyu _button" @click="menu">
-	<img :src="`/emoji/${emoji.name}.webp`" class="img" loading="lazy"/>
+	<img :src="emoji.url" class="img" loading="lazy"/>
 	<div class="body">
 		<div class="name _monospace">{{ emoji.name }}</div>
 		<div class="info">{{ emoji.aliases.join(' ') }}</div>
@@ -15,7 +15,12 @@ import copyToClipboard from '@/scripts/copy-to-clipboard';
 import { i18n } from '@/i18n';
 
 const props = defineProps<{
-	emoji: Record<string, unknown>; // TODO
+	emoji: {
+		name: string;
+		aliases: string[];
+		category: string;
+		url: string;
+	};
 }>();
 
 function menu(ev) {

From 683ddbef3ec147a9b5b4f1055067639ca96067ed Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 23 Jan 2023 16:33:47 +0900
Subject: [PATCH 093/177] update contributors

---
 packages/frontend/src/pages/about-misskey.vue | 65 +++++++++++++++++--
 1 file changed, 60 insertions(+), 5 deletions(-)

diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index 82f4e30a4..bc63d7159 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -40,11 +40,31 @@
 				</FormSection>
 				<FormSection>
 					<template #label>{{ i18n.ts._aboutMisskey.contributors }}</template>
-					<div class="_formLinksGrid">
-						<FormLink to="https://github.com/syuilo" external>@syuilo</FormLink>
-						<FormLink to="https://github.com/tamaina" external>@tamaina</FormLink>
-						<FormLink to="https://github.com/acid-chicken" external>@acid-chicken</FormLink>
-						<FormLink to="https://github.com/rinsuki" external>@rinsuki</FormLink>
+					<div :class="$style.contributors">
+						<a href="https://github.com/syuilo" target="_blank" :class="$style.contributor">
+							<img src="https://avatars.githubusercontent.com/u/4439005?v=4" :class="$style.contributorAvatar">
+							<span :class="$style.contributorUsername">@syuilo</span>
+						</a>
+						<a href="https://github.com/tamaina" target="_blank" :class="$style.contributor">
+							<img src="https://avatars.githubusercontent.com/u/7973572?v=4" :class="$style.contributorAvatar">
+							<span :class="$style.contributorUsername">@tamaina</span>
+						</a>
+						<a href="https://github.com/acid-chicken" target="_blank" :class="$style.contributor">
+							<img src="https://avatars.githubusercontent.com/u/20679825?v=4" :class="$style.contributorAvatar">
+							<span :class="$style.contributorUsername">@acid-chicken</span>
+						</a>
+						<a href="https://github.com/rinsuki" target="_blank" :class="$style.contributor">
+							<img src="https://avatars.githubusercontent.com/u/6533808?v=4" :class="$style.contributorAvatar">
+							<span :class="$style.contributorUsername">@rinsuki</span>
+						</a>
+						<a href="https://github.com/mei23" target="_blank" :class="$style.contributor">
+							<img src="https://avatars.githubusercontent.com/u/30769358?v=4" :class="$style.contributorAvatar">
+							<span :class="$style.contributorUsername">@mei23</span>
+						</a>
+						<a href="https://github.com/robflop" target="_blank" :class="$style.contributor">
+							<img src="https://avatars.githubusercontent.com/u/8159402?v=4" :class="$style.contributorAvatar">
+							<span :class="$style.contributorUsername">@robflop</span>
+						</a>
 					</div>
 					<template #caption><MkLink url="https://github.com/misskey-dev/misskey/graphs/contributors">{{ i18n.ts._aboutMisskey.allContributors }}</MkLink></template>
 				</FormSection>
@@ -295,3 +315,38 @@ definePageMetadata({
 	}
 }
 </style>
+
+<style lang="scss" module>
+.contributors {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+	grid-gap: 12px;
+}
+
+.contributor {
+	display: flex;
+	align-items: center;
+	padding: 12px;
+	background: var(--buttonBg);
+	border-radius: 6px;
+
+	&:hover {
+		text-decoration: none;
+		background: var(--buttonHoverBg);
+	}
+
+	&.active {
+		color: var(--accent);
+		background: var(--buttonHoverBg);
+	}
+}
+
+.contributorAvatar {
+	width: 30px;
+	border-radius: 100%;
+}
+
+.contributorUsername {
+	margin-left: 12px;
+}
+</style>

From eefebab5302aac9751128c4b24f53678ab73ff0c Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 23 Jan 2023 16:36:47 +0900
Subject: [PATCH 094/177] =?UTF-8?q?=E3=82=A2=E3=83=8B=E3=83=A1=E3=83=BC?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E6=B8=9B=E3=82=89=E3=81=99=E3=82=AA?=
 =?UTF-8?q?=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3=E6=9C=89=E5=8A=B9=E6=99=82?=
 =?UTF-8?q?=E3=81=AF=E3=83=AA=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3?=
 =?UTF-8?q?=E3=81=AE=E3=82=A2=E3=83=8B=E3=83=A1=E3=83=BC=E3=82=B7=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E3=82=92=E7=84=A1=E5=8A=B9=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkReactionsViewer.reaction.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index ec4042d18..eed6b4659 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -21,6 +21,7 @@ import { useTooltip } from '@/scripts/use-tooltip';
 import { $i } from '@/account';
 import MkReactionEffect from '@/components/MkReactionEffect.vue';
 import { claimAchievement } from '@/scripts/achievements';
+import { defaultStore } from '@/store';
 
 const props = defineProps<{
 	reaction: string;
@@ -61,6 +62,7 @@ const toggleReaction = () => {
 
 const anime = () => {
 	if (document.hidden) return;
+	if (!defaultStore.state.animation) return;
 
 	const rect = buttonEl.value.getBoundingClientRect();
 	const x = rect.left + 16;

From 7028b7331b2beb56f49241fdb8e203da5b38bd20 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 23 Jan 2023 16:40:31 +0900
Subject: [PATCH 095/177] =?UTF-8?q?=E4=BB=96=E4=BA=BA=E3=81=AE=E5=AE=9F?=
 =?UTF-8?q?=E7=B8=BE=E9=96=B2=E8=A6=A7=E6=99=82=E3=81=AF=E7=8D=B2=E5=BE=97?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=97=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkAchievements.vue | 6 ++++--
 packages/frontend/src/pages/user/achievements.vue   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/components/MkAchievements.vue b/packages/frontend/src/components/MkAchievements.vue
index 64fea9635..19d04721d 100644
--- a/packages/frontend/src/components/MkAchievements.vue
+++ b/packages/frontend/src/components/MkAchievements.vue
@@ -16,8 +16,8 @@
 						<time v-tooltip="new Date(achievement.unlockedAt).toLocaleString()">{{ new Date(achievement.unlockedAt).getFullYear() }}/{{ new Date(achievement.unlockedAt).getMonth() + 1 }}/{{ new Date(achievement.unlockedAt).getDate() }}</time>
 					</span>
 				</div>
-				<div :class="$style.description">{{ i18n.ts._achievements._types['_' + achievement.name].description }}</div>
-				<div v-if="i18n.ts._achievements._types['_' + achievement.name].flavor" :class="$style.flavor">{{ i18n.ts._achievements._types['_' + achievement.name].flavor }}</div>
+				<div :class="$style.description">{{ withDescription ? i18n.ts._achievements._types['_' + achievement.name].description : '???' }}</div>
+				<div v-if="i18n.ts._achievements._types['_' + achievement.name].flavor && withDescription" :class="$style.flavor">{{ i18n.ts._achievements._types['_' + achievement.name].flavor }}</div>
 			</div>
 		</div>
 		<template v-if="withLocked">
@@ -49,8 +49,10 @@ import { ACHIEVEMENT_TYPES, ACHIEVEMENT_BADGES, claimAchievement } from '@/scrip
 const props = withDefaults(defineProps<{
 	user: misskey.entities.User;
 	withLocked: boolean;
+	withDescription: boolean;
 }>(), {
 	withLocked: true,
+	withDescription: true,
 });
 
 let achievements = $ref();
diff --git a/packages/frontend/src/pages/user/achievements.vue b/packages/frontend/src/pages/user/achievements.vue
index eaea26db4..615613b7f 100644
--- a/packages/frontend/src/pages/user/achievements.vue
+++ b/packages/frontend/src/pages/user/achievements.vue
@@ -1,6 +1,6 @@
 <template>
 <MkSpacer :content-max="1200">
-	<MkAchievements :user="user" :with-locked="false"/>
+	<MkAchievements :user="user" :with-locked="false" :with-description="$i != null && (props.user.id === $i.id)"/>
 </MkSpacer>
 </template>
 

From 7b73dd2d62333725f3974e9ec041e936e37a19c9 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 23 Jan 2023 20:07:48 +0900
Subject: [PATCH 096/177] =?UTF-8?q?enhance(server):=20onlyServer=20/=20onl?=
 =?UTF-8?q?yQueue=20=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92?=
 =?UTF-8?q?=E5=BE=A9=E6=B4=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/boot/common.ts | 35 +++++++++++++++++++++++++++++
 packages/backend/src/boot/master.ts | 33 ++++++++-------------------
 packages/backend/src/boot/worker.ts | 23 ++++++++-----------
 3 files changed, 53 insertions(+), 38 deletions(-)
 create mode 100644 packages/backend/src/boot/common.ts

diff --git a/packages/backend/src/boot/common.ts b/packages/backend/src/boot/common.ts
new file mode 100644
index 000000000..04aa26e65
--- /dev/null
+++ b/packages/backend/src/boot/common.ts
@@ -0,0 +1,35 @@
+import { NestFactory } from '@nestjs/core';
+import { ChartManagementService } from '@/core/chart/ChartManagementService.js';
+import { QueueProcessorService } from '@/queue/QueueProcessorService.js';
+import { NestLogger } from '@/NestLogger.js';
+import { QueueProcessorModule } from '@/queue/QueueProcessorModule.js';
+import { JanitorService } from '@/daemons/JanitorService.js';
+import { QueueStatsService } from '@/daemons/QueueStatsService.js';
+import { ServerStatsService } from '@/daemons/ServerStatsService.js';
+import { ServerService } from '@/server/ServerService.js';
+import { MainModule } from '@/MainModule.js';
+
+export async function server() {
+	const app = await NestFactory.createApplicationContext(MainModule, {
+		logger: new NestLogger(),
+	});
+	app.enableShutdownHooks();
+
+	const serverService = app.get(ServerService);
+	serverService.launch();
+
+	app.get(ChartManagementService).start();
+	app.get(JanitorService).start();
+	app.get(QueueStatsService).start();
+	app.get(ServerStatsService).start();
+}
+
+export async function jobQueue() {
+	const jobQueue = await NestFactory.createApplicationContext(QueueProcessorModule, {
+		logger: new NestLogger(),
+	});
+	jobQueue.enableShutdownHooks();
+
+	jobQueue.get(QueueProcessorService).start();
+	jobQueue.get(ChartManagementService).start();
+}
diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts
index 93cb3131b..f5d936fad 100644
--- a/packages/backend/src/boot/master.ts
+++ b/packages/backend/src/boot/master.ts
@@ -6,21 +6,12 @@ import cluster from 'node:cluster';
 import chalk from 'chalk';
 import chalkTemplate from 'chalk-template';
 import semver from 'semver';
-import { NestFactory } from '@nestjs/core';
 import Logger from '@/logger.js';
 import { loadConfig } from '@/config.js';
 import type { Config } from '@/config.js';
-import { lessThan } from '@/misc/prelude/array.js';
 import { showMachineInfo } from '@/misc/show-machine-info.js';
-import { DaemonModule } from '@/daemons/DaemonModule.js';
-import { JanitorService } from '@/daemons/JanitorService.js';
-import { QueueStatsService } from '@/daemons/QueueStatsService.js';
-import { ServerStatsService } from '@/daemons/ServerStatsService.js';
-import { NestLogger } from '@/NestLogger.js';
-import { ChartManagementService } from '@/core/chart/ChartManagementService.js';
-import { ServerService } from '@/server/ServerService.js';
-import { MainModule } from '@/MainModule.js';
-import { envOption } from '../env.js';
+import { envOption } from '@/env.js';
+import { jobQueue, server } from './common.js';
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
@@ -73,14 +64,13 @@ export async function masterMain() {
 		process.exit(1);
 	}
 
-	const app = await NestFactory.createApplicationContext(MainModule, {
-		logger: new NestLogger(),
-	});
-	app.enableShutdownHooks();
-
-	// start server
-	const serverService = app.get(ServerService);
-	serverService.launch();
+	if (envOption.onlyServer) {
+		await server();
+	} else if (envOption.onlyQueue) {
+		await jobQueue();
+	} else {
+		await server();
+	}
 
 	bootLogger.succ('Misskey initialized');
 
@@ -89,11 +79,6 @@ export async function masterMain() {
 	}
 
 	bootLogger.succ(`Now listening on port ${config.port} on ${config.url}`, null, true);
-
-	app.get(ChartManagementService).start();
-	app.get(JanitorService).start();
-	app.get(QueueStatsService).start();
-	app.get(ServerStatsService).start();
 }
 
 function showEnvironment(): void {
diff --git a/packages/backend/src/boot/worker.ts b/packages/backend/src/boot/worker.ts
index e0574643b..ab75aaa57 100644
--- a/packages/backend/src/boot/worker.ts
+++ b/packages/backend/src/boot/worker.ts
@@ -1,23 +1,18 @@
 import cluster from 'node:cluster';
-import { NestFactory } from '@nestjs/core';
-import { ChartManagementService } from '@/core/chart/ChartManagementService.js';
-import { QueueProcessorService } from '@/queue/QueueProcessorService.js';
-import { NestLogger } from '@/NestLogger.js';
-import { QueueProcessorModule } from '@/queue/QueueProcessorModule.js';
+import { envOption } from '@/env.js';
+import { jobQueue, server } from './common.js';
 
 /**
  * Init worker process
  */
 export async function workerMain() {
-	const jobQueue = await NestFactory.createApplicationContext(QueueProcessorModule, {
-		logger: new NestLogger(),
-	});
-	jobQueue.enableShutdownHooks();
-
-	// start job queue
-	jobQueue.get(QueueProcessorService).start();
-
-	jobQueue.get(ChartManagementService).start();
+	if (envOption.onlyServer) {
+		await server();
+	} else if (envOption.onlyQueue) {
+		await jobQueue();
+	} else {
+		await jobQueue();
+	}
 
 	if (cluster.isWorker) {
 		// Send a 'ready' message to parent process

From 083fa53d9c901de91e1b312833f0fd96795baf4d Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 23 Jan 2023 20:13:18 +0900
Subject: [PATCH 097/177] update deps

---
 CHANGELOG.md                  |  4 ++++
 packages/backend/package.json |  8 +++----
 pnpm-lock.yaml                | 42 +++++++++++++++++------------------
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61f7367c4..df0d05afe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,10 @@ You should also include the user name that made the change.
 ## 13.x.x (unreleased)
 
 ### Improvements
+- onlyServer / onlyQueue オプションを復活
+- 他人の実績閲覧時は獲得条件を表示しないように
+- アニメーション減らすオプション有効時はリアクションのアニメーションを無効に
+- カスタム絵文字一覧のパフォーマンスを改善
 
 ### Bugfixes
 - Aiscript: button is not defined
diff --git a/packages/backend/package.json b/packages/backend/package.json
index be9012021..565de4310 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -23,9 +23,9 @@
 		"@tensorflow/tfjs-node": "4.1.0"
 	},
 	"dependencies": {
-		"@bull-board/api": "^4.10.2",
-		"@bull-board/fastify": "^4.10.2",
-		"@bull-board/ui": "^4.10.2",
+		"@bull-board/api": "^4.11.0",
+		"@bull-board/fastify": "^4.11.0",
+		"@bull-board/ui": "^4.11.0",
 		"@discordapp/twemoji": "14.0.2",
 		"@fastify/accepts": "4.1.0",
 		"@fastify/cookie": "^8.3.0",
@@ -120,7 +120,7 @@
 		"typeorm": "0.3.11",
 		"typescript": "4.9.4",
 		"ulid": "2.3.0",
-		"undici": "^5.15.1",
+		"undici": "^5.16.0",
 		"unzipper": "0.10.11",
 		"uuid": "9.0.0",
 		"vary": "1.1.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 13b709bb2..2551c4fd7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -48,9 +48,9 @@ importers:
 
   packages/backend:
     specifiers:
-      '@bull-board/api': ^4.10.2
-      '@bull-board/fastify': ^4.10.2
-      '@bull-board/ui': ^4.10.2
+      '@bull-board/api': ^4.11.0
+      '@bull-board/fastify': ^4.11.0
+      '@bull-board/ui': ^4.11.0
       '@discordapp/twemoji': 14.0.2
       '@fastify/accepts': 4.1.0
       '@fastify/cookie': ^8.3.0
@@ -202,7 +202,7 @@ importers:
       typeorm: 0.3.11
       typescript: 4.9.4
       ulid: 2.3.0
-      undici: ^5.15.1
+      undici: ^5.16.0
       unzipper: 0.10.11
       uuid: 9.0.0
       vary: 1.1.2
@@ -211,9 +211,9 @@ importers:
       ws: 8.12.0
       xev: 3.0.2
     dependencies:
-      '@bull-board/api': 4.10.2
-      '@bull-board/fastify': 4.10.2
-      '@bull-board/ui': 4.10.2
+      '@bull-board/api': 4.11.0
+      '@bull-board/fastify': 4.11.0
+      '@bull-board/ui': 4.11.0
       '@discordapp/twemoji': 14.0.2
       '@fastify/accepts': 4.1.0
       '@fastify/cookie': 8.3.0
@@ -308,7 +308,7 @@ importers:
       typeorm: 0.3.11_ioredis@4.28.5+pg@8.8.0
       typescript: 4.9.4
       ulid: 2.3.0
-      undici: 5.15.1
+      undici: 5.16.0
       unzipper: 0.10.11
       uuid: 9.0.0
       vary: 1.1.2
@@ -915,17 +915,17 @@ packages:
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
     dev: true
 
-  /@bull-board/api/4.10.2:
-    resolution: {integrity: sha512-lRHo0A7hsz71aOx1ZN0SmLLWfSuvKdL6EZ4imlgo5SuXGozybvlRc5KPIJU2/E1w5meoUGi+nFezBwp1gT/SMw==}
+  /@bull-board/api/4.11.0:
+    resolution: {integrity: sha512-qFnG63s3BkaslsNnXYagEUcdeK9SijZTJ+I4vMU+OiZt9VlKh01X1KjNlqjF9guvWcjk+Rg8UOMm0fWwM6PK6g==}
     dependencies:
       redis-info: 3.1.0
     dev: false
 
-  /@bull-board/fastify/4.10.2:
-    resolution: {integrity: sha512-yp/TlfyfMBgR6vibyCUBOTKn2BFlBSLxkJxzlvIcMDs2Vl3PMXMs4YoCr2o3m+dXxSNzpTfomxAc5XQfJdp0VQ==}
+  /@bull-board/fastify/4.11.0:
+    resolution: {integrity: sha512-G4sAFVx5kGT5T/F2gL91RjZ2+YrMHNrLWoVo/QfHMcZe3RoOP4PpbOLgLC/O67KYn3JK6t8ysGyyP035OSJ2HA==}
     dependencies:
-      '@bull-board/api': 4.10.2
-      '@bull-board/ui': 4.10.2
+      '@bull-board/api': 4.11.0
+      '@bull-board/ui': 4.11.0
       '@fastify/static': 6.6.1
       '@fastify/view': 7.4.0
       ejs: 3.1.8
@@ -933,10 +933,10 @@ packages:
       - supports-color
     dev: false
 
-  /@bull-board/ui/4.10.2:
-    resolution: {integrity: sha512-vaHGojG5D3xjnaed3nwOaLy4Y06RgDJdYRaFR5E06SjZ0vOvjVYGD6s4cykK512Aw/ElFhKDPwzhf8BvpwAtDQ==}
+  /@bull-board/ui/4.11.0:
+    resolution: {integrity: sha512-/Yb7x/3tWxysA2jRDQ89xEPnscvfGQdf4MmDRzWH5lDkVmL8b1HvZAQxLrHcxwB6y16oorQTf/1KbRZl0rJDHg==}
     dependencies:
-      '@bull-board/api': 4.10.2
+      '@bull-board/api': 4.11.0
     dev: false
 
   /@chainsafe/is-ip/2.0.1:
@@ -1077,7 +1077,7 @@ packages:
     dependencies:
       ky: 0.30.0
       ky-universal: 0.10.1_ky@0.30.0
-      undici: 5.15.1
+      undici: 5.16.0
     transitivePeerDependencies:
       - web-streams-polyfill
     dev: false
@@ -1402,7 +1402,7 @@ packages:
       fastify-plugin: 4.5.0
       pump: 3.0.0
       tiny-lru: 10.0.1
-      undici: 5.15.1
+      undici: 5.16.0
     dev: false
 
   /@fastify/send/1.0.0:
@@ -13541,8 +13541,8 @@ packages:
       undertaker-registry: 1.0.1
     dev: false
 
-  /undici/5.15.1:
-    resolution: {integrity: sha512-XLk8g0WAngdvFqTI+VKfBtM4YWXgdxkf1WezC771Es0Dd+Pm1KmNx8t93WTC+Hh9tnghmVxkclU1HN+j+CvIUA==}
+  /undici/5.16.0:
+    resolution: {integrity: sha512-KWBOXNv6VX+oJQhchXieUznEmnJMqgXMbs0xxH2t8q/FUAWSJvOSr/rMaZKnX5RIVq7JDn0JbP4BOnKG2SGXLQ==}
     engines: {node: '>=12.18'}
     dependencies:
       busboy: 1.6.0

From e6eae558d3ad6d456e68864242beb123216331ec Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 23 Jan 2023 20:13:38 +0900
Subject: [PATCH 098/177] 13.2.0

---
 CHANGELOG.md | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df0d05afe..9fd48fcbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@
 You should also include the user name that made the change.
 -->
 
-## 13.x.x (unreleased)
+## 13.2.0 (2021/01/23)
 
 ### Improvements
 - onlyServer / onlyQueue オプションを復活
diff --git a/package.json b/package.json
index be5b86669..279d3949c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.1.8",
+	"version": "13.2.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From 238f923b419b487337fbcaa5ba415bf2f823f27e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 24 Jan 2023 08:31:02 +0900
Subject: [PATCH 099/177] =?UTF-8?q?refactor(server):=20httpRequestService?=
 =?UTF-8?q?=E3=81=AEUndiciFetcher=E4=BE=9D=E5=AD=98=E3=82=92=E3=81=AA?=
 =?UTF-8?q?=E3=82=8B=E3=81=B9=E3=81=8F=E3=82=AB=E3=83=97=E3=82=BB=E3=83=AB?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/DownloadService.ts  | 33 ++++++------
 .../backend/src/core/HttpRequestService.ts    | 53 ++++++++++---------
 .../src/core/activitypub/ApResolverService.ts | 10 ++--
 3 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/packages/backend/src/core/DownloadService.ts b/packages/backend/src/core/DownloadService.ts
index a3078bff4..e4632f857 100644
--- a/packages/backend/src/core/DownloadService.ts
+++ b/packages/backend/src/core/DownloadService.ts
@@ -6,6 +6,7 @@ import IPCIDR from 'ip-cidr';
 import PrivateIp from 'private-ip';
 import got, * as Got from 'got';
 import chalk from 'chalk';
+import { buildConnector } from 'undici';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { HttpRequestService, UndiciFetcher } from '@/core/HttpRequestService.js';
@@ -13,7 +14,6 @@ import { createTemp } from '@/misc/create-temp.js';
 import { StatusError } from '@/misc/status-error.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import type Logger from '@/logger.js';
-import { buildConnector } from 'undici';
 
 const pipeline = util.promisify(stream.pipeline);
 import { bindThis } from '@/decorators.js';
@@ -32,23 +32,20 @@ export class DownloadService {
 	) {
 		this.logger = this.loggerService.getLogger('download');
 
-		this.undiciFetcher = new UndiciFetcher(this.httpRequestService.getStandardUndiciFetcherOption(
-			{
-				connect: process.env.NODE_ENV === 'development' ?
-					this.httpRequestService.clientDefaults.connect
-					:
-					this.httpRequestService.getConnectorWithIpCheck(
-						buildConnector({
-							...this.httpRequestService.clientDefaults.connect,
-						}),
-						(ip) => !this.isPrivateIp(ip)
-					),
-				bodyTimeout: 30 * 1000,
-			},
-			{
-				connect: this.httpRequestService.clientDefaults.connect,
-			}
-		), this.logger);
+		this.undiciFetcher = this.httpRequestService.createFetcher({
+			connect: process.env.NODE_ENV === 'development' ?
+				this.httpRequestService.clientDefaults.connect
+				:
+				this.httpRequestService.getConnectorWithIpCheck(
+					buildConnector({
+						...this.httpRequestService.clientDefaults.connect,
+					}),
+					(ip) => !this.isPrivateIp(ip),
+				),
+			bodyTimeout: 30 * 1000,
+		}, {
+			connect: this.httpRequestService.clientDefaults.connect,
+		}, this.logger);
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/HttpRequestService.ts b/packages/backend/src/core/HttpRequestService.ts
index 2864ad440..3a70ac77f 100644
--- a/packages/backend/src/core/HttpRequestService.ts
+++ b/packages/backend/src/core/HttpRequestService.ts
@@ -1,14 +1,14 @@
 import * as http from 'node:http';
 import * as https from 'node:https';
+import { LookupFunction } from 'node:net';
 import CacheableLookup from 'cacheable-lookup';
 import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent';
 import { Inject, Injectable } from '@nestjs/common';
+import * as undici from 'undici';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { StatusError } from '@/misc/status-error.js';
 import { bindThis } from '@/decorators.js';
-import * as undici from 'undici';
-import { LookupFunction } from 'node:net';
 import { LoggerService } from '@/core/LoggerService.js';
 import type Logger from '@/logger.js';
 
@@ -62,7 +62,7 @@ export class UndiciFetcher {
 					undici.buildConnector(args.agentOptions.connect as undici.buildConnector.BuildOptions)(options, (err, socket) => {
 						this.logger?.debug('Socket connector called', socket);
 						if (err) {
-							this.logger?.debug(`Socket error`, err);
+							this.logger?.debug('Socket error', err);
 							cb(new Error(`Error while socket connecting\n${err}`), null);
 							return;
 						}
@@ -79,20 +79,20 @@ export class UndiciFetcher {
 
 				uri: args.proxy.uri,
 
-				connect: (process.env.NODE_ENV !== 'production' && typeof (args.proxy?.options?.connect ?? args.agentOptions.connect) !== 'function')
+				connect: (process.env.NODE_ENV !== 'production' && typeof (args.proxy.options?.connect ?? args.agentOptions.connect) !== 'function')
 					? (options, cb) => {
 						// Custom connector for debug
 						undici.buildConnector((args.proxy?.options?.connect ?? args.agentOptions.connect) as undici.buildConnector.BuildOptions)(options, (err, socket) => {
 							this.logger?.debug('Socket connector called (secure)', socket);
 							if (err) {
-								this.logger?.debug(`Socket error`, err);
+								this.logger?.debug('Socket error', err);
 								cb(new Error(`Error while socket connecting\n${err}`), null);
 								return;
 							}
 							this.logger?.debug(`Socket connected (secure): port ${socket.localPort} => remote ${socket.remoteAddress}`);
 							cb(null, socket);
 						});
-					} : (args.proxy?.options?.connect ?? args.agentOptions.connect),
+					} : (args.proxy.options?.connect ?? args.agentOptions.connect),
 			})
 			: this.nonProxiedAgent;
 	}
@@ -115,7 +115,7 @@ export class UndiciFetcher {
 	public async fetch(
 		url: string | URL,
 		options: undici.RequestInit = {},
-		privateOptions: { noOkError?: boolean; bypassProxy?: boolean; } = { noOkError: false, bypassProxy: false }
+		privateOptions: { noOkError?: boolean; bypassProxy?: boolean; } = { noOkError: false, bypassProxy: false },
 	): Promise<undici.Response> {
 		const res = await undici.fetch(url, {
 			dispatcher: this.getAgentByUrl(new URL(url), privateOptions.bypassProxy),
@@ -142,7 +142,7 @@ export class UndiciFetcher {
 				headers: Object.assign({
 					Accept: accept,
 				}, headers ?? {}),
-			}
+			},
 		);
 
 		return await res.json() as T;
@@ -156,7 +156,7 @@ export class UndiciFetcher {
 				headers: Object.assign({
 					Accept: accept,
 				}, headers ?? {}),
-			}
+			},
 		);
 
 		return await res.text();
@@ -219,18 +219,18 @@ export class HttpRequestService {
 				maxCachedSessions: 300, // TLSセッションのキャッシュ数 https://github.com/nodejs/undici/blob/v5.14.0/lib/core/connect.js#L80
 				lookup: this.dnsCache.lookup as LookupFunction, // https://github.com/nodejs/undici/blob/v5.14.0/lib/core/connect.js#L98
 			},
-		}
+		};
 
 		this.maxSockets = Math.max(64, this.config.deliverJobConcurrency ?? 128);
 
-		this.defaultFetcher = new UndiciFetcher(this.getStandardUndiciFetcherOption(), this.logger);
+		this.defaultFetcher = this.createFetcher({}, {}, this.logger);
 
 		this.fetch = this.defaultFetcher.fetch;
 		this.getHtml = this.defaultFetcher.getHtml;
 
-		this.defaultJsonFetcher = new UndiciFetcher(this.getStandardUndiciFetcherOption({
+		this.defaultJsonFetcher = this.createFetcher({
 			maxResponseSize: 1024 * 256,
-		}), this.logger);
+		}, {}, this.logger);
 
 		this.getJson = this.defaultJsonFetcher.getJson;
 
@@ -272,23 +272,28 @@ export class HttpRequestService {
 	}
 
 	@bindThis
-	public getStandardUndiciFetcherOption(opts: undici.Agent.Options = {}, proxyOpts: undici.Agent.Options = {}) {
+	private getStandardUndiciFetcherOption(opts: undici.Agent.Options = {}, proxyOpts: undici.Agent.Options = {}) {
 		return {
 			agentOptions: {
 				...this.clientDefaults,
 				...opts,
 			},
 			...(this.config.proxy ? {
-			proxy: {
-				uri: this.config.proxy,
-				options: {
-					connections: this.maxSockets,
-					...proxyOpts,
-				}
-			}
+				proxy: {
+					uri: this.config.proxy,
+					options: {
+						connections: this.maxSockets,
+						...proxyOpts,
+					},
+				},
 			} : {}),
 			userAgent: this.config.userAgent,
-		}
+		};
+	}
+
+	@bindThis
+	public createFetcher(opts: undici.Agent.Options = {}, proxyOpts: undici.Agent.Options = {}, logger: Logger) {
+		return new UndiciFetcher(this.getStandardUndiciFetcherOption(opts, proxyOpts), logger);
 	}
 
 	/**
@@ -314,13 +319,13 @@ export class HttpRequestService {
 			connector(options, (err, socket) => {
 				this.logger.debug('Socket connector (with ip checker) called', socket);
 				if (err) {
-					this.logger.error(`Socket error`, err)
+					this.logger.error('Socket error', err);
 					cb(new Error(`Error while socket connecting\n${err}`), null);
 					return;
 				}
 
 				if (socket.remoteAddress == undefined) {
-					this.logger.error(`Socket error: remoteAddress is undefined`);
+					this.logger.error('Socket error: remoteAddress is undefined');
 					cb(new Error('remoteAddress is undefined (maybe socket destroyed)'), null);
 					return;
 				}
diff --git a/packages/backend/src/core/activitypub/ApResolverService.ts b/packages/backend/src/core/activitypub/ApResolverService.ts
index e51ae3795..94bb6d6c5 100644
--- a/packages/backend/src/core/activitypub/ApResolverService.ts
+++ b/packages/backend/src/core/activitypub/ApResolverService.ts
@@ -8,13 +8,13 @@ import { HttpRequestService, UndiciFetcher } from '@/core/HttpRequestService.js'
 import { DI } from '@/di-symbols.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
+import { LoggerService } from '@/core/LoggerService.js';
+import type Logger from '@/logger.js';
 import { isCollectionOrOrderedCollection } from './type.js';
 import { ApDbResolverService } from './ApDbResolverService.js';
 import { ApRendererService } from './ApRendererService.js';
 import { ApRequestService } from './ApRequestService.js';
-import { LoggerService } from '@/core/LoggerService.js';
 import type { IObject, ICollection, IOrderedCollection } from './type.js';
-import type Logger from '@/logger.js';
 
 export class Resolver {
 	private history: Set<string>;
@@ -39,10 +39,10 @@ export class Resolver {
 		private recursionLimit = 100,
 	) {
 		this.history = new Set();
-		this.logger = this.loggerService?.getLogger('ap-resolve');  // なぜか TypeError: Cannot read properties of undefined (reading 'getLogger') と言われる
-		this.undiciFetcher = new UndiciFetcher(this.httpRequestService.getStandardUndiciFetcherOption({
+		this.logger = this.loggerService.getLogger('ap-resolve'); // なぜか TypeError: Cannot read properties of undefined (reading 'getLogger') と言われる
+		this.undiciFetcher = this.httpRequestService.createFetcher({
 			maxRedirections: 0,
-		}), this.logger);
+		}, {}, this.logger);
 	}
 
 	@bindThis

From 869854eae736cf5c910f533191ea0d1f7c9755dd Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 24 Jan 2023 08:32:17 +0900
Subject: [PATCH 100/177] =?UTF-8?q?=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88?=
 =?UTF-8?q?=E6=BC=8F=E3=82=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/DownloadService.ts           |  1 -
 .../backend/src/core/activitypub/ApRequestService.ts   | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/core/DownloadService.ts b/packages/backend/src/core/DownloadService.ts
index e4632f857..c5b2bcaef 100644
--- a/packages/backend/src/core/DownloadService.ts
+++ b/packages/backend/src/core/DownloadService.ts
@@ -4,7 +4,6 @@ import * as util from 'node:util';
 import { Inject, Injectable } from '@nestjs/common';
 import IPCIDR from 'ip-cidr';
 import PrivateIp from 'private-ip';
-import got, * as Got from 'got';
 import chalk from 'chalk';
 import { buildConnector } from 'undici';
 import { DI } from '@/di-symbols.js';
diff --git a/packages/backend/src/core/activitypub/ApRequestService.ts b/packages/backend/src/core/activitypub/ApRequestService.ts
index ab22a0c41..fd7319702 100644
--- a/packages/backend/src/core/activitypub/ApRequestService.ts
+++ b/packages/backend/src/core/activitypub/ApRequestService.ts
@@ -41,10 +41,10 @@ export class ApRequestService {
 		private httpRequestService: HttpRequestService,
 		private loggerService: LoggerService,
 	) {
-		this.logger = this.loggerService?.getLogger('ap-request'); // なぜか TypeError: Cannot read properties of undefined (reading 'getLogger') と言われる
-		this.undiciFetcher = new UndiciFetcher(this.httpRequestService.getStandardUndiciFetcherOption({
+		this.logger = this.loggerService.getLogger('ap-request'); // なぜか TypeError: Cannot read properties of undefined (reading 'getLogger') と言われる
+		this.undiciFetcher = this.httpRequestService.createFetcher({
 			maxRedirections: 0,
-		}), this.logger );
+		}, {}, this.logger);
 	}
 
 	@bindThis
@@ -169,7 +169,7 @@ export class ApRequestService {
 				method: req.request.method,
 				headers: req.request.headers,
 				body,
-			}
+			},
 		);
 	}
 
@@ -197,7 +197,7 @@ export class ApRequestService {
 			{
 				method: req.request.method,
 				headers: req.request.headers,
-			}
+			},
 		);
 
 		return await res.json();

From 9fd1b35d958523205444fecb7e9184072a1720e4 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 24 Jan 2023 01:34:14 +0000
Subject: [PATCH 101/177] fix TypeError: Cannot read properties of undefined
 (reading 'getLogger')

---
 packages/backend/src/core/activitypub/ApResolverService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/core/activitypub/ApResolverService.ts b/packages/backend/src/core/activitypub/ApResolverService.ts
index 94bb6d6c5..ca7760af8 100644
--- a/packages/backend/src/core/activitypub/ApResolverService.ts
+++ b/packages/backend/src/core/activitypub/ApResolverService.ts
@@ -39,7 +39,7 @@ export class Resolver {
 		private recursionLimit = 100,
 	) {
 		this.history = new Set();
-		this.logger = this.loggerService.getLogger('ap-resolve'); // なぜか TypeError: Cannot read properties of undefined (reading 'getLogger') と言われる
+		this.logger = this.loggerService?.getLogger('ap-resolve'); // なぜか TypeError: Cannot read properties of undefined (reading 'getLogger') と言われる
 		this.undiciFetcher = this.httpRequestService.createFetcher({
 			maxRedirections: 0,
 		}, {}, this.logger);

From a2268a95be28d5591febed902c7682e4924b21f4 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 24 Jan 2023 14:10:26 +0900
Subject: [PATCH 102/177] :art:

---
 packages/frontend/src/components/MkNotification.vue | 2 +-
 packages/frontend/src/navbar.ts                     | 2 +-
 packages/frontend/src/pages/achievements.vue        | 2 +-
 packages/frontend/src/pages/user/index.vue          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue
index e992495a7..d8087eb23 100644
--- a/packages/frontend/src/components/MkNotification.vue
+++ b/packages/frontend/src/components/MkNotification.vue
@@ -15,7 +15,7 @@
 			<i v-else-if="notification.type === 'mention'" class="ti ti-at"></i>
 			<i v-else-if="notification.type === 'quote'" class="ti ti-quote"></i>
 			<i v-else-if="notification.type === 'pollEnded'" class="ti ti-chart-arrows"></i>
-			<i v-else-if="notification.type === 'achievementEarned'" class="ti ti-military-award"></i>
+			<i v-else-if="notification.type === 'achievementEarned'" class="ti ti-medal"></i>
 			<!-- notification.reaction が null になることはまずないが、ここでoptional chaining使うと一部ブラウザで刺さるので念の為 -->
 			<MkReactionIcon
 				v-else-if="notification.type === 'reaction'"
diff --git a/packages/frontend/src/navbar.ts b/packages/frontend/src/navbar.ts
index 3d16a52e6..4f809d888 100644
--- a/packages/frontend/src/navbar.ts
+++ b/packages/frontend/src/navbar.ts
@@ -105,7 +105,7 @@ export const navbarItemDef = reactive({
 	},
 	achievements: {
 		title: i18n.ts.achievements,
-		icon: 'ti ti-military-award',
+		icon: 'ti ti-medal',
 		show: computed(() => $i != null),
 		to: '/my/achievements',
 	},
diff --git a/packages/frontend/src/pages/achievements.vue b/packages/frontend/src/pages/achievements.vue
index 14b852069..effa2fcaf 100644
--- a/packages/frontend/src/pages/achievements.vue
+++ b/packages/frontend/src/pages/achievements.vue
@@ -45,7 +45,7 @@ onDeactivated(() => {
 
 definePageMetadata({
 	title: i18n.ts.achievements,
-	icon: 'ti ti-military-award',
+	icon: 'ti ti-medal',
 });
 </script>
 
diff --git a/packages/frontend/src/pages/user/index.vue b/packages/frontend/src/pages/user/index.vue
index d63aa3a3a..120f67d8a 100644
--- a/packages/frontend/src/pages/user/index.vue
+++ b/packages/frontend/src/pages/user/index.vue
@@ -81,7 +81,7 @@ const headerTabs = $computed(() => user ? [{
 }, ...(user.host == null ? [{
 	key: 'achievements',
 	title: i18n.ts.achievements,
-	icon: 'ti ti-military-award',
+	icon: 'ti ti-medal',
 }] : []), ...($i && ($i.id === user.id)) || user.publicReactions ? [{
 	key: 'reactions',
 	title: i18n.ts.reaction,

From da274cd458c7a19507b9713b9063a5ce6d377674 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 24 Jan 2023 14:49:29 +0900
Subject: [PATCH 103/177] update deps

---
 gulpfile.js                      |   2 +-
 package.json                     |   6 +-
 packages/backend/package.json    |  11 +-
 packages/frontend/package.json   |   8 +-
 packages/frontend/src/style.scss |   6 +-
 pnpm-lock.yaml                   | 322 +++++++++++++------------------
 6 files changed, 150 insertions(+), 205 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index d567e8bf6..a04ab4c1a 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -20,7 +20,7 @@ gulp.task('copy:frontend:fonts', () =>
 );
 
 gulp.task('copy:frontend:tabler-icons', () =>
-	gulp.src('./packages/frontend/node_modules/@tabler/icons/iconfont/**/*').pipe(gulp.dest('./built/_frontend_dist_/tabler-icons/'))
+	gulp.src('./packages/frontend/node_modules/@tabler/icons-webfont/**/*').pipe(gulp.dest('./built/_frontend_dist_/tabler-icons/'))
 );
 
 gulp.task('copy:frontend:locales', cb => {
diff --git a/package.json b/package.json
index 279d3949c..7b0d5093d 100644
--- a/package.json
+++ b/package.json
@@ -54,12 +54,12 @@
 	"devDependencies": {
 		"@types/gulp": "4.0.10",
 		"@types/gulp-rename": "2.0.1",
-		"@typescript-eslint/eslint-plugin": "5.48.2",
-		"@typescript-eslint/parser": "5.48.2",
+		"@typescript-eslint/eslint-plugin": "5.49.0",
+		"@typescript-eslint/parser": "5.49.0",
 		"cross-env": "7.0.3",
 		"cypress": "12.3.0",
 		"eslint": "^8.32.0",
-		"start-server-and-test": "1.15.2"
+		"start-server-and-test": "1.15.3"
 	},
 	"optionalDependencies": {
 		"@tensorflow/tfjs-core": "^4.2.0"
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 565de4310..6cac949ea 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -19,8 +19,8 @@
 		"test-and-coverage": "pnpm jest-and-coverage"
 	},
 	"optionalDependencies": {
-		"@tensorflow/tfjs": "^4.1.0",
-		"@tensorflow/tfjs-node": "4.1.0"
+		"@tensorflow/tfjs": "^4.2.0",
+		"@tensorflow/tfjs-node": "4.2.0"
 	},
 	"dependencies": {
 		"@bull-board/api": "^4.11.0",
@@ -69,9 +69,8 @@
 		"ip-cidr": "3.0.11",
 		"is-svg": "4.3.2",
 		"js-yaml": "4.1.0",
-		"jsdom": "21.0.0",
+		"jsdom": "21.1.0",
 		"json5": "2.2.3",
-		"json5-loader": "4.0.1",
 		"jsonld": "8.1.0",
 		"jsrsasign": "10.6.1",
 		"mfm-js": "0.23.3",
@@ -176,8 +175,8 @@
 		"@types/web-push": "3.3.2",
 		"@types/websocket": "1.0.5",
 		"@types/ws": "8.5.4",
-		"@typescript-eslint/eslint-plugin": "5.48.2",
-		"@typescript-eslint/parser": "5.48.2",
+		"@typescript-eslint/eslint-plugin": "5.49.0",
+		"@typescript-eslint/parser": "5.49.0",
 		"cross-env": "7.0.3",
 		"eslint": "8.32.0",
 		"eslint-plugin-import": "2.27.5",
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index cdfa96ea8..da568a9ea 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -12,7 +12,7 @@
 		"@rollup/plugin-json": "6.0.0",
 		"@rollup/pluginutils": "5.0.2",
 		"@syuilo/aiscript": "0.12.2",
-		"@tabler/icons": "^1.118.0",
+		"@tabler/icons-webfont": "^2.0.0",
 		"@vitejs/plugin-vue": "4.0.0",
 		"@vue/compiler-sfc": "3.2.45",
 		"autobind-decorator": "2.4.0",
@@ -82,15 +82,15 @@
 		"@types/uuid": "9.0.0",
 		"@types/websocket": "1.0.5",
 		"@types/ws": "8.5.4",
-		"@typescript-eslint/eslint-plugin": "5.48.2",
-		"@typescript-eslint/parser": "5.48.2",
+		"@typescript-eslint/eslint-plugin": "5.49.0",
+		"@typescript-eslint/parser": "5.49.0",
 		"@vue/runtime-core": "3.2.45",
 		"cross-env": "7.0.3",
 		"cypress": "12.3.0",
 		"eslint": "8.32.0",
 		"eslint-plugin-import": "2.27.5",
 		"eslint-plugin-vue": "9.9.0",
-		"start-server-and-test": "1.15.2",
+		"start-server-and-test": "1.15.3",
 		"vue-eslint-parser": "^9.1.0",
 		"vue-tsc": "^1.0.24"
 	}
diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index 4c6b76435..5d539a0f0 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -127,11 +127,11 @@ hr {
 }
 
 .ti {
-	vertical-align: -10%;
-	line-height: 0.9em;
+	vertical-align: -70%;
+	line-height: 0.5em;
 
 	&:before {
-		font-size: 130%;
+		font-size: 150%;
 	}
 }
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2551c4fd7..cdbbd3b82 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -11,8 +11,8 @@ importers:
       '@tensorflow/tfjs-core': ^4.2.0
       '@types/gulp': 4.0.10
       '@types/gulp-rename': 2.0.1
-      '@typescript-eslint/eslint-plugin': 5.48.2
-      '@typescript-eslint/parser': 5.48.2
+      '@typescript-eslint/eslint-plugin': 5.49.0
+      '@typescript-eslint/parser': 5.49.0
       cross-env: 7.0.3
       cypress: 12.3.0
       eslint: ^8.32.0
@@ -23,7 +23,7 @@ importers:
       gulp-replace: 1.1.4
       gulp-terser: 2.1.0
       js-yaml: 4.1.0
-      start-server-and-test: 1.15.2
+      start-server-and-test: 1.15.3
       typescript: 4.9.4
     dependencies:
       execa: 5.1.1
@@ -39,12 +39,12 @@ importers:
     devDependencies:
       '@types/gulp': 4.0.10
       '@types/gulp-rename': 2.0.1
-      '@typescript-eslint/eslint-plugin': 5.48.2_caon6io6stgpr7lz2rtbhekxqy
-      '@typescript-eslint/parser': 5.48.2_7uibuqfxkfaozanbtbziikiqje
+      '@typescript-eslint/eslint-plugin': 5.49.0_iu322prlnwsygkcra5kbpy22si
+      '@typescript-eslint/parser': 5.49.0_7uibuqfxkfaozanbtbziikiqje
       cross-env: 7.0.3
       cypress: 12.3.0
       eslint: 8.32.0
-      start-server-and-test: 1.15.2
+      start-server-and-test: 1.15.3
 
   packages/backend:
     specifiers:
@@ -68,8 +68,8 @@ importers:
       '@swc/cli': ^0.1.59
       '@swc/core': 1.3.27
       '@swc/jest': 0.2.24
-      '@tensorflow/tfjs': ^4.1.0
-      '@tensorflow/tfjs-node': 4.1.0
+      '@tensorflow/tfjs': ^4.2.0
+      '@tensorflow/tfjs-node': 4.2.0
       '@types/accepts': 1.3.5
       '@types/archiver': 5.3.1
       '@types/bcryptjs': 2.4.2
@@ -112,8 +112,8 @@ importers:
       '@types/web-push': 3.3.2
       '@types/websocket': 1.0.5
       '@types/ws': 8.5.4
-      '@typescript-eslint/eslint-plugin': 5.48.2
-      '@typescript-eslint/parser': 5.48.2
+      '@typescript-eslint/eslint-plugin': 5.49.0
+      '@typescript-eslint/parser': 5.49.0
       accepts: ^1.3.8
       ajv: 8.12.0
       archiver: 5.3.1
@@ -150,9 +150,8 @@ importers:
       jest: 29.3.1
       jest-mock: ^29.3.1
       js-yaml: 4.1.0
-      jsdom: 21.0.0
+      jsdom: 21.1.0
       json5: 2.2.3
-      json5-loader: 4.0.1
       jsonld: 8.1.0
       jsrsasign: 10.6.1
       mfm-js: 0.23.3
@@ -257,9 +256,8 @@ importers:
       ip-cidr: 3.0.11
       is-svg: 4.3.2
       js-yaml: 4.1.0
-      jsdom: 21.0.0
+      jsdom: 21.1.0
       json5: 2.2.3
-      json5-loader: 4.0.1
       jsonld: 8.1.0
       jsrsasign: 10.6.1
       mfm-js: 0.23.3
@@ -268,7 +266,7 @@ importers:
       ms: 3.0.0-canary.1
       nested-property: 4.0.0
       nodemailer: 6.9.0
-      nsfwjs: 2.4.2_@tensorflow+tfjs@4.1.0
+      nsfwjs: 2.4.2_@tensorflow+tfjs@4.2.0
       oauth: 0.10.0
       os-utils: 0.0.14
       parse5: 7.1.2
@@ -317,8 +315,8 @@ importers:
       ws: 8.12.0
       xev: 3.0.2
     optionalDependencies:
-      '@tensorflow/tfjs': 4.1.0_seedrandom@3.0.5
-      '@tensorflow/tfjs-node': 4.1.0_seedrandom@3.0.5
+      '@tensorflow/tfjs': 4.2.0_seedrandom@3.0.5
+      '@tensorflow/tfjs-node': 4.2.0_seedrandom@3.0.5
     devDependencies:
       '@redocly/openapi-core': 1.0.0-beta.120
       '@swc/cli': 0.1.59_2w2rsb5d2wh3txrlxuiknf4vra
@@ -366,11 +364,11 @@ importers:
       '@types/web-push': 3.3.2
       '@types/websocket': 1.0.5
       '@types/ws': 8.5.4
-      '@typescript-eslint/eslint-plugin': 5.48.2_caon6io6stgpr7lz2rtbhekxqy
-      '@typescript-eslint/parser': 5.48.2_7uibuqfxkfaozanbtbziikiqje
+      '@typescript-eslint/eslint-plugin': 5.49.0_iu322prlnwsygkcra5kbpy22si
+      '@typescript-eslint/parser': 5.49.0_7uibuqfxkfaozanbtbziikiqje
       cross-env: 7.0.3
       eslint: 8.32.0
-      eslint-plugin-import: 2.27.5_2l6piu6guil2f63lj3qmhzbnn4
+      eslint-plugin-import: 2.27.5_6savw6y3b7jng6f64kgkyoij64
       execa: 6.1.0
       jest: 29.3.1_@types+node@18.11.18
       jest-mock: 29.3.1
@@ -383,7 +381,7 @@ importers:
       '@rollup/plugin-json': 6.0.0
       '@rollup/pluginutils': 5.0.2
       '@syuilo/aiscript': 0.12.2
-      '@tabler/icons': ^1.118.0
+      '@tabler/icons-webfont': ^2.0.0
       '@types/escape-regexp': 0.0.1
       '@types/glob': 8.0.1
       '@types/gulp': 4.0.10
@@ -398,8 +396,8 @@ importers:
       '@types/uuid': 9.0.0
       '@types/websocket': 1.0.5
       '@types/ws': 8.5.4
-      '@typescript-eslint/eslint-plugin': 5.48.2
-      '@typescript-eslint/parser': 5.48.2
+      '@typescript-eslint/eslint-plugin': 5.49.0
+      '@typescript-eslint/parser': 5.49.0
       '@vitejs/plugin-vue': 4.0.0
       '@vue/compiler-sfc': 3.2.45
       '@vue/runtime-core': 3.2.45
@@ -442,7 +440,7 @@ importers:
       sanitize-html: ^2.8.1
       sass: 1.57.1
       seedrandom: 3.0.5
-      start-server-and-test: 1.15.2
+      start-server-and-test: 1.15.3
       strict-event-emitter-types: 2.0.0
       stringz: 2.1.0
       syuilo-password-strength: 0.0.1
@@ -468,7 +466,7 @@ importers:
       '@rollup/plugin-json': 6.0.0_rollup@3.10.1
       '@rollup/pluginutils': 5.0.2_rollup@3.10.1
       '@syuilo/aiscript': 0.12.2
-      '@tabler/icons': 1.119.0
+      '@tabler/icons-webfont': 2.0.0
       '@vitejs/plugin-vue': 4.0.0_vite@4.0.4+vue@3.2.45
       '@vue/compiler-sfc': 3.2.45
       autobind-decorator: 2.4.0
@@ -537,15 +535,15 @@ importers:
       '@types/uuid': 9.0.0
       '@types/websocket': 1.0.5
       '@types/ws': 8.5.4
-      '@typescript-eslint/eslint-plugin': 5.48.2_caon6io6stgpr7lz2rtbhekxqy
-      '@typescript-eslint/parser': 5.48.2_7uibuqfxkfaozanbtbziikiqje
+      '@typescript-eslint/eslint-plugin': 5.49.0_iu322prlnwsygkcra5kbpy22si
+      '@typescript-eslint/parser': 5.49.0_7uibuqfxkfaozanbtbziikiqje
       '@vue/runtime-core': 3.2.45
       cross-env: 7.0.3
       cypress: 12.3.0
       eslint: 8.32.0
-      eslint-plugin-import: 2.27.5_2l6piu6guil2f63lj3qmhzbnn4
+      eslint-plugin-import: 2.27.5_6savw6y3b7jng6f64kgkyoij64
       eslint-plugin-vue: 9.9.0_eslint@8.32.0
-      start-server-and-test: 1.15.2
+      start-server-and-test: 1.15.3
       vue-eslint-parser: 9.1.0_eslint@8.32.0
       vue-tsc: 1.0.24_typescript@4.9.4
 
@@ -2323,65 +2321,47 @@ packages:
       defer-to-connect: 2.0.1
     dev: false
 
-  /@tabler/icons/1.119.0:
-    resolution: {integrity: sha512-Fk3Qq4w2SXcTjc/n1cuL5bccPkylrOMo7cYpQIf/yw6zP76LQV9dtLcHQUjFiUnaYuswR645CnURIhlafyAh9g==}
-    peerDependencies:
-      react: ^16.x || 17.x || 18.x
-      react-dom: ^16.x || 17.x || 18.x
-    peerDependenciesMeta:
-      react:
-        optional: true
-      react-dom:
-        optional: true
+  /@tabler/icons-webfont/2.0.0:
+    resolution: {integrity: sha512-ApVVupe7WKZOJzK6T2iw15/k6VrTALsL5YzAmvgvcriuX8sRCKlcWaRljcf2sZMUrqyY+Yq6xiOpL2p2NHgQBQ==}
+    dependencies:
+      '@tabler/icons': 2.0.0
     dev: false
 
-  /@tensorflow/tfjs-backend-cpu/4.1.0_npjwttp6o2hhjgfcmiedqvkgoa:
-    resolution: {integrity: sha512-NqxrwpYa/hXGaBa1RzxfHsLAsaniIZryhF5CxQM9uSp1ny8wUJMH+Mda/Y8+llS3weHug8JDAbAW2cabn8l84A==}
+  /@tabler/icons/2.0.0:
+    resolution: {integrity: sha512-ye93cVD8baCwJJ7J3GKlUM3FN+qW6lsEz4uaH8bHCwC8un2R4p+ZzyRNc/ksqVgMQJ4PKQ8xbYpv4dnbbRffsA==}
+    dev: false
+
+  /@tensorflow/tfjs-backend-cpu/4.2.0_tkoh6rxfpzme3tc2ndqbqcrg7y:
+    resolution: {integrity: sha512-8HWg9J69m0Ovc6w8TVhhixMOcwA3t/NPXLblOA/sgJ+/JD5gsbpLWJk4QISQyb1RnpSVzw6PX3BSMTJU7hWVOg==}
     engines: {yarn: '>= 1.3.2'}
     peerDependencies:
-      '@tensorflow/tfjs-core': 4.1.0
+      '@tensorflow/tfjs-core': 4.2.0
     dependencies:
-      '@tensorflow/tfjs-core': 4.1.0
+      '@tensorflow/tfjs-core': 4.2.0
       '@types/seedrandom': 2.4.30
       seedrandom: 3.0.5
     dev: false
 
-  /@tensorflow/tfjs-backend-webgl/4.1.0_npjwttp6o2hhjgfcmiedqvkgoa:
-    resolution: {integrity: sha512-RDjwbFCPESjh+QTrTvKC623MO58gIqxQvtX3DfJLhlsSbnsvIpA5s1CXNJYzNVmFDia35mPYKmQQWvEvhl9weA==}
+  /@tensorflow/tfjs-backend-webgl/4.2.0_tkoh6rxfpzme3tc2ndqbqcrg7y:
+    resolution: {integrity: sha512-Qvf+hD5pSh+xi48kChSGzcDKJemkc4EKfoVVjuxl4k25ZUPwuEd7zZUAtinkLu1dzgHNyvePZY8k+9rVm59HJA==}
     engines: {yarn: '>= 1.3.2'}
     peerDependencies:
-      '@tensorflow/tfjs-core': 4.1.0
+      '@tensorflow/tfjs-core': 4.2.0
     dependencies:
-      '@tensorflow/tfjs-backend-cpu': 4.1.0_npjwttp6o2hhjgfcmiedqvkgoa
-      '@tensorflow/tfjs-core': 4.1.0
+      '@tensorflow/tfjs-backend-cpu': 4.2.0_tkoh6rxfpzme3tc2ndqbqcrg7y
+      '@tensorflow/tfjs-core': 4.2.0
       '@types/offscreencanvas': 2019.3.0
       '@types/seedrandom': 2.4.30
       '@types/webgl-ext': 0.0.30
       seedrandom: 3.0.5
     dev: false
 
-  /@tensorflow/tfjs-converter/4.1.0_npjwttp6o2hhjgfcmiedqvkgoa:
-    resolution: {integrity: sha512-pR4TSUI949a/5uUWjHga8xzxD7Y9AbobHJtCmg86Bldfl2GV8aibz87cNjpoO+iUhH8WZo1TOJy8GpM+MPT2DA==}
+  /@tensorflow/tfjs-converter/4.2.0_tkoh6rxfpzme3tc2ndqbqcrg7y:
+    resolution: {integrity: sha512-m+E2KJM6yGQdi8ElzWpChdD/JaqhWMCi9yK70v/ndkOaCL2q2UN48nYP2T5S15vkDvMIgzAQyZfh7hxQsMuvRQ==}
     peerDependencies:
-      '@tensorflow/tfjs-core': 4.1.0
+      '@tensorflow/tfjs-core': 4.2.0
     dependencies:
-      '@tensorflow/tfjs-core': 4.1.0
-    dev: false
-
-  /@tensorflow/tfjs-core/4.1.0:
-    resolution: {integrity: sha512-zERD4xtxNq3dV3+wPEMi2HWSV68FA8WucSAogzErp38/q98Byv9G1x8DhxQ+jowTcqN4srGWcBfK59jYwjlAvA==}
-    engines: {yarn: '>= 1.3.2'}
-    dependencies:
-      '@types/long': 4.0.2
-      '@types/offscreencanvas': 2019.7.0
-      '@types/seedrandom': 2.4.30
-      '@types/webgl-ext': 0.0.30
-      '@webgpu/types': 0.1.21
-      long: 4.0.0
-      node-fetch: 2.6.7
-      seedrandom: 3.0.5
-    transitivePeerDependencies:
-      - encoding
+      '@tensorflow/tfjs-core': 4.2.0
     dev: false
 
   /@tensorflow/tfjs-core/4.2.0:
@@ -2400,15 +2380,14 @@ packages:
     transitivePeerDependencies:
       - encoding
     dev: false
-    optional: true
 
-  /@tensorflow/tfjs-data/4.1.0_x6uqorr55fevqojbxncmwlp444:
-    resolution: {integrity: sha512-H6ef6NXPwi2xKYB6tVNZi5RqniMFpfUSlxG3q0BNxnyuyeCUSjJvHJFpah9hT/ysYjVdwspzh/I6B67h+lBchg==}
+  /@tensorflow/tfjs-data/4.2.0_qsavyspjcgrxymzlcpasp6rzxe:
+    resolution: {integrity: sha512-11t7Q+ikseduJgkd9iSeRrtor1aA3o5PVCFhC5yYvR3JLO55ic1+4Ryo0EJfhRoismS6zBUJrpzX4K0zlLbIfw==}
     peerDependencies:
-      '@tensorflow/tfjs-core': 4.1.0
+      '@tensorflow/tfjs-core': 4.2.0
       seedrandom: ^3.0.5
     dependencies:
-      '@tensorflow/tfjs-core': 4.1.0
+      '@tensorflow/tfjs-core': 4.2.0
       '@types/node-fetch': 2.6.2
       node-fetch: 2.6.7
       seedrandom: 3.0.5
@@ -2417,21 +2396,21 @@ packages:
       - encoding
     dev: false
 
-  /@tensorflow/tfjs-layers/4.1.0_npjwttp6o2hhjgfcmiedqvkgoa:
-    resolution: {integrity: sha512-lzHNTZu1GwKl7hW5tt2COSpflE0m7xrsOf8AzRzpTDVJYYRx/x5ScMt/y//5jbRuaDOnb3EjT1FxWxwkD44/sg==}
+  /@tensorflow/tfjs-layers/4.2.0_tkoh6rxfpzme3tc2ndqbqcrg7y:
+    resolution: {integrity: sha512-SO0KTmCFOjrW+PlP9nKYXz07XGFq6uE7am9yH2bRaRPWpEeaKT/+k0C9vFMxI/GzRwY8AK4sLe4U+jE1mhYxGw==}
     peerDependencies:
-      '@tensorflow/tfjs-core': 4.1.0
+      '@tensorflow/tfjs-core': 4.2.0
     dependencies:
-      '@tensorflow/tfjs-core': 4.1.0
+      '@tensorflow/tfjs-core': 4.2.0
     dev: false
 
-  /@tensorflow/tfjs-node/4.1.0_seedrandom@3.0.5:
-    resolution: {integrity: sha512-2H7UJqVafuM9fbsMdzUkcfWLpH/owgvVHWES+gQsiueIqyOjpq6ZGSQLDxyuKtHP2D/8/kWeVIbnzAjnIRniuA==}
+  /@tensorflow/tfjs-node/4.2.0_seedrandom@3.0.5:
+    resolution: {integrity: sha512-dkyExfqTjMVDpKLBzHH2b7JWzGK+QORtYswvoNHbeHwx7kvYYRAQeiHxp+xrgry6LdbWfZs88IWCwNGoOiZ21w==}
     engines: {node: '>=8.11.0'}
     requiresBuild: true
     dependencies:
       '@mapbox/node-pre-gyp': 1.0.9
-      '@tensorflow/tfjs': 4.1.0_seedrandom@3.0.5
+      '@tensorflow/tfjs': 4.2.0_seedrandom@3.0.5
       adm-zip: 0.5.10
       google-protobuf: 3.21.2
       https-proxy-agent: 2.2.4
@@ -2445,17 +2424,16 @@ packages:
     dev: false
     optional: true
 
-  /@tensorflow/tfjs/4.1.0_seedrandom@3.0.5:
-    resolution: {integrity: sha512-jlrJ6MIBos8NkmF+NHIWBnKVBGYJTG06QmW/A0vgyXwkp+3PgzX8TJ4MWIv/7oZr7g27zfY6dXA1OFzrrgvklA==}
+  /@tensorflow/tfjs/4.2.0_seedrandom@3.0.5:
+    resolution: {integrity: sha512-iZmtyGC9IJkx+TpFnkgDol8BHv2BU3zJ01HyNcuvnm1w1EqoNe+1n8bwvLzI/sxHMcHTqzuu7VugMaphryxE+A==}
     hasBin: true
-    requiresBuild: true
     dependencies:
-      '@tensorflow/tfjs-backend-cpu': 4.1.0_npjwttp6o2hhjgfcmiedqvkgoa
-      '@tensorflow/tfjs-backend-webgl': 4.1.0_npjwttp6o2hhjgfcmiedqvkgoa
-      '@tensorflow/tfjs-converter': 4.1.0_npjwttp6o2hhjgfcmiedqvkgoa
-      '@tensorflow/tfjs-core': 4.1.0
-      '@tensorflow/tfjs-data': 4.1.0_x6uqorr55fevqojbxncmwlp444
-      '@tensorflow/tfjs-layers': 4.1.0_npjwttp6o2hhjgfcmiedqvkgoa
+      '@tensorflow/tfjs-backend-cpu': 4.2.0_tkoh6rxfpzme3tc2ndqbqcrg7y
+      '@tensorflow/tfjs-backend-webgl': 4.2.0_tkoh6rxfpzme3tc2ndqbqcrg7y
+      '@tensorflow/tfjs-converter': 4.2.0_tkoh6rxfpzme3tc2ndqbqcrg7y
+      '@tensorflow/tfjs-core': 4.2.0
+      '@tensorflow/tfjs-data': 4.2.0_qsavyspjcgrxymzlcpasp6rzxe
+      '@tensorflow/tfjs-layers': 4.2.0_tkoh6rxfpzme3tc2ndqbqcrg7y
       argparse: 1.0.10
       chalk: 4.1.2
       core-js: 3.27.1
@@ -2669,6 +2647,7 @@ packages:
 
   /@types/json-schema/7.0.11:
     resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==}
+    dev: true
 
   /@types/json5/0.0.29:
     resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
@@ -2956,8 +2935,8 @@ packages:
     dev: true
     optional: true
 
-  /@typescript-eslint/eslint-plugin/5.48.2_caon6io6stgpr7lz2rtbhekxqy:
-    resolution: {integrity: sha512-sR0Gja9Ky1teIq4qJOl0nC+Tk64/uYdX+mi+5iB//MH8gwyx8e3SOyhEzeLZEFEEfCaLf8KJq+Bd/6je1t+CAg==}
+  /@typescript-eslint/eslint-plugin/5.49.0_iu322prlnwsygkcra5kbpy22si:
+    resolution: {integrity: sha512-IhxabIpcf++TBaBa1h7jtOWyon80SXPRLDq0dVz5SLFC/eW6tofkw/O7Ar3lkx5z5U6wzbKDrl2larprp5kk5Q==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       '@typescript-eslint/parser': ^5.0.0
@@ -2967,10 +2946,10 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.48.2_7uibuqfxkfaozanbtbziikiqje
-      '@typescript-eslint/scope-manager': 5.48.2
-      '@typescript-eslint/type-utils': 5.48.2_7uibuqfxkfaozanbtbziikiqje
-      '@typescript-eslint/utils': 5.48.2_7uibuqfxkfaozanbtbziikiqje
+      '@typescript-eslint/parser': 5.49.0_7uibuqfxkfaozanbtbziikiqje
+      '@typescript-eslint/scope-manager': 5.49.0
+      '@typescript-eslint/type-utils': 5.49.0_7uibuqfxkfaozanbtbziikiqje
+      '@typescript-eslint/utils': 5.49.0_7uibuqfxkfaozanbtbziikiqje
       debug: 4.3.4
       eslint: 8.32.0
       ignore: 5.2.4
@@ -3003,8 +2982,8 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser/5.48.2_7uibuqfxkfaozanbtbziikiqje:
-    resolution: {integrity: sha512-38zMsKsG2sIuM5Oi/olurGwYJXzmtdsHhn5mI/pQogP+BjYVkK5iRazCQ8RGS0V+YLk282uWElN70zAAUmaYHw==}
+  /@typescript-eslint/parser/5.49.0_7uibuqfxkfaozanbtbziikiqje:
+    resolution: {integrity: sha512-veDlZN9mUhGqU31Qiv2qEp+XrJj5fgZpJ8PW30sHU+j/8/e5ruAhLaVDAeznS7A7i4ucb/s8IozpDtt9NqCkZg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -3013,9 +2992,9 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 5.48.2
-      '@typescript-eslint/types': 5.48.2
-      '@typescript-eslint/typescript-estree': 5.48.2_typescript@4.9.4
+      '@typescript-eslint/scope-manager': 5.49.0
+      '@typescript-eslint/types': 5.49.0
+      '@typescript-eslint/typescript-estree': 5.49.0_typescript@4.9.4
       debug: 4.3.4
       eslint: 8.32.0
       typescript: 4.9.4
@@ -3031,16 +3010,16 @@ packages:
       '@typescript-eslint/visitor-keys': 5.48.1
     dev: true
 
-  /@typescript-eslint/scope-manager/5.48.2:
-    resolution: {integrity: sha512-zEUFfonQid5KRDKoI3O+uP1GnrFd4tIHlvs+sTJXiWuypUWMuDaottkJuR612wQfOkjYbsaskSIURV9xo4f+Fw==}
+  /@typescript-eslint/scope-manager/5.49.0:
+    resolution: {integrity: sha512-clpROBOiMIzpbWNxCe1xDK14uPZh35u4QaZO1GddilEzoCLAEz4szb51rBpdgurs5k2YzPtJeTEN3qVbG+LRUQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      '@typescript-eslint/types': 5.48.2
-      '@typescript-eslint/visitor-keys': 5.48.2
+      '@typescript-eslint/types': 5.49.0
+      '@typescript-eslint/visitor-keys': 5.49.0
     dev: true
 
-  /@typescript-eslint/type-utils/5.48.2_7uibuqfxkfaozanbtbziikiqje:
-    resolution: {integrity: sha512-QVWx7J5sPMRiOMJp5dYshPxABRoZV1xbRirqSk8yuIIsu0nvMTZesKErEA3Oix1k+uvsk8Cs8TGJ6kQ0ndAcew==}
+  /@typescript-eslint/type-utils/5.49.0_7uibuqfxkfaozanbtbziikiqje:
+    resolution: {integrity: sha512-eUgLTYq0tR0FGU5g1YHm4rt5H/+V2IPVkP0cBmbhRyEmyGe4XvJ2YJ6sYTmONfjmdMqyMLad7SB8GvblbeESZA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: '*'
@@ -3049,8 +3028,8 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/typescript-estree': 5.48.2_typescript@4.9.4
-      '@typescript-eslint/utils': 5.48.2_7uibuqfxkfaozanbtbziikiqje
+      '@typescript-eslint/typescript-estree': 5.49.0_typescript@4.9.4
+      '@typescript-eslint/utils': 5.49.0_7uibuqfxkfaozanbtbziikiqje
       debug: 4.3.4
       eslint: 8.32.0
       tsutils: 3.21.0_typescript@4.9.4
@@ -3064,8 +3043,8 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@typescript-eslint/types/5.48.2:
-    resolution: {integrity: sha512-hE7dA77xxu7ByBc6KCzikgfRyBCTst6dZQpwaTy25iMYOnbNljDT4hjhrGEJJ0QoMjrfqrx+j1l1B9/LtKeuqA==}
+  /@typescript-eslint/types/5.49.0:
+    resolution: {integrity: sha512-7If46kusG+sSnEpu0yOz2xFv5nRz158nzEXnJFCGVEHWnuzolXKwrH5Bsf9zsNlOQkyZuk0BZKKoJQI+1JPBBg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
@@ -3090,8 +3069,8 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/typescript-estree/5.48.2_typescript@4.9.4:
-    resolution: {integrity: sha512-bibvD3z6ilnoVxUBFEgkO0k0aFvUc4Cttt0dAreEr+nrAHhWzkO83PEVVuieK3DqcgL6VAK5dkzK8XUVja5Zcg==}
+  /@typescript-eslint/typescript-estree/5.49.0_typescript@4.9.4:
+    resolution: {integrity: sha512-PBdx+V7deZT/3GjNYPVQv1Nc0U46dAHbIuOG8AZ3on3vuEKiPDwFE/lG1snN2eUB9IhF7EyF7K1hmTcLztNIsA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       typescript: '*'
@@ -3099,8 +3078,8 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 5.48.2
-      '@typescript-eslint/visitor-keys': 5.48.2
+      '@typescript-eslint/types': 5.49.0
+      '@typescript-eslint/visitor-keys': 5.49.0
       debug: 4.3.4
       globby: 11.1.0
       is-glob: 4.0.3
@@ -3111,17 +3090,17 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils/5.48.2_7uibuqfxkfaozanbtbziikiqje:
-    resolution: {integrity: sha512-2h18c0d7jgkw6tdKTlNaM7wyopbLRBiit8oAxoP89YnuBOzCZ8g8aBCaCqq7h208qUTroL7Whgzam7UY3HVLow==}
+  /@typescript-eslint/utils/5.49.0_7uibuqfxkfaozanbtbziikiqje:
+    resolution: {integrity: sha512-cPJue/4Si25FViIb74sHCLtM4nTSBXtLx1d3/QT6mirQ/c65bV8arBEebBJJizfq8W2YyMoPI/WWPFWitmNqnQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
       '@types/json-schema': 7.0.11
       '@types/semver': 7.3.13
-      '@typescript-eslint/scope-manager': 5.48.2
-      '@typescript-eslint/types': 5.48.2
-      '@typescript-eslint/typescript-estree': 5.48.2_typescript@4.9.4
+      '@typescript-eslint/scope-manager': 5.49.0
+      '@typescript-eslint/types': 5.49.0
+      '@typescript-eslint/typescript-estree': 5.49.0_typescript@4.9.4
       eslint: 8.32.0
       eslint-scope: 5.1.1
       eslint-utils: 3.0.0_eslint@8.32.0
@@ -3139,11 +3118,11 @@ packages:
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /@typescript-eslint/visitor-keys/5.48.2:
-    resolution: {integrity: sha512-z9njZLSkwmjFWUelGEwEbdf4NwKvfHxvGC0OcGN1Hp/XNDIcJ7D5DpPNPv6x6/mFvc1tQHsaWmpD/a4gOvvCJQ==}
+  /@typescript-eslint/visitor-keys/5.49.0:
+    resolution: {integrity: sha512-v9jBMjpNWyn8B6k/Mjt6VbUS4J1GvUlR4x3Y+ibnP1z7y7V4n0WRz+50DY6+Myj0UaXVSuUlHohO+eZ8IJEnkg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      '@typescript-eslint/types': 5.48.2
+      '@typescript-eslint/types': 5.49.0
       eslint-visitor-keys: 3.3.0
     dev: true
 
@@ -3386,14 +3365,6 @@ packages:
       ajv: 8.12.0
     dev: false
 
-  /ajv-keywords/3.5.2_ajv@6.12.6:
-    resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}
-    peerDependencies:
-      ajv: ^6.9.1
-    dependencies:
-      ajv: 6.12.6
-    dev: false
-
   /ajv/6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
     dependencies:
@@ -3835,10 +3806,11 @@ packages:
       - debug
     dev: false
 
-  /axios/0.25.0_debug@4.3.4:
-    resolution: {integrity: sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==}
+  /axios/0.27.2_debug@4.3.4:
+    resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
     dependencies:
-      follow-redirects: 1.15.2
+      follow-redirects: 1.15.2_debug@4.3.4
+      form-data: 4.0.0
     transitivePeerDependencies:
       - debug
     dev: true
@@ -3978,10 +3950,6 @@ packages:
     engines: {node: '>=0.6'}
     dev: false
 
-  /big.js/5.2.2:
-    resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==}
-    dev: false
-
   /bin-check/4.1.0:
     resolution: {integrity: sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==}
     engines: {node: '>=4'}
@@ -5671,11 +5639,6 @@ packages:
   /emoji-regex/8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
-  /emojis-list/3.0.0:
-    resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==}
-    engines: {node: '>= 4'}
-    dev: false
-
   /encode-utf8/1.0.3:
     resolution: {integrity: sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==}
     dev: false
@@ -6109,7 +6072,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-module-utils/2.7.4_kvyj4idustix6trhy5lyssy2sq:
+  /eslint-module-utils/2.7.4_cnxxylyx37asr43xy64ejg3pwe:
     resolution: {integrity: sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -6130,7 +6093,7 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.48.2_7uibuqfxkfaozanbtbziikiqje
+      '@typescript-eslint/parser': 5.49.0_7uibuqfxkfaozanbtbziikiqje
       debug: 3.2.7
       eslint: 8.32.0
       eslint-import-resolver-node: 0.3.7
@@ -6200,7 +6163,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-import/2.27.5_2l6piu6guil2f63lj3qmhzbnn4:
+  /eslint-plugin-import/2.27.5_6savw6y3b7jng6f64kgkyoij64:
     resolution: {integrity: sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -6210,7 +6173,7 @@ packages:
       '@typescript-eslint/parser':
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.48.2_7uibuqfxkfaozanbtbziikiqje
+      '@typescript-eslint/parser': 5.49.0_7uibuqfxkfaozanbtbziikiqje
       array-includes: 3.1.6
       array.prototype.flat: 1.3.1
       array.prototype.flatmap: 1.3.1
@@ -6218,7 +6181,7 @@ packages:
       doctrine: 2.1.0
       eslint: 8.32.0
       eslint-import-resolver-node: 0.3.7
-      eslint-module-utils: 2.7.4_kvyj4idustix6trhy5lyssy2sq
+      eslint-module-utils: 2.7.4_cnxxylyx37asr43xy64ejg3pwe
       has: 1.0.3
       is-core-module: 2.11.0
       is-glob: 4.0.3
@@ -7018,6 +6981,19 @@ packages:
     peerDependenciesMeta:
       debug:
         optional: true
+    dev: false
+
+  /follow-redirects/1.15.2_debug@4.3.4:
+    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
+    dependencies:
+      debug: 4.3.4
+    dev: true
 
   /for-each/0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
@@ -7069,7 +7045,6 @@ packages:
       asynckit: 0.4.0
       combined-stream: 1.0.8
       mime-types: 2.1.35
-    dev: false
 
   /formdata-polyfill/4.0.10:
     resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}
@@ -9125,8 +9100,8 @@ packages:
     engines: {node: '>=0.1.90'}
     dev: false
 
-  /jsdom/21.0.0:
-    resolution: {integrity: sha512-AIw+3ZakSUtDYvhwPwWHiZsUi3zHugpMEKlNPaurviseYoBqo0zBd3zqoUi3LPCNtPFlEP8FiW9MqCZdjb2IYA==}
+  /jsdom/21.1.0:
+    resolution: {integrity: sha512-m0lzlP7qOtthD918nenK3hdItSd2I+V3W9IrBcB36sqDwG+KnUs66IF5GY7laGWUnlM9vTsD0W1QwSEBYWWcJg==}
     engines: {node: '>=14'}
     peerDependencies:
       canvas: ^2.5.0
@@ -9199,17 +9174,6 @@ packages:
   /json-stringify-safe/5.0.1:
     resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
 
-  /json5-loader/4.0.1:
-    resolution: {integrity: sha512-c9viNZlZTz0MTIcf/4qvek5Dz1/PU3DNCB4PwUhlEZIV3qb1bSD6vQQymlV17/Wm6ncra1aCvmIPsuRj+KfEEg==}
-    engines: {node: '>= 10.13.0'}
-    peerDependencies:
-      webpack: ^4.0.0 || ^5.0.0
-    dependencies:
-      json5: 2.2.3
-      loader-utils: 2.0.4
-      schema-utils: 3.1.1
-    dev: false
-
   /json5/1.0.1:
     resolution: {integrity: sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==}
     hasBin: true
@@ -9539,15 +9503,6 @@ packages:
       strip-bom: 2.0.0
     dev: false
 
-  /loader-utils/2.0.4:
-    resolution: {integrity: sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==}
-    engines: {node: '>=8.9.0'}
-    dependencies:
-      big.js: 5.2.2
-      emojis-list: 3.0.0
-      json5: 2.2.3
-    dev: false
-
   /locate-path/5.0.0:
     resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
     engines: {node: '>=8'}
@@ -10403,13 +10358,13 @@ packages:
       set-blocking: 2.0.0
     dev: false
 
-  /nsfwjs/2.4.2_@tensorflow+tfjs@4.1.0:
+  /nsfwjs/2.4.2_@tensorflow+tfjs@4.2.0:
     resolution: {integrity: sha512-i4Pp2yt59qPQgeZFyg3wXFBX52uSeu/hkDoqdZfe+sILRxNBUu0VDogj7Lmqak0GlrXviS/wLiVeIx40IDUu7A==}
     peerDependencies:
       '@tensorflow/tfjs': ^3.18.0
     dependencies:
       '@nsfw-filter/gif-frames': 1.0.2
-      '@tensorflow/tfjs': 4.1.0_seedrandom@3.0.5
+      '@tensorflow/tfjs': 4.2.0_seedrandom@3.0.5
     dev: false
 
   /nth-check/1.0.2:
@@ -12262,15 +12217,6 @@ packages:
       xmlchars: 2.2.0
     dev: false
 
-  /schema-utils/3.1.1:
-    resolution: {integrity: sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==}
-    engines: {node: '>= 10.13.0'}
-    dependencies:
-      '@types/json-schema': 7.0.11
-      ajv: 6.12.6
-      ajv-keywords: 3.5.2_ajv@6.12.6
-    dev: false
-
   /secure-json-parse/2.7.0:
     resolution: {integrity: sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==}
     dev: false
@@ -12688,8 +12634,8 @@ packages:
   /standard-as-callback/2.1.0:
     resolution: {integrity: sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==}
 
-  /start-server-and-test/1.15.2:
-    resolution: {integrity: sha512-t5xJX04Hg7hqxiKHMJBz/n4zIMsE6G7hpAcerFAH+4Vh9le/LeyFcJERJM7WLiPygWF9TOg33oroJF1XOzJtYQ==}
+  /start-server-and-test/1.15.3:
+    resolution: {integrity: sha512-4GqkqghvUR9cJ8buvtgkyT0AHgVwCJ5EN8eDEhe9grTChGwWUxGm2nqfSeE9+0PZkLRdFqcwTwxVHe1y3ViutQ==}
     engines: {node: '>=6'}
     hasBin: true
     dependencies:
@@ -12700,7 +12646,7 @@ packages:
       execa: 5.1.1
       lazy-ass: 1.6.0
       ps-tree: 1.2.0
-      wait-on: 6.0.1_debug@4.3.4
+      wait-on: 7.0.1_debug@4.3.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -13945,12 +13891,12 @@ packages:
       xml-name-validator: 4.0.0
     dev: false
 
-  /wait-on/6.0.1_debug@4.3.4:
-    resolution: {integrity: sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw==}
-    engines: {node: '>=10.0.0'}
+  /wait-on/7.0.1_debug@4.3.4:
+    resolution: {integrity: sha512-9AnJE9qTjRQOlTZIldAaf/da2eW0eSRSgcqq85mXQja/DW3MriHxkpODDSUEg+Gri/rKEcXUZHe+cevvYItaog==}
+    engines: {node: '>=12.0.0'}
     hasBin: true
     dependencies:
-      axios: 0.25.0_debug@4.3.4
+      axios: 0.27.2_debug@4.3.4
       joi: 17.7.0
       lodash: 4.17.21
       minimist: 1.2.7

From b62894ff56b33f96dd979e309e015858cafcc33a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 24 Jan 2023 15:02:16 +0900
Subject: [PATCH 104/177] use minified css

---
 packages/backend/src/server/web/views/base.pug | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug
index b27bbcbce..d05901bae 100644
--- a/packages/backend/src/server/web/views/base.pug
+++ b/packages/backend/src/server/web/views/base.pug
@@ -35,7 +35,7 @@ html
 		link(rel='prefetch' href='https://xn--931a.moe/assets/info.jpg')
 		link(rel='prefetch' href='https://xn--931a.moe/assets/not-found.jpg')
 		link(rel='prefetch' href='https://xn--931a.moe/assets/error.jpg')
-		link(rel='stylesheet' href='/assets/tabler-icons/tabler-icons.css')
+		link(rel='stylesheet' href='/assets/tabler-icons/tabler-icons.min.css')
 		link(rel='modulepreload' href=`/vite/${clientEntry.file}`)
 
 		if !config.clientManifestExists

From 6589e8a3909e42d8d116b06a608d5cfefd6aa7ed Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 24 Jan 2023 15:54:14 +0900
Subject: [PATCH 105/177] Fix #9710 ? (#9712)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* wip

* update pnpm-lock

* use our own DevNull

* fix

* deliverJobConcurrencyをmacSocketsで割ってソケット数にする
---
 .../backend/src/core/HttpRequestService.ts    | 37 ++++++++++++++++---
 .../src/core/activitypub/ApRequestService.ts  |  7 +++-
 packages/backend/src/misc/dev-null.ts         | 11 ++++++
 pnpm-lock.yaml                                | 13 +------
 4 files changed, 49 insertions(+), 19 deletions(-)
 create mode 100644 packages/backend/src/misc/dev-null.ts

diff --git a/packages/backend/src/core/HttpRequestService.ts b/packages/backend/src/core/HttpRequestService.ts
index 3a70ac77f..cd859d002 100644
--- a/packages/backend/src/core/HttpRequestService.ts
+++ b/packages/backend/src/core/HttpRequestService.ts
@@ -134,9 +134,34 @@ export class UndiciFetcher {
 		return res;
 	}
 
+	@bindThis
+	public async request(
+		url: string | URL,
+		options: { dispatcher?: undici.Dispatcher } & Omit<undici.Dispatcher.RequestOptions, 'origin' | 'path' | 'method'> & Partial<Pick<undici.Dispatcher.RequestOptions, 'method'>> = {},
+		privateOptions: { noOkError?: boolean; bypassProxy?: boolean; } = { noOkError: false, bypassProxy: false },
+	): Promise<undici.Dispatcher.ResponseData> {
+		const res = await undici.request(url, {
+			dispatcher: this.getAgentByUrl(new URL(url), privateOptions.bypassProxy),
+			...options,
+			headers: {
+				'user-agent': this.userAgent ?? '',
+				...(options.headers ?? {}),
+			},
+		}).catch((err) => {
+			this.logger?.error(`fetch error to ${typeof url === 'string' ? url : url.href}`, err);
+			throw new StatusError('Resource Unreachable', 500, 'Resource Unreachable');
+		});
+
+		if (res.statusCode >= 400) {
+			throw new StatusError(`${res.statusCode}`, res.statusCode, '');
+		}
+
+		return res;
+	}
+
 	@bindThis
 	public async getJson<T extends unknown>(url: string, accept = 'application/json, */*', headers?: Record<string, string>): Promise<T> {
-		const res = await this.fetch(
+		const { body } = await this.request( 
 			url,
 			{
 				headers: Object.assign({
@@ -145,12 +170,12 @@ export class UndiciFetcher {
 			},
 		);
 
-		return await res.json() as T;
+		return await body.json() as T;
 	}
 
 	@bindThis
 	public async getHtml(url: string, accept = 'text/html, */*', headers?: Record<string, string>): Promise<string> {
-		const res = await this.fetch(
+		const { body } = await this.request(
 			url,
 			{
 				headers: Object.assign({
@@ -159,7 +184,7 @@ export class UndiciFetcher {
 			},
 		);
 
-		return await res.text();
+		return await body.text();
 	}
 }
 
@@ -167,6 +192,7 @@ export class UndiciFetcher {
 export class HttpRequestService {
 	public defaultFetcher: UndiciFetcher;
 	public fetch: UndiciFetcher['fetch'];
+	public request: UndiciFetcher['request'];
 	public getHtml: UndiciFetcher['getHtml'];
 	public defaultJsonFetcher: UndiciFetcher;
 	public getJson: UndiciFetcher['getJson'];
@@ -221,11 +247,12 @@ export class HttpRequestService {
 			},
 		};
 
-		this.maxSockets = Math.max(64, this.config.deliverJobConcurrency ?? 128);
+		this.maxSockets = Math.max(64, ((this.config.deliverJobConcurrency ?? 128) / (this.config.clusterLimit ?? 1)));
 
 		this.defaultFetcher = this.createFetcher({}, {}, this.logger);
 
 		this.fetch = this.defaultFetcher.fetch;
+		this.request = this.defaultFetcher.request;
 		this.getHtml = this.defaultFetcher.getHtml;
 
 		this.defaultJsonFetcher = this.createFetcher({
diff --git a/packages/backend/src/core/activitypub/ApRequestService.ts b/packages/backend/src/core/activitypub/ApRequestService.ts
index fd7319702..db87475c4 100644
--- a/packages/backend/src/core/activitypub/ApRequestService.ts
+++ b/packages/backend/src/core/activitypub/ApRequestService.ts
@@ -9,10 +9,12 @@ import { HttpRequestService, UndiciFetcher } from '@/core/HttpRequestService.js'
 import { LoggerService } from '@/core/LoggerService.js';
 import { bindThis } from '@/decorators.js';
 import type Logger from '@/logger.js';
+import type { Dispatcher } from 'undici';
+import { DevNull } from '@/misc/dev-null.js';
 
 type Request = {
 	url: string;
-	method: string;
+	method: Dispatcher.HttpMethod;
 	headers: Record<string, string>;
 };
 
@@ -163,7 +165,7 @@ export class ApRequestService {
 			},
 		});
 
-		await this.undiciFetcher.fetch(
+		const response = await this.undiciFetcher.request(
 			url,
 			{
 				method: req.request.method,
@@ -171,6 +173,7 @@ export class ApRequestService {
 				body,
 			},
 		);
+		response.body.pipe(new DevNull());
 	}
 
 	/**
diff --git a/packages/backend/src/misc/dev-null.ts b/packages/backend/src/misc/dev-null.ts
new file mode 100644
index 000000000..38b9d8266
--- /dev/null
+++ b/packages/backend/src/misc/dev-null.ts
@@ -0,0 +1,11 @@
+import { Writable, WritableOptions } from "node:stream";
+
+export class DevNull extends Writable implements NodeJS.WritableStream {
+    constructor(opts?: WritableOptions) {
+        super(opts);
+    }
+
+    _write (chunk: any, encoding: BufferEncoding, cb: (err?: Error | null) => void) {
+        setImmediate(cb);
+    }
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cdbbd3b82..3fdaf1449 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -3801,7 +3801,7 @@ packages:
   /axios/0.24.0:
     resolution: {integrity: sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==}
     dependencies:
-      follow-redirects: 1.15.2
+      follow-redirects: 1.15.2_debug@4.3.4
     transitivePeerDependencies:
       - debug
     dev: false
@@ -6973,16 +6973,6 @@ packages:
       readable-stream: 2.3.7
     dev: false
 
-  /follow-redirects/1.15.2:
-    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-    dev: false
-
   /follow-redirects/1.15.2_debug@4.3.4:
     resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
     engines: {node: '>=4.0'}
@@ -6993,7 +6983,6 @@ packages:
         optional: true
     dependencies:
       debug: 4.3.4
-    dev: true
 
   /for-each/0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}

From 8d3283e2a5dc49b9e9daa926c798efcb68bcec5e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 24 Jan 2023 17:25:52 +0900
Subject: [PATCH 106/177] tweak ti style

---
 packages/frontend/src/style.scss | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index 5d539a0f0..aa4efe305 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -127,11 +127,13 @@ hr {
 }
 
 .ti {
-	vertical-align: -70%;
-	line-height: 0.5em;
+	vertical-align: -40%;
+	line-height: 1em;
 
 	&:before {
-		font-size: 150%;
+		display: inline-block;
+		font-size: 165%;
+		width: 0.74em;
 	}
 }
 

From 9ca1197759b25b6244abd8dc14d19dcac3c23c8f Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 24 Jan 2023 17:26:49 +0900
Subject: [PATCH 107/177] :art:

---
 packages/frontend/src/components/MkNotification.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue
index d8087eb23..a8b8fec34 100644
--- a/packages/frontend/src/components/MkNotification.vue
+++ b/packages/frontend/src/components/MkNotification.vue
@@ -249,7 +249,7 @@ useTooltip(reactionRef, (showing) => {
 
 .t_achievementEarned {
 	padding: 3px;
-	background: #88a6b7;
+	background: #cb9a11;
 	pointer-events: none;
 }
 

From 2c379732d2bd7ec655bd01d361ad0b955760c5d1 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 24 Jan 2023 17:28:38 +0900
Subject: [PATCH 108/177] New Crowdin updates (#9696)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Chinese Traditional)
---
 locales/de-DE.yml | 10 +++++++--
 locales/en-US.yml |  8 +++++++-
 locales/it-IT.yml | 26 +++++++++++++++---------
 locales/ko-KR.yml | 52 ++++++++++++++++++++++++++---------------------
 locales/ru-RU.yml |  2 +-
 locales/th-TH.yml | 37 +++++++++++++++++++++++++++++++++
 locales/uk-UA.yml | 46 +++++++++++++++++++++++++++++++++++++++++
 locales/zh-CN.yml |  3 +++
 locales/zh-TW.yml | 10 +++++++--
 9 files changed, 155 insertions(+), 39 deletions(-)

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index e81f7579c..a3e8f221d 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -1104,9 +1104,12 @@ _achievements:
       title: "I Love Misskey"
       description: "Sende \"I ❤ #Misskey\""
       flavor: "Danke, dass du Misskey verwendest! - vom Entwicklerteam"
+    _foundTreasure:
+      title: "Schatzsuche"
+      description: "Du hast einen verborgenen Schatz gefunden"
     _client30min:
-      title: "Kleine Pause"
-      description: "Seit dem Öffnen deines Clients sind 30 Minuten vergangen"
+      title: "Kurze Pause"
+      description: "Habe Misskey für 30 Minuten geöffnet"
     _noteDeletedWithin1min:
       title: "Ups"
       description: "Lösche eine Notiz innerhalb von 1 Minute nachdem sie gesendet wurde"
@@ -1124,6 +1127,9 @@ _achievements:
     _htl20npm:
       title: "Fließende Chronik"
       description: "Deine Startseitenchronik erreicht eine Geschwindigkeit von 20 npm (Notizen pro Minute)"
+    _viewInstanceChart:
+      title: "Analyst"
+      description: "Schau dir die Messwerte der Instanz an"
     _outputHelloWorldOnScratchpad:
       title: "Hallo Welt!"
       description: "Gib \"hello world\" in der Testumgebung aus"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 6a43d4569..4e2f18629 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -945,7 +945,7 @@ _achievements:
     _notes1:
       title: "just setting up my msky"
       description: "Post your first note"
-      flavor: "Have a good Misskey life!"
+      flavor: "Have a good time with Misskey!"
     _notes10:
       title: "Some notes"
       description: "Post 10 notes"
@@ -1104,6 +1104,9 @@ _achievements:
       title: "I Love Misskey"
       description: "Post \"I ❤ #Misskey\""
       flavor: "Misskey's development team greatly appreciates your support!"
+    _foundTreasure:
+      title: "Treasure Hunt"
+      description: "You've found the hidden treasure"
     _client30min:
       title: "Short break"
       description: "Spend 30 minutes on Misskey"
@@ -1124,6 +1127,9 @@ _achievements:
     _htl20npm:
       title: "Flowing Timeline"
       description: "Have the speed of your home timeline exceed 20 npm (notes per minute)"
+    _viewInstanceChart:
+      title: "Analyst"
+      description: "View your instance's charts"
     _outputHelloWorldOnScratchpad:
       title: "Hello, world!"
       description: "Output \"hello world\" in the Scratchpad"
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index 1726a84ff..66af4654c 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -1059,8 +1059,8 @@ _achievements:
       description: "Aggiungi le orecchie da gatto al tuo profilo"
       flavor: "Ti chiamerò..."
     _following1:
-      title: "Hai seguito il tuo primo profilo"
-      description: "Il tuo primo profilo Follower"
+      title: "Il mio primo Follow"
+      description: "Hai seguito il tuo primo profilo"
     _following10:
       title: "Segui, segui!"
       description: "Hai seguito 10 profili"
@@ -1074,17 +1074,17 @@ _achievements:
       title: "Sovraccarico di amici"
       description: "Hai seguito 300 profili"
     _followers1:
-      title: "Primo Follower"
-      description: "Hai ottenuto un Follower"
+      title: "Il primo profilo tuo Follower"
+      description: "Hai ottenuto il tuo primo Follower"
     _followers10:
       title: "Follow me!"
-      description: "Hai ottenuto 10 Follower"
+      description: "Hai ottenuto 10 profili Follower"
     _followers50:
       title: "Follower a frotte"
       description: "Hai ottenuto 50 Follower"
     _followers100:
       title: "Popolare"
-      description: "Hai ottenuto 100 Follower"
+      description: "Hai ottenuto 100 profili Follower"
     _followers300:
       title: "Mettetevi in fila"
       description: "Hai ottenuto 300 Follower"
@@ -1093,7 +1093,7 @@ _achievements:
       description: "Hai ottenuto 500 Follower"
     _followers1000:
       title: "Influenzer"
-      description: "Hai superato i 1.000 Follower"
+      description: "Hai superato i 1.000 profili Follower"
     _collectAchievements30:
       title: "Collezionista di successi"
       description: "Hai raggiunto 30 obiettivi"
@@ -1104,9 +1104,12 @@ _achievements:
       title: "I LOVE Misskey"
       description: "Pubblica «I ♥ #Misskey»"
       flavor: "Grazie per aver utilizzato Misskey! Dal team di sviluppo"
+    _foundTreasure:
+      title: "Caccia al tesoro"
+      description: "Hai trovato un tesoro nascosto"
     _client30min:
       title: "Piccola pausa"
-      description: "Hai passato più di 30 minuti di fila su Misskey"
+      description: "Hai passato più di 30 minuti su Misskey"
     _noteDeletedWithin1min:
       title: "Ooops!"
       description: "Hai eliminato una nota entro un minuto dalla sua pubblicazione"
@@ -1124,6 +1127,9 @@ _achievements:
     _htl20npm:
       title: "Timeline scorrevole"
       description: "La tua Timeline personale ha superato la velocità di 20 Note orarie (Note al minuto)"
+    _viewInstanceChart:
+      title: "Analista"
+      description: "Visualizza i grafici dell'istanza"
     _outputHelloWorldOnScratchpad:
       title: "Hello, world!"
       description: "Hai scritto «Hello world» nel blocco appunti"
@@ -1501,8 +1507,8 @@ _sfx:
   channel: "Notifiche di canale"
 _ago:
   future: "Futuro"
-  justNow: "Ora"
-  secondsAgo: "{n}s fa"
+  justNow: "Adesso"
+  secondsAgo: "{n} sec fa"
   minutesAgo: "{n} min fa"
   hoursAgo: "{n} ore fa"
   daysAgo: "{n} gg fa"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 97708a86d..265f14ec5 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -938,13 +938,13 @@ cannotPerformTemporary: "일시적으로 사용할 수 없음"
 cannotPerformTemporaryDescription: "조작 횟수 제한을 초과하여 일시적으로 사용이 불가합니다. 잠시 후 다시 시도해 주세요."
 preset: "프리셋"
 selectFromPresets: "프리셋에서 선택"
-achievements: "도전과제"
+achievements: "도전 과제"
 _achievements:
   earnedAt: "달성 일시"
   _types:
     _notes1:
-      title: "미스키 설정하고 있었는데요"
-      description: "첫 노트를 포스트했습니다"
+      title: "미스키 시작했는데요"
+      description: "첫 노트를 작성했습니다"
       flavor: "Misskey에 오신 것을 환영합니다!"
     _notes10:
       title: "노트 조금"
@@ -962,7 +962,7 @@ _achievements:
       title: "노트가 어디서 솟아?"
       description: "5,000개의 노트를 작성했습니다"
     _notes10000:
-      title: "슈퍼-노트"
+      title: "슈퍼 노트"
       description: "10,000개의 노트를 작성했습니다"
     _notes20000:
       title: "노트 더 없어?"
@@ -989,7 +989,7 @@ _achievements:
       title: "노트 우주"
       description: "90,000개의 노트를 작성했습니다"
     _notes100000:
-      title: "네 모든 노트는 내 거야"
+      title: "ALL YOUR NOTE ARE BELONG TO US"
       description: "100,000개의 노트를 작성했습니다"
       flavor: "이만큼 쓸 일도 없겠지만... 다른 할 일이 있진 않으신가요?"
     _login3:
@@ -1012,7 +1012,7 @@ _achievements:
     _login100:
       title: "미스키스트 III"
       description: "총 100일간 로그인했습니다"
-      flavor: "그 유저, 미스키스트를 위하여"
+      flavor: "그 유저, 미스키스트이다"
     _login200:
       title: "단골 I"
       description: "총 200일간 로그인했습니다"
@@ -1025,7 +1025,7 @@ _achievements:
     _login500:
       title: "베테랑 I"
       description: "총 500일간 로그인했습니다"
-      flavor: "여러분, 저 이 노트들 좋아해요"
+      flavor: "제군, 나는 노트가 좋다"
     _login600:
       title: "베테랑 II"
       description: "총 600일간 로그인했습니다"
@@ -1041,7 +1041,7 @@ _achievements:
     _login1000:
       title: "노트 마스터 III"
       description: "총 1,000일간 로그인했습니다"
-      flavor: "미스키를 사용해 주셔서 감사합니다!"
+      flavor: "Misskey를 사용해 주셔서 감사합니다!"
     _noteClipped1:
       title: "클립할 수밖에 없었어"
       description: "처음으로 노트를 클립했습니다"
@@ -1049,7 +1049,7 @@ _achievements:
       title: "별을 바라보는 자"
       description: "처음으로 노트를 즐겨찾기했습니다"
     _myNoteFavorited1:
-      title: "I wanna Star"
+      title: "별을 원하는 자"
       description: "다른 사람이 당신의 노트를 즐겨찾기했습니다"
     _profileFilled:
       title: "준비 완료"
@@ -1077,7 +1077,7 @@ _achievements:
       title: "첫 팔로워"
       description: "사용자가 처음으로 팔로잉했습니다"
     _followers10:
-      title: "날 따라와!"
+      title: "팔로우 미!"
       description: "10명의 사용자가 팔로우했습니다"
     _followers50:
       title: "이곳저곳"
@@ -1095,15 +1095,18 @@ _achievements:
       title: "유명인사"
       description: "1,000명의 사용자가 팔로우했습니다"
     _collectAchievements30:
-      title: "도전과제 콜렉터"
+      title: "도전 과제 콜렉터"
       description: "30개의 도전과제를 획득했습니다"
     _viewAchievements3min:
       title: "저 도전과제 좋아해요"
-      description: "도전과제 목록을 3분 이상 보세요"
+      description: "도전 과제 목록을 3분 이상 쳐다봤습니다"
     _iLoveMisskey:
       title: "I Love Misskey"
       description: "\"I ❤ #Misskey\"를 포스트했습니다"
       flavor: "Misskey를 이용해주셔서 감사합니다! - 개발팀 일동"
+    _foundTreasure:
+      title: "보물찾기"
+      description: "숨겨진 보물을 발견했습니다"
     _client30min:
       title: "잠깐 쉬어"
       description: "클라이언트를 시작하고 30분이 경과하였습니다"
@@ -1116,7 +1119,7 @@ _achievements:
       flavor: "잠 좀 자세요. 걱정돼요."
     _postedAt0min0sec:
       title: "정각"
-      description: "1초도 어긋나지 않은 정각에 노트를 포스트했습니다"
+      description: "0분 0초 정각에 노트를 작성했습니다"
       flavor: "째깍 째깍 째깍 땡!"
     _selfQuote:
       title: "혼잣말"
@@ -1124,21 +1127,24 @@ _achievements:
     _htl20npm:
       title: "타임라인 폭주 중"
       description: "1분 사이에 홈 타임라인에 노트가 20개 넘게 생성되었습니다"
+    _viewInstanceChart:
+      title: "애널리스트"
+      description: "인스턴스의 차트를 열었습니다"
     _outputHelloWorldOnScratchpad:
       title: "Hello, world!"
-      description: "스크래치패드에서 hello world를 출력하세요"
+      description: "스크래치패드에서 hello world를 출력했습니다"
     _open3windows:
       title: "멀티 윈도우"
-      description: "3개 이상의 창을 여세요"
+      description: "3개 이상의 창을 열었습니다"
     _driveFolderCircularReference:
       title: "순환 참조"
       description: "드라이브 폴더를 자신을 가리키도록 만드려 시도했습니다"
     _reactWithoutRead:
       title: "읽고 답하긴 하시는 건가요?"
-      description: "100자가 넘는 포스트에 3초 안에 포스트했습니다"
+      description: "100자가 넘는 노트가 작성되고 3초 안에 반응했습니다"
     _clickedClickHere:
       title: "여길 눌러보세요"
-      description: "이 곳을 눌러봤습니다"
+      description: "여길을 눌러봤습니다"
     _justPlainLucky:
       title: "그냥 운이 좋았어"
       description: "매 10초마다 0.01%의 확률로 달성됩니다"
@@ -1146,25 +1152,25 @@ _achievements:
       title: "신 콤플렉스"
       description: "이름을 syuilo로 설정했습니다"
     _passedSinceAccountCreated1:
-      title: "1년"
+      title: "1주년"
       description: "계정을 생성하고 1년이 지났습니다"
     _passedSinceAccountCreated2:
-      title: "2년"
+      title: "2주년"
       description: "계정을 생성하고 2년이 지났습니다"
     _passedSinceAccountCreated3:
-      title: "3년"
+      title: "3주년"
       description: "계정을 생성하고 3년이 지났습니다"
     _loggedInOnBirthday:
       title: "생일 축하합니다!"
-      description: "설정한 생일에 로그인했습니다"
+      description: "생일에 로그인했습니다"
     _loggedInOnNewYearsDay:
       title: "새해 복 많이 받으세요"
       description: "새해 첫 날에 로그인했습니다"
       flavor: "올해에도 저희 인스턴스에 관심을 가져 주셔서 감사합니다"
     _cookieClicked:
-      title: "쿠키 클리커 게임"
+      title: "쿠키를 클릭하는 게임"
       description: "쿠키를 클릭했습니다"
-      flavor: "뭔가 문제가 있나요?"
+      flavor: "소프트웨어 착각하지 않으셨나요?"
     _brainDiver:
       title: "Brain Diver"
       description: "Brain Diver로의 링크를 첨부했습니다"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index 541941398..1c0138466 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -1004,7 +1004,7 @@ _achievements:
     _login100:
       title: "Мискиец Ⅲ"
       description: "100 дней на сайте"
-      flavor: "Жестокий Misskist "
+      flavor: "Жестокий мискиец"
     _login200:
       title: "Завсегдатай Ⅰ"
       description: "200 дней на сайте"
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index 08737fb1b..47c9a3a41 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -942,14 +942,51 @@ achievements: "ความสำเร็จ"
 _achievements:
   earnedAt: "ได้รับเมื่อ"
   _types:
+    _notes1:
+      title: "เพียงแค่ตั้งค่า msky ของฉัน"
     _followers100:
       title: "บุคคลที่เป็นที่นิยม"
     _followers500:
       title: "เสาสัญญาณ"
+    _followers1000:
+      title: "ผู้ทรงอิทธิพล"
     _iLoveMisskey:
       title: "ฉันรัก Misskey"
+      description: "โพสต์ \"I ❤ #Misskey\""
+    _foundTreasure:
+      title: "ล่าสมบัติ"
+      description: "คุณพบสมบัติที่ซ่อนอยู่"
+    _client30min:
+      title: "พักผ่อนสักหน่อย"
+    _noteDeletedWithin1min:
+      title: "ไม่เป็นไร"
+    _postedAtLateNight:
+      title: "กลางคืน"
+    _viewInstanceChart:
+      title: "วิเคราะห์"
+      description: "ดูแผนภูมิอินสแตนซ์ของคุณ"
     _driveFolderCircularReference:
       title: "อ้างอิงวงจร"
+    _clickedClickHere:
+      title: "คลิ๊กที่นี่"
+      description: "คุณได้คลิกที่นี่"
+    _passedSinceAccountCreated1:
+      title: "ครบรอบหนึ่งปี"
+    _passedSinceAccountCreated2:
+      title: "ครบรอบสองปี"
+    _passedSinceAccountCreated3:
+      title: "ครบรอบสามปี"
+    _loggedInOnBirthday:
+      title: "สุขสันต์วันเกิด"
+      description: "เข้าสู่ระบบในวันเกิดของคุณ"
+    _loggedInOnNewYearsDay:
+      title: "สวัสดีปีใหม่!"
+      description: "เข้าสู่ระบบในวันแรกของปี"
+    _cookieClicked:
+      description: "คลิกคุกกี้"
+    _brainDiver:
+      title: "Brain Diver"
+      flavor: "Misskey-Misskey La-Tu-Ma"
 _role:
   new: "บทบาทใหม่"
   edit: "แก้ไขบทบาท"
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index ee978b58d..f000337f3 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -910,34 +910,80 @@ _achievements:
       title: "Декілька нотаток"
       description: "10 нотаток відправлено"
     _notes100:
+      title: "Купа нотаток"
       description: "100 нотаток відправлено"
     _notes500:
+      title: "Все в нотатках"
       description: "500 нотаток відправлено"
     _notes1000:
+      title: "Гора нотаток"
       description: "1 000 нотаток відправлено"
     _notes5000:
+      title: "Переповнюючі нотатки"
       description: "5 000 нотаток відправлено"
     _notes10000:
+      title: "Супернотатка"
       description: "10 000 нотаток відправлено"
     _notes20000:
+      title: "Треба Більше Нотаток"
       description: "20 000 нотаток відправлено"
     _notes30000:
+      title: "Нотатки нотатки нотатки"
       description: "30 000 нотаток відправлено"
     _notes40000:
+      title: "Фабрика нотаток"
       description: "40 000 нотаток відправлено"
     _notes50000:
+      title: "Планета нотаток"
       description: "50 000 нотаток відправлено"
     _notes60000:
+      title: "Нотатковий квазар"
       description: "60 000 нотаток відправлено"
     _notes70000:
+      title: "Чорна нотаткова діра"
       description: "70 000 нотаток відправлено"
     _notes80000:
+      title: "Галактика нотаток"
       description: "80 000 нотаток відправлено"
     _notes90000:
+      title: "Нотатковерс"
       description: "90 000 нотаток відправлено"
     _notes100000:
       title: "ALL YOUR NOTE ARE BELONG TO US"
       description: "100 000 нотаток відправлено"
+      flavor: "Так багато потрібно сказати?"
+    _login3:
+      title: "Новачок I"
+    _login7:
+      title: "Новачок II"
+    _login15:
+      title: "Новачок III"
+    _login30:
+      title: "Міскієць I"
+    _login60:
+      title: "Міскієць II"
+    _login100:
+      title: "Міскієць III"
+    _login200:
+      title: "Завсідник I"
+    _login300:
+      title: "Завсідник II"
+    _login400:
+      title: "Завсідник III"
+    _login500:
+      title: "Ветеран I"
+    _login600:
+      title: "Ветеран II"
+    _login700:
+      title: "Ветеран III"
+    _login1000:
+      flavor: "Дякуємо, що користуєтеся Misskey!"
+    _passedSinceAccountCreated3:
+      description: "Минуло 3 роки з моменту створення акаунта"
+    _loggedInOnBirthday:
+      title: "З Днем народження!"
+    _brainDiver:
+      flavor: "Misskey-Misskey La-Tu-Ma"
 _role:
   priority: "Пріоритет"
   _priority:
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 433af4c83..9d20b8544 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1007,6 +1007,9 @@ _achievements:
       flavor: "感谢您使用Misskey！"
     _noteFavorited1:
       title: "观星者"
+    _profileFilled:
+      title: "整装待发"
+      description: "设置了个人资料"
     _markedAsCat:
       title: "我是猫"
       description: "将账户设定为一只猫"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index a8a06528d..c40476c34 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -950,13 +950,13 @@ _achievements:
       title: "若干貼文"
       description: "發表了10則貼文"
     _notes100:
-      title: "許多的貼文"
+      title: "許多貼文"
       description: "發表了100則貼文"
     _notes500:
       title: "滿滿的貼文"
       description: "發表了500則貼文"
     _notes1000:
-      title: "一堆貼文"
+      title: "堆積如山的貼文"
       description: "發表了1000則貼文"
     _notes5000:
       title: "滔滔不絕的貼文"
@@ -1104,6 +1104,9 @@ _achievements:
       title: "I Love Misskey"
       description: "發布「I ❤ #Misskey」"
       flavor: "感謝您使用Misskey！ by 開發團隊"
+    _foundTreasure:
+      title: "尋寶"
+      description: "發現了隱藏的寶藏"
     _client30min:
       title: "休息一下"
       description: "用戶端啟動已超過30分鐘"
@@ -1124,6 +1127,9 @@ _achievements:
     _htl20npm:
       title: "流動的TL"
       description: "在首頁時間軸的流速超過20npm"
+    _viewInstanceChart:
+      title: "分析師"
+      description: "顯示了實例的圖表"
     _outputHelloWorldOnScratchpad:
       title: "Hello world!"
       description: "在暫存記憶體輸出了 hello world"

From 117ac53505b264edbac787e165ed45ea1a7e3db0 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 24 Jan 2023 17:30:51 +0900
Subject: [PATCH 109/177] 13.2.1

---
 CHANGELOG.md | 7 ++++++-
 package.json | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fd48fcbd..5f2d8ad37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,12 @@
 You should also include the user name that made the change.
 -->
 
-## 13.2.0 (2021/01/23)
+## 13.2.1 (2023/01/24)
+### Improvements
+- デザインの調整
+- サーバーのパフォーマンスを改善
+
+## 13.2.0 (2023/01/23)
 
 ### Improvements
 - onlyServer / onlyQueue オプションを復活
diff --git a/package.json b/package.json
index 7b0d5093d..32f1f8394 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.2.0",
+	"version": "13.2.1",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From 8cab16c824f27a1ebc6b67c8012504eb58e50e20 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 24 Jan 2023 17:51:09 +0900
Subject: [PATCH 110/177] fix(server): /api/signin always returns 429 when
 request header x-forwarded-for contains client port

Fix #9408
---
 packages/backend/src/misc/get-ip-hash.ts | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/misc/get-ip-hash.ts b/packages/backend/src/misc/get-ip-hash.ts
index 379325bb1..70e61aef8 100644
--- a/packages/backend/src/misc/get-ip-hash.ts
+++ b/packages/backend/src/misc/get-ip-hash.ts
@@ -1,9 +1,14 @@
 import IPCIDR from 'ip-cidr';
 
 export function getIpHash(ip: string) {
-	// because a single person may control many IPv6 addresses,
-	// only a /64 subnet prefix of any IP will be taken into account.
-	// (this means for IPv4 the entire address is used)
-	const prefix = IPCIDR.createAddress(ip).mask(64);
-	return 'ip-' + BigInt('0b' + prefix).toString(36);
+	try {
+		// because a single person may control many IPv6 addresses,
+		// only a /64 subnet prefix of any IP will be taken into account.
+		// (this means for IPv4 the entire address is used)
+		const prefix = IPCIDR.createAddress(ip).mask(64);
+		return 'ip-' + BigInt('0b' + prefix).toString(36);
+	} catch (e) {
+		const prefix = IPCIDR.createAddress(ip.replace(/:[0-9]+$/, '')).mask(64);
+		return 'ip-' + BigInt('0b' + prefix).toString(36);
+	}
 }

From 520ed8cb4d04004717e25185a8805e05ece413d7 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 25 Jan 2023 11:18:16 +0900
Subject: [PATCH 111/177] refactor(server): fix type errors

---
 packages/backend/src/core/AntennaService.ts | 10 ++++++--
 packages/backend/src/core/RoleService.ts    | 26 +++++++++++++--------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/packages/backend/src/core/AntennaService.ts b/packages/backend/src/core/AntennaService.ts
index be755f7da..7db8c43ea 100644
--- a/packages/backend/src/core/AntennaService.ts
+++ b/packages/backend/src/core/AntennaService.ts
@@ -77,10 +77,16 @@ export class AntennaService implements OnApplicationShutdown {
 			const { type, body } = obj.message as StreamMessages['internal']['payload'];
 			switch (type) {
 				case 'antennaCreated':
-					this.antennas.push(body);
+					this.antennas.push({
+						...body,
+						createdAt: new Date(body.createdAt),
+					});
 					break;
 				case 'antennaUpdated':
-					this.antennas[this.antennas.findIndex(a => a.id === body.id)] = body;
+					this.antennas[this.antennas.findIndex(a => a.id === body.id)] = {
+						...body,
+						createdAt: new Date(body.createdAt),
+					};
 					break;
 				case 'antennaDeleted':
 					this.antennas = this.antennas.filter(a => a.id !== body.id);
diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts
index c0f5eae3d..f8f9231cd 100644
--- a/packages/backend/src/core/RoleService.ts
+++ b/packages/backend/src/core/RoleService.ts
@@ -91,10 +91,12 @@ export class RoleService implements OnApplicationShutdown {
 				case 'roleCreated': {
 					const cached = this.rolesCache.get(null);
 					if (cached) {
-						body.createdAt = new Date(body.createdAt);
-						body.updatedAt = new Date(body.updatedAt);
-						body.lastUsedAt = new Date(body.lastUsedAt);
-						cached.push(body);
+						cached.push({
+							...body,
+							createdAt: new Date(body.createdAt),
+							updatedAt: new Date(body.updatedAt),
+							lastUsedAt: new Date(body.lastUsedAt),
+						});
 					}
 					break;
 				}
@@ -103,10 +105,12 @@ export class RoleService implements OnApplicationShutdown {
 					if (cached) {
 						const i = cached.findIndex(x => x.id === body.id);
 						if (i > -1) {
-							body.createdAt = new Date(body.createdAt);
-							body.updatedAt = new Date(body.updatedAt);
-							body.lastUsedAt = new Date(body.lastUsedAt);
-							cached[i] = body;
+							cached[i] = {
+								...body,
+								createdAt: new Date(body.createdAt),
+								updatedAt: new Date(body.updatedAt),
+								lastUsedAt: new Date(body.lastUsedAt),
+							};
 						}
 					}
 					break;
@@ -121,8 +125,10 @@ export class RoleService implements OnApplicationShutdown {
 				case 'userRoleAssigned': {
 					const cached = this.roleAssignmentByUserIdCache.get(body.userId);
 					if (cached) {
-						body.createdAt = new Date(body.createdAt);
-						cached.push(body);
+						cached.push({
+							...body,
+							createdAt: new Date(body.createdAt),
+						});
 					}
 					break;
 				}

From 2a2e8d0cf6a83c4a10e3a62331d6fbd3adb416a6 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 25 Jan 2023 11:23:57 +0900
Subject: [PATCH 112/177] refactor(server): fix type errors

---
 .../backend/src/core/activitypub/ApRendererService.ts     | 2 +-
 .../src/core/activitypub/models/ApPersonService.ts        | 8 ++++----
 packages/backend/src/server/api/stream/types.ts           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts
index 29f216aa1..91a2767e6 100644
--- a/packages/backend/src/core/activitypub/ApRendererService.ts
+++ b/packages/backend/src/core/activitypub/ApRendererService.ts
@@ -21,11 +21,11 @@ import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
 import type { UserKeypair } from '@/models/entities/UserKeypair.js';
 import type { UsersRepository, UserProfilesRepository, NotesRepository, DriveFilesRepository, EmojisRepository, PollsRepository } from '@/models/index.js';
+import { bindThis } from '@/decorators.js';
 import { LdSignatureService } from './LdSignatureService.js';
 import { ApMfmService } from './ApMfmService.js';
 import type { IActivity, IObject } from './type.js';
 import type { IIdentifier } from './models/identifier.js';
-import { bindThis } from '@/decorators.js';
 
 @Injectable()
 export class ApRendererService {
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index e08f33c90..f86b5e6f9 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -566,22 +566,22 @@ export class ApPersonService implements OnModuleInit {
 
 		this.logger.info(`Updating the featured: ${user.uri}`);
 
-		if (resolver == null) resolver = this.apResolverService.createResolver();
+		const _resolver = resolver ?? this.apResolverService.createResolver();
 
 		// Resolve to (Ordered)Collection Object
-		const collection = await resolver.resolveCollection(user.featured);
+		const collection = await _resolver.resolveCollection(user.featured);
 		if (!isCollectionOrOrderedCollection(collection)) throw new Error('Object is not Collection or OrderedCollection');
 
 		// Resolve to Object(may be Note) arrays
 		const unresolvedItems = isCollection(collection) ? collection.items : collection.orderedItems;
-		const items = await Promise.all(toArray(unresolvedItems).map(x => resolver.resolve(x)));
+		const items = await Promise.all(toArray(unresolvedItems).map(x => _resolver.resolve(x)));
 
 		// Resolve and regist Notes
 		const limit = promiseLimit<Note | null>(2);
 		const featuredNotes = await Promise.all(items
 			.filter(item => getApType(item) === 'Note')	// TODO: Noteでなくてもいいかも
 			.slice(0, 5)
-			.map(item => limit(() => this.apNoteService.resolveNote(item, resolver))));
+			.map(item => limit(() => this.apNoteService.resolveNote(item, _resolver))));
 
 		await this.db.transaction(async transactionalEntityManager => {
 			await transactionalEntityManager.delete(UserNotePining, { userId: user.id });
diff --git a/packages/backend/src/server/api/stream/types.ts b/packages/backend/src/server/api/stream/types.ts
index a442529bb..ef65b27dd 100644
--- a/packages/backend/src/server/api/stream/types.ts
+++ b/packages/backend/src/server/api/stream/types.ts
@@ -30,7 +30,7 @@ export interface InternalStreamTypes {
 	remoteUserUpdated: Serialized<{ id: User['id']; }>;
 	follow: Serialized<{ followerId: User['id']; followeeId: User['id']; }>;
 	unfollow: Serialized<{ followerId: User['id']; followeeId: User['id']; }>;
-	policiesUpdated: Serialized<Role['options']>;
+	policiesUpdated: Serialized<Role['policies']>;
 	roleCreated: Serialized<Role>;
 	roleDeleted: Serialized<Role>;
 	roleUpdated: Serialized<Role>;

From d4fb201d05fc4e0da85f21eece7cc6baf30b6d05 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 25 Jan 2023 12:00:04 +0900
Subject: [PATCH 113/177] =?UTF-8?q?fix(server):=20node-fetch=E3=81=8A?=
 =?UTF-8?q?=E3=82=88=E3=81=B3got=E3=82=92=E4=BD=BF=E3=81=86=E4=BB=A5?=
 =?UTF-8?q?=E5=89=8D=E3=81=AE=E5=AE=9F=E8=A3=85=E3=81=AB=E6=88=BB=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

see #9710
---
 packages/backend/package.json                 |   3 +-
 packages/backend/src/core/CaptchaService.ts   |  17 +-
 packages/backend/src/core/DownloadService.ts  |  76 ++--
 .../src/core/FetchInstanceMetadataService.ts  |   5 +-
 .../backend/src/core/HttpRequestService.ts    | 381 ++++--------------
 packages/backend/src/core/S3Service.ts        |   2 +-
 .../src/core/activitypub/ApRequestService.ts  |  35 +-
 .../src/core/activitypub/ApResolverService.ts |  10 +-
 .../core/activitypub/LdSignatureService.ts    |  19 +-
 .../WebhookDeliverProcessorService.ts         |  39 +-
 .../src/server/api/endpoints/fetch-rss.ts     |  17 +-
 .../server/api/endpoints/notes/translate.ts   |  22 +-
 pnpm-lock.yaml                                |   4 +-
 13 files changed, 203 insertions(+), 427 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 6cac949ea..586b95f2e 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -63,7 +63,7 @@
 		"file-type": "18.2.0",
 		"fluent-ffmpeg": "2.1.2",
 		"form-data": "^4.0.0",
-		"got": "12.5.3",
+		"got": "^12.5.3",
 		"hpagent": "1.2.0",
 		"ioredis": "4.28.5",
 		"ip-cidr": "3.0.11",
@@ -119,7 +119,6 @@
 		"typeorm": "0.3.11",
 		"typescript": "4.9.4",
 		"ulid": "2.3.0",
-		"undici": "^5.16.0",
 		"unzipper": "0.10.11",
 		"uuid": "9.0.0",
 		"vary": "1.1.2",
diff --git a/packages/backend/src/core/CaptchaService.ts b/packages/backend/src/core/CaptchaService.ts
index 1e9891405..c8428a26b 100644
--- a/packages/backend/src/core/CaptchaService.ts
+++ b/packages/backend/src/core/CaptchaService.ts
@@ -21,18 +21,13 @@ export class CaptchaService {
 			response,
 		});
 	
-		const res = await this.httpRequestService.fetch(
-			url,
-			{
-				method: 'POST',
-				body: params,
+		const res = await this.httpRequestService.send(url, {
+			method: 'POST',
+			body: JSON.stringify(params),
+			headers: {
+				'Content-Type': 'application/json',
 			},
-			{
-				noOkError: true,
-			}
-		).catch(err => {
-			throw `${err.message ?? err}`;
-		});
+		}, { throwErrorWhenResponseNotOk: false });
 	
 		if (!res.ok) {
 			throw `${res.status}`;
diff --git a/packages/backend/src/core/DownloadService.ts b/packages/backend/src/core/DownloadService.ts
index c5b2bcaef..a971e06fd 100644
--- a/packages/backend/src/core/DownloadService.ts
+++ b/packages/backend/src/core/DownloadService.ts
@@ -5,10 +5,10 @@ import { Inject, Injectable } from '@nestjs/common';
 import IPCIDR from 'ip-cidr';
 import PrivateIp from 'private-ip';
 import chalk from 'chalk';
-import { buildConnector } from 'undici';
+import got, * as Got from 'got';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
-import { HttpRequestService, UndiciFetcher } from '@/core/HttpRequestService.js';
+import { HttpRequestService } from '@/core/HttpRequestService.js';
 import { createTemp } from '@/misc/create-temp.js';
 import { StatusError } from '@/misc/status-error.js';
 import { LoggerService } from '@/core/LoggerService.js';
@@ -20,7 +20,6 @@ import { bindThis } from '@/decorators.js';
 @Injectable()
 export class DownloadService {
 	private logger: Logger;
-	private undiciFetcher: UndiciFetcher;
 
 	constructor(
 		@Inject(DI.config)
@@ -30,21 +29,6 @@ export class DownloadService {
 		private loggerService: LoggerService,
 	) {
 		this.logger = this.loggerService.getLogger('download');
-
-		this.undiciFetcher = this.httpRequestService.createFetcher({
-			connect: process.env.NODE_ENV === 'development' ?
-				this.httpRequestService.clientDefaults.connect
-				:
-				this.httpRequestService.getConnectorWithIpCheck(
-					buildConnector({
-						...this.httpRequestService.clientDefaults.connect,
-					}),
-					(ip) => !this.isPrivateIp(ip),
-				),
-			bodyTimeout: 30 * 1000,
-		}, {
-			connect: this.httpRequestService.clientDefaults.connect,
-		}, this.logger);
 	}
 
 	@bindThis
@@ -55,14 +39,60 @@ export class DownloadService {
 		const operationTimeout = 60 * 1000;
 		const maxSize = this.config.maxFileSize ?? 262144000;
 
-		const response = await this.undiciFetcher.fetch(url);
+		const req = got.stream(url, {
+			headers: {
+				'User-Agent': this.config.userAgent,
+			},
+			timeout: {
+				lookup: timeout,
+				connect: timeout,
+				secureConnect: timeout,
+				socket: timeout,	// read timeout
+				response: timeout,
+				send: timeout,
+				request: operationTimeout,	// whole operation timeout
+			},
+			agent: {
+				http: this.httpRequestService.httpAgent,
+				https: this.httpRequestService.httpsAgent,
+			},
+			http2: false,	// default
+			retry: {
+				limit: 0,
+			},
+		}).on('response', (res: Got.Response) => {
+			if ((process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'test') && !this.config.proxy && res.ip) {
+				if (this.isPrivateIp(res.ip)) {
+					this.logger.warn(`Blocked address: ${res.ip}`);
+					req.destroy();
+				}
+			}
 
-		if (response.body === null) {
-			throw new StatusError('No body', 400, 'No body');
+			const contentLength = res.headers['content-length'];
+			if (contentLength != null) {
+				const size = Number(contentLength);
+				if (size > maxSize) {
+					this.logger.warn(`maxSize exceeded (${size} > ${maxSize}) on response`);
+					req.destroy();
+				}
+			}
+		}).on('downloadProgress', (progress: Got.Progress) => {
+			if (progress.transferred > maxSize) {
+				this.logger.warn(`maxSize exceeded (${progress.transferred} > ${maxSize}) on downloadProgress`);
+				req.destroy();
+			}
+		});
+
+		try {
+			await pipeline(req, fs.createWriteStream(path));
+		} catch (e) {
+			if (e instanceof Got.HTTPError) {
+				throw new StatusError(`${e.response.statusCode} ${e.response.statusMessage}`, e.response.statusCode, e.response.statusMessage);
+			} else {
+				throw e;
+			}
 		}
 
-		await pipeline(stream.Readable.fromWeb(response.body), fs.createWriteStream(path));
-
 		this.logger.succ(`Download finished: ${chalk.cyan(url)}`);
 	}
 
diff --git a/packages/backend/src/core/FetchInstanceMetadataService.ts b/packages/backend/src/core/FetchInstanceMetadataService.ts
index cb9d099a2..35f30deeb 100644
--- a/packages/backend/src/core/FetchInstanceMetadataService.ts
+++ b/packages/backend/src/core/FetchInstanceMetadataService.ts
@@ -2,6 +2,7 @@ import { URL } from 'node:url';
 import { Inject, Injectable } from '@nestjs/common';
 import { JSDOM } from 'jsdom';
 import tinycolor from 'tinycolor2';
+import fetch from 'node-fetch';
 import type { Instance } from '@/models/entities/Instance.js';
 import type { InstancesRepository } from '@/models/index.js';
 import { AppLockService } from '@/core/AppLockService.js';
@@ -190,7 +191,9 @@ export class FetchInstanceMetadataService {
 	
 		const faviconUrl = url + '/favicon.ico';
 	
-		const favicon = await this.httpRequestService.fetch(faviconUrl, {}, { noOkError: true });
+		const favicon = await this.httpRequestService.send(faviconUrl, {
+			method: 'HEAD',
+		}, { throwErrorWhenResponseNotOk: false });
 	
 		if (favicon.ok) {
 			return faviconUrl;
diff --git a/packages/backend/src/core/HttpRequestService.ts b/packages/backend/src/core/HttpRequestService.ts
index cd859d002..baf74acfa 100644
--- a/packages/backend/src/core/HttpRequestService.ts
+++ b/packages/backend/src/core/HttpRequestService.ts
@@ -1,284 +1,67 @@
 import * as http from 'node:http';
 import * as https from 'node:https';
-import { LookupFunction } from 'node:net';
 import CacheableLookup from 'cacheable-lookup';
+import fetch from 'node-fetch';
 import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent';
 import { Inject, Injectable } from '@nestjs/common';
-import * as undici from 'undici';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { StatusError } from '@/misc/status-error.js';
 import { bindThis } from '@/decorators.js';
-import { LoggerService } from '@/core/LoggerService.js';
-import type Logger from '@/logger.js';
-
-// true to allow, false to deny
-export type IpChecker = (ip: string) => boolean;
-
-/* 
- *  Child class to create and save Agent for fetch.
- *  You should construct this when you want
- *  to change timeout, size limit, socket connect function, etc.
- */
-export class UndiciFetcher {
-	/**
-	 * Get http non-proxy agent (undici)
-	 */
-	public nonProxiedAgent: undici.Agent;
-
-	/**
-	 * Get http proxy or non-proxy agent (undici)
-	 */
-	public agent: undici.ProxyAgent | undici.Agent;
-
-	private proxyBypassHosts: string[];
-	private userAgent: string | undefined;
-
-	private logger: Logger | undefined;
-
-	constructor(
-		args: {
-			agentOptions: undici.Agent.Options;
-			proxy?: {
-				uri: string;
-				options?: undici.Agent.Options; // Override of agentOptions
-			},
-			proxyBypassHosts?: string[];
-			userAgent?: string;
-		},
-		logger?: Logger,
-	) {
-		this.logger = logger;
-		this.logger?.debug('UndiciFetcher constructor', args);
-
-		this.proxyBypassHosts = args.proxyBypassHosts ?? [];
-		this.userAgent = args.userAgent;
-
-		this.nonProxiedAgent = new undici.Agent({
-			...args.agentOptions,
-			connect: (process.env.NODE_ENV !== 'production' && typeof args.agentOptions.connect !== 'function')
-				? (options, cb) => {
-					// Custom connector for debug
-					undici.buildConnector(args.agentOptions.connect as undici.buildConnector.BuildOptions)(options, (err, socket) => {
-						this.logger?.debug('Socket connector called', socket);
-						if (err) {
-							this.logger?.debug('Socket error', err);
-							cb(new Error(`Error while socket connecting\n${err}`), null);
-							return;
-						}
-						this.logger?.debug(`Socket connected: port ${socket.localPort} => remote ${socket.remoteAddress}`);
-						cb(null, socket);
-					});
-				} : args.agentOptions.connect,
-		});
-
-		this.agent = args.proxy
-			? new undici.ProxyAgent({
-				...args.agentOptions,
-				...args.proxy.options,
-
-				uri: args.proxy.uri,
-
-				connect: (process.env.NODE_ENV !== 'production' && typeof (args.proxy.options?.connect ?? args.agentOptions.connect) !== 'function')
-					? (options, cb) => {
-						// Custom connector for debug
-						undici.buildConnector((args.proxy?.options?.connect ?? args.agentOptions.connect) as undici.buildConnector.BuildOptions)(options, (err, socket) => {
-							this.logger?.debug('Socket connector called (secure)', socket);
-							if (err) {
-								this.logger?.debug('Socket error', err);
-								cb(new Error(`Error while socket connecting\n${err}`), null);
-								return;
-							}
-							this.logger?.debug(`Socket connected (secure): port ${socket.localPort} => remote ${socket.remoteAddress}`);
-							cb(null, socket);
-						});
-					} : (args.proxy.options?.connect ?? args.agentOptions.connect),
-			})
-			: this.nonProxiedAgent;
-	}
-
-	/**
-	 * Get agent by URL
-	 * @param url URL
-	 * @param bypassProxy Allways bypass proxy
-	 */
-	@bindThis
-	public getAgentByUrl(url: URL, bypassProxy = false): undici.Agent | undici.ProxyAgent {
-		if (bypassProxy || this.proxyBypassHosts.includes(url.hostname)) {
-			return this.nonProxiedAgent;
-		} else {
-			return this.agent;
-		}
-	}
-
-	@bindThis
-	public async fetch(
-		url: string | URL,
-		options: undici.RequestInit = {},
-		privateOptions: { noOkError?: boolean; bypassProxy?: boolean; } = { noOkError: false, bypassProxy: false },
-	): Promise<undici.Response> {
-		const res = await undici.fetch(url, {
-			dispatcher: this.getAgentByUrl(new URL(url), privateOptions.bypassProxy),
-			...options,
-			headers: {
-				'User-Agent': this.userAgent ?? '',
-				...(options.headers ?? {}),
-			},
-		}).catch((err) => {
-			this.logger?.error(`fetch error to ${typeof url === 'string' ? url : url.href}`, err);
-			throw new StatusError('Resource Unreachable', 500, 'Resource Unreachable');
-		});
-		if (!res.ok && !privateOptions.noOkError) {
-			throw new StatusError(`${res.status} ${res.statusText}`, res.status, res.statusText);
-		}
-		return res;
-	}
-
-	@bindThis
-	public async request(
-		url: string | URL,
-		options: { dispatcher?: undici.Dispatcher } & Omit<undici.Dispatcher.RequestOptions, 'origin' | 'path' | 'method'> & Partial<Pick<undici.Dispatcher.RequestOptions, 'method'>> = {},
-		privateOptions: { noOkError?: boolean; bypassProxy?: boolean; } = { noOkError: false, bypassProxy: false },
-	): Promise<undici.Dispatcher.ResponseData> {
-		const res = await undici.request(url, {
-			dispatcher: this.getAgentByUrl(new URL(url), privateOptions.bypassProxy),
-			...options,
-			headers: {
-				'user-agent': this.userAgent ?? '',
-				...(options.headers ?? {}),
-			},
-		}).catch((err) => {
-			this.logger?.error(`fetch error to ${typeof url === 'string' ? url : url.href}`, err);
-			throw new StatusError('Resource Unreachable', 500, 'Resource Unreachable');
-		});
-
-		if (res.statusCode >= 400) {
-			throw new StatusError(`${res.statusCode}`, res.statusCode, '');
-		}
-
-		return res;
-	}
-
-	@bindThis
-	public async getJson<T extends unknown>(url: string, accept = 'application/json, */*', headers?: Record<string, string>): Promise<T> {
-		const { body } = await this.request( 
-			url,
-			{
-				headers: Object.assign({
-					Accept: accept,
-				}, headers ?? {}),
-			},
-		);
-
-		return await body.json() as T;
-	}
-
-	@bindThis
-	public async getHtml(url: string, accept = 'text/html, */*', headers?: Record<string, string>): Promise<string> {
-		const { body } = await this.request(
-			url,
-			{
-				headers: Object.assign({
-					Accept: accept,
-				}, headers ?? {}),
-			},
-		);
-
-		return await body.text();
-	}
-}
+import type { Response } from 'node-fetch';
+import type { URL } from 'node:url';
 
 @Injectable()
 export class HttpRequestService {
-	public defaultFetcher: UndiciFetcher;
-	public fetch: UndiciFetcher['fetch'];
-	public request: UndiciFetcher['request'];
-	public getHtml: UndiciFetcher['getHtml'];
-	public defaultJsonFetcher: UndiciFetcher;
-	public getJson: UndiciFetcher['getJson'];
-
-	//#region for old http/https, only used in S3Service
-	// http non-proxy agent
+	/**
+	 * Get http non-proxy agent
+	 */
 	private http: http.Agent;
 
-	// https non-proxy agent
+	/**
+	 * Get https non-proxy agent
+	 */
 	private https: https.Agent;
 
-	// http proxy or non-proxy agent
+	/**
+	 * Get http proxy or non-proxy agent
+	 */
 	public httpAgent: http.Agent;
 
-	// https proxy or non-proxy agent
+	/**
+	 * Get https proxy or non-proxy agent
+	 */
 	public httpsAgent: https.Agent;
-	//#endregion
-
-	public readonly dnsCache: CacheableLookup;
-	public readonly clientDefaults: undici.Agent.Options;
-	private maxSockets: number;
-
-	private logger: Logger;
 
 	constructor(
 		@Inject(DI.config)
 		private config: Config,
-		private loggerService: LoggerService,
 	) {
-		this.logger = this.loggerService.getLogger('http-request');
-
-		this.dnsCache = new CacheableLookup({
+		const cache = new CacheableLookup({
 			maxTtl: 3600,	// 1hours
 			errorTtl: 30,	// 30secs
 			lookup: false,	// nativeのdns.lookupにfallbackしない
 		});
-
-		this.clientDefaults = {
-			keepAliveTimeout: 30 * 1000,
-			keepAliveMaxTimeout: 10 * 60 * 1000,
-			keepAliveTimeoutThreshold: 1 * 1000,
-			strictContentLength: true,
-			headersTimeout: 10 * 1000,
-			bodyTimeout: 10 * 1000,
-			maxHeaderSize: 16364, // default
-			maxResponseSize: 10 * 1024 * 1024,
-			maxRedirections: 3,
-			connect: {
-				timeout: 10 * 1000, // コネクションが確立するまでのタイムアウト
-				maxCachedSessions: 300, // TLSセッションのキャッシュ数 https://github.com/nodejs/undici/blob/v5.14.0/lib/core/connect.js#L80
-				lookup: this.dnsCache.lookup as LookupFunction, // https://github.com/nodejs/undici/blob/v5.14.0/lib/core/connect.js#L98
-			},
-		};
-
-		this.maxSockets = Math.max(64, ((this.config.deliverJobConcurrency ?? 128) / (this.config.clusterLimit ?? 1)));
-
-		this.defaultFetcher = this.createFetcher({}, {}, this.logger);
-
-		this.fetch = this.defaultFetcher.fetch;
-		this.request = this.defaultFetcher.request;
-		this.getHtml = this.defaultFetcher.getHtml;
-
-		this.defaultJsonFetcher = this.createFetcher({
-			maxResponseSize: 1024 * 256,
-		}, {}, this.logger);
-
-		this.getJson = this.defaultJsonFetcher.getJson;
-
-		//#region for old http/https, only used in S3Service
+		
 		this.http = new http.Agent({
 			keepAlive: true,
 			keepAliveMsecs: 30 * 1000,
-			lookup: this.dnsCache.lookup,
+			lookup: cache.lookup,
 		} as http.AgentOptions);
 		
 		this.https = new https.Agent({
 			keepAlive: true,
 			keepAliveMsecs: 30 * 1000,
-			lookup: this.dnsCache.lookup,
+			lookup: cache.lookup,
 		} as https.AgentOptions);
-
+		
+		const maxSockets = Math.max(256, config.deliverJobConcurrency ?? 128);
+		
 		this.httpAgent = config.proxy
 			? new HttpProxyAgent({
 				keepAlive: true,
 				keepAliveMsecs: 30 * 1000,
-				maxSockets: this.maxSockets,
+				maxSockets,
 				maxFreeSockets: 256,
 				scheduling: 'lifo',
 				proxy: config.proxy,
@@ -289,47 +72,21 @@ export class HttpRequestService {
 			? new HttpsProxyAgent({
 				keepAlive: true,
 				keepAliveMsecs: 30 * 1000,
-				maxSockets: this.maxSockets,
+				maxSockets,
 				maxFreeSockets: 256,
 				scheduling: 'lifo',
 				proxy: config.proxy,
 			})
 			: this.https;
-		//#endregion
-	}
-
-	@bindThis
-	private getStandardUndiciFetcherOption(opts: undici.Agent.Options = {}, proxyOpts: undici.Agent.Options = {}) {
-		return {
-			agentOptions: {
-				...this.clientDefaults,
-				...opts,
-			},
-			...(this.config.proxy ? {
-				proxy: {
-					uri: this.config.proxy,
-					options: {
-						connections: this.maxSockets,
-						...proxyOpts,
-					},
-				},
-			} : {}),
-			userAgent: this.config.userAgent,
-		};
-	}
-
-	@bindThis
-	public createFetcher(opts: undici.Agent.Options = {}, proxyOpts: undici.Agent.Options = {}, logger: Logger) {
-		return new UndiciFetcher(this.getStandardUndiciFetcherOption(opts, proxyOpts), logger);
 	}
 
 	/**
-	 * Get http agent by URL
+	 * Get agent by URL
 	 * @param url URL
 	 * @param bypassProxy Allways bypass proxy
 	 */
 	@bindThis
-	public getHttpAgentByUrl(url: URL, bypassProxy = false): http.Agent | https.Agent {
+	public getAgentByUrl(url: URL, bypassProxy = false): http.Agent | https.Agent {
 		if (bypassProxy || (this.config.proxyBypassHosts || []).includes(url.hostname)) {
 			return url.protocol === 'http:' ? this.http : this.https;
 		} else {
@@ -337,37 +94,67 @@ export class HttpRequestService {
 		}
 	}
 
-	/**
-	 * check ip
-	 */
 	@bindThis
-	public getConnectorWithIpCheck(connector: undici.buildConnector.connector, checkIp: IpChecker): undici.buildConnector.connectorAsync {
-		return (options, cb) => {
-			connector(options, (err, socket) => {
-				this.logger.debug('Socket connector (with ip checker) called', socket);
-				if (err) {
-					this.logger.error('Socket error', err);
-					cb(new Error(`Error while socket connecting\n${err}`), null);
-					return;
-				}
+	public async getJson(url: string, accept = 'application/json, */*', headers?: Record<string, string>): Promise<unknown> {
+		const res = await this.send(url, {
+			method: 'GET',
+			headers: Object.assign({
+				'User-Agent': this.config.userAgent,
+				Accept: accept,
+			}, headers ?? {}),
+			timeout: 5000,
+			size: 1024 * 256,
+		});
 
-				if (socket.remoteAddress == undefined) {
-					this.logger.error('Socket error: remoteAddress is undefined');
-					cb(new Error('remoteAddress is undefined (maybe socket destroyed)'), null);
-					return;
-				}
+		return await res.json();
+	}
 
-				// allow
-				if (checkIp(socket.remoteAddress)) {
-					this.logger.debug(`Socket connected (ip ok): ${socket.localPort} => ${socket.remoteAddress}`);
-					cb(null, socket);
-					return;
-				}
+	@bindThis
+	public async getHtml(url: string, accept = 'text/html, */*', headers?: Record<string, string>): Promise<string> {
+		const res = await this.send(url, {
+			method: 'GET',
+			headers: Object.assign({
+				'User-Agent': this.config.userAgent,
+				Accept: accept,
+			}, headers ?? {}),
+			timeout: 5000,
+		});
 
-				this.logger.error('IP is not allowed', socket);
-				cb(new StatusError('IP is not allowed', 403, 'IP is not allowed'), null);
-				socket.destroy();
-			});
-		};
+		return await res.text();
+	}
+
+	@bindThis
+	public async send(url: string, args: {
+		method?: string,
+		body?: string,
+		headers?: Record<string, string>,
+		timeout?: number,
+		size?: number,
+	} = {}, extra: {
+		throwErrorWhenResponseNotOk: boolean;
+	} = {
+		throwErrorWhenResponseNotOk: true,
+	}): Promise<Response> {
+		const timeout = args.timeout ?? 5000;
+
+		const controller = new AbortController();
+		setTimeout(() => {
+			controller.abort();
+		}, timeout);
+
+		const res = await fetch(url, {
+			method: args.method ?? 'GET',
+			headers: args.headers,
+			body: args.body,
+			size: args.size ?? 10 * 1024 * 1024,
+			agent: (url) => this.getAgentByUrl(url),
+			signal: controller.signal,
+		});
+
+		if (!res.ok && extra.throwErrorWhenResponseNotOk) {
+			throw new StatusError(`${res.status} ${res.statusText}`, res.status, res.statusText);
+		}
+
+		return res;
 	}
 }
diff --git a/packages/backend/src/core/S3Service.ts b/packages/backend/src/core/S3Service.ts
index 930188ce6..0ce69aaa7 100644
--- a/packages/backend/src/core/S3Service.ts
+++ b/packages/backend/src/core/S3Service.ts
@@ -33,7 +33,7 @@ export class S3Service {
 				? false
 				: meta.objectStorageS3ForcePathStyle,
 			httpOptions: {
-				agent: this.httpRequestService.getHttpAgentByUrl(new URL(u), !meta.objectStorageUseProxy),
+				agent: this.httpRequestService.getAgentByUrl(new URL(u), !meta.objectStorageUseProxy),
 			},
 		});
 	}
diff --git a/packages/backend/src/core/activitypub/ApRequestService.ts b/packages/backend/src/core/activitypub/ApRequestService.ts
index db87475c4..b949f3484 100644
--- a/packages/backend/src/core/activitypub/ApRequestService.ts
+++ b/packages/backend/src/core/activitypub/ApRequestService.ts
@@ -5,16 +5,14 @@ import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import type { User } from '@/models/entities/User.js';
 import { UserKeypairStoreService } from '@/core/UserKeypairStoreService.js';
-import { HttpRequestService, UndiciFetcher } from '@/core/HttpRequestService.js';
+import { HttpRequestService } from '@/core/HttpRequestService.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import { bindThis } from '@/decorators.js';
 import type Logger from '@/logger.js';
-import type { Dispatcher } from 'undici';
-import { DevNull } from '@/misc/dev-null.js';
 
 type Request = {
 	url: string;
-	method: Dispatcher.HttpMethod;
+	method: string;
 	headers: Record<string, string>;
 };
 
@@ -32,7 +30,6 @@ type PrivateKey = {
 
 @Injectable()
 export class ApRequestService {
-	private undiciFetcher: UndiciFetcher;
 	private logger: Logger;
 
 	constructor(
@@ -44,9 +41,6 @@ export class ApRequestService {
 		private loggerService: LoggerService,
 	) {
 		this.logger = this.loggerService.getLogger('ap-request'); // なぜか TypeError: Cannot read properties of undefined (reading 'getLogger') と言われる
-		this.undiciFetcher = this.httpRequestService.createFetcher({
-			maxRedirections: 0,
-		}, {}, this.logger);
 	}
 
 	@bindThis
@@ -165,15 +159,11 @@ export class ApRequestService {
 			},
 		});
 
-		const response = await this.undiciFetcher.request(
-			url,
-			{
-				method: req.request.method,
-				headers: req.request.headers,
-				body,
-			},
-		);
-		response.body.pipe(new DevNull());
+		await this.httpRequestService.send(url, {
+			method: req.request.method,
+			headers: req.request.headers,
+			body,
+		});
 	}
 
 	/**
@@ -195,13 +185,10 @@ export class ApRequestService {
 			},
 		});
 
-		const res = await this.httpRequestService.fetch(
-			url,
-			{
-				method: req.request.method,
-				headers: req.request.headers,
-			},
-		);
+		const res = await this.httpRequestService.send(url, {
+			method: req.request.method,
+			headers: req.request.headers,
+		});
 
 		return await res.json();
 	}
diff --git a/packages/backend/src/core/activitypub/ApResolverService.ts b/packages/backend/src/core/activitypub/ApResolverService.ts
index ca7760af8..8ead29a5f 100644
--- a/packages/backend/src/core/activitypub/ApResolverService.ts
+++ b/packages/backend/src/core/activitypub/ApResolverService.ts
@@ -4,7 +4,7 @@ import { InstanceActorService } from '@/core/InstanceActorService.js';
 import type { NotesRepository, PollsRepository, NoteReactionsRepository, UsersRepository } from '@/models/index.js';
 import type { Config } from '@/config.js';
 import { MetaService } from '@/core/MetaService.js';
-import { HttpRequestService, UndiciFetcher } from '@/core/HttpRequestService.js';
+import { HttpRequestService } from '@/core/HttpRequestService.js';
 import { DI } from '@/di-symbols.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
@@ -19,7 +19,6 @@ import type { IObject, ICollection, IOrderedCollection } from './type.js';
 export class Resolver {
 	private history: Set<string>;
 	private user?: ILocalUser;
-	private undiciFetcher: UndiciFetcher;
 	private logger: Logger;
 
 	constructor(
@@ -39,10 +38,7 @@ export class Resolver {
 		private recursionLimit = 100,
 	) {
 		this.history = new Set();
-		this.logger = this.loggerService?.getLogger('ap-resolve'); // なぜか TypeError: Cannot read properties of undefined (reading 'getLogger') と言われる
-		this.undiciFetcher = this.httpRequestService.createFetcher({
-			maxRedirections: 0,
-		}, {}, this.logger);
+		this.logger = this.loggerService.getLogger('ap-resolve'); // なぜか TypeError: Cannot read properties of undefined (reading 'getLogger') と言われる
 	}
 
 	@bindThis
@@ -106,7 +102,7 @@ export class Resolver {
 
 		const object = (this.user
 			? await this.apRequestService.signedGet(value, this.user) as IObject
-			: await this.undiciFetcher.getJson<IObject>(value, 'application/activity+json, application/ld+json'));
+			: await this.httpRequestService.getJson(value, 'application/activity+json, application/ld+json')) as IObject;
 
 		if (object == null || (
 			Array.isArray(object['@context']) ?
diff --git a/packages/backend/src/core/activitypub/LdSignatureService.ts b/packages/backend/src/core/activitypub/LdSignatureService.ts
index 4e4b7dce2..5a1e01574 100644
--- a/packages/backend/src/core/activitypub/LdSignatureService.ts
+++ b/packages/backend/src/core/activitypub/LdSignatureService.ts
@@ -9,7 +9,7 @@ import { CONTEXTS } from './misc/contexts.js';
 class LdSignature {
 	public debug = false;
 	public preLoad = true;
-	public loderTimeout = 10 * 1000;
+	public loderTimeout = 5000;
 
 	constructor(
 		private httpRequestService: HttpRequestService,
@@ -115,19 +115,12 @@ class LdSignature {
 
 	@bindThis
 	private async fetchDocument(url: string) {
-		const json = await this.httpRequestService.fetch(
-			url,
-			{
-				headers: {
-					Accept: 'application/ld+json, application/json',
-				},
-				// TODO
-				//timeout: this.loderTimeout,
+		const json = await this.httpRequestService.send(url, {
+			headers: {
+				Accept: 'application/ld+json, application/json',
 			},
-			{
-				noOkError: true,
-			}
-		).then(res => {
+			timeout: this.loderTimeout,
+		}, { throwErrorWhenResponseNotOk: false }).then(res => {
 			if (!res.ok) {
 				throw `${res.status} ${res.statusText}`;
 			} else {
diff --git a/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts b/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts
index f0543a5ed..57210b25d 100644
--- a/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts
+++ b/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts
@@ -6,10 +6,10 @@ import type { Config } from '@/config.js';
 import type Logger from '@/logger.js';
 import { HttpRequestService } from '@/core/HttpRequestService.js';
 import { StatusError } from '@/misc/status-error.js';
+import { bindThis } from '@/decorators.js';
 import { QueueLoggerService } from '../QueueLoggerService.js';
 import type Bull from 'bull';
 import type { WebhookDeliverJobData } from '../types.js';
-import { bindThis } from '@/decorators.js';
 
 @Injectable()
 export class WebhookDeliverProcessorService {
@@ -33,26 +33,23 @@ export class WebhookDeliverProcessorService {
 		try {
 			this.logger.debug(`delivering ${job.data.webhookId}`);
 	
-			const res = await this.httpRequestService.fetch(
-				job.data.to,
-				{
-					method: 'POST',
-					headers: {
-						'User-Agent': 'Misskey-Hooks',
-						'X-Misskey-Host': this.config.host,
-						'X-Misskey-Hook-Id': job.data.webhookId,
-						'X-Misskey-Hook-Secret': job.data.secret,
-					},
-					body: JSON.stringify({
-						hookId: job.data.webhookId,
-						userId: job.data.userId,
-						eventId: job.data.eventId,
-						createdAt: job.data.createdAt,
-						type: job.data.type,
-						body: job.data.content,
-					}),
-				}
-			);
+			const res = await this.httpRequestService.send(job.data.to, {
+				method: 'POST',
+				headers: {
+					'User-Agent': 'Misskey-Hooks',
+					'X-Misskey-Host': this.config.host,
+					'X-Misskey-Hook-Id': job.data.webhookId,
+					'X-Misskey-Hook-Secret': job.data.secret,
+				},
+				body: JSON.stringify({
+					hookId: job.data.webhookId,
+					userId: job.data.userId,
+					eventId: job.data.eventId,
+					createdAt: job.data.createdAt,
+					type: job.data.type,
+					body: job.data.content,
+				}),
+			});
 	
 			this.webhooksRepository.update({ id: job.data.webhookId }, {
 				latestSentAt: new Date(),
diff --git a/packages/backend/src/server/api/endpoints/fetch-rss.ts b/packages/backend/src/server/api/endpoints/fetch-rss.ts
index ae6a87513..5849d3111 100644
--- a/packages/backend/src/server/api/endpoints/fetch-rss.ts
+++ b/packages/backend/src/server/api/endpoints/fetch-rss.ts
@@ -33,16 +33,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 		private httpRequestService: HttpRequestService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			const res = await this.httpRequestService.fetch(
-				ps.url,
-				{
-					method: 'GET',
-					headers: {
-						Accept: 'application/rss+xml, */*',
-					},
-					// timeout: 5000,
-				}
-			);
+			const res = await this.httpRequestService.send(ps.url, {
+				method: 'GET',
+				headers: {
+					Accept: 'application/rss+xml, */*',
+				},
+				timeout: 5000,
+			});
 
 			const text = await res.text();
 
diff --git a/packages/backend/src/server/api/endpoints/notes/translate.ts b/packages/backend/src/server/api/endpoints/notes/translate.ts
index ab1977167..66655234a 100644
--- a/packages/backend/src/server/api/endpoints/notes/translate.ts
+++ b/packages/backend/src/server/api/endpoints/notes/translate.ts
@@ -7,8 +7,8 @@ import { DI } from '@/di-symbols.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { MetaService } from '@/core/MetaService.js';
 import { HttpRequestService } from '@/core/HttpRequestService.js';
-import { ApiError } from '../../error.js';
 import { GetterService } from '@/server/api/GetterService.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	tags: ['notes'],
@@ -83,20 +83,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 			const endpoint = instance.deeplIsPro ? 'https://api.deepl.com/v2/translate' : 'https://api-free.deepl.com/v2/translate';
 
-			const res = await this.httpRequestService.fetch(
-				endpoint,
-				{
-					method: 'POST',
-					headers: {
-						'Content-Type': 'application/x-www-form-urlencoded',
-						Accept: 'application/json, */*',
-					},
-					body: params.toString(),
+			const res = await this.httpRequestService.send(endpoint, {
+				method: 'POST',
+				headers: {
+					'Content-Type': 'application/x-www-form-urlencoded',
+					Accept: 'application/json, */*',
 				},
-				{
-					noOkError: false,
-				}
-			);
+				body: params.toString(),
+			});
 
 			const json = (await res.json()) as {
 				translations: {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fdaf1449..bfe98f9a8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -142,7 +142,7 @@ importers:
       file-type: 18.2.0
       fluent-ffmpeg: 2.1.2
       form-data: ^4.0.0
-      got: 12.5.3
+      got: ^12.5.3
       hpagent: 1.2.0
       ioredis: 4.28.5
       ip-cidr: 3.0.11
@@ -201,7 +201,6 @@ importers:
       typeorm: 0.3.11
       typescript: 4.9.4
       ulid: 2.3.0
-      undici: ^5.16.0
       unzipper: 0.10.11
       uuid: 9.0.0
       vary: 1.1.2
@@ -306,7 +305,6 @@ importers:
       typeorm: 0.3.11_ioredis@4.28.5+pg@8.8.0
       typescript: 4.9.4
       ulid: 2.3.0
-      undici: 5.16.0
       unzipper: 0.10.11
       uuid: 9.0.0
       vary: 1.1.2

From 30dce42e039c372b3cb584d97dd6e0878b614f6a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 25 Jan 2023 12:17:53 +0900
Subject: [PATCH 114/177] fix deps

---
 packages/backend/package.json |  6 +++---
 pnpm-lock.yaml                | 10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 586b95f2e..c3b45f6bf 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -125,7 +125,8 @@
 		"web-push": "3.5.0",
 		"websocket": "1.0.34",
 		"ws": "8.12.0",
-		"xev": "3.0.2"
+		"xev": "3.0.2",
+		"node-fetch": "3.3.0"
 	},
 	"devDependencies": {
 		"@redocly/openapi-core": "1.0.0-beta.120",
@@ -181,7 +182,6 @@
 		"eslint-plugin-import": "2.27.5",
 		"execa": "6.1.0",
 		"jest": "29.3.1",
-		"jest-mock": "^29.3.1",
-		"node-fetch": "3.3.0"
+		"jest-mock": "^29.3.1"
 	}
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bfe98f9a8..a6b7699e2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -264,6 +264,7 @@ importers:
       misskey-js: 0.0.14
       ms: 3.0.0-canary.1
       nested-property: 4.0.0
+      node-fetch: 3.3.0
       nodemailer: 6.9.0
       nsfwjs: 2.4.2_@tensorflow+tfjs@4.2.0
       oauth: 0.10.0
@@ -370,7 +371,6 @@ importers:
       execa: 6.1.0
       jest: 29.3.1_@types+node@18.11.18
       jest-mock: 29.3.1
-      node-fetch: 3.3.0
 
   packages/frontend:
     specifiers:
@@ -3799,7 +3799,7 @@ packages:
   /axios/0.24.0:
     resolution: {integrity: sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==}
     dependencies:
-      follow-redirects: 1.15.2_debug@4.3.4
+      follow-redirects: 1.15.2
     transitivePeerDependencies:
       - debug
     dev: false
@@ -3807,7 +3807,7 @@ packages:
   /axios/0.27.2_debug@4.3.4:
     resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
     dependencies:
-      follow-redirects: 1.15.2_debug@4.3.4
+      follow-redirects: 1.15.2
       form-data: 4.0.0
     transitivePeerDependencies:
       - debug
@@ -6971,7 +6971,7 @@ packages:
       readable-stream: 2.3.7
     dev: false
 
-  /follow-redirects/1.15.2_debug@4.3.4:
+  /follow-redirects/1.15.2:
     resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
     engines: {node: '>=4.0'}
     peerDependencies:
@@ -6979,8 +6979,6 @@ packages:
     peerDependenciesMeta:
       debug:
         optional: true
-    dependencies:
-      debug: 4.3.4
 
   /for-each/0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}

From 945c50db1f2e2e2a3612ee327adc5575da4b5ccb Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 25 Jan 2023 12:31:03 +0900
Subject: [PATCH 115/177] Update ApRequestService.ts

---
 packages/backend/src/core/activitypub/ApRequestService.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/core/activitypub/ApRequestService.ts b/packages/backend/src/core/activitypub/ApRequestService.ts
index b949f3484..bfd53dfab 100644
--- a/packages/backend/src/core/activitypub/ApRequestService.ts
+++ b/packages/backend/src/core/activitypub/ApRequestService.ts
@@ -40,7 +40,8 @@ export class ApRequestService {
 		private httpRequestService: HttpRequestService,
 		private loggerService: LoggerService,
 	) {
-		this.logger = this.loggerService.getLogger('ap-request'); // なぜか TypeError: Cannot read properties of undefined (reading 'getLogger') と言われる
+		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+		this.logger = this.loggerService?.getLogger('ap-request'); // なぜか TypeError: Cannot read properties of undefined (reading 'getLogger') と言われる
 	}
 
 	@bindThis

From 3ba5541a6623fc1256c51aade666fd5cdef5c073 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 25 Jan 2023 12:36:39 +0900
Subject: [PATCH 116/177] Update ApResolverService.ts

---
 packages/backend/src/core/activitypub/ApResolverService.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/core/activitypub/ApResolverService.ts b/packages/backend/src/core/activitypub/ApResolverService.ts
index 8ead29a5f..7e962cb12 100644
--- a/packages/backend/src/core/activitypub/ApResolverService.ts
+++ b/packages/backend/src/core/activitypub/ApResolverService.ts
@@ -38,7 +38,8 @@ export class Resolver {
 		private recursionLimit = 100,
 	) {
 		this.history = new Set();
-		this.logger = this.loggerService.getLogger('ap-resolve'); // なぜか TypeError: Cannot read properties of undefined (reading 'getLogger') と言われる
+		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+		this.logger = this.loggerService?.getLogger('ap-resolve'); // なぜか TypeError: Cannot read properties of undefined (reading 'getLogger') と言われる
 	}
 
 	@bindThis

From e3275e916b92d05241bff4b1391d6166c4ab1ec1 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 25 Jan 2023 15:15:15 +0900
Subject: [PATCH 117/177] =?UTF-8?q?fix(client):=20MFM=E3=81=AEposition?=
 =?UTF-8?q?=E3=80=81rotate=E3=80=81scale=E3=81=A7=E5=B0=8F=E6=95=B0?=
 =?UTF-8?q?=E3=81=8C=E4=BD=BF=E3=81=88=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/mfm.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/frontend/src/components/mfm.ts b/packages/frontend/src/components/mfm.ts
index 91875de9c..b9ed9002a 100644
--- a/packages/frontend/src/components/mfm.ts
+++ b/packages/frontend/src/components/mfm.ts
@@ -190,19 +190,19 @@ export default defineComponent({
 							return h(MkSparkle, {}, genEl(token.children));
 						}
 						case 'rotate': {
-							const degrees = parseInt(token.props.args.deg) ?? '90';
+							const degrees = parseFloat(token.props.args.deg) ?? '90';
 							style = `transform: rotate(${degrees}deg); transform-origin: center center;`;
 							break;
 						}
 						case 'position': {
-							const x = parseInt(token.props.args.x ?? '0');
-							const y = parseInt(token.props.args.y ?? '0');
+							const x = parseFloat(token.props.args.x ?? '0');
+							const y = parseFloat(token.props.args.y ?? '0');
 							style = `transform: translateX(${x}em) translateY(${y}em);`;
 							break;
 						}
 						case 'scale': {
-							const x = Math.min(parseInt(token.props.args.x ?? '1'), 5);
-							const y = Math.min(parseInt(token.props.args.y ?? '1'), 5);
+							const x = Math.min(parseFloat(token.props.args.x ?? '1'), 5);
+							const y = Math.min(parseFloat(token.props.args.y ?? '1'), 5);
 							style = `transform: scale(${x}, ${y});`;
 							break;
 						}

From 6721d4216c6276d921fa853d4246d06f1ae2cfc6 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 25 Jan 2023 15:15:29 +0900
Subject: [PATCH 118/177] New Crowdin updates (#9716)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)
---
 locales/uk-UA.yml | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index f000337f3..a77bfa4f8 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -901,6 +901,7 @@ show: "Відображення"
 color: "Колір"
 achievements: "Досягнення"
 _achievements:
+  earnedAt: "Відкрито"
   _types:
     _notes1:
       title: "налаштовую свій msky"
@@ -954,30 +955,72 @@ _achievements:
       flavor: "Так багато потрібно сказати?"
     _login3:
       title: "Новачок I"
+      description: "3 дні користування загально"
     _login7:
       title: "Новачок II"
+      description: "7 днів користування загально"
     _login15:
       title: "Новачок III"
+      description: "15 днів користування загально"
     _login30:
       title: "Міскієць I"
+      description: "30 днів користування загально"
     _login60:
       title: "Міскієць II"
+      description: "60 днів користування загально"
     _login100:
       title: "Міскієць III"
+      description: "100 днів користування загально"
     _login200:
       title: "Завсідник I"
+      description: "200 днів користування загально"
     _login300:
       title: "Завсідник II"
+      description: "300 днів користування загально"
     _login400:
       title: "Завсідник III"
+      description: "400 днів користування загально"
     _login500:
       title: "Ветеран I"
+      description: "500 днів користування загально"
     _login600:
       title: "Ветеран II"
+      description: "600 днів користування загально"
     _login700:
       title: "Ветеран III"
+      description: "700 днів користування загально"
+    _login800:
+      description: "800 днів користування загально"
+    _login900:
+      description: "900 днів користування загально"
     _login1000:
+      description: "1000 днів користування загально"
       flavor: "Дякуємо, що користуєтеся Misskey!"
+    _following50:
+      description: "Кількість підписок сягнула 50"
+    _following100:
+      title: "100 друзів"
+      description: "Кількість підписок сягнула 100"
+    _following300:
+      title: "Надлишок друзів"
+      description: "Кількість підписок сягнула 300"
+    _followers1:
+      title: "Перший підписник"
+      description: "З'явився перший підписник"
+    _followers10:
+      title: "Follow me!"
+      description: "Кількість підписників досягла 10"
+    _followers50:
+      description: "Кількість підписників досягла 50"
+    _followers100:
+      description: "Кількість підписників досягла 100"
+    _followers300:
+      description: "Кількість підписників досягла 300"
+    _followers500:
+      description: "Кількість підписників досягла 500"
+    _followers1000:
+      title: "Інфлюенсер"
+      description: "Кількість підписників досягла 1000"
     _passedSinceAccountCreated3:
       description: "Минуло 3 роки з моменту створення акаунта"
     _loggedInOnBirthday:

From 35fd523edfd7b1b7dfedb5ceb04266f4c2376274 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 25 Jan 2023 15:15:59 +0900
Subject: [PATCH 119/177] 13.2.2

---
 CHANGELOG.md | 8 ++++++++
 package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f2d8ad37..8dd21ce6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,14 @@
 You should also include the user name that made the change.
 -->
 
+## 13.2.2 (2023/01/25)
+### Improvements
+- サーバーのパフォーマンスを改善
+
+### Bugfixes
+- サインイン時に誤ったレートリミットがかかることがある問題を修正
+- MFMのposition、rotate、scaleで小数が使えない問題を修正
+
 ## 13.2.1 (2023/01/24)
 ### Improvements
 - デザインの調整
diff --git a/package.json b/package.json
index 32f1f8394..800ca39ef 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.2.1",
+	"version": "13.2.2",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From 5f49ac1b11ab7927ab17df2bd8a30eaf803e94f4 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 25 Jan 2023 06:21:08 +0000
Subject: [PATCH 120/177] =?UTF-8?q?fix(client):=20=E3=82=A2=E3=83=8B?=
 =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92=E3=82=AA?=
 =?UTF-8?q?=E3=83=95=E3=81=AB=E8=A8=AD=E5=AE=9A=E3=81=97=E3=81=A6=E3=82=82?=
 =?UTF-8?q?=E7=B5=B5=E6=96=87=E5=AD=97=E3=81=AE=E3=82=A2=E3=83=8B=E3=83=A1?=
 =?UTF-8?q?=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=8C=E6=AD=A2=E3=81=BE?=
 =?UTF-8?q?=E3=82=89=E3=81=AA=E3=81=84=20Fix=20#9720?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/global/MkEmoji.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/global/MkEmoji.vue b/packages/frontend/src/components/global/MkEmoji.vue
index 93f50da20..991c6fb7c 100644
--- a/packages/frontend/src/components/global/MkEmoji.vue
+++ b/packages/frontend/src/components/global/MkEmoji.vue
@@ -33,7 +33,7 @@ const url = computed(() => {
 		return char2path(char.value);
 	} else if (props.host == null && !customEmojiName.includes('@')) {
 		const found = customEmojis.find(x => x.name === customEmojiName);
-		return found ? found.url : null;
+		return found ? defaultStore.state.disableShowingAnimatedImages ? getStaticImageUrl(found.url) : found.url : null;
 	} else {
 		const rawUrl = props.host ? `/emoji/${customEmojiName}@${props.host}.webp` : `/emoji/${customEmojiName}.webp`;
 		return defaultStore.state.disableShowingAnimatedImages

From 5ffa106cc1ada8c0680a57cef027114232258870 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 25 Jan 2023 19:34:10 +0900
Subject: [PATCH 121/177] =?UTF-8?q?=E3=82=B5=E3=83=BC=E3=83=89=E3=83=91?=
 =?UTF-8?q?=E3=83=BC=E3=83=86=E3=82=A3=E3=81=8B=E3=82=89=E3=82=82=E8=87=AA?=
 =?UTF-8?q?=E8=BA=AB=E3=81=AE=E3=83=AD=E3=83=BC=E3=83=AB=E3=82=92=E7=A2=BA?=
 =?UTF-8?q?=E8=AA=8D=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Close #9700
---
 packages/backend/src/core/entities/UserEntityService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index 34b523e14..f532b5bf6 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -496,10 +496,10 @@ export class UserEntityService implements OnModuleInit {
 				showTimelineReplies: user.showTimelineReplies ?? falsy,
 				achievements: profile!.achievements,
 				loggedInDays: profile!.loggedInDates.length,
+				policies: this.roleService.getUserPolicies(user.id),
 			} : {}),
 
 			...(opts.includeSecrets ? {
-				policies: this.roleService.getUserPolicies(user.id),
 				email: profile!.email,
 				emailVerified: profile!.emailVerified,
 				securityKeysList: profile!.twoFactorEnabled

From 1e3447bccbbabf09bafabf6df79d9ce3da04a506 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 25 Jan 2023 19:45:25 +0900
Subject: [PATCH 122/177] :art:

---
 packages/frontend/src/components/MkSuperMenu.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/components/MkSuperMenu.vue b/packages/frontend/src/components/MkSuperMenu.vue
index bb2a789b3..5d33ad0ad 100644
--- a/packages/frontend/src/components/MkSuperMenu.vue
+++ b/packages/frontend/src/components/MkSuperMenu.vue
@@ -6,15 +6,15 @@
 		<div class="items">
 			<template v-for="(item, i) in group.items">
 				<a v-if="item.type === 'a'" :href="item.href" :target="item.target" :tabindex="i" class="_button item" :class="{ danger: item.danger, active: item.active }">
-					<i v-if="item.icon" class="icon ti-fw" :class="item.icon"></i>
+					<span v-if="item.icon" class="icon"><i :class="item.icon" class="ti-fw"></i></span>
 					<span class="text">{{ item.text }}</span>
 				</a>
 				<button v-else-if="item.type === 'button'" :tabindex="i" class="_button item" :class="{ danger: item.danger, active: item.active }" :disabled="item.active" @click="ev => item.action(ev)">
-					<i v-if="item.icon" class="icon ti-fw" :class="item.icon"></i>
+					<span v-if="item.icon" class="icon"><i :class="item.icon" class="ti-fw"></i></span>
 					<span class="text">{{ item.text }}</span>
 				</button>
 				<MkA v-else :to="item.to" :tabindex="i" class="_button item" :class="{ danger: item.danger, active: item.active }">
-					<i v-if="item.icon" class="icon ti-fw" :class="item.icon"></i>
+					<span v-if="item.icon" class="icon"><i :class="item.icon" class="ti-fw"></i></span>
 					<span class="text">{{ item.text }}</span>
 				</MkA>
 			</template>

From 80d2e157f6a08d593367b2b933beb2a30b666b83 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 25 Jan 2023 19:49:17 +0900
Subject: [PATCH 123/177] :art:

---
 packages/frontend/src/components/MkMenu.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue
index 94dabcac9..eee77a947 100644
--- a/packages/frontend/src/components/MkMenu.vue
+++ b/packages/frontend/src/components/MkMenu.vue
@@ -335,8 +335,7 @@ onBeforeUnmount(() => {
 }
 
 .icon {
-	margin-right: 5px;
-	width: 20px;
+	margin-right: 8px;
 }
 
 .caret {

From 7131eb1827311186698ebd5aa75d30c5ceafafe4 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 26 Jan 2023 11:31:43 +0900
Subject: [PATCH 124/177] fix(server): turnstile-failed: missing-input-secret

Fix #9726
---
 packages/backend/src/core/CaptchaService.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/CaptchaService.ts b/packages/backend/src/core/CaptchaService.ts
index c8428a26b..7aaa1b833 100644
--- a/packages/backend/src/core/CaptchaService.ts
+++ b/packages/backend/src/core/CaptchaService.ts
@@ -23,9 +23,9 @@ export class CaptchaService {
 	
 		const res = await this.httpRequestService.send(url, {
 			method: 'POST',
-			body: JSON.stringify(params),
+			body: params.toString(),
 			headers: {
-				'Content-Type': 'application/json',
+				'Content-Type': 'application/x-www-form-urlencoded',
 			},
 		}, { throwErrorWhenResponseNotOk: false });
 	

From ec8074cd494da59f35e20cb8bc4e896060343877 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 26 Jan 2023 11:32:43 +0900
Subject: [PATCH 125/177] New Crowdin updates (#9724)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)
---
 locales/uk-UA.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index a77bfa4f8..a85233996 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -956,9 +956,11 @@ _achievements:
     _login3:
       title: "Новачок I"
       description: "3 дні користування загально"
+      flavor: "Відсьогодні називайте мене \"Місскіст\""
     _login7:
       title: "Новачок II"
       description: "7 днів користування загально"
+      flavor: "Ви звикли до цього?"
     _login15:
       title: "Новачок III"
       description: "15 днів користування загально"
@@ -971,6 +973,7 @@ _achievements:
     _login100:
       title: "Міскієць III"
       description: "100 днів користування загально"
+      flavor: "Цей юзер лютий місскіст"
     _login200:
       title: "Завсідник I"
       description: "200 днів користування загально"
@@ -983,6 +986,7 @@ _achievements:
     _login500:
       title: "Ветеран I"
       description: "500 днів користування загально"
+      flavor: "Meine Kameraden, ich liebe sie, die Notizen."
     _login600:
       title: "Ветеран II"
       description: "600 днів користування загально"
@@ -990,13 +994,25 @@ _achievements:
       title: "Ветеран III"
       description: "700 днів користування загально"
     _login800:
+      title: "Майстер нотаток I"
       description: "800 днів користування загально"
     _login900:
+      title: "Майстер нотаток II"
       description: "900 днів користування загально"
     _login1000:
+      title: "Майстер нотаток III"
       description: "1000 днів користування загально"
       flavor: "Дякуємо, що користуєтеся Misskey!"
+    _myNoteFavorited1:
+      title: "У пошуках зірок"
+    _markedAsCat:
+      flavor: "Я дам тобі ім'я пізніше"
+    _following1:
+      title: "Перша підписка"
+    _following10:
+      title: "Продовжуй, продовжуй"
     _following50:
+      title: "Багато друзів"
       description: "Кількість підписок сягнула 50"
     _following100:
       title: "100 друзів"
@@ -1013,6 +1029,7 @@ _achievements:
     _followers50:
       description: "Кількість підписників досягла 50"
     _followers100:
+      title: "Популярна особа"
       description: "Кількість підписників досягла 100"
     _followers300:
       description: "Кількість підписників досягла 300"
@@ -1021,11 +1038,17 @@ _achievements:
     _followers1000:
       title: "Інфлюенсер"
       description: "Кількість підписників досягла 1000"
+    _passedSinceAccountCreated1:
+      title: "Перша річниця"
+    _passedSinceAccountCreated2:
+      title: "Друга річниця"
     _passedSinceAccountCreated3:
+      title: "Третя річниця"
       description: "Минуло 3 роки з моменту створення акаунта"
     _loggedInOnBirthday:
       title: "З Днем народження!"
     _brainDiver:
+      title: "Brain Diver"
       flavor: "Misskey-Misskey La-Tu-Ma"
 _role:
   priority: "Пріоритет"

From 41a6ed0de01f5ddb711e874e6d9cf0f97ab8cb2a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 26 Jan 2023 11:33:31 +0900
Subject: [PATCH 126/177] lint

---
 packages/frontend/src/custom-emojis.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/custom-emojis.ts b/packages/frontend/src/custom-emojis.ts
index 4dd2e0909..0ba7cab5e 100644
--- a/packages/frontend/src/custom-emojis.ts
+++ b/packages/frontend/src/custom-emojis.ts
@@ -1,7 +1,7 @@
-import { apiGet } from './os';
-import { miLocalStorage } from './local-storage';
 import { shallowRef, computed, markRaw } from 'vue';
 import * as Misskey from 'misskey-js';
+import { apiGet } from './os';
+import { miLocalStorage } from './local-storage';
 import { stream } from '@/stream';
 
 const storageCache = miLocalStorage.getItem('emojis');
@@ -13,11 +13,11 @@ export const customEmojiCategories = computed<[ ...string[], null ]>(() => {
 			categories.add(emoji.category);
 		}
 	}
-	return markRaw([ ...Array.from(categories), null ]);
+	return markRaw([...Array.from(categories), null]);
 });
 
 stream.on('emojiAdded', emojiData => {
-	customEmojis.value = [ emojiData.emoji, ...customEmojis.value ];
+	customEmojis.value = [emojiData.emoji, ...customEmojis.value];
 });
 
 stream.on('emojiUpdated', emojiData => {

From d87bb807c30597dd050607b5d37030cc9f27f922 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 26 Jan 2023 11:39:21 +0900
Subject: [PATCH 127/177] tweak error screen

---
 packages/backend/src/server/web/boot.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js
index e635959fc..c6cb25e43 100644
--- a/packages/backend/src/server/web/boot.js
+++ b/packages/backend/src/server/web/boot.js
@@ -154,7 +154,7 @@
 				<path d="M5 19h14a2 2 0 0 0 1.84 -2.75l-7.1 -12.25a2 2 0 0 0 -3.5 0l-7.1 12.25a2 2 0 0 0 1.75 2.75"></path>
 			</svg>
 			<h1>An error has occurred!</h1>
-			<button class="button-big" onclick="location.reload(true);">
+			<button class="button-big" onclick="location.reload();">
 				<span class="button-label-big">Refresh</span>
 			</button>
 			<p class="dont-worry">Don't worry, it's (probably) not your fault.</p>

From aa8adc07aa225838a090bde499343514200bf55c Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 26 Jan 2023 11:40:36 +0900
Subject: [PATCH 128/177] 13.2.3

---
 CHANGELOG.md | 7 +++++++
 package.json | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dd21ce6d..b0dbb6e24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,13 @@
 You should also include the user name that made the change.
 -->
 
+## 13.2.3 (2023/01/26)
+### Improvements
+- カスタム絵文字の更新をリアルタイムで反映するように
+
+### Bugfixes
+- turnstile-failed: missing-input-secret
+
 ## 13.2.2 (2023/01/25)
 ### Improvements
 - サーバーのパフォーマンスを改善
diff --git a/package.json b/package.json
index 800ca39ef..c5a556aea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.2.2",
+	"version": "13.2.3",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From f5d6b8438159952c840865229221fa5a1297afe2 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 26 Jan 2023 14:29:28 +0900
Subject: [PATCH 129/177] chore: check emoji host

---
 packages/backend/src/core/CustomEmojiService.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts
index 1f0b21415..169b7892e 100644
--- a/packages/backend/src/core/CustomEmojiService.ts
+++ b/packages/backend/src/core/CustomEmojiService.ts
@@ -44,11 +44,13 @@ export class CustomEmojiService {
 			type: data.driveFile.webpublicType ?? data.driveFile.type,
 		}).then(x => this.emojisRepository.findOneByOrFail(x.identifiers[0]));
 
-		await this.db.queryResultCache!.remove(['meta_emojis']);
+		if (data.host == null) {
+			await this.db.queryResultCache!.remove(['meta_emojis']);
 
-		this.globalEventService.publishBroadcastStream('emojiAdded', {
-			emoji: await this.emojiEntityService.pack(emoji.id),
-		});
+			this.globalEventService.publishBroadcastStream('emojiAdded', {
+				emoji: await this.emojiEntityService.pack(emoji.id),
+			});
+		}
 
 		return emoji;
 	}

From 452bd6db2501a1f862b167f56230acd40e62731b Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 26 Jan 2023 15:48:12 +0900
Subject: [PATCH 130/177] tweak custom emoji handling

Close #9721
---
 .../backend/src/core/CustomEmojiService.ts    | 132 +++++++++++++++++-
 .../src/core/entities/NoteEntityService.ts    |   8 +-
 .../entities/NotificationEntityService.ts     |   2 +
 .../src/core/entities/UserEntityService.ts    |   1 +
 .../src/components/MkAutocomplete.vue         |   4 +-
 .../frontend/src/components/MkEmojiPicker.vue |   8 +-
 packages/frontend/src/components/MkNote.vue   |   4 +-
 .../src/components/MkNoteDetailed.vue         |   4 +-
 .../frontend/src/components/MkNoteSimple.vue  |   2 +-
 .../src/components/MkReactionIcon.vue         |   4 +-
 .../components/MkReactionsViewer.reaction.vue |   2 +-
 .../src/components/MkSubNoteContent.vue       |   2 +-
 .../src/components/global/MkCustomEmoji.vue   |  61 ++++++++
 .../src/components/global/MkEmoji.vue         |  58 +-------
 .../src/components/global/MkUserName.vue      |   2 +-
 packages/frontend/src/components/index.ts     |   3 +
 packages/frontend/src/components/mfm.ts       |  34 ++++-
 packages/frontend/src/pages/about-misskey.vue |   5 +-
 .../frontend/src/pages/settings/reaction.vue  |   3 +-
 19 files changed, 261 insertions(+), 78 deletions(-)
 create mode 100644 packages/frontend/src/components/global/MkCustomEmoji.vue

diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts
index 169b7892e..2610ad569 100644
--- a/packages/backend/src/core/CustomEmojiService.ts
+++ b/packages/backend/src/core/CustomEmojiService.ts
@@ -6,22 +6,35 @@ import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import type { DriveFile } from '@/models/entities/DriveFile.js';
 import type { Emoji } from '@/models/entities/Emoji.js';
-import type { EmojisRepository } from '@/models/index.js';
+import type { EmojisRepository, Note } from '@/models/index.js';
 import { bindThis } from '@/decorators.js';
+import { Cache } from '@/misc/cache.js';
+import { UtilityService } from '@/core/UtilityService.js';
+import type { Config } from '@/config.js';
+import { ReactionService } from '@/core/ReactionService.js';
+import { query } from '@/misc/prelude/url.js';
 
 @Injectable()
 export class CustomEmojiService {
+	private cache: Cache<Emoji | null>;
+
 	constructor(
+		@Inject(DI.config)
+		private config: Config,
+
 		@Inject(DI.db)
 		private db: DataSource,
 
 		@Inject(DI.emojisRepository)
 		private emojisRepository: EmojisRepository,
 
+		private utilityService: UtilityService,
 		private idService: IdService,
 		private emojiEntityService: EmojiEntityService,
 		private globalEventService: GlobalEventService,
+		private reactionService: ReactionService,
 	) {
+		this.cache = new Cache<Emoji | null>(1000 * 60 * 60 * 12);
 	}
 
 	@bindThis
@@ -54,4 +67,121 @@ export class CustomEmojiService {
 
 		return emoji;
 	}
+
+	@bindThis
+	private normalizeHost(src: string | undefined, noteUserHost: string | null): string | null {
+	// クエリに使うホスト
+		let host = src === '.' ? null	// .はローカルホスト (ここがマッチするのはリアクションのみ)
+			: src === undefined ? noteUserHost	// ノートなどでホスト省略表記の場合はローカルホスト (ここがリアクションにマッチすることはない)
+			: this.utilityService.isSelfHost(src) ? null	// 自ホスト指定
+			: (src || noteUserHost);	// 指定されたホスト || ノートなどの所有者のホスト (こっちがリアクションにマッチすることはない)
+
+		host = this.utilityService.toPunyNullable(host);
+
+		return host;
+	}
+
+	@bindThis
+	private parseEmojiStr(emojiName: string, noteUserHost: string | null) {
+		const match = emojiName.match(/^(\w+)(?:@([\w.-]+))?$/);
+		if (!match) return { name: null, host: null };
+
+		const name = match[1];
+
+		// ホスト正規化
+		const host = this.utilityService.toPunyNullable(this.normalizeHost(match[2], noteUserHost));
+
+		return { name, host };
+	}
+
+	/**
+	 * 添付用(リモート)カスタム絵文字URLを解決する
+	 * @param emojiName ノートやユーザープロフィールに添付された、またはリアクションのカスタム絵文字名 (:は含めない, リアクションでローカルホストの場合は@.を付ける (これはdecodeReactionで可能))
+	 * @param noteUserHost ノートやユーザープロフィールの所有者のホスト
+	 * @returns URL, nullは未マッチを意味する
+	 */
+	@bindThis
+	public async populateEmoji(emojiName: string, noteUserHost: string | null): Promise<string | null> {
+		const { name, host } = this.parseEmojiStr(emojiName, noteUserHost);
+		if (name == null) return null;
+		if (host == null) return null;
+
+		const queryOrNull = async () => (await this.emojisRepository.findOneBy({
+			name,
+			host: host ?? IsNull(),
+		})) ?? null;
+
+		const emoji = await this.cache.fetch(`${name} ${host}`, queryOrNull);
+
+		if (emoji == null) return null;
+
+		const isLocal = emoji.host == null;
+		const emojiUrl = emoji.publicUrl || emoji.originalUrl; // || emoji.originalUrl してるのは後方互換性のため（publicUrlはstringなので??はだめ）
+		const url = isLocal ? emojiUrl : `${this.config.url}/proxy/${encodeURIComponent((new URL(emojiUrl)).pathname)}?${query({ url: emojiUrl })}`;
+
+		return url;
+	}
+
+	/**
+	 * 複数の添付用(リモート)カスタム絵文字URLを解決する (キャシュ付き, 存在しないものは結果から除外される)
+	 */
+	@bindThis
+	public async populateEmojis(emojiNames: string[], noteUserHost: string | null): Promise<Record<string, string>> {
+		const emojis = await Promise.all(emojiNames.map(x => this.populateEmoji(x, noteUserHost)));
+		const res = {} as any;
+		for (let i = 0; i < emojiNames.length; i++) {
+			if (emojis[i] != null) {
+				res[emojiNames[i]] = emojis[i];
+			}
+		}
+		return res;
+	}
+
+	@bindThis
+	public aggregateNoteEmojis(notes: Note[]) {
+		let emojis: { name: string | null; host: string | null; }[] = [];
+		for (const note of notes) {
+			emojis = emojis.concat(note.emojis
+				.map(e => this.parseEmojiStr(e, note.userHost)));
+			if (note.renote) {
+				emojis = emojis.concat(note.renote.emojis
+					.map(e => this.parseEmojiStr(e, note.renote!.userHost)));
+				if (note.renote.user) {
+					emojis = emojis.concat(note.renote.user.emojis
+						.map(e => this.parseEmojiStr(e, note.renote!.userHost)));
+				}
+			}
+			const customReactions = Object.keys(note.reactions).map(x => this.reactionService.decodeReaction(x)).filter(x => x.name != null) as typeof emojis;
+			emojis = emojis.concat(customReactions);
+			if (note.user) {
+				emojis = emojis.concat(note.user.emojis
+					.map(e => this.parseEmojiStr(e, note.userHost)));
+			}
+		}
+		return emojis.filter(x => x.name != null && x.host != null) as { name: string; host: string; }[];
+	}
+
+	/**
+	 * 与えられた絵文字のリストをデータベースから取得し、キャッシュに追加します
+	 */
+	@bindThis
+	public async prefetchEmojis(emojis: { name: string; host: string | null; }[]): Promise<void> {
+		const notCachedEmojis = emojis.filter(emoji => this.cache.get(`${emoji.name} ${emoji.host}`) == null);
+		const emojisQuery: any[] = [];
+		const hosts = new Set(notCachedEmojis.map(e => e.host));
+		for (const host of hosts) {
+			if (host == null) continue;
+			emojisQuery.push({
+				name: In(notCachedEmojis.filter(e => e.host === host).map(e => e.name)),
+				host: host,
+			});
+		}
+		const _emojis = emojisQuery.length > 0 ? await this.emojisRepository.find({
+			where: emojisQuery,
+			select: ['name', 'host', 'originalUrl', 'publicUrl'],
+		}) : [];
+		for (const emoji of _emojis) {
+			this.cache.set(`${emoji.name} ${emoji.host}`, emoji);
+		}
+	}
 }
diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index 2b179643f..bd6971adb 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -282,7 +282,9 @@ export class NoteEntityService implements OnModuleInit {
 				: await this.channelsRepository.findOneBy({ id: note.channelId })
 			: null;
 
-		const reactionEmojiNames = Object.keys(note.reactions).filter(x => x.startsWith(':')).map(x => this.reactionService.decodeReaction(x).reaction).map(x => x.replace(/:/g, ''));
+		const reactionEmojiNames = Object.keys(note.reactions)
+			.filter(x => x.startsWith(':') && x.includes('@') && !x.includes('@.')) // リモートカスタム絵文字のみ
+			.map(x => this.reactionService.decodeReaction(x).reaction.replaceAll(':', ''));
 
 		const packed: Packed<'Note'> = await awaitAll({
 			id: note.id,
@@ -299,6 +301,8 @@ export class NoteEntityService implements OnModuleInit {
 			renoteCount: note.renoteCount,
 			repliesCount: note.repliesCount,
 			reactions: this.reactionService.convertLegacyReactions(note.reactions),
+			reactionEmojis: this.customEmojiService.populateEmojis(reactionEmojiNames, host),
+			emojis: host != null ? this.customEmojiService.populateEmojis(note.emojis, host) : undefined,
 			tags: note.tags.length > 0 ? note.tags : undefined,
 			fileIds: note.fileIds,
 			files: this.driveFileEntityService.packMany(note.fileIds),
@@ -384,6 +388,8 @@ export class NoteEntityService implements OnModuleInit {
 			}
 		}
 
+		await this.customEmojiService.prefetchEmojis(this.customEmojiService.aggregateNoteEmojis(notes));
+
 		return await Promise.all(notes.map(n => this.pack(n, me, {
 			...options,
 			_hint_: {
diff --git a/packages/backend/src/core/entities/NotificationEntityService.ts b/packages/backend/src/core/entities/NotificationEntityService.ts
index a8210eea0..ded1b512a 100644
--- a/packages/backend/src/core/entities/NotificationEntityService.ts
+++ b/packages/backend/src/core/entities/NotificationEntityService.ts
@@ -146,6 +146,8 @@ export class NotificationEntityService implements OnModuleInit {
 			myReactionsMap.set(target, myReactions.find(reaction => reaction.noteId === target) ?? null);
 		}
 
+		await this.customEmojiService.prefetchEmojis(this.customEmojiService.aggregateNoteEmojis(notes));
+
 		return await Promise.all(notifications.map(x => this.pack(x, {
 			_hintForEachNotes_: {
 				myReactions: myReactionsMap,
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index f532b5bf6..546e61a26 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -413,6 +413,7 @@ export class UserEntityService implements OnModuleInit {
 				faviconUrl: instance.faviconUrl,
 				themeColor: instance.themeColor,
 			} : undefined) : undefined,
+			emojis: this.customEmojiService.populateEmojis(user.emojis, user.host),
 			onlineStatus: this.getOnlineStatus(user),
 
 			...(opts.detail ? {
diff --git a/packages/frontend/src/components/MkAutocomplete.vue b/packages/frontend/src/components/MkAutocomplete.vue
index 2cb3aeb3d..27997eb33 100644
--- a/packages/frontend/src/components/MkAutocomplete.vue
+++ b/packages/frontend/src/components/MkAutocomplete.vue
@@ -17,7 +17,7 @@
 	</ol>
 	<ol v-else-if="emojis.length > 0" ref="suggests" :class="$style.list">
 		<li v-for="emoji in emojis" :key="emoji.emoji" :class="$style.item" tabindex="-1" @click="complete(type, emoji.emoji)" @keydown="onKeydown">
-			<MkEmoji :emoji="emoji.emoji" :class="$style.emoji"/>
+			<MkCustomEmoji :name="emoji.emoji" :class="$style.emoji"/>
 			<!-- eslint-disable-next-line vue/no-v-html -->
 			<span v-if="q" :class="$style.emojiName" v-html="sanitizeHtml(emoji.name.replace(q, `<b>${q}</b>`))"></span>
 			<span v-else v-text="emoji.name"></span>
@@ -112,7 +112,7 @@ const emojiDb = computed(() => {
 	customEmojiDB.sort((a, b) => a.name.length - b.name.length);
 	//#endregion
 
-	return markRaw([ ...customEmojiDB, ...unicodeEmojiDB ]);
+	return markRaw([...customEmojiDB, ...unicodeEmojiDB]);
 });
 
 export default {
diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue
index f64cc6e9a..39e274ba1 100644
--- a/packages/frontend/src/components/MkEmojiPicker.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.vue
@@ -12,7 +12,7 @@
 					tabindex="0"
 					@click="chosen(emoji, $event)"
 				>
-					<MkEmoji class="emoji" :emoji="`:${emoji.name}:`"/>
+					<MkCustomEmoji class="emoji" :name="emoji.name"/>
 				</button>
 			</div>
 			<div v-if="searchResultUnicode.length > 0" class="body">
@@ -39,7 +39,8 @@
 						tabindex="0"
 						@click="chosen(emoji, $event)"
 					>
-						<MkEmoji class="emoji" :emoji="emoji" :normal="true"/>
+						<MkCustomEmoji v-if="emoji[0] === ':'" class="emoji" :name="emoji" :normal="true"/>
+						<MkEmoji v-else class="emoji" :emoji="emoji" :normal="true"/>
 					</button>
 				</div>
 			</section>
@@ -53,7 +54,8 @@
 						class="_button item"
 						@click="chosen(emoji, $event)"
 					>
-						<MkEmoji class="emoji" :emoji="emoji" :normal="true"/>
+						<MkCustomEmoji v-if="emoji[0] === ':'" class="emoji" :name="emoji" :normal="true"/>
+						<MkEmoji v-else class="emoji" :emoji="emoji" :normal="true"/>
 					</button>
 				</div>
 			</section>
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 1f6a2883d..351861ac1 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -48,12 +48,12 @@
 					<div :class="$style.text">
 						<span v-if="appearNote.isHidden" style="opacity: 0.5">({{ i18n.ts.private }})</span>
 						<MkA v-if="appearNote.replyId" :class="$style.replyIcon" :to="`/notes/${appearNote.replyId}`"><i class="ti ti-arrow-back-up"></i></MkA>
-						<Mfm v-if="appearNote.text" v-once :text="appearNote.text" :author="appearNote.user" :i="$i"/>
+						<Mfm v-if="appearNote.text" v-once :text="appearNote.text" :author="appearNote.user" :i="$i" :emoji-urls="appearNote.emojis"/>
 						<div v-if="translating || translation" :class="$style.translation">
 							<MkLoading v-if="translating" mini/>
 							<div v-else :class="$style.translated">
 								<b>{{ $t('translatedFrom', { x: translation.sourceLang }) }}: </b>
-								<Mfm :text="translation.text" :author="appearNote.user" :i="$i"/>
+								<Mfm :text="translation.text" :author="appearNote.user" :i="$i" :emoji-urls="appearNote.emojis"/>
 							</div>
 						</div>
 					</div>
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 48ace56d9..0da06c4f1 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -65,13 +65,13 @@
 					<div class="text">
 						<span v-if="appearNote.isHidden" style="opacity: 0.5">({{ i18n.ts.private }})</span>
 						<MkA v-if="appearNote.replyId" class="reply" :to="`/notes/${appearNote.replyId}`"><i class="ti ti-arrow-back-up"></i></MkA>
-						<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i"/>
+						<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :emoji-urls="appearNote.emojis"/>
 						<a v-if="appearNote.renote != null" class="rp">RN:</a>
 						<div v-if="translating || translation" class="translation">
 							<MkLoading v-if="translating" mini/>
 							<div v-else class="translated">
 								<b>{{ $t('translatedFrom', { x: translation.sourceLang }) }}: </b>
-								<Mfm :text="translation.text" :author="appearNote.user" :i="$i"/>
+								<Mfm :text="translation.text" :author="appearNote.user" :i="$i" :emoji-urls="appearNote.emojis"/>
 							</div>
 						</div>
 					</div>
diff --git a/packages/frontend/src/components/MkNoteSimple.vue b/packages/frontend/src/components/MkNoteSimple.vue
index 828bbee5a..757b325a0 100644
--- a/packages/frontend/src/components/MkNoteSimple.vue
+++ b/packages/frontend/src/components/MkNoteSimple.vue
@@ -5,7 +5,7 @@
 		<MkNoteHeader :class="$style.header" :note="note" :mini="true"/>
 		<div>
 			<p v-if="note.cw != null" :class="$style.cw">
-				<Mfm v-if="note.cw != ''" style="margin-right: 8px;" :text="note.cw" :author="note.user" :i="$i"/>
+				<Mfm v-if="note.cw != ''" style="margin-right: 8px;" :text="note.cw" :author="note.user" :i="$i" :emoji-urls="note.emojis"/>
 				<MkCwButton v-model="showContent" :note="note"/>
 			</p>
 			<div v-show="note.cw == null || showContent">
diff --git a/packages/frontend/src/components/MkReactionIcon.vue b/packages/frontend/src/components/MkReactionIcon.vue
index 6e9d2b1a6..29b3f9b85 100644
--- a/packages/frontend/src/components/MkReactionIcon.vue
+++ b/packages/frontend/src/components/MkReactionIcon.vue
@@ -1,5 +1,6 @@
 <template>
-<MkEmoji :emoji="reaction" :is-reaction="true" :normal="true" :no-style="noStyle"/>
+<MkCustomEmoji v-if="reaction[0] === ':'" :name="reaction" :normal="true" :no-style="noStyle" :url="emojiUrl"/>
+<MkEmoji v-else :emoji="reaction" :normal="true" :no-style="noStyle"/>
 </template>
 
 <script lang="ts" setup>
@@ -8,5 +9,6 @@ import { } from 'vue';
 const props = defineProps<{
 	reaction: string;
 	noStyle?: boolean;
+	emojiUrl?: string;
 }>();
 </script>
diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index eed6b4659..83fdf0f98 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -6,7 +6,7 @@
 	:class="[$style.root, { [$style.reacted]: note.myReaction == reaction, [$style.canToggle]: canToggle }]"
 	@click="toggleReaction()"
 >
-	<MkReactionIcon :class="$style.icon" :reaction="reaction"/>
+	<MkReactionIcon :class="$style.icon" :reaction="reaction" :emoji-url="note.reactionEmojis[reaction.substr(1, reaction.length - 2)]"/>
 	<span :class="$style.count">{{ count }}</span>
 </button>
 </template>
diff --git a/packages/frontend/src/components/MkSubNoteContent.vue b/packages/frontend/src/components/MkSubNoteContent.vue
index 482a43f47..7e6833dae 100644
--- a/packages/frontend/src/components/MkSubNoteContent.vue
+++ b/packages/frontend/src/components/MkSubNoteContent.vue
@@ -4,7 +4,7 @@
 		<span v-if="note.isHidden" style="opacity: 0.5">({{ i18n.ts.private }})</span>
 		<span v-if="note.deletedAt" style="opacity: 0.5">({{ i18n.ts.deleted }})</span>
 		<MkA v-if="note.replyId" :class="$style.reply" :to="`/notes/${note.replyId}`"><i class="ti ti-arrow-back-up"></i></MkA>
-		<Mfm v-if="note.text" v-once :text="note.text" :author="note.user" :i="$i"/>
+		<Mfm v-if="note.text" v-once :text="note.text" :author="note.user" :i="$i" :emoji-urls="note.emojis"/>
 		<MkA v-if="note.renoteId" :class="$style.rp" :to="`/notes/${note.renoteId}`">RN: ...</MkA>
 	</div>
 	<details v-if="note.files.length > 0">
diff --git a/packages/frontend/src/components/global/MkCustomEmoji.vue b/packages/frontend/src/components/global/MkCustomEmoji.vue
new file mode 100644
index 000000000..93c47f0c2
--- /dev/null
+++ b/packages/frontend/src/components/global/MkCustomEmoji.vue
@@ -0,0 +1,61 @@
+<template>
+<span v-if="errored">:{{ customEmojiName }}:</span>
+<img v-else :class="[$style.root, { [$style.normal]: normal, [$style.noStyle]: noStyle }]" :src="url" :alt="alt" :title="alt" decoding="async" @error="errored = true" @load="errored = false"/>
+</template>
+
+<script lang="ts" setup>
+import { computed } from 'vue';
+import { getStaticImageUrl } from '@/scripts/media-proxy';
+import { defaultStore } from '@/store';
+import { customEmojis } from '@/custom-emojis';
+
+const props = defineProps<{
+	name: string;
+	normal?: boolean;
+	noStyle?: boolean;
+	host?: string | null;
+	url?: string;
+}>();
+
+const customEmojiName = computed(() => (props.name[0] === ':' ? props.name.substr(1, props.name.length - 2) : props.name).replace('@.', ''));
+const url = computed(() => {
+	if (props.url) {
+		return props.url;
+	} else if (props.host == null && !customEmojiName.value.includes('@')) {
+		const found = customEmojis.value.find(x => x.name === customEmojiName.value);
+		return found ? defaultStore.state.disableShowingAnimatedImages ? getStaticImageUrl(found.url) : found.url : null;
+	} else {
+		const rawUrl = props.host ? `/emoji/${customEmojiName.value}@${props.host}.webp` : `/emoji/${customEmojiName.value}.webp`;
+		return defaultStore.state.disableShowingAnimatedImages
+			? getStaticImageUrl(rawUrl)
+			: rawUrl;
+	}
+});
+const alt = computed(() => `:${customEmojiName.value}:`);
+let errored = $ref(url.value == null);
+</script>
+
+<style lang="scss" module>
+.root {
+	height: 2.5em;
+	vertical-align: middle;
+	transition: transform 0.2s ease;
+
+	&:hover {
+		transform: scale(1.2);
+	}
+}
+
+.normal {
+	height: 1.25em;
+	vertical-align: -0.25em;
+
+	&:hover {
+		transform: none;
+	}
+}
+
+.noStyle {
+	height: auto !important;
+}
+</style>
diff --git a/packages/frontend/src/components/global/MkEmoji.vue b/packages/frontend/src/components/global/MkEmoji.vue
index b554d5e47..1b0d34a44 100644
--- a/packages/frontend/src/components/global/MkEmoji.vue
+++ b/packages/frontend/src/components/global/MkEmoji.vue
@@ -1,54 +1,29 @@
 <template>
-<span v-if="isCustom && errored">:{{ customEmojiName }}:</span>
-<img v-else-if="isCustom" :class="[$style.root, $style.custom, { [$style.normal]: normal, [$style.noStyle]: noStyle }]" :src="url" :alt="alt" :title="alt" decoding="async" @error="errored = true" @load="errored = false"/>
-<img v-else-if="char && !useOsNativeEmojis" :class="$style.root" :src="url" :alt="alt" decoding="async" @pointerenter="computeTitle"/>
-<span v-else-if="char && useOsNativeEmojis" :alt="alt" @pointerenter="computeTitle">{{ char }}</span>
+<img v-if="!useOsNativeEmojis" :class="$style.root" :src="url" :alt="props.emoji" decoding="async" @pointerenter="computeTitle"/>
+<span v-else-if="useOsNativeEmojis" :alt="props.emoji" @pointerenter="computeTitle">{{ props.emoji }}</span>
 <span v-else>{{ emoji }}</span>
 </template>
 
 <script lang="ts" setup>
 import { computed } from 'vue';
-import { getStaticImageUrl } from '@/scripts/media-proxy';
 import { char2twemojiFilePath, char2fluentEmojiFilePath } from '@/scripts/emoji-base';
 import { defaultStore } from '@/store';
 import { getEmojiName } from '@/scripts/emojilist';
-import { customEmojis } from '@/custom-emojis';
 
 const props = defineProps<{
 	emoji: string;
-	normal?: boolean;
-	noStyle?: boolean;
-	isReaction?: boolean;
-	host?: string | null;
 }>();
 
 const char2path = defaultStore.state.emojiStyle === 'twemoji' ? char2twemojiFilePath : char2fluentEmojiFilePath;
 
-const isCustom = computed(() => props.emoji.startsWith(':'));
-const customEmojiName = computed(() => props.emoji.substr(1, props.emoji.length - 2).replace('@.', ''));
-const char = computed(() => isCustom.value ? undefined : props.emoji);
-const useOsNativeEmojis = computed(() => defaultStore.state.emojiStyle === 'native' && !props.isReaction);
+const useOsNativeEmojis = computed(() => defaultStore.state.emojiStyle === 'native');
 const url = computed(() => {
-	if (char.value) {
-		return char2path(char.value);
-	} else if (props.host == null && !customEmojiName.value.includes('@')) {
-		const found = customEmojis.value.find(x => x.name === customEmojiName.value);
-		return found ? defaultStore.state.disableShowingAnimatedImages ? getStaticImageUrl(found.url) : found.url : null;
-	} else {
-		const rawUrl = props.host ? `/emoji/${customEmojiName.value}@${props.host}.webp` : `/emoji/${customEmojiName.value}.webp`;
-		return defaultStore.state.disableShowingAnimatedImages
-			? getStaticImageUrl(rawUrl)
-			: rawUrl;
-	}
+	return char2path(props.emoji);
 });
-const alt = computed(() => isCustom.value ? `:${customEmojiName.value}:` : char.value);
-let errored = $ref(isCustom.value && url.value == null);
 
 // Searching from an array with 2000 items for every emoji felt like too energy-consuming, so I decided to do it lazily on pointerenter
 function computeTitle(event: PointerEvent): void {
-	const title = isCustom.value
-		? `:${customEmojiName.value}:`
-		: (getEmojiName(char.value as string) ?? char.value as string);
+	const title = getEmojiName(props.emoji as string) ?? props.emoji as string;
 	(event.target as HTMLElement).title = title;
 }
 </script>
@@ -58,27 +33,4 @@ function computeTitle(event: PointerEvent): void {
 	height: 1.25em;
 	vertical-align: -0.25em;
 }
-
-.custom {
-	height: 2.5em;
-	vertical-align: middle;
-	transition: transform 0.2s ease;
-
-	&:hover {
-		transform: scale(1.2);
-	}
-}
-
-.normal {
-	height: 1.25em;
-	vertical-align: -0.25em;
-
-	&:hover {
-		transform: none;
-	}
-}
-
-.noStyle {
-	height: auto !important;
-}
 </style>
diff --git a/packages/frontend/src/components/global/MkUserName.vue b/packages/frontend/src/components/global/MkUserName.vue
index fc08310ac..4186a4a4f 100644
--- a/packages/frontend/src/components/global/MkUserName.vue
+++ b/packages/frontend/src/components/global/MkUserName.vue
@@ -1,5 +1,5 @@
 <template>
-<Mfm :text="user.name ?? user.username" :author="user" :plain="true" :nowrap="nowrap"/>
+<Mfm :text="user.name ?? user.username" :author="user" :plain="true" :nowrap="nowrap" :emoji-urls="user.emojis"/>
 </template>
 
 <script lang="ts" setup>
diff --git a/packages/frontend/src/components/index.ts b/packages/frontend/src/components/index.ts
index 863925700..560870f84 100644
--- a/packages/frontend/src/components/index.ts
+++ b/packages/frontend/src/components/index.ts
@@ -5,6 +5,7 @@ import MkA from './global/MkA.vue';
 import MkAcct from './global/MkAcct.vue';
 import MkAvatar from './global/MkAvatar.vue';
 import MkEmoji from './global/MkEmoji.vue';
+import MkCustomEmoji from './global/MkCustomEmoji.vue';
 import MkUserName from './global/MkUserName.vue';
 import MkEllipsis from './global/MkEllipsis.vue';
 import MkTime from './global/MkTime.vue';
@@ -26,6 +27,7 @@ export default function(app: App) {
 	app.component('MkAcct', MkAcct);
 	app.component('MkAvatar', MkAvatar);
 	app.component('MkEmoji', MkEmoji);
+	app.component('MkCustomEmoji', MkCustomEmoji);
 	app.component('MkUserName', MkUserName);
 	app.component('MkEllipsis', MkEllipsis);
 	app.component('MkTime', MkTime);
@@ -47,6 +49,7 @@ declare module '@vue/runtime-core' {
 		MkAcct: typeof MkAcct;
 		MkAvatar: typeof MkAvatar;
 		MkEmoji: typeof MkEmoji;
+		MkCustomEmoji: typeof MkCustomEmoji;
 		MkUserName: typeof MkUserName;
 		MkEllipsis: typeof MkEllipsis;
 		MkTime: typeof MkTime;
diff --git a/packages/frontend/src/components/mfm.ts b/packages/frontend/src/components/mfm.ts
index b9ed9002a..7cfb19aeb 100644
--- a/packages/frontend/src/components/mfm.ts
+++ b/packages/frontend/src/components/mfm.ts
@@ -4,6 +4,7 @@ import MkUrl from '@/components/global/MkUrl.vue';
 import MkLink from '@/components/MkLink.vue';
 import MkMention from '@/components/MkMention.vue';
 import MkEmoji from '@/components/global/MkEmoji.vue';
+import MkCustomEmoji from '@/components/global/MkCustomEmoji.vue';
 import { concat } from '@/scripts/array';
 import MkCode from '@/components/MkCode.vue';
 import MkGoogle from '@/components/MkGoogle.vue';
@@ -47,6 +48,10 @@ export default defineComponent({
 			type: Boolean,
 			default: true,
 		},
+		emojiUrls: {
+			type: Object,
+			default: null,
+		},
 	},
 
 	render() {
@@ -301,20 +306,35 @@ export default defineComponent({
 				}
 
 				case 'emojiCode': {
-					return [h(MkEmoji, {
-						key: Math.random(),
-						emoji: `:${token.props.name}:`,
-						normal: this.plain,
+					// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+					if (this.author?.host == null) {
+						return [h(MkCustomEmoji, {
+							key: Math.random(),
+							name: token.props.name,
+							normal: this.plain,
+							host: null,
+						})];
+					} else {
 						// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-						host: this.author?.host,
-					})];
+						if (this.emojiUrls && (this.emojiUrls[token.props.name] == null)) {
+							return [h('span', `:${token.props.name}:`)];
+						} else {
+							return [h(MkCustomEmoji, {
+								key: Math.random(),
+								name: token.props.name,
+								// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+								url: this.emojiUrls ? this.emojiUrls[token.props.name] : null,
+								normal: this.plain,
+								host: this.author.host,
+							})];
+						}
+					}
 				}
 
 				case 'unicodeEmoji': {
 					return [h(MkEmoji, {
 						key: Math.random(),
 						emoji: token.props.emoji,
-						normal: this.plain,
 					})];
 				}
 
diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index bc63d7159..6d88fecea 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -9,7 +9,10 @@
 						<img src="/client-assets/about-icon.png" alt="" class="icon" draggable="false" @load="iconLoaded" @click="gravity"/>
 						<div class="misskey">Misskey</div>
 						<div class="version">v{{ version }}</div>
-						<span v-for="emoji in easterEggEmojis" :key="emoji.id" class="emoji" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }"><MkEmoji class="emoji" :emoji="emoji.emoji" :is-reaction="false" :normal="true" :no-style="true"/></span>
+						<span v-for="emoji in easterEggEmojis" :key="emoji.id" class="emoji" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }">
+							<MkCustomEmoji v-if="emoji.emoji[0] === ':'" class="emoji" :name="emoji.emoji" :normal="true" :no-style="true"/>
+							<MkEmoji v-else class="emoji" :emoji="emoji.emoji" :normal="true" :no-style="true"/>
+						</span>
 					</div>
 					<button v-if="thereIsTreasure" class="_button treasure" @click="getTreasure"><img src="/fluent-emoji/1f3c6.png" class="treasureImg"></button>
 				</div>
diff --git a/packages/frontend/src/pages/settings/reaction.vue b/packages/frontend/src/pages/settings/reaction.vue
index e307abe2d..c8b47b829 100644
--- a/packages/frontend/src/pages/settings/reaction.vue
+++ b/packages/frontend/src/pages/settings/reaction.vue
@@ -6,7 +6,8 @@
 			<Sortable v-model="reactions" class="zoaiodol" :item-key="item => item" :animation="150" :delay="100" :delay-on-touch-only="true">
 				<template #item="{element}">
 					<button class="_button item" @click="remove(element, $event)">
-						<MkEmoji :emoji="element" :normal="true"/>
+						<MkCustomEmoji v-if="element[0] === ':'" :name="element" :normal="true"/>
+						<MkEmoji v-else :emoji="element" :normal="true"/>
 					</button>
 				</template>
 				<template #footer>

From 4735ae64516a82b525a8dfd16a04c4b91d1f23c0 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 26 Jan 2023 16:06:29 +0900
Subject: [PATCH 131/177] =?UTF-8?q?refactor:=20/proxy=E3=82=92FileServerSe?=
 =?UTF-8?q?rvice=E3=81=AB=E7=B5=B1=E5=90=88=E3=81=97=E3=80=81/proxy?=
 =?UTF-8?q?=E3=81=AEurl=E3=81=A7/files=E3=81=8C=E6=8C=87=E5=AE=9A=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=81=A6=E3=81=84=E3=81=9F=E5=A0=B4=E5=90=88=E3=81=AF?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92?=
 =?UTF-8?q?=E8=A7=A3=E6=B1=BA=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=20(#9709)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* wip?

* clean up

* Implement? HttpFetchService

* :v:

* remove node-fetch

* fix

* refactor

* fix

* gateway timeout

* UndiciFetcherクラスを追加 (仮コミット, ビルドもstartもさせていない)

* fix

* add logger and fix url preview

* fix ip check

* enhance logger and error handling

* fix

* fix

* clean up

* Use custom fetcher for ApRequest / ApResolver

* bypassProxyはproxyBypassHostsに判断を委譲するように

* set maxRedirections (default 3, ApRequest/ApResolver: 0)

* fix

* wip????

* wip

* :v:

* set .node-version

* clean up

* refactor

* clean up

* refactor

* refactor detectRequestType

* rename detectResponseType

* :v:

* fix

* wip

* clean up

* no got

* remove got

* wip

* :v:

* fix

* clean up

* remove unnnecessary const

* good cleanup

* no stream

* Revert "no stream"

This reverts commit 636f9192fcd2b17e71bbf6b5b106b490e0f66244.

* fix

* cache-control: max-age=300 to error

* refactor cleanup
---
 .node-version                                 |   2 +-
 .../src/core/ImageProcessingService.ts        |  32 +-
 packages/backend/src/logger.ts                |   1 +
 .../backend/src/server/FileServerService.ts   | 400 ++++++++++++++----
 .../src/server/MediaProxyServerService.ts     | 177 --------
 packages/backend/src/server/ServerModule.ts   |   2 -
 packages/backend/src/server/ServerService.ts  |   5 +-
 7 files changed, 354 insertions(+), 265 deletions(-)
 delete mode 100644 packages/backend/src/server/MediaProxyServerService.ts

diff --git a/.node-version b/.node-version
index e44a38e08..0e9dc6b58 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-v18.12.1
+v18.13.0
diff --git a/packages/backend/src/core/ImageProcessingService.ts b/packages/backend/src/core/ImageProcessingService.ts
index 312189eea..fbc02f504 100644
--- a/packages/backend/src/core/ImageProcessingService.ts
+++ b/packages/backend/src/core/ImageProcessingService.ts
@@ -9,6 +9,14 @@ export type IImage = {
 	type: string;
 };
 
+export type IImageStream = {
+	data: Readable;
+	ext: string | null;
+	type: string;
+};
+
+export type IImageStreamable = IImage | IImageStream;
+
 export const webpDefault: sharp.WebpOptions = {
 	quality: 85,
 	alphaQuality: 95,
@@ -19,6 +27,7 @@ export const webpDefault: sharp.WebpOptions = {
 };
 
 import { bindThis } from '@/decorators.js';
+import { Readable } from 'node:stream';
 
 @Injectable()
 export class ImageProcessingService {
@@ -64,7 +73,7 @@ export class ImageProcessingService {
 	 */
 	@bindThis
 	public async convertToWebp(path: string, width: number, height: number, options: sharp.WebpOptions = webpDefault): Promise<IImage> {
-		return this.convertSharpToWebp(await sharp(path), width, height, options);
+		return this.convertSharpToWebp(sharp(path), width, height, options);
 	}
 
 	@bindThis
@@ -85,6 +94,27 @@ export class ImageProcessingService {
 		};
 	}
 
+	@bindThis
+	public convertToWebpStream(path: string, width: number, height: number, options: sharp.WebpOptions = webpDefault): IImageStream {
+		return this.convertSharpToWebpStream(sharp(path), width, height, options);
+	}
+
+	@bindThis
+	public convertSharpToWebpStream(sharp: sharp.Sharp, width: number, height: number, options: sharp.WebpOptions = webpDefault): IImageStream {
+		const data = sharp
+			.resize(width, height, {
+				fit: 'inside',
+				withoutEnlargement: true,
+			})
+			.rotate()
+			.webp(options)
+
+		return {
+			data,
+			ext: 'webp',
+			type: 'image/webp',
+		};
+	}
 	/**
 	 * Convert to PNG
 	 *   with resize, remove metadata, resolve orientation, stop animation
diff --git a/packages/backend/src/logger.ts b/packages/backend/src/logger.ts
index e7d705163..5d275bc7b 100644
--- a/packages/backend/src/logger.ts
+++ b/packages/backend/src/logger.ts
@@ -68,6 +68,7 @@ export default class Logger {
 		if (envOption.withLogTime) log = chalk.gray(time) + ' ' + log;
 
 		console.log(important ? chalk.bold(log) : log);
+		if (level === 'error' && data) console.log(data);
 
 		if (store) {
 			if (this.syslogClient) {
diff --git a/packages/backend/src/server/FileServerService.ts b/packages/backend/src/server/FileServerService.ts
index 134b3df32..40024270a 100644
--- a/packages/backend/src/server/FileServerService.ts
+++ b/packages/backend/src/server/FileServerService.ts
@@ -5,14 +5,14 @@ import { Inject, Injectable } from '@nestjs/common';
 import fastifyStatic from '@fastify/static';
 import rename from 'rename';
 import type { Config } from '@/config.js';
-import type { DriveFilesRepository } from '@/models/index.js';
+import type { DriveFile, DriveFilesRepository } from '@/models/index.js';
 import { DI } from '@/di-symbols.js';
 import { createTemp } from '@/misc/create-temp.js';
 import { FILE_TYPE_BROWSERSAFE } from '@/const.js';
 import { StatusError } from '@/misc/status-error.js';
 import type Logger from '@/logger.js';
 import { DownloadService } from '@/core/DownloadService.js';
-import { ImageProcessingService } from '@/core/ImageProcessingService.js';
+import { IImageStreamable, ImageProcessingService, webpDefault } from '@/core/ImageProcessingService.js';
 import { VideoProcessingService } from '@/core/VideoProcessingService.js';
 import { InternalStorageService } from '@/core/InternalStorageService.js';
 import { contentDisposition } from '@/misc/content-disposition.js';
@@ -20,6 +20,8 @@ import { FileInfoService } from '@/core/FileInfoService.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import { bindThis } from '@/decorators.js';
 import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyPluginOptions } from 'fastify';
+import { isMimeImage } from '@/misc/is-mime-image.js';
+import sharp from 'sharp';
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
@@ -57,7 +59,7 @@ export class FileServerService {
 			reply.header('Cache-Control', 'max-age=300');
 		};
 	}
-	
+
 	@bindThis
 	public createServer(fastify: FastifyInstance, options: FastifyPluginOptions, done: (err?: Error) => void) {
 		fastify.addHook('onRequest', (request, reply, done) => {
@@ -70,23 +72,309 @@ export class FileServerService {
 			serve: false,
 		});
 
-		fastify.get('/app-default.jpg', (request, reply) => {
+		fastify.get('/files/app-default.jpg', (request, reply) => {
 			const file = fs.createReadStream(`${_dirname}/assets/dummy.png`);
 			reply.header('Content-Type', 'image/jpeg');
 			reply.header('Cache-Control', 'max-age=31536000, immutable');
 			return reply.send(file);
 		});
 
-		fastify.get<{ Params: { key: string; } }>('/:key', async (request, reply) => await this.sendDriveFile(request, reply));
-		fastify.get<{ Params: { key: string; } }>('/:key/*', async (request, reply) => await this.sendDriveFile(request, reply));
+		fastify.get<{ Params: { key: string; } }>('/files/:key', async (request, reply) => {
+			return await this.sendDriveFile(request, reply)
+				.catch(err => this.errorHandler(request, reply, err));
+		});
+		fastify.get<{ Params: { key: string; } }>('/files/:key/*', async (request, reply) => {
+			return await this.sendDriveFile(request, reply)
+				.catch(err => this.errorHandler(request, reply, err));
+		});
+
+		fastify.get<{
+			Params: { url: string; };
+			Querystring: { url?: string; };
+		}>('/proxy/:url*', async (request, reply) => {
+			return await this.proxyHandler(request, reply)
+				.catch(err => this.errorHandler(request, reply, err));
+		});
 
 		done();
 	}
 
+	@bindThis
+	private async errorHandler(request: FastifyRequest<{ Params?: { [x: string]: any }; Querystring?: { [x: string]: any }; }>, reply: FastifyReply, err?: any) {
+		this.logger.error(`${err}`);
+
+		reply.header('Cache-Control', 'max-age=300');
+
+		if (request.query && 'fallback' in request.query) {
+			return reply.sendFile('/dummy.png', assets);
+		}
+
+		if (err instanceof StatusError && (err.statusCode === 302 || err.isClientError)) {
+			reply.code(err.statusCode);
+			return;
+		}
+
+		reply.code(500);
+		return;
+	}
+
 	@bindThis
 	private async sendDriveFile(request: FastifyRequest<{ Params: { key: string; } }>, reply: FastifyReply) {
 		const key = request.params.key;
+		const file = await this.getFileFromKey(key).then();
 
+		if (file === '404') {
+			reply.code(404);
+			reply.header('Cache-Control', 'max-age=86400');
+			return reply.sendFile('/dummy.png', assets);
+		}
+
+		if (file === '204') {
+			reply.code(204);
+			reply.header('Cache-Control', 'max-age=86400');
+			return;
+		}
+
+		try {
+			if (file.state === 'remote') {
+				const convertFile = async () => {
+					if (file.fileRole === 'thumbnail') {
+						if (['image/jpeg', 'image/webp', 'image/avif', 'image/png', 'image/svg+xml'].includes(file.mime)) {
+							return this.imageProcessingService.convertToWebpStream(
+								file.path,
+								498,
+								280
+							);
+						} else if (file.mime.startsWith('video/')) {
+							return await this.videoProcessingService.generateVideoThumbnail(file.path);
+						}
+					}
+
+					if (file.fileRole === 'webpublic') {
+						if (['image/svg+xml'].includes(file.mime)) {
+							return this.imageProcessingService.convertToWebpStream(
+								file.path,
+								2048,
+								2048,
+								{ ...webpDefault, lossless: true }
+							)
+						}
+					}
+
+					return {
+						data: fs.createReadStream(file.path),
+						ext: file.ext,
+						type: file.mime,
+					};
+				};
+
+				const image = await convertFile();
+
+				if ('pipe' in image.data && typeof image.data.pipe === 'function') {
+					// image.dataがstreamなら、stream終了後にcleanup
+					image.data.on('end', file.cleanup);
+					image.data.on('close', file.cleanup);
+				} else {
+					// image.dataがstreamでないなら直ちにcleanup
+					file.cleanup();
+				}
+
+				reply.header('Content-Type', FILE_TYPE_BROWSERSAFE.includes(image.type) ? image.type : 'application/octet-stream');
+				reply.header('Cache-Control', 'max-age=31536000, immutable');
+				return image.data;
+			}
+
+			if (file.fileRole !== 'original') {
+				const filename = rename(file.file.name, {
+					suffix: file.fileRole === 'thumbnail' ? '-thumb' : '-web',
+					extname: file.ext ? `.${file.ext}` : undefined,
+				}).toString();
+
+				reply.header('Content-Type', FILE_TYPE_BROWSERSAFE.includes(file.mime) ? file.mime : 'application/octet-stream');
+				reply.header('Cache-Control', 'max-age=31536000, immutable');
+				reply.header('Content-Disposition', contentDisposition('inline', filename));
+				return fs.createReadStream(file.path);
+			} else {
+				const stream = fs.createReadStream(file.path);
+				stream.on('error', this.commonReadableHandlerGenerator(reply));
+				reply.header('Content-Type', FILE_TYPE_BROWSERSAFE.includes(file.file.type) ? file.file.type : 'application/octet-stream');
+				reply.header('Cache-Control', 'max-age=31536000, immutable');
+				reply.header('Content-Disposition', contentDisposition('inline', file.file.name));
+				return stream;
+			}
+		} catch (e) {
+			if ('cleanup' in file) file.cleanup();
+			throw e;
+		}
+	}
+
+	@bindThis
+	private async proxyHandler(request: FastifyRequest<{ Params: { url: string; }; Querystring: { url?: string; }; }>, reply: FastifyReply) {
+		const url = 'url' in request.query ? request.query.url : 'https://' + request.params.url;
+
+		if (typeof url !== 'string') {
+			reply.code(400);
+			return;
+		}
+
+		// Create temp file
+		const file = await this.getStreamAndTypeFromUrl(url);
+		if (file === '404') {
+			reply.code(404);
+			reply.header('Cache-Control', 'max-age=86400');
+			return reply.sendFile('/dummy.png', assets);
+		}
+
+		if (file === '204') {
+			reply.code(204);
+			reply.header('Cache-Control', 'max-age=86400');
+			return;
+		}
+
+		try {
+			const isConvertibleImage = isMimeImage(file.mime, 'sharp-convertible-image');
+			const isAnimationConvertibleImage = isMimeImage(file.mime, 'sharp-animation-convertible-image');
+
+			let image: IImageStreamable | null = null;
+			if ('emoji' in request.query && isConvertibleImage) {
+				if (!isAnimationConvertibleImage && !('static' in request.query)) {
+					image = {
+						data: fs.createReadStream(file.path),
+						ext: file.ext,
+						type: file.mime,
+					};
+				} else {
+					const data = sharp(file.path, { animated: !('static' in request.query) })
+							.resize({
+								height: 128,
+								withoutEnlargement: true,
+							})
+							.webp(webpDefault);
+
+					image = {
+						data,
+						ext: 'webp',
+						type: 'image/webp',
+					};
+				}
+			} else if ('static' in request.query && isConvertibleImage) {
+				image = this.imageProcessingService.convertToWebpStream(file.path, 498, 280);
+			} else if ('preview' in request.query && isConvertibleImage) {
+				image = this.imageProcessingService.convertToWebpStream(file.path, 200, 200);
+			} else if ('badge' in request.query) {
+				if (!isConvertibleImage) {
+					// 画像でないなら404でお茶を濁す
+					throw new StatusError('Unexpected mime', 404);
+				}
+
+				const mask = sharp(file.path)
+					.resize(96, 96, {
+						fit: 'inside',
+						withoutEnlargement: false,
+					})
+					.greyscale()
+					.normalise()
+					.linear(1.75, -(128 * 1.75) + 128) // 1.75x contrast
+					.flatten({ background: '#000' })
+					.toColorspace('b-w');
+	
+				const stats = await mask.clone().stats();
+	
+				if (stats.entropy < 0.1) {
+					// エントロピーがあまりない場合は404にする
+					throw new StatusError('Skip to provide badge', 404);
+				}
+	
+				const data = sharp({
+					create: { width: 96, height: 96, channels: 4, background: { r: 0, g: 0, b: 0, alpha: 0 } },
+				})
+					.pipelineColorspace('b-w')
+					.boolean(await mask.png().toBuffer(), 'eor');
+	
+				image = {
+					data: await data.png().toBuffer(),
+					ext: 'png',
+					type: 'image/png',
+				};
+			} else if (file.mime === 'image/svg+xml') {
+				image = this.imageProcessingService.convertToWebpStream(file.path, 2048, 2048);
+			} else if (!file.mime.startsWith('image/') || !FILE_TYPE_BROWSERSAFE.includes(file.mime)) {
+				throw new StatusError('Rejected type', 403, 'Rejected type');
+			}
+
+			if (!image) {
+				image = {
+					data: fs.createReadStream(file.path),
+					ext: file.ext,
+					type: file.mime,
+				};
+			}
+
+			if ('cleanup' in file) {
+				if ('pipe' in image.data && typeof image.data.pipe === 'function') {
+					// image.dataがstreamなら、stream終了後にcleanup
+					image.data.on('end', file.cleanup);
+					image.data.on('close', file.cleanup);
+				} else {
+					// image.dataがstreamでないなら直ちにcleanup
+					file.cleanup();
+				}
+			}
+
+			reply.header('Content-Type', image.type);
+			reply.header('Cache-Control', 'max-age=31536000, immutable');
+			return image.data;
+		} catch (e) {
+			if ('cleanup' in file) file.cleanup();
+			throw e;
+		}
+	}
+
+	@bindThis
+	private async getStreamAndTypeFromUrl(url: string): Promise<
+		{ state: 'remote'; fileRole?: 'thumbnail' | 'webpublic' | 'original'; file?: DriveFile; mime: string; ext: string | null; path: string; cleanup: () => void; }
+		| { state: 'stored_internal'; fileRole: 'thumbnail' | 'webpublic' | 'original'; file: DriveFile; mime: string; ext: string | null; path: string; }
+		| '404'
+		| '204'
+	> {
+		if (url.startsWith(`${this.config.url}/files/`)) {
+			const key = url.replace(`${this.config.url}/files/`, '').split('/').shift();
+			if (!key) throw new StatusError('Invalid File Key', 400, 'Invalid File Key');
+
+			return await this.getFileFromKey(key);
+		}
+
+		return await this.downloadAndDetectTypeFromUrl(url);
+	}
+
+	@bindThis
+	private async downloadAndDetectTypeFromUrl(url: string): Promise<
+		{ state: 'remote' ; mime: string; ext: string | null; path: string; cleanup: () => void; }
+	> {
+		const [path, cleanup] = await createTemp();
+		try {
+			await this.downloadService.downloadUrl(url, path);
+
+			const { mime, ext } = await this.fileInfoService.detectType(path);
+	
+			return {
+				state: 'remote',
+				mime, ext,
+				path, cleanup,
+			}
+		} catch (e) {
+			cleanup();
+			throw e;
+		}
+	}
+
+	@bindThis
+	private async getFileFromKey(key: string): Promise<
+		{ state: 'remote'; fileRole: 'thumbnail' | 'webpublic' | 'original'; file: DriveFile; mime: string; ext: string | null; path: string; cleanup: () => void; }
+		| { state: 'stored_internal'; fileRole: 'thumbnail' | 'webpublic' | 'original'; file: DriveFile; mime: string; ext: string | null; path: string; }
+		| '404'
+		| '204'
+	> {
 		// Fetch drive file
 		const file = await this.driveFilesRepository.createQueryBuilder('file')
 			.where('file.accessKey = :accessKey', { accessKey: key })
@@ -94,89 +382,41 @@ export class FileServerService {
 			.orWhere('file.webpublicAccessKey = :webpublicAccessKey', { webpublicAccessKey: key })
 			.getOne();
 
-		if (file == null) {
-			reply.code(404);
-			reply.header('Cache-Control', 'max-age=86400');
-			return reply.sendFile('/dummy.png', assets);
-		}
+		if (file == null) return '404';
 
 		const isThumbnail = file.thumbnailAccessKey === key;
 		const isWebpublic = file.webpublicAccessKey === key;
 
 		if (!file.storedInternal) {
-			if (file.isLink && file.uri) {	// 期限切れリモートファイル
-				const [path, cleanup] = await createTemp();
-
-				try {
-					await this.downloadService.downloadUrl(file.uri, path);
-
-					const { mime, ext } = await this.fileInfoService.detectType(path);
-
-					const convertFile = async () => {
-						if (isThumbnail) {
-							if (['image/jpeg', 'image/webp', 'image/avif', 'image/png', 'image/svg+xml'].includes(mime)) {
-								return await this.imageProcessingService.convertToWebp(path, 498, 280);
-							} else if (mime.startsWith('video/')) {
-								return await this.videoProcessingService.generateVideoThumbnail(path);
-							}
-						}
-
-						if (isWebpublic) {
-							if (['image/svg+xml'].includes(mime)) {
-								return await this.imageProcessingService.convertToPng(path, 2048, 2048);
-							}
-						}
-
-						return {
-							data: fs.readFileSync(path),
-							ext,
-							type: mime,
-						};
-					};
-
-					const image = await convertFile();
-					reply.header('Content-Type', FILE_TYPE_BROWSERSAFE.includes(image.type) ? image.type : 'application/octet-stream');
-					reply.header('Cache-Control', 'max-age=31536000, immutable');
-					return image.data;
-				} catch (err) {
-					this.logger.error(`${err}`);
-
-					if (err instanceof StatusError && err.isClientError) {
-						reply.code(err.statusCode);
-						reply.header('Cache-Control', 'max-age=86400');
-					} else {
-						reply.code(500);
-						reply.header('Cache-Control', 'max-age=300');
-					}
-				} finally {
-					cleanup();
-				}
-				return;
+			if (!(file.isLink && file.uri)) return '204';
+			const result = await this.downloadAndDetectTypeFromUrl(file.uri);
+			return {
+				...result,
+				fileRole: isThumbnail ? 'thumbnail' : isWebpublic ? 'webpublic' : 'original',
+				file,
 			}
-
-			reply.code(204);
-			reply.header('Cache-Control', 'max-age=86400');
-			return;
 		}
 
-		if (isThumbnail || isWebpublic) {
-			const { mime, ext } = await this.fileInfoService.detectType(this.internalStorageService.resolvePath(key));
-			const filename = rename(file.name, {
-				suffix: isThumbnail ? '-thumb' : '-web',
-				extname: ext ? `.${ext}` : undefined,
-			}).toString();
+		const path = this.internalStorageService.resolvePath(key);
 
-			reply.header('Content-Type', FILE_TYPE_BROWSERSAFE.includes(mime) ? mime : 'application/octet-stream');
-			reply.header('Cache-Control', 'max-age=31536000, immutable');
-			reply.header('Content-Disposition', contentDisposition('inline', filename));
-			return this.internalStorageService.read(key);
-		} else {
-			const readable = this.internalStorageService.read(file.accessKey!);
-			readable.on('error', this.commonReadableHandlerGenerator(reply));
-			reply.header('Content-Type', FILE_TYPE_BROWSERSAFE.includes(file.type) ? file.type : 'application/octet-stream');
-			reply.header('Cache-Control', 'max-age=31536000, immutable');
-			reply.header('Content-Disposition', contentDisposition('inline', file.name));
-			return readable;
+		if (isThumbnail || isWebpublic) {
+			const { mime, ext } = await this.fileInfoService.detectType(path);
+			return {
+				state: 'stored_internal',
+				fileRole: isThumbnail ? 'thumbnail' : 'webpublic',
+				file,
+				mime, ext,
+				path,
+			};
+		}
+
+		return {
+			state: 'stored_internal',
+			fileRole: 'original',
+			file,
+			mime: file.type,
+			ext: null,
+			path,
 		}
 	}
 }
diff --git a/packages/backend/src/server/MediaProxyServerService.ts b/packages/backend/src/server/MediaProxyServerService.ts
deleted file mode 100644
index 5b76f1502..000000000
--- a/packages/backend/src/server/MediaProxyServerService.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-import * as fs from 'node:fs';
-import { fileURLToPath } from 'node:url';
-import { dirname } from 'node:path';
-import { Inject, Injectable } from '@nestjs/common';
-import sharp from 'sharp';
-import fastifyStatic from '@fastify/static';
-import { DI } from '@/di-symbols.js';
-import type { Config } from '@/config.js';
-import { isMimeImage } from '@/misc/is-mime-image.js';
-import { createTemp } from '@/misc/create-temp.js';
-import { DownloadService } from '@/core/DownloadService.js';
-import { ImageProcessingService, webpDefault } from '@/core/ImageProcessingService.js';
-import type { IImage } from '@/core/ImageProcessingService.js';
-import { FILE_TYPE_BROWSERSAFE } from '@/const.js';
-import { StatusError } from '@/misc/status-error.js';
-import type Logger from '@/logger.js';
-import { FileInfoService } from '@/core/FileInfoService.js';
-import { LoggerService } from '@/core/LoggerService.js';
-import { bindThis } from '@/decorators.js';
-import type { FastifyInstance, FastifyPluginOptions, FastifyReply, FastifyRequest } from 'fastify';
-
-const _filename = fileURLToPath(import.meta.url);
-const _dirname = dirname(_filename);
-
-const assets = `${_dirname}/../../src/server/assets/`;
-
-@Injectable()
-export class MediaProxyServerService {
-	private logger: Logger;
-
-	constructor(
-		@Inject(DI.config)
-		private config: Config,
-
-		private fileInfoService: FileInfoService,
-		private downloadService: DownloadService,
-		private imageProcessingService: ImageProcessingService,
-		private loggerService: LoggerService,
-	) {
-		this.logger = this.loggerService.getLogger('server', 'gray', false);
-
-		//this.createServer = this.createServer.bind(this);
-	}
-
-	@bindThis
-	public createServer(fastify: FastifyInstance, options: FastifyPluginOptions, done: (err?: Error) => void) {
-		fastify.addHook('onRequest', (request, reply, done) => {
-			reply.header('Content-Security-Policy', 'default-src \'none\'; img-src \'self\'; media-src \'self\'; style-src \'unsafe-inline\'');
-			done();
-		});
-
-		fastify.register(fastifyStatic, {
-			root: _dirname,
-			serve: false,
-		});
-
-		fastify.get<{
-			Params: { url: string; };
-			Querystring: { url?: string; };
-		}>('/:url*', async (request, reply) => await this.handler(request, reply));
-
-		done();
-	}
-
-	@bindThis
-	private async handler(request: FastifyRequest<{ Params: { url: string; }; Querystring: { url?: string; }; }>, reply: FastifyReply) {
-		const url = 'url' in request.query ? request.query.url : 'https://' + request.params.url;
-	
-		if (typeof url !== 'string') {
-			reply.code(400);
-			return;
-		}
-	
-		// Create temp file
-		const [path, cleanup] = await createTemp();
-	
-		try {
-			await this.downloadService.downloadUrl(url, path);
-	
-			const { mime, ext } = await this.fileInfoService.detectType(path);
-			const isConvertibleImage = isMimeImage(mime, 'sharp-convertible-image');
-			const isAnimationConvertibleImage = isMimeImage(mime, 'sharp-animation-convertible-image');
-	
-			let image: IImage;
-			if ('emoji' in request.query && isConvertibleImage) {
-				if (!isAnimationConvertibleImage && !('static' in request.query)) {
-					image = {
-						data: fs.readFileSync(path),
-						ext,
-						type: mime,
-					};
-				} else {
-					const data = await sharp(path, { animated: !('static' in request.query) })
-					.resize({
-						height: 128,
-						withoutEnlargement: true,
-					})
-					.webp(webpDefault)
-					.toBuffer();
-
-					image = {
-						data,
-						ext: 'webp',
-						type: 'image/webp',
-					};
-				}
-			} else if ('static' in request.query && isConvertibleImage) {
-				image = await this.imageProcessingService.convertToWebp(path, 498, 280);
-			} else if ('preview' in request.query && isConvertibleImage) {
-				image = await this.imageProcessingService.convertToWebp(path, 200, 200);
-			} else if ('badge' in request.query) {
-				if (!isConvertibleImage) {
-					// 画像でないなら404でお茶を濁す
-					throw new StatusError('Unexpected mime', 404);
-				}
-
-				const mask = sharp(path)
-					.resize(96, 96, {
-						fit: 'inside',
-						withoutEnlargement: false,
-					})
-					.greyscale()
-					.normalise()
-					.linear(1.75, -(128 * 1.75) + 128) // 1.75x contrast
-					.flatten({ background: '#000' })
-					.toColorspace('b-w');
-	
-				const stats = await mask.clone().stats();
-	
-				if (stats.entropy < 0.1) {
-					// エントロピーがあまりない場合は404にする
-					throw new StatusError('Skip to provide badge', 404);
-				}
-	
-				const data = sharp({
-					create: { width: 96, height: 96, channels: 4, background: { r: 0, g: 0, b: 0, alpha: 0 } },
-				})
-					.pipelineColorspace('b-w')
-					.boolean(await mask.png().toBuffer(), 'eor');
-	
-				image = {
-					data: await data.png().toBuffer(),
-					ext: 'png',
-					type: 'image/png',
-				};
-			} else if (mime === 'image/svg+xml') {
-				image = await this.imageProcessingService.convertToWebp(path, 2048, 2048, webpDefault);
-			} else if (!mime.startsWith('image/') || !FILE_TYPE_BROWSERSAFE.includes(mime)) {
-				throw new StatusError('Rejected type', 403, 'Rejected type');
-			} else {
-				image = {
-					data: fs.readFileSync(path),
-					ext,
-					type: mime,
-				};
-			}
-	
-			reply.header('Content-Type', image.type);
-			reply.header('Cache-Control', 'max-age=31536000, immutable');
-			return image.data;
-		} catch (err) {
-			this.logger.error(`${err}`);
-
-			if ('fallback' in request.query) {
-				return reply.sendFile('/dummy.png', assets);
-			}
-	
-			if (err instanceof StatusError && (err.statusCode === 302 || err.isClientError)) {
-				reply.code(err.statusCode);
-			} else {
-				reply.code(500);
-			}
-		} finally {
-			cleanup();
-		}
-	}
-}
diff --git a/packages/backend/src/server/ServerModule.ts b/packages/backend/src/server/ServerModule.ts
index 474edafe4..9dc152769 100644
--- a/packages/backend/src/server/ServerModule.ts
+++ b/packages/backend/src/server/ServerModule.ts
@@ -3,7 +3,6 @@ import { EndpointsModule } from '@/server/api/EndpointsModule.js';
 import { CoreModule } from '@/core/CoreModule.js';
 import { ApiCallService } from './api/ApiCallService.js';
 import { FileServerService } from './FileServerService.js';
-import { MediaProxyServerService } from './MediaProxyServerService.js';
 import { NodeinfoServerService } from './NodeinfoServerService.js';
 import { ServerService } from './ServerService.js';
 import { WellKnownServerService } from './WellKnownServerService.js';
@@ -51,7 +50,6 @@ import { UserListChannelService } from './api/stream/channels/user-list.js';
 		UrlPreviewService,
 		ActivityPubServerService,
 		FileServerService,
-		MediaProxyServerService,
 		NodeinfoServerService,
 		ServerService,
 		WellKnownServerService,
diff --git a/packages/backend/src/server/ServerService.ts b/packages/backend/src/server/ServerService.ts
index eb6a3795e..beb3a34ec 100644
--- a/packages/backend/src/server/ServerService.ts
+++ b/packages/backend/src/server/ServerService.ts
@@ -20,7 +20,6 @@ import { NodeinfoServerService } from './NodeinfoServerService.js';
 import { ApiServerService } from './api/ApiServerService.js';
 import { StreamingApiServerService } from './api/StreamingApiServerService.js';
 import { WellKnownServerService } from './WellKnownServerService.js';
-import { MediaProxyServerService } from './MediaProxyServerService.js';
 import { FileServerService } from './FileServerService.js';
 import { ClientServerService } from './web/ClientServerService.js';
 
@@ -48,7 +47,6 @@ export class ServerService {
 		private wellKnownServerService: WellKnownServerService,
 		private nodeinfoServerService: NodeinfoServerService,
 		private fileServerService: FileServerService,
-		private mediaProxyServerService: MediaProxyServerService,
 		private clientServerService: ClientServerService,
 		private globalEventService: GlobalEventService,
 		private loggerService: LoggerService,
@@ -73,8 +71,7 @@ export class ServerService {
 		}
 
 		fastify.register(this.apiServerService.createServer, { prefix: '/api' });
-		fastify.register(this.fileServerService.createServer, { prefix: '/files' });
-		fastify.register(this.mediaProxyServerService.createServer, { prefix: '/proxy' });
+		fastify.register(this.fileServerService.createServer);
 		fastify.register(this.activityPubServerService.createServer);
 		fastify.register(this.nodeinfoServerService.createServer);
 		fastify.register(this.wellKnownServerService.createServer);

From 1d6767ef0c05bf78127afe576b143fd4e59524a7 Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <saschanaz@outlook.com>
Date: Thu, 26 Jan 2023 08:07:15 +0100
Subject: [PATCH 132/177] Try reinstalling cypress in CI (#9694)

---
 .github/workflows/test.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 48e2b19d6..9135b4f60 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -109,8 +109,12 @@ jobs:
     # https://github.com/cypress-io/cypress/issues/4351#issuecomment-559489091
     - name: ALSA Env
       run: echo -e 'pcm.!default {\n type hw\n card 0\n}\n\nctl.!default {\n type hw\n card 0\n}' > ~/.asoundrc
+    # XXX: This tries reinstalling Cypress if the binary is not cached
+    # Remove this when the cache issue is fixed
+    - name: Cypress install
+      run: pnpm exec cypress install
     - name: Cypress run
-      uses: cypress-io/github-action@v4
+      uses: cypress-io/github-action@v5
       with:
         install: false
         start: pnpm start:test

From 1959cb462b352f5bfc72c869ab40a6fc0917ea99 Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <saschanaz@outlook.com>
Date: Thu, 26 Jan 2023 08:08:45 +0100
Subject: [PATCH 133/177] Default to `animation: false` when
 prefers-reduced-motion is set (#9690)

* Default to `animation: false` when prefers-reduced-motion is set

* `.matches`
---
 packages/frontend/src/store.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index b29d9355b..3f1ab6052 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -156,7 +156,7 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	animation: {
 		where: 'device',
-		default: true,
+		default: !matchMedia('(prefers-reduced-motion)').matches,
 	},
 	animatedMfm: {
 		where: 'device',

From b21064ffa410f7c6b9b4654081e6e6d059c6a69e Mon Sep 17 00:00:00 2001
From: hayabusa <10593623+m-hayabusa@users.noreply.github.com>
Date: Thu, 26 Jan 2023 16:10:32 +0900
Subject: [PATCH 134/177] =?UTF-8?q?=E3=83=AA=E3=82=A2=E3=82=AF=E3=82=B7?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E5=B1=A5=E6=AD=B4=E3=81=8C=E5=85=AC=E9=96=8B?=
 =?UTF-8?q?=E3=81=AA=E3=82=89=E3=80=81=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8F=E3=81=A6=E3=82=82?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=20(#9728)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/server/api/endpoints/users/reactions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/endpoints/users/reactions.ts b/packages/backend/src/server/api/endpoints/users/reactions.ts
index 9ec911f32..ac401a60e 100644
--- a/packages/backend/src/server/api/endpoints/users/reactions.ts
+++ b/packages/backend/src/server/api/endpoints/users/reactions.ts
@@ -61,7 +61,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 		super(meta, paramDef, async (ps, me) => {
 			const profile = await this.userProfilesRepository.findOneByOrFail({ userId: ps.userId });
 
-			if (me == null || (me.id !== ps.userId && !profile.publicReactions)) {
+			if ((me == null || me.id !== ps.userId) && !profile.publicReactions) {
 				throw new ApiError(meta.errors.reactionsNotPublic);
 			}
 

From 6670c72f8bfd9cd1c076fe85acdf126fb132d026 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 26 Jan 2023 08:46:21 +0000
Subject: [PATCH 135/177] fix(client): note reacted reflection failed Fix #9730

---
 packages/frontend/src/scripts/use-note-capture.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/frontend/src/scripts/use-note-capture.ts b/packages/frontend/src/scripts/use-note-capture.ts
index 389ee1256..ffe33cccc 100644
--- a/packages/frontend/src/scripts/use-note-capture.ts
+++ b/packages/frontend/src/scripts/use-note-capture.ts
@@ -20,11 +20,8 @@ export function useNoteCapture(props: {
 			case 'reacted': {
 				const reaction = body.reaction;
 
-				if (body.emoji) {
-					const emojis = note.value.emojis || [];
-					if (!emojis.includes(body.emoji)) {
-						note.value.emojis = [...emojis, body.emoji];
-					}
+				if (body.emoji && !(body.emoji.name in note.value.reactionEmojis)) {
+					note.value.reactionEmojis[body.emoji.name] = body.emoji.url;
 				}
 
 				// TODO: reactionsプロパティがない場合ってあったっけ？ なければ || {} は消せる

From d7dda8f6e38ee5486013b8d7a274cc7152a14fa0 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 26 Jan 2023 18:28:17 +0900
Subject: [PATCH 136/177] =?UTF-8?q?=E7=B5=B5=E6=96=87=E5=AD=97=E3=83=94?=
 =?UTF-8?q?=E3=83=83=E3=82=AB=E3=83=BC=E3=81=A7=E3=82=AB=E3=82=B9=E3=82=BF?=
 =?UTF-8?q?=E3=83=A0=E7=B5=B5=E6=96=87=E5=AD=97=E3=81=8C=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E3=81=AE=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkEmojiPicker.section.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkEmojiPicker.section.vue b/packages/frontend/src/components/MkEmojiPicker.section.vue
index acced4479..c418ac2c5 100644
--- a/packages/frontend/src/components/MkEmojiPicker.section.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.section.vue
@@ -11,7 +11,8 @@
 			class="_button item"
 			@click="emit('chosen', emoji, $event)"
 		>
-			<MkEmoji class="emoji" :emoji="emoji" :normal="true"/>
+			<MkCustomEmoji v-if="emoji[0] === ':'" class="emoji" :name="emoji" :normal="true"/>
+			<MkEmoji v-else class="emoji" :emoji="emoji" :normal="true"/>
 		</button>
 	</div>
 </section>

From 7cb13cf83956b534f806bc6d622e3d4d720d5c9e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 26 Jan 2023 18:44:43 +0900
Subject: [PATCH 137/177] =?UTF-8?q?proxyRemoteFiles=E3=81=8Cfalse=E3=81=AA?=
 =?UTF-8?q?=E3=82=89=E3=83=AA=E3=83=A2=E3=83=BC=E3=83=88=E3=82=AB=E3=82=B9?=
 =?UTF-8?q?=E3=82=BF=E3=83=A0=E7=B5=B5=E6=96=87=E5=AD=97=E3=81=AF=E7=9B=B4?=
 =?UTF-8?q?=E3=83=AA=E3=83=B3=E3=81=AB=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/CustomEmojiService.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts
index 2610ad569..39814e1be 100644
--- a/packages/backend/src/core/CustomEmojiService.ts
+++ b/packages/backend/src/core/CustomEmojiService.ts
@@ -117,7 +117,11 @@ export class CustomEmojiService {
 
 		const isLocal = emoji.host == null;
 		const emojiUrl = emoji.publicUrl || emoji.originalUrl; // || emoji.originalUrl してるのは後方互換性のため（publicUrlはstringなので??はだめ）
-		const url = isLocal ? emojiUrl : `${this.config.url}/proxy/${encodeURIComponent((new URL(emojiUrl)).pathname)}?${query({ url: emojiUrl })}`;
+		const url = isLocal
+			? emojiUrl
+			: this.config.proxyRemoteFiles
+				? `${this.config.url}/proxy/${encodeURIComponent((new URL(emojiUrl)).pathname)}?${query({ url: emojiUrl })}`
+				: emojiUrl;
 
 		return url;
 	}

From d37a734379c52b8ad7edc983e3b06a7f3cdb79b6 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 27 Jan 2023 11:10:37 +0900
Subject: [PATCH 138/177] fix(server): fix aggregation of retention

---
 .../processors/AggregateRetentionProcessorService.ts     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts b/packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts
index 4650da76b..da4ae8855 100644
--- a/packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts
+++ b/packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts
@@ -57,8 +57,15 @@ export class AggregateRetentionProcessorService {
 			usersCount: targetUserIds.length,
 		});
 
+		// 今日活動したユーザーを全て取得
+		const activeUsers = await this.usersRepository.findBy({
+			host: IsNull(),
+			lastActiveDate: MoreThan(new Date(Date.now() - (1000 * 60 * 60 * 24))),
+		});
+		const activeUsersIds = activeUsers.map(u => u.id);
+
 		for (const record of pastRecords) {
-			const retention = record.userIds.filter(id => targetUserIds.includes(id)).length;
+			const retention = record.userIds.filter(id => activeUsersIds.includes(id)).length;
 
 			const data = deepClone(record.data);
 			data[dateKey] = retention;

From 269af9d6b9b637ff68f92fb57f1b40c911c3e72a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 27 Jan 2023 11:11:56 +0900
Subject: [PATCH 139/177] =?UTF-8?q?fix(client):=20=E3=83=80=E3=83=83?=
 =?UTF-8?q?=E3=82=B7=E3=83=A5=E3=83=9C=E3=83=BC=E3=83=89=E3=81=A7=E3=82=AA?=
 =?UTF-8?q?=E3=83=B3=E3=83=A9=E3=82=A4=E3=83=B3=E3=83=A6=E3=83=BC=E3=82=B6?=
 =?UTF-8?q?=E3=83=BC=E6=95=B0=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/admin/overview.stats.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/admin/overview.stats.vue b/packages/frontend/src/pages/admin/overview.stats.vue
index ce68222fb..bd636cc3e 100644
--- a/packages/frontend/src/pages/admin/overview.stats.vue
+++ b/packages/frontend/src/pages/admin/overview.stats.vue
@@ -45,7 +45,7 @@
 				<div class="icon"><i class="ti ti-access-point"></i></div>
 				<div class="body">
 					<div class="value">
-						<MkNumber :value="stats.onlineUsersCount" style="margin-right: 0.5em;"/>
+						<MkNumber :value="onlineUsersCount" style="margin-right: 0.5em;"/>
 					</div>
 					<div class="label">Online</div>
 				</div>

From 67d64c936506aa43760fe696d78d5cb60d17a61c Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 27 Jan 2023 11:16:22 +0900
Subject: [PATCH 140/177] refactor

---
 packages/frontend/src/scripts/device-kind.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/scripts/device-kind.ts b/packages/frontend/src/scripts/device-kind.ts
index 544cac060..6bb349c55 100644
--- a/packages/frontend/src/scripts/device-kind.ts
+++ b/packages/frontend/src/scripts/device-kind.ts
@@ -4,7 +4,7 @@ const ua = navigator.userAgent.toLowerCase();
 const isTablet = /ipad/.test(ua) || (/mobile|iphone|android/.test(ua) && window.innerWidth > 700);
 const isSmartphone = !isTablet && /mobile|iphone|android/.test(ua);
 
-export const deviceKind = defaultStore.state.overridedDeviceKind ? defaultStore.state.overridedDeviceKind
+export const deviceKind: 'smartphone' | 'tablet' | 'desktop' = defaultStore.state.overridedDeviceKind ? defaultStore.state.overridedDeviceKind
 	: isSmartphone ? 'smartphone'
 	: isTablet ? 'tablet'
 	: 'desktop';

From cef448f0f290e0ef265dad0ba22e05b1e220ddb7 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 27 Jan 2023 11:18:44 +0900
Subject: [PATCH 141/177] tweak blur setting

---
 packages/frontend/src/store.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 3f1ab6052..f9ad50b30 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -184,11 +184,11 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	useBlurEffectForModal: {
 		where: 'device',
-		default: true,
+		default: !/mobile|iphone|android/.test(navigator.userAgent.toLowerCase()), // 循環参照するのでdevice-kind.tsは参照できない
 	},
 	useBlurEffect: {
 		where: 'device',
-		default: true,
+		default: !/mobile|iphone|android/.test(navigator.userAgent.toLowerCase()), // 循環参照するのでdevice-kind.tsは参照できない
 	},
 	showFixedPostForm: {
 		where: 'device',

From 7d9d1ae7c26d97ba3aa4077f515d308e84a35a64 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 27 Jan 2023 11:28:51 +0900
Subject: [PATCH 142/177] enhance(client): tweak custom emoji cache

---
 packages/frontend/src/custom-emojis.ts         | 15 ++++++++++-----
 packages/frontend/src/pages/settings/index.vue |  5 ++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/frontend/src/custom-emojis.ts b/packages/frontend/src/custom-emojis.ts
index 0ba7cab5e..9ce370e7e 100644
--- a/packages/frontend/src/custom-emojis.ts
+++ b/packages/frontend/src/custom-emojis.ts
@@ -1,6 +1,6 @@
 import { shallowRef, computed, markRaw } from 'vue';
 import * as Misskey from 'misskey-js';
-import { apiGet } from './os';
+import { api, apiGet } from './os';
 import { miLocalStorage } from './local-storage';
 import { stream } from '@/stream';
 
@@ -28,12 +28,17 @@ stream.on('emojiDeleted', emojiData => {
 	customEmojis.value = customEmojis.value.filter(item => !emojiData.emojis.some(search => search.name === item.name));
 });
 
-export async function fetchCustomEmojis() {
+export async function fetchCustomEmojis(force = false) {
 	const now = Date.now();
-	const lastFetchedAt = miLocalStorage.getItem('lastEmojisFetchedAt');
-	if (lastFetchedAt && (now - parseInt(lastFetchedAt)) < 1000 * 60 * 60) return;
 
-	const res = await apiGet('emojis', {});
+	let res;
+	if (force) {
+		res = await api('emojis', {});
+	} else {
+		const lastFetchedAt = miLocalStorage.getItem('lastEmojisFetchedAt');
+		if (lastFetchedAt && (now - parseInt(lastFetchedAt)) < 1000 * 60 * 60) return;
+		res = await apiGet('emojis', {});
+	}
 
 	customEmojis.value = res.emojis;
 	miLocalStorage.setItem('emojis', JSON.stringify(res.emojis));
diff --git a/packages/frontend/src/pages/settings/index.vue b/packages/frontend/src/pages/settings/index.vue
index e1e050ee7..4dbc6ec74 100644
--- a/packages/frontend/src/pages/settings/index.vue
+++ b/packages/frontend/src/pages/settings/index.vue
@@ -34,6 +34,7 @@ import { useRouter } from '@/router';
 import { definePageMetadata, provideMetadataReceiver, setPageMetadata } from '@/scripts/page-metadata';
 import * as os from '@/os';
 import { miLocalStorage } from '@/local-storage';
+import { fetchCustomEmojis } from '@/custom-emojis';
 
 const indexInfo = {
 	title: i18n.ts.settings,
@@ -180,11 +181,13 @@ const menuDef = computed(() => [{
 		type: 'button',
 		icon: 'ti ti-trash',
 		text: i18n.ts.clearCache,
-		action: () => {
+		action: async () => {
+			os.waiting();
 			miLocalStorage.removeItem('locale');
 			miLocalStorage.removeItem('theme');
 			miLocalStorage.removeItem('emojis');
 			miLocalStorage.removeItem('lastEmojisFetchedAt');
+			await fetchCustomEmojis();
 			unisonReload();
 		},
 	}, {

From 7af0e38dd35ed34aadb9c3fb9205792bc73daa85 Mon Sep 17 00:00:00 2001
From: Takuya Yoshida <hawaiianphoto@geekhost.net>
Date: Fri, 27 Jan 2023 11:30:22 +0900
Subject: [PATCH 143/177] Use cache on build (#9639)

---
 .github/workflows/docker-develop.yml |  2 ++
 Dockerfile                           | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
index d2cf4bf62..63dc940e2 100644
--- a/.github/workflows/docker-develop.yml
+++ b/.github/workflows/docker-develop.yml
@@ -31,3 +31,5 @@ jobs:
           push: true
           tags: misskey/misskey:develop
           labels: develop
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/Dockerfile b/Dockerfile
index 47fe31bca..3876b5f6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,12 @@ ARG NODE_VERSION=18.13.0-bullseye
 
 FROM node:${NODE_VERSION} AS builder
 
-RUN apt-get update \
-	&& apt-get install -y --no-install-recommends \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+	--mount=type=cache,target=/var/lib/apt,sharing=locked \
+	rm -f /etc/apt/apt.conf.d/docker-clean \
+	; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \
+	&& apt-get update \
+	&& apt-get install -yqq --no-install-recommends \
 	build-essential
 
 RUN corepack enable
@@ -16,7 +20,8 @@ COPY ["packages/backend/package.json", "./packages/backend/"]
 COPY ["packages/frontend/package.json", "./packages/frontend/"]
 COPY ["packages/sw/package.json", "./packages/sw/"]
 
-RUN pnpm i --frozen-lockfile
+RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \
+	pnpm i --frozen-lockfile --aggregate-output
 
 COPY . ./
 
@@ -30,11 +35,13 @@ FROM node:${NODE_VERSION}-slim AS runner
 ARG UID="991"
 ARG GID="991"
 
-RUN apt-get update \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+	--mount=type=cache,target=/var/lib/apt,sharing=locked \
+	rm -f /etc/apt/apt.conf.d/docker-clean \
+	; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \
+	&& apt-get update \
 	&& apt-get install -y --no-install-recommends \
 	ffmpeg tini \
-	&& apt-get -y clean \
-	&& rm -rf /var/lib/apt/lists/* \
 	&& corepack enable \
 	&& groupadd -g "${GID}" misskey \
 	&& useradd -l -u "${UID}" -g "${GID}" -m -d /misskey misskey

From c5a12ca2c74081cac6255aae114853ba41389d17 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 27 Jan 2023 11:35:04 +0900
Subject: [PATCH 144/177] =?UTF-8?q?fix(client):=20=E3=83=95=E3=82=A9?=
 =?UTF-8?q?=E3=83=AD=E3=83=BC=E7=94=B3=E8=AB=8B=E3=83=BB=E3=83=95=E3=82=A9?=
 =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=81=AE=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=8C?=
 =?UTF-8?q?=E3=80=81=E9=80=9A=E7=9F=A5=E3=81=8B=E3=82=89=E6=B6=88=E3=81=88?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #9717
---
 .../frontend/src/components/MkNotification.vue     | 14 +++++++-------
 .../frontend/src/components/MkNotifications.vue    |  2 +-
 packages/frontend/src/ui/_common_/notification.vue |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue
index a8b8fec34..b51d456ea 100644
--- a/packages/frontend/src/components/MkNotification.vue
+++ b/packages/frontend/src/components/MkNotification.vue
@@ -38,26 +38,26 @@
 		<div v-once :class="$style.content">
 			<MkA v-if="notification.type === 'reaction'" :class="$style.text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
 				<i class="ti ti-quote" :class="$style.quote"></i>
-				<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :author="notification.note.user"/>
+				<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :author="notification.note.user"/>
 				<i class="ti ti-quote" :class="$style.quote"></i>
 			</MkA>
 			<MkA v-else-if="notification.type === 'renote'" :class="$style.text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note.renote)">
 				<i class="ti ti-quote" :class="$style.quote"></i>
-				<Mfm :text="getNoteSummary(notification.note.renote)" :plain="true" :nowrap="!full" :author="notification.note.renote.user"/>
+				<Mfm :text="getNoteSummary(notification.note.renote)" :plain="true" :nowrap="true" :author="notification.note.renote.user"/>
 				<i class="ti ti-quote" :class="$style.quote"></i>
 			</MkA>
 			<MkA v-else-if="notification.type === 'reply'" :class="$style.text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
-				<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :author="notification.note.user"/>
+				<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :author="notification.note.user"/>
 			</MkA>
 			<MkA v-else-if="notification.type === 'mention'" :class="$style.text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
-				<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :author="notification.note.user"/>
+				<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :author="notification.note.user"/>
 			</MkA>
 			<MkA v-else-if="notification.type === 'quote'" :class="$style.text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
-				<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :author="notification.note.user"/>
+				<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :author="notification.note.user"/>
 			</MkA>
 			<MkA v-else-if="notification.type === 'pollEnded'" :class="$style.text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
 				<i class="ti ti-quote" :class="$style.quote"></i>
-				<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :author="notification.note.user"/>
+				<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :author="notification.note.user"/>
 				<i class="ti ti-quote" :class="$style.quote"></i>
 			</MkA>
 			<MkA v-else-if="notification.type === 'achievementEarned'" :class="$style.text" to="/my/achievements">
@@ -68,7 +68,7 @@
 			<span v-else-if="notification.type === 'receiveFollowRequest'" :class="$style.text" style="opacity: 0.6;">{{ i18n.ts.receiveFollowRequest }}<div v-if="full && !followRequestDone"><button class="_textButton" @click="acceptFollowRequest()">{{ i18n.ts.accept }}</button> | <button class="_textButton" @click="rejectFollowRequest()">{{ i18n.ts.reject }}</button></div></span>
 			<span v-else-if="notification.type === 'groupInvited'" :class="$style.text" style="opacity: 0.6;">{{ i18n.ts.groupInvited }}: <b>{{ notification.invitation.group.name }}</b><div v-if="full && !groupInviteDone"><button class="_textButton" @click="acceptGroupInvitation()">{{ i18n.ts.accept }}</button> | <button class="_textButton" @click="rejectGroupInvitation()">{{ i18n.ts.reject }}</button></div></span>
 			<span v-else-if="notification.type === 'app'" :class="$style.text">
-				<Mfm :text="notification.body" :nowrap="!full"/>
+				<Mfm :text="notification.body" :nowrap="false"/>
 			</span>
 		</div>
 	</div>
diff --git a/packages/frontend/src/components/MkNotifications.vue b/packages/frontend/src/components/MkNotifications.vue
index f5ae7bcee..ab5dff8db 100644
--- a/packages/frontend/src/components/MkNotifications.vue
+++ b/packages/frontend/src/components/MkNotifications.vue
@@ -10,7 +10,7 @@
 	<template #default="{ items: notifications }">
 		<MkDateSeparatedList v-slot="{ item: notification }" :class="$style.list" :items="notifications" :no-gap="true">
 			<XNote v-if="['reply', 'quote', 'mention'].includes(notification.type)" :key="notification.id" :note="notification.note"/>
-			<XNotification v-else :key="notification.id" :notification="notification" :with-time="true" :full="false" class="_panel notification"/>
+			<XNotification v-else :key="notification.id" :notification="notification" :with-time="true" :full="true" class="_panel notification"/>
 		</MkDateSeparatedList>
 	</template>
 </MkPagination>
diff --git a/packages/frontend/src/ui/_common_/notification.vue b/packages/frontend/src/ui/_common_/notification.vue
index 1f9c675a1..06dfcb0a2 100644
--- a/packages/frontend/src/ui/_common_/notification.vue
+++ b/packages/frontend/src/ui/_common_/notification.vue
@@ -1,6 +1,6 @@
 <template>
 <div :class="$style.root">
-	<XNotification :notification="notification" class="notification _acrylic"/>
+	<XNotification :notification="notification" class="notification _acrylic" :full="false"/>
 </div>
 </template>
 

From 663999556f8dd416f242d65fc7d714d92dbfb987 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 27 Jan 2023 11:35:27 +0900
Subject: [PATCH 145/177] New Crowdin updates (#9734)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)
---
 locales/uk-UA.yml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index a85233996..a6ba27e4f 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -688,7 +688,7 @@ pageLikesCount: "Кількість отриманих вподобань сто
 pageLikedCount: "Кількість вподобаних сторінок"
 contact: "Контакт"
 useSystemFont: "Використовувати стандартний шрифт системи"
-clips: "Добірка"
+clips: "Добірки"
 experimentalFeatures: "Експериментальні функції"
 developer: "Розробник"
 makeExplorable: "Зробіть обліковий запис видимим у розділі \"Огляд\""
@@ -1003,9 +1003,19 @@ _achievements:
       title: "Майстер нотаток III"
       description: "1000 днів користування загально"
       flavor: "Дякуємо, що користуєтеся Misskey!"
+    _noteClipped1:
+      title: "Не можна не зберегти"
+      description: "Перша нотатка у добірці"
+    _noteFavorited1:
+      title: "Дивитися на зірки"
     _myNoteFavorited1:
       title: "У пошуках зірок"
+    _profileFilled:
+      title: "Повна готовність"
+      description: "Профіль заповнено"
     _markedAsCat:
+      title: "Я кіт"
+      description: "Позначено як акаунт кота"
       flavor: "Я дам тобі ім'я пізніше"
     _following1:
       title: "Перша підписка"
@@ -1034,6 +1044,7 @@ _achievements:
     _followers300:
       description: "Кількість підписників досягла 300"
     _followers500:
+      title: "Радіовежа"
       description: "Кількість підписників досягла 500"
     _followers1000:
       title: "Інфлюенсер"
@@ -1047,6 +1058,8 @@ _achievements:
       description: "Минуло 3 роки з моменту створення акаунта"
     _loggedInOnBirthday:
       title: "З Днем народження!"
+    _loggedInOnNewYearsDay:
+      description: "Увійшли в перший день року"
     _brainDiver:
       title: "Brain Diver"
       flavor: "Misskey-Misskey La-Tu-Ma"
@@ -1586,6 +1599,7 @@ _notification:
   youReceivedFollowRequest: "Ви отримали запит на підписку"
   yourFollowRequestAccepted: "Запит на підписку прийнято"
   youWereInvitedToGroup: "Запрошення до групи"
+  achievementEarned: "Досягнення відкрито"
   _types:
     all: "Все"
     follow: "Підписки"

From d8f33bc0afd5f20a60fa2727c8524ead25a9690f Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 27 Jan 2023 11:40:18 +0900
Subject: [PATCH 146/177] update deps

---
 package.json                   |    2 +-
 packages/backend/package.json  |   16 +-
 packages/frontend/package.json |    8 +-
 packages/sw/package.json       |   12 +-
 pnpm-lock.yaml                 | 1378 +++++++++++++++-----------------
 5 files changed, 652 insertions(+), 764 deletions(-)

diff --git a/package.json b/package.json
index c5a556aea..e1494f064 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
 		"@typescript-eslint/eslint-plugin": "5.49.0",
 		"@typescript-eslint/parser": "5.49.0",
 		"cross-env": "7.0.3",
-		"cypress": "12.3.0",
+		"cypress": "12.4.0",
 		"eslint": "^8.32.0",
 		"start-server-and-test": "1.15.3"
 	},
diff --git a/packages/backend/package.json b/packages/backend/package.json
index c3b45f6bf..f68fde8b4 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -32,8 +32,8 @@
 		"@fastify/cors": "8.2.0",
 		"@fastify/http-proxy": "^8.4.0",
 		"@fastify/multipart": "7.4.0",
-		"@fastify/static": "6.6.1",
-		"@fastify/view": "7.4.0",
+		"@fastify/static": "6.7.0",
+		"@fastify/view": "7.4.1",
 		"@nestjs/common": "9.2.1",
 		"@nestjs/core": "9.2.1",
 		"@nestjs/testing": "9.2.1",
@@ -110,7 +110,7 @@
 		"stringz": "2.1.0",
 		"summaly": "2.7.0",
 		"syslog-pro": "git+https://github.com/misskey-dev/SyslogPro#0.2.9-misskey.2",
-		"systeminformation": "5.17.3",
+		"systeminformation": "5.17.4",
 		"tinycolor2": "1.5.2",
 		"tmp": "0.2.1",
 		"tsc-alias": "1.8.2",
@@ -131,7 +131,7 @@
 	"devDependencies": {
 		"@redocly/openapi-core": "1.0.0-beta.120",
 		"@swc/cli": "^0.1.59",
-		"@swc/core": "1.3.27",
+		"@swc/core": "1.3.29",
 		"@swc/jest": "0.2.24",
 		"@types/accepts": "1.3.5",
 		"@types/archiver": "5.3.1",
@@ -143,11 +143,11 @@
 		"@types/escape-regexp": "0.0.1",
 		"@types/fluent-ffmpeg": "2.1.20",
 		"@types/ioredis": "4.28.10",
-		"@types/jest": "29.2.6",
+		"@types/jest": "29.4.0",
 		"@types/js-yaml": "4.0.5",
 		"@types/jsdom": "20.0.1",
 		"@types/jsonld": "1.5.8",
-		"@types/jsrsasign": "10.5.4",
+		"@types/jsrsasign": "10.5.5",
 		"@types/mime-types": "2.1.1",
 		"@types/node": "18.11.18",
 		"@types/node-fetch": "3.0.3",
@@ -181,7 +181,7 @@
 		"eslint": "8.32.0",
 		"eslint-plugin-import": "2.27.5",
 		"execa": "6.1.0",
-		"jest": "29.3.1",
-		"jest-mock": "^29.3.1"
+		"jest": "29.4.1",
+		"jest-mock": "^29.4.1"
 	}
 }
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index da568a9ea..12f890aa5 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -12,7 +12,7 @@
 		"@rollup/plugin-json": "6.0.0",
 		"@rollup/pluginutils": "5.0.2",
 		"@syuilo/aiscript": "0.12.2",
-		"@tabler/icons-webfont": "^2.0.0",
+		"@tabler/icons-webfont": "^2.1.2",
 		"@vitejs/plugin-vue": "4.0.0",
 		"@vue/compiler-sfc": "3.2.45",
 		"autobind-decorator": "2.4.0",
@@ -44,7 +44,7 @@
 		"punycode": "2.3.0",
 		"querystring": "0.2.1",
 		"rndstr": "1.0.0",
-		"rollup": "3.10.1",
+		"rollup": "3.11.0",
 		"s-age": "1.1.2",
 		"sanitize-html": "^2.8.1",
 		"sass": "1.57.1",
@@ -53,7 +53,7 @@
 		"stringz": "2.1.0",
 		"syuilo-password-strength": "0.0.1",
 		"textarea-caret": "3.1.0",
-		"three": "0.148.0",
+		"three": "0.149.0",
 		"throttle-debounce": "5.0.0",
 		"tinycolor2": "1.5.2",
 		"tsc-alias": "1.8.2",
@@ -86,7 +86,7 @@
 		"@typescript-eslint/parser": "5.49.0",
 		"@vue/runtime-core": "3.2.45",
 		"cross-env": "7.0.3",
-		"cypress": "12.3.0",
+		"cypress": "12.4.0",
 		"eslint": "8.32.0",
 		"eslint-plugin-import": "2.27.5",
 		"eslint-plugin-vue": "9.9.0",
diff --git a/packages/sw/package.json b/packages/sw/package.json
index 163cdf592..ef46112da 100644
--- a/packages/sw/package.json
+++ b/packages/sw/package.json
@@ -7,15 +7,15 @@
 		"lint": "tsc --noEmit && eslint --quiet src/**/*.ts"
 	},
 	"dependencies": {
-		"esbuild": "^0.14.42",
-		"idb-keyval": "^6.1.0",
+		"esbuild": "^0.17.4",
+		"idb-keyval": "^6.2.0",
 		"misskey-js": "0.0.14"
 	},
 	"devDependencies": {
-		"@typescript-eslint/parser": "^5.45.0",
-		"@typescript/lib-webworker": "npm:@types/serviceworker@^0.0.58",
-		"eslint": "^8.16.0",
-		"eslint-plugin-import": "^2.26.0",
+		"@typescript-eslint/parser": "^5.49.0",
+		"@typescript/lib-webworker": "npm:@types/serviceworker@0.0.61",
+		"eslint": "^8.32.0",
+		"eslint-plugin-import": "^2.27.5",
 		"typescript": "4.9.4"
 	}
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a6b7699e2..dda76c38f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -14,7 +14,7 @@ importers:
       '@typescript-eslint/eslint-plugin': 5.49.0
       '@typescript-eslint/parser': 5.49.0
       cross-env: 7.0.3
-      cypress: 12.3.0
+      cypress: 12.4.0
       eslint: ^8.32.0
       execa: 5.1.1
       gulp: 4.0.2
@@ -42,7 +42,7 @@ importers:
       '@typescript-eslint/eslint-plugin': 5.49.0_iu322prlnwsygkcra5kbpy22si
       '@typescript-eslint/parser': 5.49.0_7uibuqfxkfaozanbtbziikiqje
       cross-env: 7.0.3
-      cypress: 12.3.0
+      cypress: 12.4.0
       eslint: 8.32.0
       start-server-and-test: 1.15.3
 
@@ -57,8 +57,8 @@ importers:
       '@fastify/cors': 8.2.0
       '@fastify/http-proxy': ^8.4.0
       '@fastify/multipart': 7.4.0
-      '@fastify/static': 6.6.1
-      '@fastify/view': 7.4.0
+      '@fastify/static': 6.7.0
+      '@fastify/view': 7.4.1
       '@nestjs/common': 9.2.1
       '@nestjs/core': 9.2.1
       '@nestjs/testing': 9.2.1
@@ -66,7 +66,7 @@ importers:
       '@redocly/openapi-core': 1.0.0-beta.120
       '@sinonjs/fake-timers': 10.0.2
       '@swc/cli': ^0.1.59
-      '@swc/core': 1.3.27
+      '@swc/core': 1.3.29
       '@swc/jest': 0.2.24
       '@tensorflow/tfjs': ^4.2.0
       '@tensorflow/tfjs-node': 4.2.0
@@ -80,11 +80,11 @@ importers:
       '@types/escape-regexp': 0.0.1
       '@types/fluent-ffmpeg': 2.1.20
       '@types/ioredis': 4.28.10
-      '@types/jest': 29.2.6
+      '@types/jest': 29.4.0
       '@types/js-yaml': 4.0.5
       '@types/jsdom': 20.0.1
       '@types/jsonld': 1.5.8
-      '@types/jsrsasign': 10.5.4
+      '@types/jsrsasign': 10.5.5
       '@types/mime-types': 2.1.1
       '@types/node': 18.11.18
       '@types/node-fetch': 3.0.3
@@ -147,8 +147,8 @@ importers:
       ioredis: 4.28.5
       ip-cidr: 3.0.11
       is-svg: 4.3.2
-      jest: 29.3.1
-      jest-mock: ^29.3.1
+      jest: 29.4.1
+      jest-mock: ^29.4.1
       js-yaml: 4.1.0
       jsdom: 21.1.0
       json5: 2.2.3
@@ -192,7 +192,7 @@ importers:
       stringz: 2.1.0
       summaly: 2.7.0
       syslog-pro: git+https://github.com/misskey-dev/SyslogPro#0.2.9-misskey.2
-      systeminformation: 5.17.3
+      systeminformation: 5.17.4
       tinycolor2: 1.5.2
       tmp: 0.2.1
       tsc-alias: 1.8.2
@@ -218,8 +218,8 @@ importers:
       '@fastify/cors': 8.2.0
       '@fastify/http-proxy': 8.4.0
       '@fastify/multipart': 7.4.0
-      '@fastify/static': 6.6.1
-      '@fastify/view': 7.4.0
+      '@fastify/static': 6.7.0
+      '@fastify/view': 7.4.1
       '@nestjs/common': 9.2.1_mnr6j2del53muneqly5h4y27ai
       '@nestjs/core': 9.2.1_b4pxbpa7chblgbyake5iz5rdmu
       '@nestjs/testing': 9.2.1_hjcqpoaebdr7gdo5hgc22hthbe
@@ -297,7 +297,7 @@ importers:
       stringz: 2.1.0
       summaly: 2.7.0
       syslog-pro: github.com/misskey-dev/SyslogPro/2772b33fa126784fc6e21377786471a918b22dc7
-      systeminformation: 5.17.3
+      systeminformation: 5.17.4
       tinycolor2: 1.5.2
       tmp: 0.2.1
       tsc-alias: 1.8.2
@@ -318,9 +318,9 @@ importers:
       '@tensorflow/tfjs-node': 4.2.0_seedrandom@3.0.5
     devDependencies:
       '@redocly/openapi-core': 1.0.0-beta.120
-      '@swc/cli': 0.1.59_2w2rsb5d2wh3txrlxuiknf4vra
-      '@swc/core': 1.3.27
-      '@swc/jest': 0.2.24_@swc+core@1.3.27
+      '@swc/cli': 0.1.59_dbbgdut2njxjatv5n3st5z6gqa
+      '@swc/core': 1.3.29
+      '@swc/jest': 0.2.24_@swc+core@1.3.29
       '@types/accepts': 1.3.5
       '@types/archiver': 5.3.1
       '@types/bcryptjs': 2.4.2
@@ -331,11 +331,11 @@ importers:
       '@types/escape-regexp': 0.0.1
       '@types/fluent-ffmpeg': 2.1.20
       '@types/ioredis': 4.28.10
-      '@types/jest': 29.2.6
+      '@types/jest': 29.4.0
       '@types/js-yaml': 4.0.5
       '@types/jsdom': 20.0.1
       '@types/jsonld': 1.5.8
-      '@types/jsrsasign': 10.5.4
+      '@types/jsrsasign': 10.5.5
       '@types/mime-types': 2.1.1
       '@types/node': 18.11.18
       '@types/node-fetch': 3.0.3
@@ -369,8 +369,8 @@ importers:
       eslint: 8.32.0
       eslint-plugin-import: 2.27.5_6savw6y3b7jng6f64kgkyoij64
       execa: 6.1.0
-      jest: 29.3.1_@types+node@18.11.18
-      jest-mock: 29.3.1
+      jest: 29.4.1_@types+node@18.11.18
+      jest-mock: 29.4.1
 
   packages/frontend:
     specifiers:
@@ -379,7 +379,7 @@ importers:
       '@rollup/plugin-json': 6.0.0
       '@rollup/pluginutils': 5.0.2
       '@syuilo/aiscript': 0.12.2
-      '@tabler/icons-webfont': ^2.0.0
+      '@tabler/icons-webfont': ^2.1.2
       '@types/escape-regexp': 0.0.1
       '@types/glob': 8.0.1
       '@types/gulp': 4.0.10
@@ -413,7 +413,7 @@ importers:
       compare-versions: 5.0.1
       cropperjs: 2.0.0-beta.2
       cross-env: 7.0.3
-      cypress: 12.3.0
+      cypress: 12.4.0
       date-fns: 2.29.3
       escape-regexp: 0.0.1
       eslint: 8.32.0
@@ -433,7 +433,7 @@ importers:
       punycode: 2.3.0
       querystring: 0.2.1
       rndstr: 1.0.0
-      rollup: 3.10.1
+      rollup: 3.11.0
       s-age: 1.1.2
       sanitize-html: ^2.8.1
       sass: 1.57.1
@@ -443,7 +443,7 @@ importers:
       stringz: 2.1.0
       syuilo-password-strength: 0.0.1
       textarea-caret: 3.1.0
-      three: 0.148.0
+      three: 0.149.0
       throttle-debounce: 5.0.0
       tinycolor2: 1.5.2
       tsc-alias: 1.8.2
@@ -460,11 +460,11 @@ importers:
       vuedraggable: next
     dependencies:
       '@discordapp/twemoji': 14.0.2
-      '@rollup/plugin-alias': 4.0.3_rollup@3.10.1
-      '@rollup/plugin-json': 6.0.0_rollup@3.10.1
-      '@rollup/pluginutils': 5.0.2_rollup@3.10.1
+      '@rollup/plugin-alias': 4.0.3_rollup@3.11.0
+      '@rollup/plugin-json': 6.0.0_rollup@3.11.0
+      '@rollup/pluginutils': 5.0.2_rollup@3.11.0
       '@syuilo/aiscript': 0.12.2
-      '@tabler/icons-webfont': 2.0.0
+      '@tabler/icons-webfont': 2.1.2
       '@vitejs/plugin-vue': 4.0.0_vite@4.0.4+vue@3.2.45
       '@vue/compiler-sfc': 3.2.45
       autobind-decorator: 2.4.0
@@ -496,7 +496,7 @@ importers:
       punycode: 2.3.0
       querystring: 0.2.1
       rndstr: 1.0.0
-      rollup: 3.10.1
+      rollup: 3.11.0
       s-age: 1.1.2
       sanitize-html: 2.8.1
       sass: 1.57.1
@@ -505,7 +505,7 @@ importers:
       stringz: 2.1.0
       syuilo-password-strength: 0.0.1
       textarea-caret: 3.1.0
-      three: 0.148.0
+      three: 0.149.0
       throttle-debounce: 5.0.0
       tinycolor2: 1.5.2
       tsc-alias: 1.8.2
@@ -537,7 +537,7 @@ importers:
       '@typescript-eslint/parser': 5.49.0_7uibuqfxkfaozanbtbziikiqje
       '@vue/runtime-core': 3.2.45
       cross-env: 7.0.3
-      cypress: 12.3.0
+      cypress: 12.4.0
       eslint: 8.32.0
       eslint-plugin-import: 2.27.5_6savw6y3b7jng6f64kgkyoij64
       eslint-plugin-vue: 9.9.0_eslint@8.32.0
@@ -547,23 +547,23 @@ importers:
 
   packages/sw:
     specifiers:
-      '@typescript-eslint/parser': ^5.45.0
-      '@typescript/lib-webworker': npm:@types/serviceworker@^0.0.58
-      esbuild: ^0.14.42
-      eslint: ^8.16.0
-      eslint-plugin-import: ^2.26.0
-      idb-keyval: ^6.1.0
+      '@typescript-eslint/parser': ^5.49.0
+      '@typescript/lib-webworker': npm:@types/serviceworker@0.0.61
+      esbuild: ^0.17.4
+      eslint: ^8.32.0
+      eslint-plugin-import: ^2.27.5
+      idb-keyval: ^6.2.0
       misskey-js: 0.0.14
       typescript: 4.9.4
     dependencies:
-      esbuild: 0.14.54
+      esbuild: 0.17.4
       idb-keyval: 6.2.0
       misskey-js: 0.0.14
     devDependencies:
-      '@typescript-eslint/parser': 5.48.1_iukboom6ndih5an6iafl45j2fe
-      '@typescript/lib-webworker': /@types/serviceworker/0.0.58
-      eslint: 8.31.0
-      eslint-plugin-import: 2.27.4_qdjeohovcytra7xto5vgmxssaq
+      '@typescript-eslint/parser': 5.49.0_7uibuqfxkfaozanbtbziikiqje
+      '@typescript/lib-webworker': /@types/serviceworker/0.0.61
+      eslint: 8.32.0
+      eslint-plugin-import: 2.27.5_6savw6y3b7jng6f64kgkyoij64
       typescript: 4.9.4
 
 packages:
@@ -922,8 +922,8 @@ packages:
     dependencies:
       '@bull-board/api': 4.11.0
       '@bull-board/ui': 4.11.0
-      '@fastify/static': 6.6.1
-      '@fastify/view': 7.4.0
+      '@fastify/static': 6.7.0
+      '@fastify/view': 7.4.1
       ejs: 3.1.8
     transitivePeerDependencies:
       - supports-color
@@ -1096,6 +1096,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/android-arm/0.17.4:
+    resolution: {integrity: sha512-R9GCe2xl2XDSc2XbQB63mFiFXHIVkOP+ltIxICKXqUPrFX97z6Z7vONCLQM1pSOLGqfLrGi3B7nbhxmFY/fomg==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@esbuild/android-arm64/0.16.17:
     resolution: {integrity: sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==}
     engines: {node: '>=12'}
@@ -1105,6 +1114,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/android-arm64/0.17.4:
+    resolution: {integrity: sha512-91VwDrl4EpxBCiG6h2LZZEkuNvVZYJkv2T9gyLG/mhGG1qrM7i5SwUcg/hlSPnL/4hDT0TFcF35/XMGSn0bemg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@esbuild/android-x64/0.16.17:
     resolution: {integrity: sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==}
     engines: {node: '>=12'}
@@ -1114,6 +1132,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/android-x64/0.17.4:
+    resolution: {integrity: sha512-mGSqhEPL7029XL7QHNPxPs15JVa02hvZvysUcyMP9UXdGFwncl2WU0bqx+Ysgzd+WAbv8rfNa73QveOxAnAM2w==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@esbuild/darwin-arm64/0.16.17:
     resolution: {integrity: sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==}
     engines: {node: '>=12'}
@@ -1123,6 +1150,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/darwin-arm64/0.17.4:
+    resolution: {integrity: sha512-tTyJRM9dHvlMPt1KrBFVB5OW1kXOsRNvAPtbzoKazd5RhD5/wKlXk1qR2MpaZRYwf4WDMadt0Pv0GwxB41CVow==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@esbuild/darwin-x64/0.16.17:
     resolution: {integrity: sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==}
     engines: {node: '>=12'}
@@ -1132,6 +1168,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/darwin-x64/0.17.4:
+    resolution: {integrity: sha512-phQuC2Imrb3TjOJwLN8EO50nb2FHe8Ew0OwgZDH1SV6asIPGudnwTQtighDF2EAYlXChLoMJwqjAp4vAaACq6w==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@esbuild/freebsd-arm64/0.16.17:
     resolution: {integrity: sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==}
     engines: {node: '>=12'}
@@ -1141,6 +1186,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/freebsd-arm64/0.17.4:
+    resolution: {integrity: sha512-oH6JUZkocgmjzzYaP5juERLpJQSwazdjZrTPgLRmAU2bzJ688x0vfMB/WTv4r58RiecdHvXOPC46VtsMy/mepg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@esbuild/freebsd-x64/0.16.17:
     resolution: {integrity: sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==}
     engines: {node: '>=12'}
@@ -1150,6 +1204,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/freebsd-x64/0.17.4:
+    resolution: {integrity: sha512-U4iWGn/9TrAfpAdfd56eO0pRxIgb0a8Wj9jClrhT8hvZnOnS4dfMPW7o4fn15D/KqoiVYHRm43jjBaTt3g/2KA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@esbuild/linux-arm/0.16.17:
     resolution: {integrity: sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==}
     engines: {node: '>=12'}
@@ -1159,6 +1222,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/linux-arm/0.17.4:
+    resolution: {integrity: sha512-S2s9xWTGMTa/fG5EyMGDeL0wrWVgOSQcNddJWgu6rG1NCSXJHs76ZP9AsxjB3f2nZow9fWOyApklIgiTGZKhiw==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@esbuild/linux-arm64/0.16.17:
     resolution: {integrity: sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==}
     engines: {node: '>=12'}
@@ -1168,6 +1240,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/linux-arm64/0.17.4:
+    resolution: {integrity: sha512-UkGfQvYlwOaeYJzZG4cLV0hCASzQZnKNktRXUo3/BMZvdau40AOz9GzmGA063n1piq6VrFFh43apRDQx8hMP2w==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@esbuild/linux-ia32/0.16.17:
     resolution: {integrity: sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==}
     engines: {node: '>=12'}
@@ -1177,10 +1258,10 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/linux-loong64/0.14.54:
-    resolution: {integrity: sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==}
+  /@esbuild/linux-ia32/0.17.4:
+    resolution: {integrity: sha512-3lqFi4VFo/Vwvn77FZXeLd0ctolIJH/uXkH3yNgEk89Eh6D3XXAC9/iTPEzeEpsNE5IqGIsFa5Z0iPeOh25IyA==}
     engines: {node: '>=12'}
-    cpu: [loong64]
+    cpu: [ia32]
     os: [linux]
     requiresBuild: true
     dev: false
@@ -1195,6 +1276,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/linux-loong64/0.17.4:
+    resolution: {integrity: sha512-HqpWZkVslDHIwdQ9D+gk7NuAulgQvRxF9no54ut/M55KEb3mi7sQS3GwpPJzSyzzP0UkjQVN7/tbk88/CaX4EQ==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@esbuild/linux-mips64el/0.16.17:
     resolution: {integrity: sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==}
     engines: {node: '>=12'}
@@ -1204,6 +1294,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/linux-mips64el/0.17.4:
+    resolution: {integrity: sha512-d/nMCKKh/SVDbqR9ju+b78vOr0tNXtfBjcp5vfHONCCOAL9ad8gN9dC/u+UnH939pz7wO+0u/x9y1MaZcb/lKA==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@esbuild/linux-ppc64/0.16.17:
     resolution: {integrity: sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==}
     engines: {node: '>=12'}
@@ -1213,6 +1312,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/linux-ppc64/0.17.4:
+    resolution: {integrity: sha512-lOD9p2dmjZcNiTU+sGe9Nn6G3aYw3k0HBJies1PU0j5IGfp6tdKOQ6mzfACRFCqXjnBuTqK7eTYpwx09O5LLfg==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@esbuild/linux-riscv64/0.16.17:
     resolution: {integrity: sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==}
     engines: {node: '>=12'}
@@ -1222,6 +1330,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/linux-riscv64/0.17.4:
+    resolution: {integrity: sha512-mTGnwWwVshAjGsd8rP+K6583cPDgxOunsqqldEYij7T5/ysluMHKqUIT4TJHfrDFadUwrghAL6QjER4FeqQXoA==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@esbuild/linux-s390x/0.16.17:
     resolution: {integrity: sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==}
     engines: {node: '>=12'}
@@ -1231,6 +1348,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/linux-s390x/0.17.4:
+    resolution: {integrity: sha512-AQYuUGp50XM29/N/dehADxvc2bUqDcoqrVuijop1Wv72SyxT6dDB9wjUxuPZm2HwIM876UoNNBMVd+iX/UTKVQ==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@esbuild/linux-x64/0.16.17:
     resolution: {integrity: sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==}
     engines: {node: '>=12'}
@@ -1240,6 +1366,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/linux-x64/0.17.4:
+    resolution: {integrity: sha512-+AsFBwKgQuhV2shfGgA9YloxLDVjXgUEWZum7glR5lLmV94IThu/u2JZGxTgjYby6kyXEx8lKOqP5rTEVBR0Rw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@esbuild/netbsd-x64/0.16.17:
     resolution: {integrity: sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==}
     engines: {node: '>=12'}
@@ -1249,6 +1384,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/netbsd-x64/0.17.4:
+    resolution: {integrity: sha512-zD1TKYX9553OiLS/qkXPMlWoELYkH/VkzRYNKEU+GwFiqkq0SuxsKnsCg5UCdxN3cqd+1KZ8SS3R+WG/Hxy2jQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@esbuild/openbsd-x64/0.16.17:
     resolution: {integrity: sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==}
     engines: {node: '>=12'}
@@ -1258,6 +1402,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/openbsd-x64/0.17.4:
+    resolution: {integrity: sha512-PY1NjEsLRhPEFFg1AV0/4Or/gR+q2dOb9s5rXcPuCjyHRzbt8vnHJl3vYj+641TgWZzTFmSUnZbzs1zwTzjeqw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@esbuild/sunos-x64/0.16.17:
     resolution: {integrity: sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==}
     engines: {node: '>=12'}
@@ -1267,6 +1420,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/sunos-x64/0.17.4:
+    resolution: {integrity: sha512-B3Z7s8QZQW9tKGleMRXvVmwwLPAUoDCHs4WZ2ElVMWiortLJFowU1NjAhXOKjDgC7o9ByeVcwyOlJ+F2r6ZgmQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@esbuild/win32-arm64/0.16.17:
     resolution: {integrity: sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==}
     engines: {node: '>=12'}
@@ -1276,6 +1438,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/win32-arm64/0.17.4:
+    resolution: {integrity: sha512-0HCu8R3mY/H5V7N6kdlsJkvrT591bO/oRZy8ztF1dhgNU5xD5tAh5bKByT1UjTGjp/VVBsl1PDQ3L18SfvtnBQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@esbuild/win32-ia32/0.16.17:
     resolution: {integrity: sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==}
     engines: {node: '>=12'}
@@ -1285,6 +1456,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/win32-ia32/0.17.4:
+    resolution: {integrity: sha512-VUjhVDQycse1gLbe06pC/uaA0M+piQXJpdpNdhg8sPmeIZZqu5xPoGWVCmcsOO2gaM2cywuTYTHkXRozo3/Nkg==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@esbuild/win32-x64/0.16.17:
     resolution: {integrity: sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==}
     engines: {node: '>=12'}
@@ -1294,6 +1474,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/win32-x64/0.17.4:
+    resolution: {integrity: sha512-0kLAjs+xN5OjhTt/aUA6t48SfENSCKgGPfExADYTOo/UCn0ivxos9/anUVeSfg+L+2O9xkFxvJXIJfG+Q4sYSg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@eslint/eslintrc/1.4.1:
     resolution: {integrity: sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -1422,8 +1611,8 @@ packages:
       - supports-color
     dev: false
 
-  /@fastify/static/6.6.1:
-    resolution: {integrity: sha512-sylhlmhclqwkyZy/SD5wzd4yjmMuqW8cRmfnuPXPhftZuEwJ8G2apm0kECQRnHJnk+W3Ksx2fpIHHcthzxNRTA==}
+  /@fastify/static/6.7.0:
+    resolution: {integrity: sha512-GYFDTSK83OL3mlzEDhgZXwFqPpGPiOsOr+dx63y2hcDF+NF4j1Ps2Swvmq/tMc5CFGoEDhkVN+P9fWG+/4a30Q==}
     dependencies:
       '@fastify/accept-negotiator': 1.0.0
       '@fastify/send': 1.0.0
@@ -1436,8 +1625,8 @@ packages:
       - supports-color
     dev: false
 
-  /@fastify/view/7.4.0:
-    resolution: {integrity: sha512-0AzLsS7+Vbn2ElN2w1MqbHacecv4FJxWuiDg9LrqeWeG8suUIV5qBnF1ZGbf023NQUchgR++g2hY7uAyk5PaWA==}
+  /@fastify/view/7.4.1:
+    resolution: {integrity: sha512-ahmRmSbNVM8bIoz0BAFnY0jNigom+xbPQ9Q1ZjmNOtGVVT3nYXCxw2OMkTr9iXwrJ4Le3EtWDHlFkZ2fCQ2hJA==}
     dependencies:
       fastify-plugin: 4.5.0
       hashlru: 2.3.0
@@ -1496,20 +1685,20 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /@jest/console/29.3.1:
-    resolution: {integrity: sha512-IRE6GD47KwcqA09RIWrabKdHPiKDGgtAL31xDxbi/RjQMsr+lY+ppxmHwY0dUEV3qvvxZzoe5Hl0RXZJOjQNUg==}
+  /@jest/console/29.4.1:
+    resolution: {integrity: sha512-m+XpwKSi3PPM9znm5NGS8bBReeAJJpSkL1OuFCqaMaJL2YX9YXLkkI+MBchMPwu+ZuM2rynL51sgfkQteQ1CKQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.3.1
+      '@jest/types': 29.4.1
       '@types/node': 18.11.18
       chalk: 4.1.2
-      jest-message-util: 29.3.1
-      jest-util: 29.3.1
+      jest-message-util: 29.4.1
+      jest-util: 29.4.1
       slash: 3.0.0
     dev: true
 
-  /@jest/core/29.3.1:
-    resolution: {integrity: sha512-0ohVjjRex985w5MmO5L3u5GR1O30DexhBSpuwx2P+9ftyqHdJXnk7IUWiP80oHMvt7ubHCJHxV0a0vlKVuZirw==}
+  /@jest/core/29.4.1:
+    resolution: {integrity: sha512-RXFTohpBqpaTebNdg5l3I5yadnKo9zLBajMT0I38D0tDhreVBYv3fA8kywthI00sWxPztWLD3yjiUkewwu/wKA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
@@ -1517,32 +1706,32 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/console': 29.3.1
-      '@jest/reporters': 29.3.1
-      '@jest/test-result': 29.3.1
-      '@jest/transform': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/console': 29.4.1
+      '@jest/reporters': 29.4.1
+      '@jest/test-result': 29.4.1
+      '@jest/transform': 29.4.1
+      '@jest/types': 29.4.1
       '@types/node': 18.11.18
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       ci-info: 3.7.1
       exit: 0.1.2
       graceful-fs: 4.2.10
-      jest-changed-files: 29.2.0
-      jest-config: 29.3.1_@types+node@18.11.18
-      jest-haste-map: 29.3.1
-      jest-message-util: 29.3.1
+      jest-changed-files: 29.4.0
+      jest-config: 29.4.1_@types+node@18.11.18
+      jest-haste-map: 29.4.1
+      jest-message-util: 29.4.1
       jest-regex-util: 29.2.0
-      jest-resolve: 29.3.1
-      jest-resolve-dependencies: 29.3.1
-      jest-runner: 29.3.1
-      jest-runtime: 29.3.1
-      jest-snapshot: 29.3.1
-      jest-util: 29.3.1
-      jest-validate: 29.3.1
-      jest-watcher: 29.3.1
+      jest-resolve: 29.4.1
+      jest-resolve-dependencies: 29.4.1
+      jest-runner: 29.4.1
+      jest-runtime: 29.4.1
+      jest-snapshot: 29.4.1
+      jest-util: 29.4.1
+      jest-validate: 29.4.1
+      jest-watcher: 29.4.1
       micromatch: 4.0.5
-      pretty-format: 29.3.1
+      pretty-format: 29.4.1
       slash: 3.0.0
       strip-ansi: 6.0.1
     transitivePeerDependencies:
@@ -1557,14 +1746,14 @@ packages:
       '@jest/types': 27.5.1
     dev: true
 
-  /@jest/environment/29.3.1:
-    resolution: {integrity: sha512-pMmvfOPmoa1c1QpfFW0nXYtNLpofqo4BrCIk6f2kW4JFeNlHV2t3vd+3iDLf31e2ot2Mec0uqZfmI+U0K2CFag==}
+  /@jest/environment/29.4.1:
+    resolution: {integrity: sha512-pJ14dHGSQke7Q3mkL/UZR9ZtTOxqskZaC91NzamEH4dlKRt42W+maRBXiw/LWkdJe+P0f/zDR37+SPMplMRlPg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/fake-timers': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/fake-timers': 29.4.1
+      '@jest/types': 29.4.1
       '@types/node': 18.11.18
-      jest-mock: 29.3.1
+      jest-mock: 29.4.1
     dev: true
 
   /@jest/expect-utils/29.3.1:
@@ -1574,42 +1763,49 @@ packages:
       jest-get-type: 29.2.0
     dev: true
 
-  /@jest/expect/29.3.1:
-    resolution: {integrity: sha512-QivM7GlSHSsIAWzgfyP8dgeExPRZ9BIe2LsdPyEhCGkZkoyA+kGsoIzbKAfZCvvRzfZioKwPtCZIt5SaoxYCvg==}
+  /@jest/expect-utils/29.4.1:
+    resolution: {integrity: sha512-w6YJMn5DlzmxjO00i9wu2YSozUYRBhIoJ6nQwpMYcBMtiqMGJm1QBzOf6DDgRao8dbtpDoaqLg6iiQTvv0UHhQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      expect: 29.3.1
-      jest-snapshot: 29.3.1
+      jest-get-type: 29.2.0
+    dev: true
+
+  /@jest/expect/29.4.1:
+    resolution: {integrity: sha512-ZxKJP5DTUNF2XkpJeZIzvnzF1KkfrhEF6Rz0HGG69fHl6Bgx5/GoU3XyaeFYEjuuKSOOsbqD/k72wFvFxc3iTw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      expect: 29.4.1
+      jest-snapshot: 29.4.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@jest/fake-timers/29.3.1:
-    resolution: {integrity: sha512-iHTL/XpnDlFki9Tq0Q1GGuVeQ8BHZGIYsvCO5eN/O/oJaRzofG9Xndd9HuSDBI/0ZS79pg0iwn07OMTQ7ngF2A==}
+  /@jest/fake-timers/29.4.1:
+    resolution: {integrity: sha512-/1joI6rfHFmmm39JxNfmNAO3Nwm6Y0VoL5fJDy7H1AtWrD1CgRtqJbN9Ld6rhAkGO76qqp4cwhhxJ9o9kYjQMw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.3.1
-      '@sinonjs/fake-timers': 9.1.2
+      '@jest/types': 29.4.1
+      '@sinonjs/fake-timers': 10.0.2
       '@types/node': 18.11.18
-      jest-message-util: 29.3.1
-      jest-mock: 29.3.1
-      jest-util: 29.3.1
+      jest-message-util: 29.4.1
+      jest-mock: 29.4.1
+      jest-util: 29.4.1
     dev: true
 
-  /@jest/globals/29.3.1:
-    resolution: {integrity: sha512-cTicd134vOcwO59OPaB6AmdHQMCtWOe+/DitpTZVxWgMJ+YvXL1HNAmPyiGbSHmF/mXVBkvlm8YYtQhyHPnV6Q==}
+  /@jest/globals/29.4.1:
+    resolution: {integrity: sha512-znoK2EuFytbHH0ZSf2mQK2K1xtIgmaw4Da21R2C/NE/+NnItm5mPEFQmn8gmF3f0rfOlmZ3Y3bIf7bFj7DHxAA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.3.1
-      '@jest/expect': 29.3.1
-      '@jest/types': 29.3.1
-      jest-mock: 29.3.1
+      '@jest/environment': 29.4.1
+      '@jest/expect': 29.4.1
+      '@jest/types': 29.4.1
+      jest-mock: 29.4.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@jest/reporters/29.3.1:
-    resolution: {integrity: sha512-GhBu3YFuDrcAYW/UESz1JphEAbvUjaY2vShRZRoRY1mxpCMB3yGSJ4j9n0GxVlEOdCf7qjvUfBCrTUUqhVfbRA==}
+  /@jest/reporters/29.4.1:
+    resolution: {integrity: sha512-AISY5xpt2Xpxj9R6y0RF1+O6GRy9JsGa8+vK23Lmzdy1AYcpQn5ItX79wJSsTmfzPKSAcsY1LNt/8Y5Xe5LOSg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
@@ -1618,10 +1814,10 @@ packages:
         optional: true
     dependencies:
       '@bcoe/v8-coverage': 0.2.3
-      '@jest/console': 29.3.1
-      '@jest/test-result': 29.3.1
-      '@jest/transform': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/console': 29.4.1
+      '@jest/test-result': 29.4.1
+      '@jest/transform': 29.4.1
+      '@jest/types': 29.4.1
       '@jridgewell/trace-mapping': 0.3.17
       '@types/node': 18.11.18
       chalk: 4.1.2
@@ -1634,9 +1830,9 @@ packages:
       istanbul-lib-report: 3.0.0
       istanbul-lib-source-maps: 4.0.1
       istanbul-reports: 3.1.5
-      jest-message-util: 29.3.1
-      jest-util: 29.3.1
-      jest-worker: 29.3.1
+      jest-message-util: 29.4.1
+      jest-util: 29.4.1
+      jest-worker: 29.4.1
       slash: 3.0.0
       string-length: 4.0.2
       strip-ansi: 6.0.1
@@ -1652,6 +1848,13 @@ packages:
       '@sinclair/typebox': 0.24.51
     dev: true
 
+  /@jest/schemas/29.4.0:
+    resolution: {integrity: sha512-0E01f/gOZeNTG76i5eWWSupvSHaIINrTie7vCyjiYFKgzNdyEGd12BUv4oNBFHOqlHDbtoJi3HrQ38KCC90NsQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@sinclair/typebox': 0.25.21
+    dev: true
+
   /@jest/source-map/29.2.0:
     resolution: {integrity: sha512-1NX9/7zzI0nqa6+kgpSdKPK+WU1p+SJk3TloWZf5MzPbxri9UEeXX5bWZAPCzbQcyuAzubcdUHA7hcNznmRqWQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -1661,45 +1864,45 @@ packages:
       graceful-fs: 4.2.10
     dev: true
 
-  /@jest/test-result/29.3.1:
-    resolution: {integrity: sha512-qeLa6qc0ddB0kuOZyZIhfN5q0e2htngokyTWsGriedsDhItisW7SDYZ7ceOe57Ii03sL988/03wAcBh3TChMGw==}
+  /@jest/test-result/29.4.1:
+    resolution: {integrity: sha512-WRt29Lwt+hEgfN8QDrXqXGgCTidq1rLyFqmZ4lmJOpVArC8daXrZWkWjiaijQvgd3aOUj2fM8INclKHsQW9YyQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/console': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/console': 29.4.1
+      '@jest/types': 29.4.1
       '@types/istanbul-lib-coverage': 2.0.4
       collect-v8-coverage: 1.0.1
     dev: true
 
-  /@jest/test-sequencer/29.3.1:
-    resolution: {integrity: sha512-IqYvLbieTv20ArgKoAMyhLHNrVHJfzO6ARZAbQRlY4UGWfdDnLlZEF0BvKOMd77uIiIjSZRwq3Jb3Fa3I8+2UA==}
+  /@jest/test-sequencer/29.4.1:
+    resolution: {integrity: sha512-v5qLBNSsM0eHzWLXsQ5fiB65xi49A3ILPSFQKPXzGL4Vyux0DPZAIN7NAFJa9b4BiTDP9MBF/Zqc/QA1vuiJ0w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/test-result': 29.3.1
+      '@jest/test-result': 29.4.1
       graceful-fs: 4.2.10
-      jest-haste-map: 29.3.1
+      jest-haste-map: 29.4.1
       slash: 3.0.0
     dev: true
 
-  /@jest/transform/29.3.1:
-    resolution: {integrity: sha512-8wmCFBTVGYqFNLWfcOWoVuMuKYPUBTnTMDkdvFtAYELwDOl9RGwOsvQWGPFxDJ8AWY9xM/8xCXdqmPK3+Q5Lug==}
+  /@jest/transform/29.4.1:
+    resolution: {integrity: sha512-5w6YJrVAtiAgr0phzKjYd83UPbCXsBRTeYI4BXokv9Er9CcrH9hfXL/crCvP2d2nGOcovPUnlYiLPFLZrkG5Hg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@babel/core': 7.20.12
-      '@jest/types': 29.3.1
+      '@jest/types': 29.4.1
       '@jridgewell/trace-mapping': 0.3.17
       babel-plugin-istanbul: 6.1.1
       chalk: 4.1.2
       convert-source-map: 2.0.0
       fast-json-stable-stringify: 2.1.0
       graceful-fs: 4.2.10
-      jest-haste-map: 29.3.1
+      jest-haste-map: 29.4.1
       jest-regex-util: 29.2.0
-      jest-util: 29.3.1
+      jest-util: 29.4.1
       micromatch: 4.0.5
       pirates: 4.0.5
       slash: 3.0.0
-      write-file-atomic: 4.0.2
+      write-file-atomic: 5.0.0
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -1715,11 +1918,11 @@ packages:
       chalk: 4.1.2
     dev: true
 
-  /@jest/types/29.3.1:
-    resolution: {integrity: sha512-d0S0jmmTpjnhCmNpApgX3jrUZgZ22ivKJRvL2lli5hpCRoNnp1f85r2/wpKfXuYu8E7Jjh1hGfhPyup1NM5AmA==}
+  /@jest/types/29.4.1:
+    resolution: {integrity: sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/schemas': 29.0.0
+      '@jest/schemas': 29.4.0
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
       '@types/node': 18.11.18
@@ -2055,7 +2258,7 @@ packages:
       - encoding
     dev: true
 
-  /@rollup/plugin-alias/4.0.3_rollup@3.10.1:
+  /@rollup/plugin-alias/4.0.3_rollup@3.11.0:
     resolution: {integrity: sha512-ZuDWE1q4PQDhvm/zc5Prun8sBpLJy41DMptYrS6MhAy9s9kL/doN1613BWfEchGVfKxzliJ3BjbOPizXX38DbQ==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -2064,11 +2267,11 @@ packages:
       rollup:
         optional: true
     dependencies:
-      rollup: 3.10.1
+      rollup: 3.11.0
       slash: 4.0.0
     dev: false
 
-  /@rollup/plugin-json/6.0.0_rollup@3.10.1:
+  /@rollup/plugin-json/6.0.0_rollup@3.11.0:
     resolution: {integrity: sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -2077,11 +2280,11 @@ packages:
       rollup:
         optional: true
     dependencies:
-      '@rollup/pluginutils': 5.0.2_rollup@3.10.1
-      rollup: 3.10.1
+      '@rollup/pluginutils': 5.0.2_rollup@3.11.0
+      rollup: 3.11.0
     dev: false
 
-  /@rollup/pluginutils/5.0.2_rollup@3.10.1:
+  /@rollup/pluginutils/5.0.2_rollup@3.11.0:
     resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -2093,7 +2296,7 @@ packages:
       '@types/estree': 1.0.0
       estree-walker: 2.0.2
       picomatch: 2.3.1
-      rollup: 3.10.1
+      rollup: 3.11.0
     dev: false
 
   /@sideway/address/4.1.4:
@@ -2114,6 +2317,10 @@ packages:
     resolution: {integrity: sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==}
     dev: true
 
+  /@sinclair/typebox/0.25.21:
+    resolution: {integrity: sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g==}
+    dev: true
+
   /@sindresorhus/is/0.7.0:
     resolution: {integrity: sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==}
     engines: {node: '>=4'}
@@ -2129,35 +2336,21 @@ packages:
     engines: {node: '>=14.16'}
     dev: false
 
-  /@sinonjs/commons/1.8.6:
-    resolution: {integrity: sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==}
-    dependencies:
-      type-detect: 4.0.8
-    dev: true
-
   /@sinonjs/commons/2.0.0:
     resolution: {integrity: sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==}
     dependencies:
       type-detect: 4.0.8
-    dev: false
 
   /@sinonjs/fake-timers/10.0.2:
     resolution: {integrity: sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==}
     dependencies:
       '@sinonjs/commons': 2.0.0
-    dev: false
-
-  /@sinonjs/fake-timers/9.1.2:
-    resolution: {integrity: sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==}
-    dependencies:
-      '@sinonjs/commons': 1.8.6
-    dev: true
 
   /@sqltools/formatter/1.2.5:
     resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
     dev: false
 
-  /@swc/cli/0.1.59_2w2rsb5d2wh3txrlxuiknf4vra:
+  /@swc/cli/0.1.59_dbbgdut2njxjatv5n3st5z6gqa:
     resolution: {integrity: sha512-BlX3wIxYTwdtR22dIqZ3FEIOJPqnlByAp4JY46OMZi2UXMB3ZbOzefawD2ZlLafRUWyy5NtiZZty5waKzaYRnA==}
     engines: {node: '>= 12.13'}
     hasBin: true
@@ -2168,7 +2361,7 @@ packages:
       chokidar:
         optional: true
     dependencies:
-      '@swc/core': 1.3.27
+      '@swc/core': 1.3.29
       bin-wrapper: 4.1.0
       chokidar: 3.5.3
       commander: 7.2.0
@@ -2178,8 +2371,8 @@ packages:
       source-map: 0.7.4
     dev: true
 
-  /@swc/core-darwin-arm64/1.3.27:
-    resolution: {integrity: sha512-IKlxkhEy99CnP9nduaf5IJWIFcr6D5cZCjYmCs7nWkjMV+aAieyDO9AX4LT8AcHy6CF7ByOX7SKoqk+gVMAaKw==}
+  /@swc/core-darwin-arm64/1.3.29:
+    resolution: {integrity: sha512-1RQ0MCmWOQmo3qG60vhbNaO/qMZ25lDfjhTayAzHjS1k7WyoUv3M8Em2Fip2VKJz5cN2M7MWiP5aHMotMovuaQ==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [darwin]
@@ -2187,8 +2380,8 @@ packages:
     dev: true
     optional: true
 
-  /@swc/core-darwin-x64/1.3.27:
-    resolution: {integrity: sha512-MtabZIhFf/dL3vs6UMbd+vJsjIkm2NaFqulGV0Jofy2bfVZPTj/b5pXeOlUsTWy7JcH1uixjdx4RvJRyvqJxQA==}
+  /@swc/core-darwin-x64/1.3.29:
+    resolution: {integrity: sha512-UXiVOkt9i/mwarhHiN6o5RAi3Q7riCQTiOO2e98c/qi3SiYqbgd6kil+2gBcpVB0CGEFyyGB9rECwNBkaYe7zw==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [darwin]
@@ -2196,8 +2389,8 @@ packages:
     dev: true
     optional: true
 
-  /@swc/core-linux-arm-gnueabihf/1.3.27:
-    resolution: {integrity: sha512-XELMoGcUTAkk+G4buwIIhu6AIr1U418Odt22HUW8+ZvV+Wty2ICgR/myOIhM3xMb6U2L8ay+evMqoVNMQ0RRTg==}
+  /@swc/core-linux-arm-gnueabihf/1.3.29:
+    resolution: {integrity: sha512-0B7+FoYgEE1Yg6j5EAtEpKVbHby3jnJo6Y4g0dGxecRtXUhu8TKVI4P93sj4PJ+l4XkAyzdhSsQ+ytFRsbOJ6w==}
     engines: {node: '>=10'}
     cpu: [arm]
     os: [linux]
@@ -2205,8 +2398,8 @@ packages:
     dev: true
     optional: true
 
-  /@swc/core-linux-arm64-gnu/1.3.27:
-    resolution: {integrity: sha512-O6vtT6bnrVR9PzEIuA5U7tIfYo7bv97H9K9Vqy2oyHNeGN0H36DKwS4UqPreHtziXNF5+7ubdUYUkrG/j8UnUQ==}
+  /@swc/core-linux-arm64-gnu/1.3.29:
+    resolution: {integrity: sha512-XN9axiTuiFOm+UBnDDOQV3b2OekziXHtVPBAPSEssRsNGS4uN7YvCyVAcS8GYdK7GoZ+cmoZBYwD4trir48WXw==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
@@ -2214,8 +2407,8 @@ packages:
     dev: true
     optional: true
 
-  /@swc/core-linux-arm64-musl/1.3.27:
-    resolution: {integrity: sha512-Oa0E1i7dOTWpaEZumKoNbTE/Ap+da6nlhqKVUdYrFDrOBi25tz76SdxZIyvAszzmgY89b5yd1naourKmkPXpww==}
+  /@swc/core-linux-arm64-musl/1.3.29:
+    resolution: {integrity: sha512-M6eE02Dzl1efRLozitGvgjiNEee0VQInqMX4tvfpzQwqZsKNAD8/NGPeTG4763BLDHc4hnMZbnt5wncDLjFq7A==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
@@ -2223,8 +2416,8 @@ packages:
     dev: true
     optional: true
 
-  /@swc/core-linux-x64-gnu/1.3.27:
-    resolution: {integrity: sha512-S3v9H8oL2a8Ur6AjQyhkC6HfBVPOxKMdBhcZmdNuVgEUHbHdbf/Lka85F9IOYXEarMn0FtQw3ywowS22O9L5Uw==}
+  /@swc/core-linux-x64-gnu/1.3.29:
+    resolution: {integrity: sha512-t2e9byHRpxKyUsLeODlb3yKJcm8wMirsLIxjr24q5YbnChD3QUMQwA8aA9w2PWc86ihukw7Ksx3RYT7uR706HA==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
@@ -2232,8 +2425,8 @@ packages:
     dev: true
     optional: true
 
-  /@swc/core-linux-x64-musl/1.3.27:
-    resolution: {integrity: sha512-6DDkdXlOADpwICFZTRphCR+cIeS8aEYh4NlyzBito0mOWwIIdfCgALzhkTQOzTOkcD42bP97CIoZ97hqV/puOg==}
+  /@swc/core-linux-x64-musl/1.3.29:
+    resolution: {integrity: sha512-3jDzDYIyHXrXKOSnTtsN56eINbTPuVQj65D3K8+zo1o52GGwNGyCvQt2RpxNfM8+ptb4j6v7weSU8kVvbUzGTQ==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
@@ -2241,8 +2434,8 @@ packages:
     dev: true
     optional: true
 
-  /@swc/core-win32-arm64-msvc/1.3.27:
-    resolution: {integrity: sha512-baxfH4AbEcaTNo08wxV0W6hiMXwVCxPS4qc0amHpXPti92unvSqeDR1W3C9GjHqzXlWtmCRsq8Ww1pal6ZVLrw==}
+  /@swc/core-win32-arm64-msvc/1.3.29:
+    resolution: {integrity: sha512-3PadPieyslG++7SQ42OApfiXtQdzFpnCv/i/UJ6gOL5d0MluNzZ2nIxD8LwXXizVdmcm8bmc0WRhK3JhvhzVJA==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [win32]
@@ -2250,8 +2443,8 @@ packages:
     dev: true
     optional: true
 
-  /@swc/core-win32-ia32-msvc/1.3.27:
-    resolution: {integrity: sha512-7iLJnH71k5qCwxv9NcM/P7nIEzTsC7r1sIiQW6bu+CpC8qZvwl0PS+XvQRlLly2gCZM+Le98tksYG14MEh+Hrw==}
+  /@swc/core-win32-ia32-msvc/1.3.29:
+    resolution: {integrity: sha512-tUFrHxxYz9Cfz07yGwDXdtRziC3q1ia2SHodzZ3obTpY+HQiBDHs0QO/HkbUBNF+du0vhnsgtWilnsMQDILFDQ==}
     engines: {node: '>=10'}
     cpu: [ia32]
     os: [win32]
@@ -2259,8 +2452,8 @@ packages:
     dev: true
     optional: true
 
-  /@swc/core-win32-x64-msvc/1.3.27:
-    resolution: {integrity: sha512-mFM907PDw/jrQ44+TRjIVGEOy2Mu06mMMz0HPMFuRsBzl5t0Kajp3vmn8FkkpS9wH5982VPi6hPYVTb7QJo5Qg==}
+  /@swc/core-win32-x64-msvc/1.3.29:
+    resolution: {integrity: sha512-/Z3kxMXGKlIhtkxBxsCSZl8j/qYfbA4dtW7RKv1RNxbPLbwk8k3Owhgk/Y3JeRavcUKwja1rUX5rhMjLYeN3tw==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [win32]
@@ -2268,31 +2461,31 @@ packages:
     dev: true
     optional: true
 
-  /@swc/core/1.3.27:
-    resolution: {integrity: sha512-praRNgpeYGvwDIm/Cl6JU+yHMvwVraL0U6ejMgGyzvpcm1FVsZd1/EYXGqzbBJ0ALv7Gx4eK56h4GnwV6d4L0w==}
+  /@swc/core/1.3.29:
+    resolution: {integrity: sha512-BYDBEqQ77ASZNQYTP7PlKnMLwbHh3lhtlzD/gQP2zIK9XhqQlcy/zIcLljYDn0EOogLn3IyaUiXgAzDWoAmWMg==}
     engines: {node: '>=10'}
     requiresBuild: true
     optionalDependencies:
-      '@swc/core-darwin-arm64': 1.3.27
-      '@swc/core-darwin-x64': 1.3.27
-      '@swc/core-linux-arm-gnueabihf': 1.3.27
-      '@swc/core-linux-arm64-gnu': 1.3.27
-      '@swc/core-linux-arm64-musl': 1.3.27
-      '@swc/core-linux-x64-gnu': 1.3.27
-      '@swc/core-linux-x64-musl': 1.3.27
-      '@swc/core-win32-arm64-msvc': 1.3.27
-      '@swc/core-win32-ia32-msvc': 1.3.27
-      '@swc/core-win32-x64-msvc': 1.3.27
+      '@swc/core-darwin-arm64': 1.3.29
+      '@swc/core-darwin-x64': 1.3.29
+      '@swc/core-linux-arm-gnueabihf': 1.3.29
+      '@swc/core-linux-arm64-gnu': 1.3.29
+      '@swc/core-linux-arm64-musl': 1.3.29
+      '@swc/core-linux-x64-gnu': 1.3.29
+      '@swc/core-linux-x64-musl': 1.3.29
+      '@swc/core-win32-arm64-msvc': 1.3.29
+      '@swc/core-win32-ia32-msvc': 1.3.29
+      '@swc/core-win32-x64-msvc': 1.3.29
     dev: true
 
-  /@swc/jest/0.2.24_@swc+core@1.3.27:
+  /@swc/jest/0.2.24_@swc+core@1.3.29:
     resolution: {integrity: sha512-fwgxQbM1wXzyKzl1+IW0aGrRvAA8k0Y3NxFhKigbPjOJ4mCKnWEcNX9HQS3gshflcxq8YKhadabGUVfdwjCr6Q==}
     engines: {npm: '>= 7.0.0'}
     peerDependencies:
       '@swc/core': '*'
     dependencies:
       '@jest/create-cache-key-function': 27.5.1
-      '@swc/core': 1.3.27
+      '@swc/core': 1.3.29
       jsonc-parser: 3.2.0
     dev: true
 
@@ -2319,14 +2512,14 @@ packages:
       defer-to-connect: 2.0.1
     dev: false
 
-  /@tabler/icons-webfont/2.0.0:
-    resolution: {integrity: sha512-ApVVupe7WKZOJzK6T2iw15/k6VrTALsL5YzAmvgvcriuX8sRCKlcWaRljcf2sZMUrqyY+Yq6xiOpL2p2NHgQBQ==}
+  /@tabler/icons-webfont/2.1.2:
+    resolution: {integrity: sha512-UoLIUeaZSDH4ORAbxvt/jO3RZ4AjaNV/qw7LXMWmEfsDUY3teaB4xrwW1WkyMqMU1HjkX5dR1z7P8Ajxxucjyw==}
     dependencies:
-      '@tabler/icons': 2.0.0
+      '@tabler/icons': 2.1.2
     dev: false
 
-  /@tabler/icons/2.0.0:
-    resolution: {integrity: sha512-ye93cVD8baCwJJ7J3GKlUM3FN+qW6lsEz4uaH8bHCwC8un2R4p+ZzyRNc/ksqVgMQJ4PKQ8xbYpv4dnbbRffsA==}
+  /@tabler/icons/2.1.2:
+    resolution: {integrity: sha512-+CPB+BSqVDP4+/d+cHSaGwG460C3sob7EJkQ+ZS8xV6bRER64OsCP92O7M+uYBhJFDWuf6poCeSETNZNcFa2nA==}
     dev: false
 
   /@tensorflow/tfjs-backend-cpu/4.2.0_tkoh6rxfpzme3tc2ndqbqcrg7y:
@@ -2624,8 +2817,8 @@ packages:
       '@types/istanbul-lib-report': 3.0.0
     dev: true
 
-  /@types/jest/29.2.6:
-    resolution: {integrity: sha512-XEUC/Tgw3uMh6Ho8GkUtQ2lPhY5Fmgyp3TdlkTJs1W9VgNxs+Ow/x3Elh8lHQKqCbZL0AubQuqWjHVT033Hhrw==}
+  /@types/jest/29.4.0:
+    resolution: {integrity: sha512-VaywcGQ9tPorCX/Jkkni7RWGFfI11whqzs8dvxF41P17Z+z872thvEvlIbznjPJ02kl1HMX3LmLOonsj2n7HeQ==}
     dependencies:
       expect: 29.3.1
       pretty-format: 29.3.1
@@ -2655,8 +2848,8 @@ packages:
     resolution: {integrity: sha512-4l5t/jDnJpqZ+i7CLTTgPcT5BYXnAnwJupb07aAokPufCV0SjDHcwctUkSTuhIuSU9yHok+WOOngIGCtpL96gw==}
     dev: true
 
-  /@types/jsrsasign/10.5.4:
-    resolution: {integrity: sha512-05S2f4lGaWgCwFHsa3OEirc4VJf/sJRfhofzxUbuFbmm6NbffPXZrnJqquQAtS3g4C8Z0L9NHgW0znmtDxNoTQ==}
+  /@types/jsrsasign/10.5.5:
+    resolution: {integrity: sha512-M2Et4hgTigFoArTu6ylK3hYFEH+UuXfgFXRXZ+flpCfux8j7fQ2D+0zEwiu6ehx0h5otaauhLSFzMzEtNA784A==}
     dev: true
 
   /@types/keyv/3.1.4:
@@ -2793,8 +2986,8 @@ packages:
     resolution: {integrity: sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==}
     dev: true
 
-  /@types/serviceworker/0.0.58:
-    resolution: {integrity: sha512-bFRpZYjYbEgfPYBVR9Vfn/95ao7PvXCjQy6Eh1rbPnZBbTPpQlurLAciLF8qWN54F0WoVwE5xcaJPeDRdLGivg==}
+  /@types/serviceworker/0.0.61:
+    resolution: {integrity: sha512-j/FCintE+6dLM4Wyej1OMTPJy8rBHOmZ9O4XgEy9OQ4B7SfAHwWEZQQk/PXuBl/tFyE+r87eOm+x+wQiiiHIag==}
     dev: true
 
   /@types/sharp/0.31.1:
@@ -2960,26 +3153,6 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser/5.48.1_iukboom6ndih5an6iafl45j2fe:
-    resolution: {integrity: sha512-4yg+FJR/V1M9Xoq56SF9Iygqm+r5LMXvheo6DQ7/yUWynQ4YfCRnsKuRgqH4EQ5Ya76rVwlEpw4Xu+TgWQUcdA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@typescript-eslint/scope-manager': 5.48.1
-      '@typescript-eslint/types': 5.48.1
-      '@typescript-eslint/typescript-estree': 5.48.1_typescript@4.9.4
-      debug: 4.3.4
-      eslint: 8.31.0
-      typescript: 4.9.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@typescript-eslint/parser/5.49.0_7uibuqfxkfaozanbtbziikiqje:
     resolution: {integrity: sha512-veDlZN9mUhGqU31Qiv2qEp+XrJj5fgZpJ8PW30sHU+j/8/e5ruAhLaVDAeznS7A7i4ucb/s8IozpDtt9NqCkZg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -3000,14 +3173,6 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/scope-manager/5.48.1:
-    resolution: {integrity: sha512-S035ueRrbxRMKvSTv9vJKIWgr86BD8s3RqoRZmsSh/s8HhIs90g6UlK8ZabUSjUZQkhVxt7nmZ63VJ9dcZhtDQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      '@typescript-eslint/types': 5.48.1
-      '@typescript-eslint/visitor-keys': 5.48.1
-    dev: true
-
   /@typescript-eslint/scope-manager/5.49.0:
     resolution: {integrity: sha512-clpROBOiMIzpbWNxCe1xDK14uPZh35u4QaZO1GddilEzoCLAEz4szb51rBpdgurs5k2YzPtJeTEN3qVbG+LRUQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -3036,37 +3201,11 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/types/5.48.1:
-    resolution: {integrity: sha512-xHyDLU6MSuEEdIlzrrAerCGS3T7AA/L8Hggd0RCYBi0w3JMvGYxlLlXHeg50JI9Tfg5MrtsfuNxbS/3zF1/ATg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
-
   /@typescript-eslint/types/5.49.0:
     resolution: {integrity: sha512-7If46kusG+sSnEpu0yOz2xFv5nRz158nzEXnJFCGVEHWnuzolXKwrH5Bsf9zsNlOQkyZuk0BZKKoJQI+1JPBBg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@typescript-eslint/typescript-estree/5.48.1_typescript@4.9.4:
-    resolution: {integrity: sha512-Hut+Osk5FYr+sgFh8J/FHjqX6HFcDzTlWLrFqGoK5kVUN3VBHF/QzZmAsIXCQ8T/W9nQNBTqalxi1P3LSqWnRA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@typescript-eslint/types': 5.48.1
-      '@typescript-eslint/visitor-keys': 5.48.1
-      debug: 4.3.4
-      globby: 11.1.0
-      is-glob: 4.0.3
-      semver: 7.3.8
-      tsutils: 3.21.0_typescript@4.9.4
-      typescript: 4.9.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@typescript-eslint/typescript-estree/5.49.0_typescript@4.9.4:
     resolution: {integrity: sha512-PBdx+V7deZT/3GjNYPVQv1Nc0U46dAHbIuOG8AZ3on3vuEKiPDwFE/lG1snN2eUB9IhF7EyF7K1hmTcLztNIsA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -3108,14 +3247,6 @@ packages:
       - typescript
     dev: true
 
-  /@typescript-eslint/visitor-keys/5.48.1:
-    resolution: {integrity: sha512-Ns0XBwmfuX7ZknznfXozgnydyR8F6ev/KEGePP4i74uL3ArsKbEhJ7raeKr1JSa997DBDwol/4a0Y+At82c9dA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      '@typescript-eslint/types': 5.48.1
-      eslint-visitor-keys: 3.3.0
-    dev: true
-
   /@typescript-eslint/visitor-keys/5.49.0:
     resolution: {integrity: sha512-v9jBMjpNWyn8B6k/Mjt6VbUS4J1GvUlR4x3Y+ibnP1z7y7V4n0WRz+50DY6+Myj0UaXVSuUlHohO+eZ8IJEnkg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -3813,17 +3944,17 @@ packages:
       - debug
     dev: true
 
-  /babel-jest/29.3.1_@babel+core@7.20.12:
-    resolution: {integrity: sha512-aard+xnMoxgjwV70t0L6wkW/3HQQtV+O0PEimxKgzNqCJnbYmroPojdP2tqKSOAt8QAKV/uSZU8851M7B5+fcA==}
+  /babel-jest/29.4.1_@babel+core@7.20.12:
+    resolution: {integrity: sha512-xBZa/pLSsF/1sNpkgsiT3CmY7zV1kAsZ9OxxtrFqYucnOuRftXAfcJqcDVyOPeN4lttWTwhLdu0T9f8uvoPEUg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@babel/core': ^7.8.0
     dependencies:
       '@babel/core': 7.20.12
-      '@jest/transform': 29.3.1
+      '@jest/transform': 29.4.1
       '@types/babel__core': 7.1.20
       babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 29.2.0_@babel+core@7.20.12
+      babel-preset-jest: 29.4.0_@babel+core@7.20.12
       chalk: 4.1.2
       graceful-fs: 4.2.10
       slash: 3.0.0
@@ -3844,8 +3975,8 @@ packages:
       - supports-color
     dev: true
 
-  /babel-plugin-jest-hoist/29.2.0:
-    resolution: {integrity: sha512-TnspP2WNiR3GLfCsUNHqeXw0RoQ2f9U5hQ5L3XFpwuO8htQmSrhh8qsB6vi5Yi8+kuynN1yjDjQsPfkebmB6ZA==}
+  /babel-plugin-jest-hoist/29.4.0:
+    resolution: {integrity: sha512-a/sZRLQJEmsmejQ2rPEUe35nO1+C9dc9O1gplH1SXmJxveQSRUYdBk8yGZG/VOUuZs1u2aHZJusEGoRMbhhwCg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@babel/template': 7.20.7
@@ -3874,14 +4005,14 @@ packages:
       '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.20.12
     dev: true
 
-  /babel-preset-jest/29.2.0_@babel+core@7.20.12:
-    resolution: {integrity: sha512-z9JmMJppMxNv8N7fNRHvhMg9cvIkMxQBXgFkane3yKVEvEOP+kB50lk8DFRvF9PGqbyXxlmebKWhuDORO8RgdA==}
+  /babel-preset-jest/29.4.0_@babel+core@7.20.12:
+    resolution: {integrity: sha512-fUB9vZflUSM3dO/6M2TCAepTzvA4VkOvl67PjErcrQMGt9Eve7uazaeyCZ2th3UtI7ljpiBJES0F7A1vBRsLZA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
       '@babel/core': 7.20.12
-      babel-plugin-jest-hoist: 29.2.0
+      babel-plugin-jest-hoist: 29.4.0
       babel-preset-current-node-syntax: 1.0.1_@babel+core@7.20.12
     dev: true
 
@@ -5078,8 +5209,8 @@ packages:
       uniq: 1.0.1
     dev: false
 
-  /cypress/12.3.0:
-    resolution: {integrity: sha512-ZQNebibi6NBt51TRxRMYKeFvIiQZ01t50HSy7z/JMgRVqBUey3cdjog5MYEbzG6Ktti5ckDt1tfcC47lmFwXkw==}
+  /cypress/12.4.0:
+    resolution: {integrity: sha512-//h93K/yGC/7pxv1KamlkADbKHLp5h3f9rZDE2McRjXZDagMETH0sXowOOanvhsH8cFt/JWspIcK+p9cuaoAqg==}
     engines: {node: ^14.0.0 || ^16.0.0 || >=18.0.0}
     hasBin: true
     requiresBuild: true
@@ -5783,215 +5914,6 @@ packages:
       es6-symbol: 3.1.3
     dev: false
 
-  /esbuild-android-64/0.14.54:
-    resolution: {integrity: sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-android-arm64/0.14.54:
-    resolution: {integrity: sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-darwin-64/0.14.54:
-    resolution: {integrity: sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-darwin-arm64/0.14.54:
-    resolution: {integrity: sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-freebsd-64/0.14.54:
-    resolution: {integrity: sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-freebsd-arm64/0.14.54:
-    resolution: {integrity: sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-linux-32/0.14.54:
-    resolution: {integrity: sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-linux-64/0.14.54:
-    resolution: {integrity: sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-linux-arm/0.14.54:
-    resolution: {integrity: sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-linux-arm64/0.14.54:
-    resolution: {integrity: sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-linux-mips64le/0.14.54:
-    resolution: {integrity: sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-linux-ppc64le/0.14.54:
-    resolution: {integrity: sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-linux-riscv64/0.14.54:
-    resolution: {integrity: sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-linux-s390x/0.14.54:
-    resolution: {integrity: sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-netbsd-64/0.14.54:
-    resolution: {integrity: sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-openbsd-64/0.14.54:
-    resolution: {integrity: sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-sunos-64/0.14.54:
-    resolution: {integrity: sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-windows-32/0.14.54:
-    resolution: {integrity: sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-windows-64/0.14.54:
-    resolution: {integrity: sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-windows-arm64/0.14.54:
-    resolution: {integrity: sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild/0.14.54:
-    resolution: {integrity: sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
-    optionalDependencies:
-      '@esbuild/linux-loong64': 0.14.54
-      esbuild-android-64: 0.14.54
-      esbuild-android-arm64: 0.14.54
-      esbuild-darwin-64: 0.14.54
-      esbuild-darwin-arm64: 0.14.54
-      esbuild-freebsd-64: 0.14.54
-      esbuild-freebsd-arm64: 0.14.54
-      esbuild-linux-32: 0.14.54
-      esbuild-linux-64: 0.14.54
-      esbuild-linux-arm: 0.14.54
-      esbuild-linux-arm64: 0.14.54
-      esbuild-linux-mips64le: 0.14.54
-      esbuild-linux-ppc64le: 0.14.54
-      esbuild-linux-riscv64: 0.14.54
-      esbuild-linux-s390x: 0.14.54
-      esbuild-netbsd-64: 0.14.54
-      esbuild-openbsd-64: 0.14.54
-      esbuild-sunos-64: 0.14.54
-      esbuild-windows-32: 0.14.54
-      esbuild-windows-64: 0.14.54
-      esbuild-windows-arm64: 0.14.54
-    dev: false
-
   /esbuild/0.16.17:
     resolution: {integrity: sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==}
     engines: {node: '>=12'}
@@ -6022,6 +5944,36 @@ packages:
       '@esbuild/win32-x64': 0.16.17
     dev: false
 
+  /esbuild/0.17.4:
+    resolution: {integrity: sha512-zBn9MeCwT7W5F1a3lXClD61ip6vQM+H8Msb0w8zMT4ZKBpDg+rFAraNyWCDelB/2L6M3g6AXHPnsyvjMFnxtFw==}
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    optionalDependencies:
+      '@esbuild/android-arm': 0.17.4
+      '@esbuild/android-arm64': 0.17.4
+      '@esbuild/android-x64': 0.17.4
+      '@esbuild/darwin-arm64': 0.17.4
+      '@esbuild/darwin-x64': 0.17.4
+      '@esbuild/freebsd-arm64': 0.17.4
+      '@esbuild/freebsd-x64': 0.17.4
+      '@esbuild/linux-arm': 0.17.4
+      '@esbuild/linux-arm64': 0.17.4
+      '@esbuild/linux-ia32': 0.17.4
+      '@esbuild/linux-loong64': 0.17.4
+      '@esbuild/linux-mips64el': 0.17.4
+      '@esbuild/linux-ppc64': 0.17.4
+      '@esbuild/linux-riscv64': 0.17.4
+      '@esbuild/linux-s390x': 0.17.4
+      '@esbuild/linux-x64': 0.17.4
+      '@esbuild/netbsd-x64': 0.17.4
+      '@esbuild/openbsd-x64': 0.17.4
+      '@esbuild/sunos-x64': 0.17.4
+      '@esbuild/win32-arm64': 0.17.4
+      '@esbuild/win32-ia32': 0.17.4
+      '@esbuild/win32-x64': 0.17.4
+    dev: false
+
   /escalade/3.1.1:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
     engines: {node: '>=6'}
@@ -6099,68 +6051,6 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-module-utils/2.7.4_sqt5xxn4ciiurbqrzlaarm6ama:
-    resolution: {integrity: sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      '@typescript-eslint/parser': '*'
-      eslint: '*'
-      eslint-import-resolver-node: '*'
-      eslint-import-resolver-typescript: '*'
-      eslint-import-resolver-webpack: '*'
-    peerDependenciesMeta:
-      '@typescript-eslint/parser':
-        optional: true
-      eslint:
-        optional: true
-      eslint-import-resolver-node:
-        optional: true
-      eslint-import-resolver-typescript:
-        optional: true
-      eslint-import-resolver-webpack:
-        optional: true
-    dependencies:
-      '@typescript-eslint/parser': 5.48.1_iukboom6ndih5an6iafl45j2fe
-      debug: 3.2.7
-      eslint: 8.31.0
-      eslint-import-resolver-node: 0.3.7
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /eslint-plugin-import/2.27.4_qdjeohovcytra7xto5vgmxssaq:
-    resolution: {integrity: sha512-Z1jVt1EGKia1X9CnBCkpAOhWy8FgQ7OmJ/IblEkT82yrFU/xJaxwujaTzLWqigewwynRQ9mmHfX9MtAfhxm0sA==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      '@typescript-eslint/parser': '*'
-      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
-    peerDependenciesMeta:
-      '@typescript-eslint/parser':
-        optional: true
-    dependencies:
-      '@typescript-eslint/parser': 5.48.1_iukboom6ndih5an6iafl45j2fe
-      array-includes: 3.1.6
-      array.prototype.flat: 1.3.1
-      array.prototype.flatmap: 1.3.1
-      debug: 3.2.7
-      doctrine: 2.1.0
-      eslint: 8.31.0
-      eslint-import-resolver-node: 0.3.7
-      eslint-module-utils: 2.7.4_sqt5xxn4ciiurbqrzlaarm6ama
-      has: 1.0.3
-      is-core-module: 2.11.0
-      is-glob: 4.0.3
-      minimatch: 3.1.2
-      object.values: 1.1.6
-      resolve: 1.22.1
-      semver: 6.3.0
-      tsconfig-paths: 3.14.1
-    transitivePeerDependencies:
-      - eslint-import-resolver-typescript
-      - eslint-import-resolver-webpack
-      - supports-color
-    dev: true
-
   /eslint-plugin-import/2.27.5_6savw6y3b7jng6f64kgkyoij64:
     resolution: {integrity: sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==}
     engines: {node: '>=4'}
@@ -6228,16 +6118,6 @@ packages:
       estraverse: 5.3.0
     dev: true
 
-  /eslint-utils/3.0.0_eslint@8.31.0:
-    resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
-    engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
-    peerDependencies:
-      eslint: '>=5'
-    dependencies:
-      eslint: 8.31.0
-      eslint-visitor-keys: 2.1.0
-    dev: true
-
   /eslint-utils/3.0.0_eslint@8.32.0:
     resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
     engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
@@ -6258,54 +6138,6 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /eslint/8.31.0:
-    resolution: {integrity: sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    hasBin: true
-    dependencies:
-      '@eslint/eslintrc': 1.4.1
-      '@humanwhocodes/config-array': 0.11.8
-      '@humanwhocodes/module-importer': 1.0.1
-      '@nodelib/fs.walk': 1.2.8
-      ajv: 6.12.6
-      chalk: 4.1.2
-      cross-spawn: 7.0.3
-      debug: 4.3.4
-      doctrine: 3.0.0
-      escape-string-regexp: 4.0.0
-      eslint-scope: 7.1.1
-      eslint-utils: 3.0.0_eslint@8.31.0
-      eslint-visitor-keys: 3.3.0
-      espree: 9.4.1
-      esquery: 1.4.0
-      esutils: 2.0.3
-      fast-deep-equal: 3.1.3
-      file-entry-cache: 6.0.1
-      find-up: 5.0.0
-      glob-parent: 6.0.2
-      globals: 13.19.0
-      grapheme-splitter: 1.0.4
-      ignore: 5.2.4
-      import-fresh: 3.3.0
-      imurmurhash: 0.1.4
-      is-glob: 4.0.3
-      is-path-inside: 3.0.3
-      js-sdsl: 4.2.0
-      js-yaml: 4.1.0
-      json-stable-stringify-without-jsonify: 1.0.1
-      levn: 0.4.1
-      lodash.merge: 4.6.2
-      minimatch: 3.1.2
-      natural-compare: 1.4.0
-      optionator: 0.9.1
-      regexpp: 3.2.0
-      strip-ansi: 6.0.1
-      strip-json-comments: 3.1.1
-      text-table: 0.2.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /eslint/8.32.0:
     resolution: {integrity: sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -6565,7 +6397,18 @@ packages:
       jest-get-type: 29.2.0
       jest-matcher-utils: 29.3.1
       jest-message-util: 29.3.1
-      jest-util: 29.3.1
+      jest-util: 29.4.1
+    dev: true
+
+  /expect/29.4.1:
+    resolution: {integrity: sha512-OKrGESHOaMxK3b6zxIq9SOW8kEXztKff/Dvg88j4xIJxur1hspEbedVkR3GpHe5LO+WB2Qw7OWN0RMTdp6as5A==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/expect-utils': 29.4.1
+      jest-get-type: 29.2.0
+      jest-matcher-utils: 29.4.1
+      jest-message-util: 29.4.1
+      jest-util: 29.4.1
     dev: true
 
   /ext-list/2.2.2:
@@ -8598,43 +8441,43 @@ packages:
       minimatch: 3.1.2
     dev: false
 
-  /jest-changed-files/29.2.0:
-    resolution: {integrity: sha512-qPVmLLyBmvF5HJrY7krDisx6Voi8DmlV3GZYX0aFNbaQsZeoz1hfxcCMbqDGuQCxU1dJy9eYc2xscE8QrCCYaA==}
+  /jest-changed-files/29.4.0:
+    resolution: {integrity: sha512-rnI1oPxgFghoz32Y8eZsGJMjW54UlqT17ycQeCEktcxxwqqKdlj9afl8LNeO0Pbu+h2JQHThQP0BzS67eTRx4w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       execa: 5.1.1
       p-limit: 3.1.0
     dev: true
 
-  /jest-circus/29.3.1:
-    resolution: {integrity: sha512-wpr26sEvwb3qQQbdlmei+gzp6yoSSoSL6GsLPxnuayZSMrSd5Ka7IjAvatpIernBvT2+Ic6RLTg+jSebScmasg==}
+  /jest-circus/29.4.1:
+    resolution: {integrity: sha512-v02NuL5crMNY4CGPHBEflLzl4v91NFb85a+dH9a1pUNx6Xjggrd8l9pPy4LZ1VYNRXlb+f65+7O/MSIbLir6pA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.3.1
-      '@jest/expect': 29.3.1
-      '@jest/test-result': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/environment': 29.4.1
+      '@jest/expect': 29.4.1
+      '@jest/test-result': 29.4.1
+      '@jest/types': 29.4.1
       '@types/node': 18.11.18
       chalk: 4.1.2
       co: 4.6.0
       dedent: 0.7.0
       is-generator-fn: 2.1.0
-      jest-each: 29.3.1
-      jest-matcher-utils: 29.3.1
-      jest-message-util: 29.3.1
-      jest-runtime: 29.3.1
-      jest-snapshot: 29.3.1
-      jest-util: 29.3.1
+      jest-each: 29.4.1
+      jest-matcher-utils: 29.4.1
+      jest-message-util: 29.4.1
+      jest-runtime: 29.4.1
+      jest-snapshot: 29.4.1
+      jest-util: 29.4.1
       p-limit: 3.1.0
-      pretty-format: 29.3.1
+      pretty-format: 29.4.1
       slash: 3.0.0
       stack-utils: 2.0.6
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /jest-cli/29.3.1_@types+node@18.11.18:
-    resolution: {integrity: sha512-TO/ewvwyvPOiBBuWZ0gm04z3WWP8TIK8acgPzE4IxgsLKQgb377NYGrQLc3Wl/7ndWzIH2CDNNsUjGxwLL43VQ==}
+  /jest-cli/29.4.1_@types+node@18.11.18:
+    resolution: {integrity: sha512-jz7GDIhtxQ37M+9dlbv5K+/FVcIo1O/b1sX3cJgzlQUf/3VG25nvuWzlDC4F1FLLzUThJeWLu8I7JF9eWpuURQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
     peerDependencies:
@@ -8643,16 +8486,16 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/core': 29.3.1
-      '@jest/test-result': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/core': 29.4.1
+      '@jest/test-result': 29.4.1
+      '@jest/types': 29.4.1
       chalk: 4.1.2
       exit: 0.1.2
       graceful-fs: 4.2.10
       import-local: 3.1.0
-      jest-config: 29.3.1_@types+node@18.11.18
-      jest-util: 29.3.1
-      jest-validate: 29.3.1
+      jest-config: 29.4.1_@types+node@18.11.18
+      jest-util: 29.4.1
+      jest-validate: 29.4.1
       prompts: 2.4.2
       yargs: 17.6.2
     transitivePeerDependencies:
@@ -8661,8 +8504,8 @@ packages:
       - ts-node
     dev: true
 
-  /jest-config/29.3.1_@types+node@18.11.18:
-    resolution: {integrity: sha512-y0tFHdj2WnTEhxmGUK1T7fgLen7YK4RtfvpLFBXfQkh2eMJAQq24Vx9472lvn5wg0MAO6B+iPfJfzdR9hJYalg==}
+  /jest-config/29.4.1_@types+node@18.11.18:
+    resolution: {integrity: sha512-g7p3q4NuXiM4hrS4XFATTkd+2z0Ml2RhFmFPM8c3WyKwVDNszbl4E7cV7WIx1YZeqqCtqbtTtZhGZWJlJqngzg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@types/node': '*'
@@ -8674,26 +8517,26 @@ packages:
         optional: true
     dependencies:
       '@babel/core': 7.20.12
-      '@jest/test-sequencer': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/test-sequencer': 29.4.1
+      '@jest/types': 29.4.1
       '@types/node': 18.11.18
-      babel-jest: 29.3.1_@babel+core@7.20.12
+      babel-jest: 29.4.1_@babel+core@7.20.12
       chalk: 4.1.2
       ci-info: 3.7.1
       deepmerge: 4.2.2
       glob: 7.2.3
       graceful-fs: 4.2.10
-      jest-circus: 29.3.1
-      jest-environment-node: 29.3.1
+      jest-circus: 29.4.1
+      jest-environment-node: 29.4.1
       jest-get-type: 29.2.0
       jest-regex-util: 29.2.0
-      jest-resolve: 29.3.1
-      jest-runner: 29.3.1
-      jest-util: 29.3.1
-      jest-validate: 29.3.1
+      jest-resolve: 29.4.1
+      jest-runner: 29.4.1
+      jest-util: 29.4.1
+      jest-validate: 29.4.1
       micromatch: 4.0.5
       parse-json: 5.2.0
-      pretty-format: 29.3.1
+      pretty-format: 29.4.1
       slash: 3.0.0
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
@@ -8707,7 +8550,17 @@ packages:
       chalk: 4.1.2
       diff-sequences: 29.3.1
       jest-get-type: 29.2.0
-      pretty-format: 29.3.1
+      pretty-format: 29.4.1
+    dev: true
+
+  /jest-diff/29.4.1:
+    resolution: {integrity: sha512-uazdl2g331iY56CEyfbNA0Ut7Mn2ulAG5vUaEHXycf1L6IPyuImIxSz4F0VYBKi7LYIuxOwTZzK3wh5jHzASMw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      chalk: 4.1.2
+      diff-sequences: 29.3.1
+      jest-get-type: 29.2.0
+      pretty-format: 29.4.1
     dev: true
 
   /jest-docblock/29.2.0:
@@ -8717,27 +8570,27 @@ packages:
       detect-newline: 3.1.0
     dev: true
 
-  /jest-each/29.3.1:
-    resolution: {integrity: sha512-qrZH7PmFB9rEzCSl00BWjZYuS1BSOH8lLuC0azQE9lQrAx3PWGKHTDudQiOSwIy5dGAJh7KA0ScYlCP7JxvFYA==}
+  /jest-each/29.4.1:
+    resolution: {integrity: sha512-QlYFiX3llJMWUV0BtWht/esGEz9w+0i7BHwODKCze7YzZzizgExB9MOfiivF/vVT0GSQ8wXLhvHXh3x2fVD4QQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.3.1
+      '@jest/types': 29.4.1
       chalk: 4.1.2
       jest-get-type: 29.2.0
-      jest-util: 29.3.1
-      pretty-format: 29.3.1
+      jest-util: 29.4.1
+      pretty-format: 29.4.1
     dev: true
 
-  /jest-environment-node/29.3.1:
-    resolution: {integrity: sha512-xm2THL18Xf5sIHoU7OThBPtuH6Lerd+Y1NLYiZJlkE3hbE+7N7r8uvHIl/FkZ5ymKXJe/11SQuf3fv4v6rUMag==}
+  /jest-environment-node/29.4.1:
+    resolution: {integrity: sha512-x/H2kdVgxSkxWAIlIh9MfMuBa0hZySmfsC5lCsWmWr6tZySP44ediRKDUiNggX/eHLH7Cd5ZN10Rw+XF5tXsqg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.3.1
-      '@jest/fake-timers': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/environment': 29.4.1
+      '@jest/fake-timers': 29.4.1
+      '@jest/types': 29.4.1
       '@types/node': 18.11.18
-      jest-mock: 29.3.1
-      jest-util: 29.3.1
+      jest-mock: 29.4.1
+      jest-util: 29.4.1
     dev: true
 
   /jest-get-type/29.2.0:
@@ -8745,31 +8598,31 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dev: true
 
-  /jest-haste-map/29.3.1:
-    resolution: {integrity: sha512-/FFtvoG1xjbbPXQLFef+WSU4yrc0fc0Dds6aRPBojUid7qlPqZvxdUBA03HW0fnVHXVCnCdkuoghYItKNzc/0A==}
+  /jest-haste-map/29.4.1:
+    resolution: {integrity: sha512-imTjcgfVVTvg02khXL11NNLTx9ZaofbAWhilrMg/G8dIkp+HYCswhxf0xxJwBkfhWb3e8dwbjuWburvxmcr58w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.3.1
+      '@jest/types': 29.4.1
       '@types/graceful-fs': 4.1.6
       '@types/node': 18.11.18
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.10
       jest-regex-util: 29.2.0
-      jest-util: 29.3.1
-      jest-worker: 29.3.1
+      jest-util: 29.4.1
+      jest-worker: 29.4.1
       micromatch: 4.0.5
       walker: 1.0.8
     optionalDependencies:
       fsevents: 2.3.2
     dev: true
 
-  /jest-leak-detector/29.3.1:
-    resolution: {integrity: sha512-3DA/VVXj4zFOPagGkuqHnSQf1GZBmmlagpguxEERO6Pla2g84Q1MaVIB3YMxgUaFIaYag8ZnTyQgiZ35YEqAQA==}
+  /jest-leak-detector/29.4.1:
+    resolution: {integrity: sha512-akpZv7TPyGMnH2RimOCgy+hPmWZf55EyFUvymQ4LMsQP8xSPlZumCPtXGoDhFNhUE2039RApZkTQDKU79p/FiQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       jest-get-type: 29.2.0
-      pretty-format: 29.3.1
+      pretty-format: 29.4.1
     dev: true
 
   /jest-matcher-utils/29.3.1:
@@ -8779,7 +8632,17 @@ packages:
       chalk: 4.1.2
       jest-diff: 29.3.1
       jest-get-type: 29.2.0
-      pretty-format: 29.3.1
+      pretty-format: 29.4.1
+    dev: true
+
+  /jest-matcher-utils/29.4.1:
+    resolution: {integrity: sha512-k5h0u8V4nAEy6lSACepxL/rw78FLDkBnXhZVgFneVpnJONhb2DhZj/Gv4eNe+1XqQ5IhgUcqj745UwH0HJmMnA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      chalk: 4.1.2
+      jest-diff: 29.4.1
+      jest-get-type: 29.2.0
+      pretty-format: 29.4.1
     dev: true
 
   /jest-message-util/29.3.1:
@@ -8787,26 +8650,41 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@babel/code-frame': 7.18.6
-      '@jest/types': 29.3.1
+      '@jest/types': 29.4.1
       '@types/stack-utils': 2.0.1
       chalk: 4.1.2
       graceful-fs: 4.2.10
       micromatch: 4.0.5
-      pretty-format: 29.3.1
+      pretty-format: 29.4.1
       slash: 3.0.0
       stack-utils: 2.0.6
     dev: true
 
-  /jest-mock/29.3.1:
-    resolution: {integrity: sha512-H8/qFDtDVMFvFP4X8NuOT3XRDzOUTz+FeACjufHzsOIBAxivLqkB1PoLCaJx9iPPQ8dZThHPp/G3WRWyMgA3JA==}
+  /jest-message-util/29.4.1:
+    resolution: {integrity: sha512-H4/I0cXUaLeCw6FM+i4AwCnOwHRgitdaUFOdm49022YD5nfyr8C/DrbXOBEyJaj+w/y0gGJ57klssOaUiLLQGQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.3.1
-      '@types/node': 18.11.18
-      jest-util: 29.3.1
+      '@babel/code-frame': 7.18.6
+      '@jest/types': 29.4.1
+      '@types/stack-utils': 2.0.1
+      chalk: 4.1.2
+      graceful-fs: 4.2.10
+      micromatch: 4.0.5
+      pretty-format: 29.4.1
+      slash: 3.0.0
+      stack-utils: 2.0.6
     dev: true
 
-  /jest-pnp-resolver/1.2.3_jest-resolve@29.3.1:
+  /jest-mock/29.4.1:
+    resolution: {integrity: sha512-MwA4hQ7zBOcgVCVnsM8TzaFLVUD/pFWTfbkY953Y81L5ret3GFRZtmPmRFAjKQSdCKoJvvqOu6Bvfpqlwwb0dQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/types': 29.4.1
+      '@types/node': 18.11.18
+      jest-util: 29.4.1
+    dev: true
+
+  /jest-pnp-resolver/1.2.3_jest-resolve@29.4.1:
     resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==}
     engines: {node: '>=6'}
     peerDependencies:
@@ -8815,7 +8693,7 @@ packages:
       jest-resolve:
         optional: true
     dependencies:
-      jest-resolve: 29.3.1
+      jest-resolve: 29.4.1
     dev: true
 
   /jest-regex-util/29.2.0:
@@ -8823,92 +8701,93 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dev: true
 
-  /jest-resolve-dependencies/29.3.1:
-    resolution: {integrity: sha512-Vk0cYq0byRw2WluNmNWGqPeRnZ3p3hHmjJMp2dyyZeYIfiBskwq4rpiuGFR6QGAdbj58WC7HN4hQHjf2mpvrLA==}
+  /jest-resolve-dependencies/29.4.1:
+    resolution: {integrity: sha512-Y3QG3M1ncAMxfjbYgtqNXC5B595zmB6e//p/qpA/58JkQXu/IpLDoLeOa8YoYfsSglBKQQzNUqtfGJJT/qLmJg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       jest-regex-util: 29.2.0
-      jest-snapshot: 29.3.1
+      jest-snapshot: 29.4.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /jest-resolve/29.3.1:
-    resolution: {integrity: sha512-amXJgH/Ng712w3Uz5gqzFBBjxV8WFLSmNjoreBGMqxgCz5cH7swmBZzgBaCIOsvb0NbpJ0vgaSFdJqMdT+rADw==}
+  /jest-resolve/29.4.1:
+    resolution: {integrity: sha512-j/ZFNV2lm9IJ2wmlq1uYK0Y/1PiyDq9g4HEGsNTNr3viRbJdV+8Lf1SXIiLZXFvyiisu0qUyIXGBnw+OKWkJwQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       chalk: 4.1.2
       graceful-fs: 4.2.10
-      jest-haste-map: 29.3.1
-      jest-pnp-resolver: 1.2.3_jest-resolve@29.3.1
-      jest-util: 29.3.1
-      jest-validate: 29.3.1
+      jest-haste-map: 29.4.1
+      jest-pnp-resolver: 1.2.3_jest-resolve@29.4.1
+      jest-util: 29.4.1
+      jest-validate: 29.4.1
       resolve: 1.22.1
-      resolve.exports: 1.1.1
+      resolve.exports: 2.0.0
       slash: 3.0.0
     dev: true
 
-  /jest-runner/29.3.1:
-    resolution: {integrity: sha512-oFvcwRNrKMtE6u9+AQPMATxFcTySyKfLhvso7Sdk/rNpbhg4g2GAGCopiInk1OP4q6gz3n6MajW4+fnHWlU3bA==}
+  /jest-runner/29.4.1:
+    resolution: {integrity: sha512-8d6XXXi7GtHmsHrnaqBKWxjKb166Eyj/ksSaUYdcBK09VbjPwIgWov1VwSmtupCIz8q1Xv4Qkzt/BTo3ZqiCeg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/console': 29.3.1
-      '@jest/environment': 29.3.1
-      '@jest/test-result': 29.3.1
-      '@jest/transform': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/console': 29.4.1
+      '@jest/environment': 29.4.1
+      '@jest/test-result': 29.4.1
+      '@jest/transform': 29.4.1
+      '@jest/types': 29.4.1
       '@types/node': 18.11.18
       chalk: 4.1.2
       emittery: 0.13.1
       graceful-fs: 4.2.10
       jest-docblock: 29.2.0
-      jest-environment-node: 29.3.1
-      jest-haste-map: 29.3.1
-      jest-leak-detector: 29.3.1
-      jest-message-util: 29.3.1
-      jest-resolve: 29.3.1
-      jest-runtime: 29.3.1
-      jest-util: 29.3.1
-      jest-watcher: 29.3.1
-      jest-worker: 29.3.1
+      jest-environment-node: 29.4.1
+      jest-haste-map: 29.4.1
+      jest-leak-detector: 29.4.1
+      jest-message-util: 29.4.1
+      jest-resolve: 29.4.1
+      jest-runtime: 29.4.1
+      jest-util: 29.4.1
+      jest-watcher: 29.4.1
+      jest-worker: 29.4.1
       p-limit: 3.1.0
       source-map-support: 0.5.13
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /jest-runtime/29.3.1:
-    resolution: {integrity: sha512-jLzkIxIqXwBEOZx7wx9OO9sxoZmgT2NhmQKzHQm1xwR1kNW/dn0OjxR424VwHHf1SPN6Qwlb5pp1oGCeFTQ62A==}
+  /jest-runtime/29.4.1:
+    resolution: {integrity: sha512-UXTMU9uKu2GjYwTtoAw5rn4STxWw/nadOfW7v1sx6LaJYa3V/iymdCLQM6xy3+7C6mY8GfX22vKpgxY171UIoA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.3.1
-      '@jest/fake-timers': 29.3.1
-      '@jest/globals': 29.3.1
+      '@jest/environment': 29.4.1
+      '@jest/fake-timers': 29.4.1
+      '@jest/globals': 29.4.1
       '@jest/source-map': 29.2.0
-      '@jest/test-result': 29.3.1
-      '@jest/transform': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/test-result': 29.4.1
+      '@jest/transform': 29.4.1
+      '@jest/types': 29.4.1
       '@types/node': 18.11.18
       chalk: 4.1.2
       cjs-module-lexer: 1.2.2
       collect-v8-coverage: 1.0.1
       glob: 7.2.3
       graceful-fs: 4.2.10
-      jest-haste-map: 29.3.1
-      jest-message-util: 29.3.1
-      jest-mock: 29.3.1
+      jest-haste-map: 29.4.1
+      jest-message-util: 29.4.1
+      jest-mock: 29.4.1
       jest-regex-util: 29.2.0
-      jest-resolve: 29.3.1
-      jest-snapshot: 29.3.1
-      jest-util: 29.3.1
+      jest-resolve: 29.4.1
+      jest-snapshot: 29.4.1
+      jest-util: 29.4.1
+      semver: 7.3.8
       slash: 3.0.0
       strip-bom: 4.0.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /jest-snapshot/29.3.1:
-    resolution: {integrity: sha512-+3JOc+s28upYLI2OJM4PWRGK9AgpsMs/ekNryUV0yMBClT9B1DF2u2qay8YxcQd338PPYSFNb0lsar1B49sLDA==}
+  /jest-snapshot/29.4.1:
+    resolution: {integrity: sha512-l4iV8EjGgQWVz3ee/LR9sULDk2pCkqb71bjvlqn+qp90lFwpnulHj4ZBT8nm1hA1C5wowXLc7MGnw321u0tsYA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@babel/core': 7.20.12
@@ -8917,33 +8796,33 @@ packages:
       '@babel/plugin-syntax-typescript': 7.20.0_@babel+core@7.20.12
       '@babel/traverse': 7.20.12
       '@babel/types': 7.20.7
-      '@jest/expect-utils': 29.3.1
-      '@jest/transform': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/expect-utils': 29.4.1
+      '@jest/transform': 29.4.1
+      '@jest/types': 29.4.1
       '@types/babel__traverse': 7.18.3
       '@types/prettier': 2.7.2
       babel-preset-current-node-syntax: 1.0.1_@babel+core@7.20.12
       chalk: 4.1.2
-      expect: 29.3.1
+      expect: 29.4.1
       graceful-fs: 4.2.10
-      jest-diff: 29.3.1
+      jest-diff: 29.4.1
       jest-get-type: 29.2.0
-      jest-haste-map: 29.3.1
-      jest-matcher-utils: 29.3.1
-      jest-message-util: 29.3.1
-      jest-util: 29.3.1
+      jest-haste-map: 29.4.1
+      jest-matcher-utils: 29.4.1
+      jest-message-util: 29.4.1
+      jest-util: 29.4.1
       natural-compare: 1.4.0
-      pretty-format: 29.3.1
+      pretty-format: 29.4.1
       semver: 7.3.8
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /jest-util/29.3.1:
-    resolution: {integrity: sha512-7YOVZaiX7RJLv76ZfHt4nbNEzzTRiMW/IiOG7ZOKmTXmoGBxUDefgMAxQubu6WPVqP5zSzAdZG0FfLcC7HOIFQ==}
+  /jest-util/29.4.1:
+    resolution: {integrity: sha512-bQy9FPGxVutgpN4VRc0hk6w7Hx/m6L53QxpDreTZgJd9gfx/AV2MjyPde9tGyZRINAUrSv57p2inGBu2dRLmkQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.3.1
+      '@jest/types': 29.4.1
       '@types/node': 18.11.18
       chalk: 4.1.2
       ci-info: 3.7.1
@@ -8951,44 +8830,44 @@ packages:
       picomatch: 2.3.1
     dev: true
 
-  /jest-validate/29.3.1:
-    resolution: {integrity: sha512-N9Lr3oYR2Mpzuelp1F8negJR3YE+L1ebk1rYA5qYo9TTY3f9OWdptLoNSPP9itOCBIRBqjt/S5XHlzYglLN67g==}
+  /jest-validate/29.4.1:
+    resolution: {integrity: sha512-qNZXcZQdIQx4SfUB/atWnI4/I2HUvhz8ajOSYUu40CSmf9U5emil8EDHgE7M+3j9/pavtk3knlZBDsgFvv/SWw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.3.1
+      '@jest/types': 29.4.1
       camelcase: 6.3.0
       chalk: 4.1.2
       jest-get-type: 29.2.0
       leven: 3.1.0
-      pretty-format: 29.3.1
+      pretty-format: 29.4.1
     dev: true
 
-  /jest-watcher/29.3.1:
-    resolution: {integrity: sha512-RspXG2BQFDsZSRKGCT/NiNa8RkQ1iKAjrO0//soTMWx/QUt+OcxMqMSBxz23PYGqUuWm2+m2mNNsmj0eIoOaFg==}
+  /jest-watcher/29.4.1:
+    resolution: {integrity: sha512-vFOzflGFs27nU6h8dpnVRER3O2rFtL+VMEwnG0H3KLHcllLsU8y9DchSh0AL/Rg5nN1/wSiQ+P4ByMGpuybaVw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/test-result': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/test-result': 29.4.1
+      '@jest/types': 29.4.1
       '@types/node': 18.11.18
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       emittery: 0.13.1
-      jest-util: 29.3.1
+      jest-util: 29.4.1
       string-length: 4.0.2
     dev: true
 
-  /jest-worker/29.3.1:
-    resolution: {integrity: sha512-lY4AnnmsEWeiXirAIA0c9SDPbuCBq8IYuDVL8PMm0MZ2PEs2yPvRA/J64QBXuZp7CYKrDM/rmNrc9/i3KJQncw==}
+  /jest-worker/29.4.1:
+    resolution: {integrity: sha512-O9doU/S1EBe+yp/mstQ0VpPwpv0Clgn68TkNwGxL6/usX/KUW9Arnn4ag8C3jc6qHcXznhsT5Na1liYzAsuAbQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@types/node': 18.11.18
-      jest-util: 29.3.1
+      jest-util: 29.4.1
       merge-stream: 2.0.0
       supports-color: 8.1.1
     dev: true
 
-  /jest/29.3.1_@types+node@18.11.18:
-    resolution: {integrity: sha512-6iWfL5DTT0Np6UYs/y5Niu7WIfNv/wRTtN5RSXt2DIEft3dx3zPuw/3WJQBCJfmEzvDiEKwoqMbGD9n49+qLSA==}
+  /jest/29.4.1_@types+node@18.11.18:
+    resolution: {integrity: sha512-cknimw7gAXPDOmj0QqztlxVtBVCw2lYY9CeIE5N6kD+kET1H4H79HSNISJmijb1HF+qk+G+ploJgiDi5k/fRlg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
     peerDependencies:
@@ -8997,10 +8876,10 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/core': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/core': 29.4.1
+      '@jest/types': 29.4.1
       import-local: 3.1.0
-      jest-cli: 29.3.1_@types+node@18.11.18
+      jest-cli: 29.4.1_@types+node@18.11.18
     transitivePeerDependencies:
       - '@types/node'
       - supports-color
@@ -11304,6 +11183,15 @@ packages:
       react-is: 18.2.0
     dev: true
 
+  /pretty-format/29.4.1:
+    resolution: {integrity: sha512-dt/Z761JUVsrIKaY215o1xQJBGlSmTx/h4cSqXqjHLnU1+Kt+mavVE7UgqJJO5ukx5HjSswHfmXz4LjS2oIJfg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/schemas': 29.4.0
+      ansi-styles: 5.2.0
+      react-is: 18.2.0
+    dev: true
+
   /pretty-hrtime/1.0.3:
     resolution: {integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==}
     engines: {node: '>= 0.8'}
@@ -12017,8 +11905,8 @@ packages:
     deprecated: https://github.com/lydell/resolve-url#deprecated
     dev: false
 
-  /resolve.exports/1.1.1:
-    resolution: {integrity: sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==}
+  /resolve.exports/2.0.0:
+    resolution: {integrity: sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg==}
     engines: {node: '>=10'}
     dev: true
 
@@ -12099,8 +11987,8 @@ packages:
       seedrandom: 2.4.2
     dev: false
 
-  /rollup/3.10.1:
-    resolution: {integrity: sha512-3Er+yel3bZbZX1g2kjVM+FW+RUWDxbG87fcqFM5/9HbPCTpbVp6JOLn7jlxnNlbu7s/N/uDA4EV/91E2gWnxzw==}
+  /rollup/3.11.0:
+    resolution: {integrity: sha512-+uWPPkpWQ2H3Qi7sNBcRfhhHJyUNgBYhG4wKe5wuGRj2m55kpo+0p5jubKNBjQODyPe6tSBE3tNpdDwEisQvAQ==}
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
@@ -12913,8 +12801,8 @@ packages:
     resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
     dev: false
 
-  /systeminformation/5.17.3:
-    resolution: {integrity: sha512-IAmnUJdeFUWqY+YneAWJ9rceTdRRIaTiwspvd1B6SG7yhqpxLrSosHgGZKiE8lcaBlBYpLQpY3BRLtus4n8PNQ==}
+  /systeminformation/5.17.4:
+    resolution: {integrity: sha512-mEiIYrw7X5ABX8tJUgzbumQAuFQxNyHdZDz6+UtwNKUbKgIoZqLtug2z1spFB/LiXZne5tdPBJOlvVckbvfhiQ==}
     engines: {node: '>=8.0.0'}
     os: [darwin, linux, win32, freebsd, openbsd, netbsd, sunos, android]
     hasBin: true
@@ -13039,8 +12927,8 @@ packages:
       real-require: 0.2.0
     dev: false
 
-  /three/0.148.0:
-    resolution: {integrity: sha512-8uzVV+qhTPi0bOFs/3te3RW6hb3urL8jYEl6irjCWo/l6sr8MPNMcClFev/MMYeIxr0gmDcoXTy/8LXh/LXkfw==}
+  /three/0.149.0:
+    resolution: {integrity: sha512-tohpUxPDht0qExRLDTM8sjRLc5d9STURNrdnK3w9A+V4pxaTBfKWWT/IqtiLfg23Vfc3Z+ImNfvRw1/0CtxrkQ==}
     dev: false
 
   /throttle-debounce/5.0.0:
@@ -13794,7 +13682,7 @@ packages:
       esbuild: 0.16.17
       postcss: 8.4.21
       resolve: 1.22.1
-      rollup: 3.10.1
+      rollup: 3.11.0
       sass: 1.57.1
     optionalDependencies:
       fsevents: 2.3.2
@@ -14058,9 +13946,9 @@ packages:
   /wrappy/1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
-  /write-file-atomic/4.0.2:
-    resolution: {integrity: sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+  /write-file-atomic/5.0.0:
+    resolution: {integrity: sha512-R7NYMnHSlV42K54lwY9lvW6MnSm1HSJqZL3xiSgi9E7//FYaI74r2G0rd+/X6VAMkHEdzxQaU5HUOXWUz5kA/w==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
     dependencies:
       imurmurhash: 0.1.4
       signal-exit: 3.0.7

From e9cb18c5aab3128f90d206aaf2b80f21a9bcb134 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 27 Jan 2023 11:44:04 +0900
Subject: [PATCH 147/177] 13.2.4

---
 CHANGELOG.md | 13 +++++++++++++
 package.json |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0dbb6e24..e767c15df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,19 @@
 You should also include the user name that made the change.
 -->
 
+## 13.2.4 (2023/01/27)
+### Improvements
+- リモートカスタム絵文字表示時のパフォーマンスを改善
+- Default to `animation: false` when prefers-reduced-motion is set
+- リアクション履歴が公開なら、ログインしていなくても表示できるように
+- tweak blur setting
+- tweak custom emoji cache
+
+### Bugfixes
+- fix aggregation of retention
+- ダッシュボードでオンラインユーザー数が表示されない問題を修正
+- フォロー申請・フォローのボタンが、通知から消えている問題を修正
+
 ## 13.2.3 (2023/01/26)
 ### Improvements
 - カスタム絵文字の更新をリアルタイムで反映するように
diff --git a/package.json b/package.json
index e1494f064..06ec191b5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.2.3",
+	"version": "13.2.4",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From c7b5c8b19e737d5646b6033875b7d16b3d2401be Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 27 Jan 2023 12:33:15 +0900
Subject: [PATCH 148/177] =?UTF-8?q?sw=E3=81=8C=E3=83=93=E3=83=AB=E3=83=89?=
 =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E3=81=AE=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/sw/package.json |   2 +-
 pnpm-lock.yaml           | 440 +++++++++++++++++++--------------------
 2 files changed, 216 insertions(+), 226 deletions(-)

diff --git a/packages/sw/package.json b/packages/sw/package.json
index ef46112da..1743b898c 100644
--- a/packages/sw/package.json
+++ b/packages/sw/package.json
@@ -7,7 +7,7 @@
 		"lint": "tsc --noEmit && eslint --quiet src/**/*.ts"
 	},
 	"dependencies": {
-		"esbuild": "^0.17.4",
+		"esbuild": "^0.14.42",
 		"idb-keyval": "^6.2.0",
 		"misskey-js": "0.0.14"
 	},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dda76c38f..3e789d846 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -549,14 +549,14 @@ importers:
     specifiers:
       '@typescript-eslint/parser': ^5.49.0
       '@typescript/lib-webworker': npm:@types/serviceworker@0.0.61
-      esbuild: ^0.17.4
+      esbuild: ^0.14.42
       eslint: ^8.32.0
       eslint-plugin-import: ^2.27.5
       idb-keyval: ^6.2.0
       misskey-js: 0.0.14
       typescript: 4.9.4
     dependencies:
-      esbuild: 0.17.4
+      esbuild: 0.14.54
       idb-keyval: 6.2.0
       misskey-js: 0.0.14
     devDependencies:
@@ -1096,15 +1096,6 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/android-arm/0.17.4:
-    resolution: {integrity: sha512-R9GCe2xl2XDSc2XbQB63mFiFXHIVkOP+ltIxICKXqUPrFX97z6Z7vONCLQM1pSOLGqfLrGi3B7nbhxmFY/fomg==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/android-arm64/0.16.17:
     resolution: {integrity: sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==}
     engines: {node: '>=12'}
@@ -1114,15 +1105,6 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/android-arm64/0.17.4:
-    resolution: {integrity: sha512-91VwDrl4EpxBCiG6h2LZZEkuNvVZYJkv2T9gyLG/mhGG1qrM7i5SwUcg/hlSPnL/4hDT0TFcF35/XMGSn0bemg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/android-x64/0.16.17:
     resolution: {integrity: sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==}
     engines: {node: '>=12'}
@@ -1132,15 +1114,6 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/android-x64/0.17.4:
-    resolution: {integrity: sha512-mGSqhEPL7029XL7QHNPxPs15JVa02hvZvysUcyMP9UXdGFwncl2WU0bqx+Ysgzd+WAbv8rfNa73QveOxAnAM2w==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/darwin-arm64/0.16.17:
     resolution: {integrity: sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==}
     engines: {node: '>=12'}
@@ -1150,15 +1123,6 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/darwin-arm64/0.17.4:
-    resolution: {integrity: sha512-tTyJRM9dHvlMPt1KrBFVB5OW1kXOsRNvAPtbzoKazd5RhD5/wKlXk1qR2MpaZRYwf4WDMadt0Pv0GwxB41CVow==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/darwin-x64/0.16.17:
     resolution: {integrity: sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==}
     engines: {node: '>=12'}
@@ -1168,15 +1132,6 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/darwin-x64/0.17.4:
-    resolution: {integrity: sha512-phQuC2Imrb3TjOJwLN8EO50nb2FHe8Ew0OwgZDH1SV6asIPGudnwTQtighDF2EAYlXChLoMJwqjAp4vAaACq6w==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/freebsd-arm64/0.16.17:
     resolution: {integrity: sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==}
     engines: {node: '>=12'}
@@ -1186,15 +1141,6 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/freebsd-arm64/0.17.4:
-    resolution: {integrity: sha512-oH6JUZkocgmjzzYaP5juERLpJQSwazdjZrTPgLRmAU2bzJ688x0vfMB/WTv4r58RiecdHvXOPC46VtsMy/mepg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/freebsd-x64/0.16.17:
     resolution: {integrity: sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==}
     engines: {node: '>=12'}
@@ -1204,15 +1150,6 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/freebsd-x64/0.17.4:
-    resolution: {integrity: sha512-U4iWGn/9TrAfpAdfd56eO0pRxIgb0a8Wj9jClrhT8hvZnOnS4dfMPW7o4fn15D/KqoiVYHRm43jjBaTt3g/2KA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/linux-arm/0.16.17:
     resolution: {integrity: sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==}
     engines: {node: '>=12'}
@@ -1222,15 +1159,6 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/linux-arm/0.17.4:
-    resolution: {integrity: sha512-S2s9xWTGMTa/fG5EyMGDeL0wrWVgOSQcNddJWgu6rG1NCSXJHs76ZP9AsxjB3f2nZow9fWOyApklIgiTGZKhiw==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/linux-arm64/0.16.17:
     resolution: {integrity: sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==}
     engines: {node: '>=12'}
@@ -1240,15 +1168,6 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/linux-arm64/0.17.4:
-    resolution: {integrity: sha512-UkGfQvYlwOaeYJzZG4cLV0hCASzQZnKNktRXUo3/BMZvdau40AOz9GzmGA063n1piq6VrFFh43apRDQx8hMP2w==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/linux-ia32/0.16.17:
     resolution: {integrity: sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==}
     engines: {node: '>=12'}
@@ -1258,17 +1177,8 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/linux-ia32/0.17.4:
-    resolution: {integrity: sha512-3lqFi4VFo/Vwvn77FZXeLd0ctolIJH/uXkH3yNgEk89Eh6D3XXAC9/iTPEzeEpsNE5IqGIsFa5Z0iPeOh25IyA==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@esbuild/linux-loong64/0.16.17:
-    resolution: {integrity: sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==}
+  /@esbuild/linux-loong64/0.14.54:
+    resolution: {integrity: sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
@@ -1276,8 +1186,8 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/linux-loong64/0.17.4:
-    resolution: {integrity: sha512-HqpWZkVslDHIwdQ9D+gk7NuAulgQvRxF9no54ut/M55KEb3mi7sQS3GwpPJzSyzzP0UkjQVN7/tbk88/CaX4EQ==}
+  /@esbuild/linux-loong64/0.16.17:
+    resolution: {integrity: sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
@@ -1294,15 +1204,6 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/linux-mips64el/0.17.4:
-    resolution: {integrity: sha512-d/nMCKKh/SVDbqR9ju+b78vOr0tNXtfBjcp5vfHONCCOAL9ad8gN9dC/u+UnH939pz7wO+0u/x9y1MaZcb/lKA==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/linux-ppc64/0.16.17:
     resolution: {integrity: sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==}
     engines: {node: '>=12'}
@@ -1312,15 +1213,6 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/linux-ppc64/0.17.4:
-    resolution: {integrity: sha512-lOD9p2dmjZcNiTU+sGe9Nn6G3aYw3k0HBJies1PU0j5IGfp6tdKOQ6mzfACRFCqXjnBuTqK7eTYpwx09O5LLfg==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/linux-riscv64/0.16.17:
     resolution: {integrity: sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==}
     engines: {node: '>=12'}
@@ -1330,15 +1222,6 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/linux-riscv64/0.17.4:
-    resolution: {integrity: sha512-mTGnwWwVshAjGsd8rP+K6583cPDgxOunsqqldEYij7T5/ysluMHKqUIT4TJHfrDFadUwrghAL6QjER4FeqQXoA==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/linux-s390x/0.16.17:
     resolution: {integrity: sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==}
     engines: {node: '>=12'}
@@ -1348,15 +1231,6 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/linux-s390x/0.17.4:
-    resolution: {integrity: sha512-AQYuUGp50XM29/N/dehADxvc2bUqDcoqrVuijop1Wv72SyxT6dDB9wjUxuPZm2HwIM876UoNNBMVd+iX/UTKVQ==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/linux-x64/0.16.17:
     resolution: {integrity: sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==}
     engines: {node: '>=12'}
@@ -1366,15 +1240,6 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/linux-x64/0.17.4:
-    resolution: {integrity: sha512-+AsFBwKgQuhV2shfGgA9YloxLDVjXgUEWZum7glR5lLmV94IThu/u2JZGxTgjYby6kyXEx8lKOqP5rTEVBR0Rw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/netbsd-x64/0.16.17:
     resolution: {integrity: sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==}
     engines: {node: '>=12'}
@@ -1384,15 +1249,6 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/netbsd-x64/0.17.4:
-    resolution: {integrity: sha512-zD1TKYX9553OiLS/qkXPMlWoELYkH/VkzRYNKEU+GwFiqkq0SuxsKnsCg5UCdxN3cqd+1KZ8SS3R+WG/Hxy2jQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/openbsd-x64/0.16.17:
     resolution: {integrity: sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==}
     engines: {node: '>=12'}
@@ -1402,15 +1258,6 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/openbsd-x64/0.17.4:
-    resolution: {integrity: sha512-PY1NjEsLRhPEFFg1AV0/4Or/gR+q2dOb9s5rXcPuCjyHRzbt8vnHJl3vYj+641TgWZzTFmSUnZbzs1zwTzjeqw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/sunos-x64/0.16.17:
     resolution: {integrity: sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==}
     engines: {node: '>=12'}
@@ -1420,15 +1267,6 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/sunos-x64/0.17.4:
-    resolution: {integrity: sha512-B3Z7s8QZQW9tKGleMRXvVmwwLPAUoDCHs4WZ2ElVMWiortLJFowU1NjAhXOKjDgC7o9ByeVcwyOlJ+F2r6ZgmQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/win32-arm64/0.16.17:
     resolution: {integrity: sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==}
     engines: {node: '>=12'}
@@ -1438,15 +1276,6 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/win32-arm64/0.17.4:
-    resolution: {integrity: sha512-0HCu8R3mY/H5V7N6kdlsJkvrT591bO/oRZy8ztF1dhgNU5xD5tAh5bKByT1UjTGjp/VVBsl1PDQ3L18SfvtnBQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/win32-ia32/0.16.17:
     resolution: {integrity: sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==}
     engines: {node: '>=12'}
@@ -1456,15 +1285,6 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/win32-ia32/0.17.4:
-    resolution: {integrity: sha512-VUjhVDQycse1gLbe06pC/uaA0M+piQXJpdpNdhg8sPmeIZZqu5xPoGWVCmcsOO2gaM2cywuTYTHkXRozo3/Nkg==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/win32-x64/0.16.17:
     resolution: {integrity: sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==}
     engines: {node: '>=12'}
@@ -1474,15 +1294,6 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/win32-x64/0.17.4:
-    resolution: {integrity: sha512-0kLAjs+xN5OjhTt/aUA6t48SfENSCKgGPfExADYTOo/UCn0ivxos9/anUVeSfg+L+2O9xkFxvJXIJfG+Q4sYSg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@eslint/eslintrc/1.4.1:
     resolution: {integrity: sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -5914,6 +5725,215 @@ packages:
       es6-symbol: 3.1.3
     dev: false
 
+  /esbuild-android-64/0.14.54:
+    resolution: {integrity: sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-android-arm64/0.14.54:
+    resolution: {integrity: sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-darwin-64/0.14.54:
+    resolution: {integrity: sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-darwin-arm64/0.14.54:
+    resolution: {integrity: sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-freebsd-64/0.14.54:
+    resolution: {integrity: sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-freebsd-arm64/0.14.54:
+    resolution: {integrity: sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-linux-32/0.14.54:
+    resolution: {integrity: sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-linux-64/0.14.54:
+    resolution: {integrity: sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-linux-arm/0.14.54:
+    resolution: {integrity: sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-linux-arm64/0.14.54:
+    resolution: {integrity: sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-linux-mips64le/0.14.54:
+    resolution: {integrity: sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-linux-ppc64le/0.14.54:
+    resolution: {integrity: sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-linux-riscv64/0.14.54:
+    resolution: {integrity: sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-linux-s390x/0.14.54:
+    resolution: {integrity: sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-netbsd-64/0.14.54:
+    resolution: {integrity: sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-openbsd-64/0.14.54:
+    resolution: {integrity: sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-sunos-64/0.14.54:
+    resolution: {integrity: sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-windows-32/0.14.54:
+    resolution: {integrity: sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-windows-64/0.14.54:
+    resolution: {integrity: sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-windows-arm64/0.14.54:
+    resolution: {integrity: sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild/0.14.54:
+    resolution: {integrity: sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==}
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    optionalDependencies:
+      '@esbuild/linux-loong64': 0.14.54
+      esbuild-android-64: 0.14.54
+      esbuild-android-arm64: 0.14.54
+      esbuild-darwin-64: 0.14.54
+      esbuild-darwin-arm64: 0.14.54
+      esbuild-freebsd-64: 0.14.54
+      esbuild-freebsd-arm64: 0.14.54
+      esbuild-linux-32: 0.14.54
+      esbuild-linux-64: 0.14.54
+      esbuild-linux-arm: 0.14.54
+      esbuild-linux-arm64: 0.14.54
+      esbuild-linux-mips64le: 0.14.54
+      esbuild-linux-ppc64le: 0.14.54
+      esbuild-linux-riscv64: 0.14.54
+      esbuild-linux-s390x: 0.14.54
+      esbuild-netbsd-64: 0.14.54
+      esbuild-openbsd-64: 0.14.54
+      esbuild-sunos-64: 0.14.54
+      esbuild-windows-32: 0.14.54
+      esbuild-windows-64: 0.14.54
+      esbuild-windows-arm64: 0.14.54
+    dev: false
+
   /esbuild/0.16.17:
     resolution: {integrity: sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==}
     engines: {node: '>=12'}
@@ -5944,36 +5964,6 @@ packages:
       '@esbuild/win32-x64': 0.16.17
     dev: false
 
-  /esbuild/0.17.4:
-    resolution: {integrity: sha512-zBn9MeCwT7W5F1a3lXClD61ip6vQM+H8Msb0w8zMT4ZKBpDg+rFAraNyWCDelB/2L6M3g6AXHPnsyvjMFnxtFw==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
-    optionalDependencies:
-      '@esbuild/android-arm': 0.17.4
-      '@esbuild/android-arm64': 0.17.4
-      '@esbuild/android-x64': 0.17.4
-      '@esbuild/darwin-arm64': 0.17.4
-      '@esbuild/darwin-x64': 0.17.4
-      '@esbuild/freebsd-arm64': 0.17.4
-      '@esbuild/freebsd-x64': 0.17.4
-      '@esbuild/linux-arm': 0.17.4
-      '@esbuild/linux-arm64': 0.17.4
-      '@esbuild/linux-ia32': 0.17.4
-      '@esbuild/linux-loong64': 0.17.4
-      '@esbuild/linux-mips64el': 0.17.4
-      '@esbuild/linux-ppc64': 0.17.4
-      '@esbuild/linux-riscv64': 0.17.4
-      '@esbuild/linux-s390x': 0.17.4
-      '@esbuild/linux-x64': 0.17.4
-      '@esbuild/netbsd-x64': 0.17.4
-      '@esbuild/openbsd-x64': 0.17.4
-      '@esbuild/sunos-x64': 0.17.4
-      '@esbuild/win32-arm64': 0.17.4
-      '@esbuild/win32-ia32': 0.17.4
-      '@esbuild/win32-x64': 0.17.4
-    dev: false
-
   /escalade/3.1.1:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
     engines: {node: '>=6'}

From b2ed4c9508fa37a4f0cf64cb5b431ec3ff46c27e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 27 Jan 2023 12:33:20 +0900
Subject: [PATCH 149/177] 13.2.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 06ec191b5..34beb5772 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.2.4",
+	"version": "13.2.5",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From 7190bd00c9dec5e0054cd52be05cc9f294485158 Mon Sep 17 00:00:00 2001
From: yupix <yupi0982@outlook.jp>
Date: Fri, 27 Jan 2023 13:52:51 +0900
Subject: [PATCH 150/177] =?UTF-8?q?feat:=20classic=E3=83=A2=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E3=81=A7=E3=83=86=E3=83=BC=E3=83=9E=E3=81=8C=E8=87=AA?=
 =?UTF-8?q?=E5=8B=95=E5=A4=89=E6=9B=B4=E3=81=95=E3=82=8C=E3=81=9F=E9=9A=9B?=
 =?UTF-8?q?=E5=85=83=E3=81=AB=E6=88=BB=E3=81=99=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=20(#9669)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: classicモードでテーマが自動変更された際元に戻すように

* docs: update CHANGELOG.md

* fix: prefixを miux:ui_temp から ui_temp に変更
---
 CHANGELOG.md                           | 5 +++++
 packages/frontend/src/local-storage.ts | 1 +
 packages/frontend/src/ui/classic.vue   | 2 ++
 packages/frontend/src/ui/universal.vue | 9 +++++++++
 4 files changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e767c15df..e236006af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,11 @@
 You should also include the user name that made the change.
 -->
 
+## 13.x.x (unreleased)
+
+### Bugfixes
+- Client: classicモード使用時にwindowサイズによってdefaultに変更された後に、windowサイズが元に戻ったらclassicに戻すように修正 #9669
+
 ## 13.2.4 (2023/01/27)
 ### Improvements
 - リモートカスタム絵文字表示時のパフォーマンスを改善
diff --git a/packages/frontend/src/local-storage.ts b/packages/frontend/src/local-storage.ts
index 68dc9ebe4..e6b828696 100644
--- a/packages/frontend/src/local-storage.ts
+++ b/packages/frontend/src/local-storage.ts
@@ -18,6 +18,7 @@ type Keys =
 	'useSystemFont' | 
 	'fontSize' |
 	'ui' |
+	'ui_temp' |
 	'locale' |
 	'localeVersion' |
 	'theme' |
diff --git a/packages/frontend/src/ui/classic.vue b/packages/frontend/src/ui/classic.vue
index dab4b9b27..a5c2f8ca2 100644
--- a/packages/frontend/src/ui/classic.vue
+++ b/packages/frontend/src/ui/classic.vue
@@ -124,6 +124,8 @@ function onAiClick(ev) {
 }
 
 if (window.innerWidth < 1024) {
+	const currentUI = miLocalStorage.getItem('ui')
+	miLocalStorage.setItem('ui_temp', currentUI || 'default');
 	miLocalStorage.setItem('ui', 'default');
 	location.reload();
 }
diff --git a/packages/frontend/src/ui/universal.vue b/packages/frontend/src/ui/universal.vue
index babc23287..a9bb85ab6 100644
--- a/packages/frontend/src/ui/universal.vue
+++ b/packages/frontend/src/ui/universal.vue
@@ -141,6 +141,15 @@ mainRouter.on('change', () => {
 
 document.documentElement.style.overflowY = 'scroll';
 
+if (window.innerWidth > 1024) {
+	const tempUI = miLocalStorage.getItem('ui_temp')
+	if (tempUI) {
+		miLocalStorage.setItem('ui', tempUI)
+		miLocalStorage.removeItem('ui_temp')
+		location.reload();
+	}
+}
+
 defaultStore.ready.then(() => {
 	if (defaultStore.state.widgets.length === 0) {
 		defaultStore.set('widgets', [{

From 8282bbd07c4b87c6678901ef4357897533a5a66e Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sat, 28 Jan 2023 06:15:29 +0000
Subject: [PATCH 151/177] =?UTF-8?q?fix(client):=20Chrome=E3=81=A7=E6=A4=9C?=
 =?UTF-8?q?=E7=B4=A2=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=E3=81=A7?=
 =?UTF-8?q?=E5=A4=89=E6=8F=9B=E7=A2=BA=E5=AE=9A=E3=81=99=E3=82=8B=E3=81=A8?=
 =?UTF-8?q?=E3=81=9D=E3=81=AE=E3=81=BE=E3=81=BE=E6=A4=9C=E7=B4=A2=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86=20Fix=20#9598?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkInput.vue    | 2 ++
 packages/frontend/src/components/MkTextarea.vue | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/packages/frontend/src/components/MkInput.vue b/packages/frontend/src/components/MkInput.vue
index a55003da2..5c5151fce 100644
--- a/packages/frontend/src/components/MkInput.vue
+++ b/packages/frontend/src/components/MkInput.vue
@@ -88,6 +88,8 @@ const onInput = (ev: KeyboardEvent) => {
 	emit('change', ev);
 };
 const onKeydown = (ev: KeyboardEvent) => {
+	if (ev.isComposing || ev.key === 'Process' || ev.keyCode === 229) return;
+
 	emit('keydown', ev);
 
 	if (ev.code === 'Enter') {
diff --git a/packages/frontend/src/components/MkTextarea.vue b/packages/frontend/src/components/MkTextarea.vue
index d34d7b177..0147ac7f8 100644
--- a/packages/frontend/src/components/MkTextarea.vue
+++ b/packages/frontend/src/components/MkTextarea.vue
@@ -119,6 +119,8 @@ export default defineComponent({
 			context.emit('change', ev);
 		};
 		const onKeydown = (ev: KeyboardEvent) => {
+			if (ev.isComposing || ev.key === 'Process' || ev.keyCode === 229) return;
+
 			context.emit('keydown', ev);
 
 			if (ev.code === 'Enter') {

From 04d60426c78d5aaa7fc40d25f376d2f4079dffc2 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sat, 28 Jan 2023 06:22:38 +0000
Subject: [PATCH 152/177] modify CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e236006af..9899eaf57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ You should also include the user name that made the change.
 
 ### Bugfixes
 - Client: classicモード使用時にwindowサイズによってdefaultに変更された後に、windowサイズが元に戻ったらclassicに戻すように修正 #9669
+- Client: Chromeで検索ダイアログで変換確定するとそのまま検索されてしまう問題を修正
 
 ## 13.2.4 (2023/01/27)
 ### Improvements

From 133644e5a9f053af9f01cde04a06efde91c38d2e Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sat, 28 Jan 2023 11:33:44 +0000
Subject: [PATCH 153/177] Rename docker-compose.yml to
 docker-compose.yml.example

---
 docker-compose.yml => docker-compose.yml.example | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docker-compose.yml => docker-compose.yml.example (100%)

diff --git a/docker-compose.yml b/docker-compose.yml.example
similarity index 100%
rename from docker-compose.yml
rename to docker-compose.yml.example

From ca7dbd60100dd4095db2fa8c3569ad9edcf620b3 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sat, 28 Jan 2023 11:34:34 +0000
Subject: [PATCH 154/177] gitignore docker-compose.yml

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 11ef3dd40..f532cdaa7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@ coverage
 !/.config/example.yml
 !/.config/docker_example.yml
 !/.config/docker_example.env
+docker-compose.yml
 
 # misskey
 /build

From 5b38f762541161fcc2923f12e4b1660cebce0a62 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sat, 28 Jan 2023 12:37:28 +0000
Subject: [PATCH 155/177] update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9899eaf57..5ee0d0295 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ You should also include the user name that made the change.
 -->
 
 ## 13.x.x (unreleased)
+### Changes
+- docker-compose.ymlをdocker-compose.yml.exampleにしました。docker-compose.ymlとしてコピーしてから使用してください。
 
 ### Bugfixes
 - Client: classicモード使用時にwindowサイズによってdefaultに変更された後に、windowサイズが元に戻ったらclassicに戻すように修正 #9669

From 00d28826b9bb2bb65c90fc4c03ddd571faa7c7f6 Mon Sep 17 00:00:00 2001
From: Nya Candy <dev@candinya.com>
Date: Tue, 31 Jan 2023 18:37:39 +0800
Subject: [PATCH 156/177] fix(try): ld signature normalizer (#9758)

---
 packages/backend/src/core/activitypub/LdSignatureService.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/core/activitypub/LdSignatureService.ts b/packages/backend/src/core/activitypub/LdSignatureService.ts
index 5a1e01574..a29e1be56 100644
--- a/packages/backend/src/core/activitypub/LdSignatureService.ts
+++ b/packages/backend/src/core/activitypub/LdSignatureService.ts
@@ -1,5 +1,6 @@
 import * as crypto from 'node:crypto';
 import { Inject, Injectable } from '@nestjs/common';
+import jsonld from 'jsonld';
 import { HttpRequestService } from '@/core/HttpRequestService.js';
 import { bindThis } from '@/decorators.js';
 import { CONTEXTS } from './misc/contexts.js';
@@ -84,7 +85,9 @@ class LdSignature {
 	@bindThis
 	public async normalize(data: any) {
 		const customLoader = this.getLoader();
-		return 42;
+		return await jsonld.normalize(data, {
+			documentLoader: customLoader,
+		});
 	}
 
 	@bindThis

From 515692d7a6d4ab953eafbcb99e00c22e1a7c396c Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 1 Feb 2023 11:20:28 +0900
Subject: [PATCH 157/177] update aiscript

---
 packages/frontend/package.json                   | 2 +-
 packages/frontend/src/pages/flash/flash-edit.vue | 8 ++++----
 pnpm-lock.yaml                                   | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index 12f890aa5..3e13e285d 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -11,7 +11,7 @@
 		"@rollup/plugin-alias": "4.0.3",
 		"@rollup/plugin-json": "6.0.0",
 		"@rollup/pluginutils": "5.0.2",
-		"@syuilo/aiscript": "0.12.2",
+		"@syuilo/aiscript": "0.12.4",
 		"@tabler/icons-webfont": "^2.1.2",
 		"@vitejs/plugin-vue": "4.0.0",
 		"@vue/compiler-sfc": "3.2.45",
diff --git a/packages/frontend/src/pages/flash/flash-edit.vue b/packages/frontend/src/pages/flash/flash-edit.vue
index 321477259..734c467e3 100644
--- a/packages/frontend/src/pages/flash/flash-edit.vue
+++ b/packages/frontend/src/pages/flash/flash-edit.vue
@@ -34,7 +34,7 @@ import MkTextarea from '@/components/MkTextarea.vue';
 import MkInput from '@/components/MkInput.vue';
 import { useRouter } from '@/router';
 
-const PRESET_DEFAULT = `/// @ 0.12.2
+const PRESET_DEFAULT = `/// @ 0.12.4
 
 var name = ""
 
@@ -52,7 +52,7 @@ Ui:render([
 ])
 `;
 
-const PRESET_OMIKUJI = `/// @ 0.12.2
+const PRESET_OMIKUJI = `/// @ 0.12.4
 // ユーザーごとに日替わりのおみくじのプリセット
 
 // 選択肢
@@ -95,7 +95,7 @@ Ui:render([
 ])
 `;
 
-const PRESET_SHUFFLE = `/// @ 0.12.2
+const PRESET_SHUFFLE = `/// @ 0.12.4
 // 巻き戻し可能な文字シャッフルのプリセット
 
 let string = "ペペロンチーノ"
@@ -174,7 +174,7 @@ var cursor = 0
 do()
 `;
 
-const PRESET_TIMELINE = `/// @ 0.12.2
+const PRESET_TIMELINE = `/// @ 0.12.4
 // APIリクエストを行いローカルタイムラインを表示するプリセット
 
 @fetch() {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3e789d846..40f2b3606 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -378,7 +378,7 @@ importers:
       '@rollup/plugin-alias': 4.0.3
       '@rollup/plugin-json': 6.0.0
       '@rollup/pluginutils': 5.0.2
-      '@syuilo/aiscript': 0.12.2
+      '@syuilo/aiscript': 0.12.4
       '@tabler/icons-webfont': ^2.1.2
       '@types/escape-regexp': 0.0.1
       '@types/glob': 8.0.1
@@ -463,7 +463,7 @@ importers:
       '@rollup/plugin-alias': 4.0.3_rollup@3.11.0
       '@rollup/plugin-json': 6.0.0_rollup@3.11.0
       '@rollup/pluginutils': 5.0.2_rollup@3.11.0
-      '@syuilo/aiscript': 0.12.2
+      '@syuilo/aiscript': 0.12.4
       '@tabler/icons-webfont': 2.1.2
       '@vitejs/plugin-vue': 4.0.0_vite@4.0.4+vue@3.2.45
       '@vue/compiler-sfc': 3.2.45
@@ -2300,8 +2300,8 @@ packages:
       jsonc-parser: 3.2.0
     dev: true
 
-  /@syuilo/aiscript/0.12.2:
-    resolution: {integrity: sha512-bXEYgFGW2uDFr2Vl5TmBtZqzgAtobT4k4ZSWwEbmwB3x5S7WrgJ7MNbpe3AszJ+I6BOQpB6uHHwr+KMNx9pWCQ==}
+  /@syuilo/aiscript/0.12.4:
+    resolution: {integrity: sha512-fIWEAHsnw9vMWTcjmSM2rCsadhb+BLirLDLW6lnRw3PFC8LV76Np8Ih8ssfAb00udh6oiGBSj+WiBdkMagbjmQ==}
     dependencies:
       autobind-decorator: 2.4.0
       seedrandom: 3.0.5

From 671d21a2c1524a2d4457e0da7707c4ae3c7b353e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 1 Feb 2023 11:21:58 +0900
Subject: [PATCH 158/177] New Crowdin updates (#9737)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Indonesian)

* New translations ja-JP.yml (Indonesian)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)
---
 locales/id-ID.yml | 200 ++++++++++++++++++++++++++++++++++++++++++++++
 locales/ru-RU.yml | 105 ++++++++++++++++++++----
 locales/th-TH.yml | 188 +++++++++++++++++++++++++++++++++++++++++++
 locales/uk-UA.yml |  46 ++++++++++-
 locales/zh-CN.yml | 111 ++++++++++++++++++++++++-
 locales/zh-TW.yml |  42 +++++-----
 6 files changed, 652 insertions(+), 40 deletions(-)

diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index 87e37518f..6a2ccfd8d 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -13,6 +13,7 @@ fetchingAsApObject: "Mengambil data dari Fediverse..."
 ok: "OK"
 gotIt: "Saya mengerti"
 cancel: "Batalkan"
+noThankYou: "Tidak sekarang."
 enterUsername: "Masukkan nama pengguna"
 renotedBy: "direnote oleh {user}"
 noNotes: "Tidak ada catatan"
@@ -206,6 +207,7 @@ done: "Selesai"
 processing: "Memproses"
 preview: "Pratinjau"
 default: "Bawaan"
+defaultValueIs: "Bawaan: {value}"
 noCustomEmojis: "Tidak ada emoji kustom"
 noJobs: "Tidak ada kerja"
 federating: "memfederasi"
@@ -349,6 +351,8 @@ recaptcha: "reCAPTCHA"
 enableRecaptcha: "Nyalakan reCAPTCHA"
 recaptchaSiteKey: "Site key"
 recaptchaSecretKey: "Secret Key"
+turnstile: "Turnstile"
+enableTurnstile: "Nyalakan Turnstile"
 turnstileSiteKey: "Site key"
 turnstileSecretKey: "Secret Key"
 avoidMultiCaptchaConfirm: "Menggunakan banyak Captcha dapat menyebabkan gangguan. Apakah kamu ingin untuk menonaktifkan Captcha yang lain? Kamu dapat membiarkan fitur ini tetap aktif dengan menekan tombol batal."
@@ -454,6 +458,7 @@ uiLanguage: "Bahasa antarmuka pengguna"
 groupInvited: "Telah diundang ke grup"
 aboutX: "Tentang {x}"
 emojiStyle: "Gaya emoji"
+native: "Native"
 disableDrawer: "Jangan gunakan menu bergaya laci"
 youHaveNoGroups: "Kamu tidak memiliki grup"
 joinOrCreateGroup: "Bergabunglah dengan grup atau kamu dapat membuat grupmu sendiri."
@@ -857,10 +862,21 @@ rateLimitExceeded: "Batas sudah terlampaui"
 cropImage: "potong gambar"
 cropImageAsk: "Ingin memotong gambar?"
 file: "Berkas"
+recentNHours: "{n} jam terakhir"
+recentNDays: "{n} hari terakhir"
 noEmailServerWarning: "Mail Server tidak disetel."
+thereIsUnresolvedAbuseReportWarning: "Ada laporan yang belum diselesaikan."
 recommended: "Disarankan"
 check: "Cek"
+driveCapOverrideLabel: "Ubah kapasitas drive untuk user ini"
+driveCapOverrideCaption: "Setel ulang kapasitas ke bawaan dengan memasukkan nilai 0 atau lebih rendah."
+requireAdminForView: "Kamu harus login dengan akun administrator untuk melihat ini."
+isSystemAccount: "Akun yang dibuat dan otomatis dioperasikan oleh sistem."
+typeToConfirm: "Mohon masukkan {x} untuk mengonfirmasi"
 deleteAccount: "Hapus Akun"
+document: "Dokumen"
+numberOfPageCache: "Jumlah halaman ditembolokkan"
+numberOfPageCacheDescription: "Menaikkan jumlah ini akan meningkatkan kenyamanan untuk pengguna, namun dapat menyebabkan lonjakan beban pada peladen dan juga memori yang digunakan."
 logoutConfirm: "Anda yakin ingin keluar?"
 lastActiveDate: "Terakhir digunakan"
 statusbar: "Bilah status"
@@ -870,20 +886,189 @@ colored: "Diwarnai"
 refreshInterval: "Jeda pembaharuan"
 label: "Label"
 type: "Tipe"
+speed: "Kecepatan"
+slow: "Lambat"
+fast: "Cepat"
+sensitiveMediaDetection: "Deteksi media NSFW"
 localOnly: "Hanya lokal"
+remoteOnly: "Hanya remot"
+failedToUpload: "Gagal mengunggah"
+cannotUploadBecauseInappropriate: "Berkas ini tidak dapat diunggah karena sebagian dari berkas terdeteksi berpotensi NSFW."
+cannotUploadBecauseNoFreeSpace: "Gagal mengunggah karena kekurangan kapasitas Drive."
+beta: "Beta"
+enableAutoSensitive: "Penandaan NSFW otomatis"
+enableAutoSensitiveDescription: "Mendeteksi otomatis dan menandai media NSFW menggunakan Machine Learning jika memungkinkan. Meskipun opsi ini dimatikan, ada kemungkinan dinyalakan secara menyeluruh pada instansi peladen."
+activeEmailValidationDescription: "Membolehkan validasi alamat surel ketat dengan mengecek apakah alamat surel tersebut temporer dan bisa berkomunikasi dengan surel tersebut. Ketidak tidak dicentang, hanya format surel yang divalidasi."
+navbar: "Bilah navigasi"
 shuffle: "Acak"
 account: "Akun"
+move: "Pindah"
+pushNotification: "Pemberitahuan push"
+subscribePushNotification: "Nyalakan pemberitahuan push"
+unsubscribePushNotification: "Matikan pemberitahuan push"
+pushNotificationAlreadySubscribed: "Pemberitahuan push telah dinyalakan"
+pushNotificationNotSupported: "Browser atau instansi kamu tidak mendukung pemberitahuan push"
+sendPushNotificationReadMessage: "Hapus pemberitahuan push ketika pemberitahuan relevan atau pesan telah dibaca"
+sendPushNotificationReadMessageCaption: "Pemberitahuan berisi teks「{emptyPushNotificationMessage}」akan ditampilkan dalam waktu pendek. Ini mungkin dapat menambah pemakaian baterai pada perangkat kamu."
+windowMaximize: "Maksimalkan"
+windowRestore: "Kembalikan"
+caption: "Keterangan"
+loggedInAsBot: "Sedang login sebagai bot"
+tools: "Alat"
+cannotLoad: "Tidak dapat memuat"
+numberOfProfileView: "tayang profil"
 like: "Suka"
 unlike: "Tidak Suka"
 numberOfLikes: "Jumlah yang disukai"
 show: "Tampilkan"
+neverShow: "Jangan tampilkan lagi"
+remindMeLater: "Mungkin nanti"
+didYouLikeMisskey: "Apakah kamu mulai menyukai Misskey?"
+pleaseDonate: "{host} menggunakan perangkat lunak bebas yaitu Misskey. Kami sangat mengapresiasi sekali donasi dari kamu agar pengembangan Misskey tetap dapat berlanjut!"
+roles: "Peran"
+role: "Peran"
 color: "Warna"
+_achievements:
+  _types:
+    _login7:
+      description: "Login selama 7 hari"
+      flavor: "Sudah mulai terbiasa?"
+    _login15:
+      title: "Pemula III"
+      description: "Login selama 15 hari"
+    _login30:
+      title: "Misskist I"
+      description: "Login selama 30 hari"
+    _login60:
+      title: "Misskist II"
+      description: "Login selama 60 hari"
+    _login100:
+      title: "Misskist III"
+      description: "Login selama 100 hari"
+      flavor: "Violent Misskist"
+    _login200:
+      title: "Reguler I"
+      description: "Login selama 200 hari"
+    _login300:
+      title: "Reguler II"
+      description: "Login selama 300 hari"
+    _login400:
+      title: "Reguler III"
+      description: "Login selama 400 hari"
+    _login500:
+      title: "Veteran I"
+      description: "Login selama 500 hari"
+      flavor: "Kawanku, aku suka catatan."
+    _login600:
+      title: "Veteran II"
+      description: "Login selama 600 hari"
+    _login700:
+      title: "Veteran III"
+      description: "Login selama 700 hari"
+    _login800:
+      title: "Sepuh Catatan I"
+      description: "Login selama 800 hari"
+    _login900:
+      title: "Sepuh Catatan II"
+      description: "Login selama 900 hari"
+    _login1000:
+      title: "Sepuh Catatan III"
+      description: "Login selama 1000 hari"
+      flavor: "Terima kasih telah menggunakan Misskey!"
+    _noteClipped1:
+      title: "Harus... Ngeklip..."
+      description: "Klip catatan pertamamu"
+    _noteFavorited1:
+      title: "Pengamat Bintang"
+      description: "Favoritkan catatan pertamamu"
+    _myNoteFavorited1:
+      title: "Pencari Bintang"
+      description: "Minta orang lain memfavoritkan salah satu catatanmu"
+    _profileFilled:
+      title: "Siap Sedia"
+      description: "Atur profil kamu"
+    _markedAsCat:
+      title: "Aku Seekor Kucing"
+      description: "Tandai akunmu sebagai kucing"
+      flavor: "Aku beri kamu nama nanti"
+    _following1:
+      title: "Ikuti pengguna lain pertamamu"
+      description: "Ikuti pengguna"
+    _following10:
+      title: "Terusin... terusin..."
+      description: "Ikuti 10 pengguna lain"
+    _following50:
+      title: "Banyak teman"
+      description: "Ikuti 50 pengguna lain"
+    _following100:
+      title: "100 Teman"
+      description: "Ikuti 100 pengguna lain"
+    _clickedClickHere:
+      description: "Kamu telah mengeklik disini"
+    _justPlainLucky:
+      title: "Lagi Beruntung"
+      description: "Mendapatkan kesempatan dengan kemungkinan 0.01% setiap 10 detik"
+    _setNameToSyuilo:
+      title: "God Complex"
+      description: "Atur namamu jadi \"syuilo\""
+    _passedSinceAccountCreated1:
+      title: "Perayaan Satu Tahun"
+      description: "Satu tahun telah lewat sejak akunmu dibuat"
+    _passedSinceAccountCreated2:
+      title: "Perayaan Dua Tahun"
+      description: "Dua tahun telah lewat sejak akunmu dibuat"
+    _passedSinceAccountCreated3:
+      title: "Perayaan Tiga Tahun"
+      description: "Tiga tahun telah lewat sejak akunmu dibuat"
+    _loggedInOnBirthday:
+      title: "Selamat Ulang Tahun"
+      description: "Login di hari ulang tahunmu"
+    _loggedInOnNewYearsDay:
+      title: "Selamat Tahun Baru!"
+      description: "Login di hari pertama tahun baru"
+    _cookieClicked:
+      title: "Permainan dimana kamu mengeklik kue"
+      description: "Mengeklik kue"
+      flavor: "Tunggu, apakah kamu sedang berada di website yang benar?"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "Posting tautan mengenai Brain Diver"
+      flavor: "Misskey-Misskey La-Tu-Ma"
 _role:
+  new: "Buat peran"
+  edit: "Sunting peran"
+  name: "Nama peran"
+  description: "Deskripsi peran"
+  permission: "Perijinan peran"
+  descriptionOfPermission: "<b>Moderator</b> dapat melakukan operasi moderasi dasar.\n<b>Administrator</b> dapat mengubah seluruh pengaturan instansi."
+  assignTarget: "Tipe tugas"
+  descriptionOfAssignTarget: "<b>Manual</b> untuk mengganti secara manual siapa yang mendapatkan peran ini dan siapa yang tidak.\n<b>Kondisional</b> untuk pengguna secara otomatis dimasukkan atau dihapus dari peran berdasarkan kondisi yang ditentukan."
+  manual: "Manual"
+  conditional: "Kondisional"
+  condition: "Kondisi"
+  isConditionalRole: "Ini adalah peran kondisional"
+  isPublic: "Publikkan Peran"
+  descriptionOfIsPublic: "Siapapun dapat melihat daftar pengguna yang ditugaskan pada peran ini. Tambahan juga peran ini akan ditampilkan ke dalam profil pengguna tentang peran yang ditugaskan."
+  options: "Opsi peran"
+  policies: "Kebijakan"
+  baseRole: "Templat peran"
+  useBaseValue: "Gunakan nilai templat peran"
+  chooseRoleToAssign: "Pilih peran yang ditugaskan"
+  canEditMembersByModerator: "Perbolehkan moderator untuk menyunting daftar anggota untuk peran ini"
+  descriptionOfCanEditMembersByModerator: "Ketika dinyalakan, moderator beserta administrator dapat menugaskan ataupun mencabut pengguna ke peran ini. Ketika dimatikan, hanya administrator saja yang dapat menugaskan pengguna ke peran ini."
   priority: "Prioritas"
   _priority:
     low: "Rendah"
     middle: "Sedang"
     high: "Tinggi"
+  _options:
+    gtlAvailable: "Dapat melihat linimasa global"
+    ltlAvailable: "Dapat melihat linimasa lokal"
+    canPublicNote: "Dapat mengirim catatan publik"
+    canInvite: "Dapat membuat kode undangan instansi"
+    canManageCustomEmojis: "Dapat mengelola Emoji kustom"
+    driveCapacity: "Kapasitas Drive"
+    pinMax: "Jumlah maksimal catatan yang disematkan"
 _emailUnavailable:
   used: "Alamat surel ini telah digunakan"
   format: "Format tidak valid."
@@ -1167,6 +1352,7 @@ _tutorial:
   step7_1: "Yay, Selamat! Kamu sudah menyelesaikan tutorial dasar Misskey."
   step7_2: "Jika kamu ingin mempelajari lebih lanjut tentang Misskey, cobalah berkunjung ke bagian {help}."
   step7_3: "Semoga berhasil dan bersenang-senanglah! 🚀"
+  step8_3: "Kamu dapat mengganti pengaturan ini nanti."
 _2fa:
   alreadyRegistered: "Kamu telah mendaftarkan perangkat otentikasi dua faktor."
   registerDevice: "Daftarkan perangkat baru"
@@ -1241,10 +1427,13 @@ _widgets:
   trends: "Tren"
   clock: "Jam"
   rss: "Pembaca RSS"
+  rssTicker: "RSS-Ticker"
   activity: "Aktivitas"
   photos: "Foto"
   digitalClock: "Jam digital"
+  unixClock: "Jam UNIX"
   federation: "Federasi"
+  instanceCloud: "Instansi awan"
   postForm: "Buat catatan"
   slideshow: "Slideshow"
   button: "Tombol"
@@ -1254,8 +1443,10 @@ _widgets:
   aiscript: "Konsol AiScript"
   aiscriptApp: "Aplikasi AiScript"
   aichan: "Ai"
+  userList: "Daftar pengguna"
   _userList:
     chooseList: "Pilih daftar"
+  clicker: "Pengeklik"
 _cw:
   hide: "Sembunyikan"
   show: "Lihat konten"
@@ -1319,6 +1510,7 @@ _profile:
   changeBanner: "Ubah header"
 _exportOrImport:
   allNotes: "Semua catatan"
+  favoritedNotes: "Catatan favorit"
   followingList: "Ikuti"
   muteList: "Bisukan"
   blockingList: "Blokir"
@@ -1437,7 +1629,9 @@ _notification:
   yourFollowRequestAccepted: "Permintaan mengikuti kamu telah diterima"
   youWereInvitedToGroup: "Telah diundang ke grup"
   pollEnded: "Hasil Kuesioner telah keluar"
+  unreadAntennaNote: "Antena {name}"
   emptyPushNotificationMessage: "Pembaruan notifikasi dorong"
+  achievementEarned: "Pencapaian didapatkan"
   _types:
     all: "Semua"
     follow: "Ikuti"
@@ -1459,6 +1653,7 @@ _deck:
   alwaysShowMainColumn: "Selalu tampilkan kolom utama"
   columnAlign: "Luruskan kolom"
   addColumn: "Tambahkan kolom"
+  configureColumn: "Atur kolom"
   swapLeft: "Pindah ke kiri"
   swapRight: "Pindah ke kanan"
   swapUp: "Pindah ke atas"
@@ -1466,6 +1661,11 @@ _deck:
   stackLeft: "Tumpukkan di kolom kiri"
   popRight: "Keluarkan di kanan"
   profile: "Profil"
+  newProfile: "Profil baru"
+  deleteProfile: "Hapus profil"
+  introduction: "Buat antarmuka sempurna untukmu dengan menata kolom secara bebas!"
+  introduction2: "Klik \"+\" pada kanan layar untuk menambahkan kolom baru kapanpun yang kamu mau."
+  widgetsIntroduction: "Mohon pilih \"Sunting gawit\" pada menu kolom dan tambahkan gawit."
   _columns:
     main: "Utama"
     widgets: "Widget"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index 1c0138466..2085cb2be 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -22,7 +22,7 @@ instance: "Инстанс"
 settings: "Настройки"
 basicSettings: "Основные настройки"
 otherSettings: "Прочие настройки"
-openInWindow: "Открывать в плавающих окнах"
+openInWindow: "Открыть в плавающем окне"
 profile: "Профиль"
 timeline: "Лента"
 noAccountDescription: "Пользователь ничего не написал про себя"
@@ -273,7 +273,7 @@ light: "Светлый"
 dark: "Тёмный"
 lightThemes: "Светлые темы"
 darkThemes: "Тёмные темы"
-syncDeviceDarkMode: "Синхронизировать с темным режимом устройства"
+syncDeviceDarkMode: "Синхронизировать с тёмной темой системы"
 drive: "Диск"
 fileName: "Имя файла"
 selectFile: "Выберите файл"
@@ -456,6 +456,7 @@ uiLanguage: "Язык интерфейса"
 groupInvited: "Приглашение в группу"
 aboutX: "Описание {x}"
 emojiStyle: "Стиль эмодзи"
+native: "Системные"
 disableDrawer: "Не использовать выдвижные меню"
 youHaveNoGroups: "У вас нет ни одной группы"
 joinOrCreateGroup: "Получайте приглашения в группы или создавайте свои собственные"
@@ -603,6 +604,7 @@ smtpSecureInfo: "Выключите при использовании STARTTLS."
 testEmail: "Проверка доставки электронной почты"
 wordMute: "Скрытие слов"
 regexpError: "Ошибка в регулярном выражении"
+regexpErrorDescription: "В списке {tab} скрытых слов, в строке {line} обнаружена синтаксическая ошибка:"
 instanceMute: "Глушение инстансов"
 userSaysSomething: "{name} что-то сообщает"
 makeActive: "Активировать"
@@ -804,7 +806,7 @@ translate: "Перевод"
 translatedFrom: "Перевод. Язык оригинала — {x}"
 accountDeletionInProgress: "В настоящее время выполняется удаление учетной записи"
 usernameInfo: "Имя, которое отличает вашу учетную запись от других на этом сервере. Вы можете использовать алфавит (a~z, A~Z), цифры (0~9) или символы подчеркивания (_). Имена пользователей не могут быть изменены позже."
-aiChanMode: "ИИ режим"
+aiChanMode: "Режим Ай"
 keepCw: "Сохраняйте Предупреждения о содержимом"
 pubSub: "Учётные записи Pub/Sub"
 lastCommunication: "Последнее сообщение"
@@ -821,8 +823,8 @@ manageAccounts: "Управление аккаунтом"
 makeReactionsPublic: "Опубликовать список реакций"
 makeReactionsPublicDescription: "Список сделанных вами реакций доступен для просмотра всем желающим."
 classic: "Классика"
-muteThread: "Заглушить цепочку"
-unmuteThread: "Отменить глушение цепочки"
+muteThread: "Скрыть цепочку"
+unmuteThread: "Отменить сокрытие цепочки"
 ffVisibility: "Видимость подписок и подписчиков"
 ffVisibilityDescription: "Здесь можно настроить, кто будет видеть ваши подписки и подписчиков."
 continueThread: "Показать следующие ответы"
@@ -891,6 +893,7 @@ cannotUploadBecauseNoFreeSpace: "Файл не может быть загруж
 beta: "Бета"
 enableAutoSensitive: "Автоматическое определение NSFW"
 enableAutoSensitiveDescription: "Если доступно, используйте машинное обучение для автоматической установки флага NSFW на носителе. Даже если эта функция отключена, она может быть установлена ​​автоматически в зависимости от инстанта."
+activeEmailValidationDescription: "Если включено, будет проводиться более строгая проверка адреса электронной почты, в том числе на то, что он действительный и не временный. Если же отключено, то проверяется только корректность написания адреса."
 navbar: "Панель навигации"
 shuffle: "Перемешать"
 account: "Учётные записи"
@@ -1096,6 +1099,9 @@ _achievements:
       title: "Я люблю Misskey"
       description: "Написана заметка «I ❤ #Misskey»"
       flavor: "Спасибо за поддержку Misskey! Ваша команда разработчиков"
+    _foundTreasure:
+      title: "Охота за сокровищами"
+      description: "Найдено спрятанное сокровище"
     _client30min:
       title: "Перерыв на обед"
       description: "Прошло 30 минут с момента запуска клиента"
@@ -1116,6 +1122,9 @@ _achievements:
     _htl20npm:
       title: "В потоке"
       description: "Достигнута скорость домашней ленты в 20 з/мин (заметок минуту)"
+    _viewInstanceChart:
+      title: "Аналитик"
+      description: "Просмотрены статистические диаграммы инстанса"
     _outputHelloWorldOnScratchpad:
       title: "Привет, мир!"
       description: "Выведен текст «hello world» в Когтеточке"
@@ -1189,7 +1198,34 @@ _role:
     middle: "Средне"
     high: "Высокий"
   _options:
+    gtlAvailable: "Может просматривать глобальную ленту"
+    ltlAvailable: "Может просматривать местную ленту"
+    canPublicNote: "Может публиковать общедоступные заметки"
+    canInvite: "Может создавать пригласительные коды"
     canManageCustomEmojis: "Управлять пользовательскими эмодзи"
+    driveCapacity: "Доступное пространство на «диске»"
+    pinMax: "Доступное количество закреплённых заметок"
+    antennaMax: "Доступное количество антенн"
+    wordMuteMax: "Доступное количество знаков в списке скрытия слов"
+    clipMax: "Максимальное количество подборок"
+    noteEachClipsMax: "Максимальное количество заметок в подборке"
+    userListMax: "Максимальное количество списков аккаунтов"
+    userEachUserListsMax: "Максимальное количество аккаунтов в списке"
+    rateLimitFactor: "Ограничение активности"
+    descriptionOfRateLimitFactor: "Меньшее значение — слабые ограничения, большее — сильные"
+    canHideAds: "Может скрыть рекламу"
+  _condition:
+    isLocal: "Местный"
+    isRemote: "Неместный"
+    createdLessThan: "Аккаунт младше, чем..."
+    createdMoreThan: "Аккаунт старше, чем..."
+    followersLessThanOrEq: "Количество подписчиков не превышает…"
+    followersMoreThanOrEq: "Количество подписчиков не меньше чем…"
+    followingLessThanOrEq: "Количество подписок не превышает…"
+    followingMoreThanOrEq: "Количество подписок не меньше чем…"
+    and: "Выполнено несколько условий:.."
+    or: "Выполнено любое из условий:.."
+    not: "Кроме тех, у кого…"
 _sensitiveMediaDetection:
   description: "Машинное обучение может быть использовано для автоматического обнаружения чувствительных медиа для модерации. Нагрузка на сервер увеличивается незначительно."
   setSensitiveFlagAutomatically: "Установить флаг NSFW"
@@ -1237,10 +1273,23 @@ _plugin:
   installWarn: "Пожалуйста, не устанавливайте расширения, которым не доверяете."
   manage: "Управление расширениями"
 _preferencesBackups:
-  saveConfirm: "Сохранить бэкап как {name}?"
-  deleteConfirm: "Удалить резервную копию {name}?"
-  renameConfirm: "Переименовать резервную копию с \"{old}\" на \"{new}\"?"
-  noBackups: "Резервной копии не существует. Вы можете создать резервную копию в настройках на этом инстансе с помощью \"Создать новую резервную копию\"."
+  list: "Существующие резервные копии"
+  saveNew: "Создать резервную копию"
+  loadFile: "Прочесть из файла"
+  apply: "Восстановить на это устройство"
+  save: "Обновить из текущих настроек"
+  inputName: "Введите название для резервной копии"
+  cannotSave: "Сохранить не удалось"
+  nameAlreadyExists: "Резервная копия под названием «{name}» уже существует. Придумайте другое."
+  applyConfirm: "Правда хотите загрузить резервную копию «{name}» на это устройство? Этим будут потеряны текущие настройки."
+  saveConfirm: "Сохранить резервную копию под названием «{name}»?"
+  deleteConfirm: "Удалить резервную копию «{name}»?"
+  renameConfirm: "Переименовать резервную копию «{old}» в «{new}»?"
+  noBackups: "Здесь ещё нет резервных копий. Вы можете создать резервную копию настроек на этом сайте с помощью кнопки «Создать резервную копию»."
+  createdAt: "Создана {date} в {time}"
+  updatedAt: "Обновлена {date} в {time}"
+  cannotLoad: "Загрузить не удалось"
+  invalidFile: "Некорректный формат файла"
 _registry:
   scope: "Область"
   key: "Ключ"
@@ -1324,6 +1373,8 @@ _mfm:
   sparkleDescription: "Добавляет эффект искрящихся частиц."
   rotate: "Повернуть"
   rotateDescription: "Поворачивает на заданный угол."
+  plain: "Буквально"
+  plainDescription: "MFM внутри отключается, и текст отображается как есть"
 _instanceTicker:
   none: "Не показывать"
   remote: "Только для других сайтов"
@@ -1353,12 +1404,14 @@ _wordMute:
   muteWordsDescription2: "Здесь можно использовать регулярные выражения — просто заключите их между двумя дробными чертами (/)."
   softDescription: "Соответствующие условиям заметки будут спрятаны из вашей ленты."
   hardDescription: "Соответстующие условиям заметки вообще не будут попадать в вашу ленту. Даже если вы поменяете условия, отсеенные таким образом заметки уже не появятся."
-  soft: "Мягкий"
-  hard: "Жёсткий"
+  soft: "Мягко"
+  hard: "Жёстко"
   mutedNotes: "Скрытые заметки"
 _instanceMute:
+  instanceMuteDescription: "Заметки и репосты с указанных здесь инстансов, а также ответы пользователям оттуда же не будут отображаться."
+  instanceMuteDescription2: "Пишите каждый инстанс на отдельной строке"
   title: "Скрывает заметки с заданных инстансов."
-  heading: "Список заглушенных инстансов"
+  heading: "Список скрытых инстансов"
 _theme:
   explore: "Обзор"
   install: "Установить тему"
@@ -1479,12 +1532,16 @@ _tutorial:
   step7_1: "На этом вводный урок по использованию Misskey закончен. Спасибо, что прошли его до конца!"
   step7_2: "Хотите изучить Misskey глубже — добро пожаловать в раздел «{help}»."
   step7_3: "Приятно вам провести время с Misskey🚀"
+  step8_1: "Ах, да, не хотите ли включить push-уведомления?"
+  step8_2: "С push-уведомлениями вы будете в курсе репостов, ответов, реакций и всего такого, даже когда закрыли Misskey."
+  step8_3: "Эту настройку вы всегда сможете поменять"
 _2fa:
   alreadyRegistered: "Двухфакторная аутентификация уже настроена."
   registerDevice: "Зарегистрируйте ваше устройство"
   registerKey: "Зарегистрировать ключ"
   step1: "Прежде всего, установите на устройство приложение для аутентификации, например, {a} или {b}."
   step2: "Далее отсканируйте отображаемый QR-код при помощи приложения."
+  step2Url: "Если пользуетесь приложением на компьютере, можете ввести в него эту строку (URL):"
   step3: "И наконец, введите код, который покажет приложение."
   step4: "Теперь при каждом входе на сайт вам нужно будет вводить код из приложения аналогичным образом."
   securityKeyInfo: "Вы можете настроить вход с помощью аппаратного ключа безопасности, поддерживающего FIDO2, или отпечатка пальца или PIN-кода на устройстве."
@@ -1501,7 +1558,7 @@ _permissions:
   "write:following": "Изменять спискок подписок"
   "read:messaging": "Смотреть сообщения"
   "write:messaging": "Писать и удалять сообщения"
-  "read:mutes": "Смотреть спискок скрытых пользователей"
+  "read:mutes": "Смотреть список скрытых пользователей"
   "write:mutes": "Изменять список скрытых пользователей"
   "write:notes": "Писать и удалять заметки"
   "read:notifications": "Смотреть уведомления"
@@ -1552,10 +1609,13 @@ _widgets:
   trends: "Актуальное"
   clock: "Часы"
   rss: "Просмотр RSS"
+  rssTicker: "Бегущая строка RSS"
   activity: "Активность"
   photos: "Фото"
   digitalClock: "Цифровые часы"
+  unixClock: "Часы UNIX"
   federation: "Федерация"
+  instanceCloud: "Облако инстансов"
   postForm: "Форма отправки"
   slideshow: "Показ слайдов"
   button: "Кнопка"
@@ -1563,9 +1623,12 @@ _widgets:
   jobQueue: "Очередь заданий"
   serverMetric: "Показатели сервера"
   aiscript: "Консоль AiScript"
+  aiscriptApp: "Приложение на AiScript"
   aichan: "Ай"
+  userList: "Список аккаунтов"
   _userList:
     chooseList: "Выберите список"
+  clicker: "Счётчик щелчков"
 _cw:
   hide: "Спрятать"
   show: "Показать еще"
@@ -1628,12 +1691,13 @@ _profile:
   changeAvatar: "Поменять аватар"
   changeBanner: "Поменять изображение в шапке"
 _exportOrImport:
-  allNotes: "Все записи\n"
+  allNotes: "Все заметки\n"
+  favoritedNotes: "Избранное"
   followingList: "Подписки"
   muteList: "Скрытые"
   blockingList: "Заблокированные"
   userLists: "Списки"
-  excludeMutingUsers: "За исключением заглушенных пользователей"
+  excludeMutingUsers: "За исключением скрытых пользователей"
   excludeInactiveUsers: "Без неактивных учётных записей"
 _charts:
   federation: "Федерация"
@@ -1737,6 +1801,8 @@ _notification:
   youReceivedFollowRequest: "У вас новый запрос на подписку."
   yourFollowRequestAccepted: "Ваш запрос на подписку одобрен."
   youWereInvitedToGroup: "Вы приглашены в группу."
+  pollEnded: "Подведены окончательные итоги опроса"
+  emptyPushNotificationMessage: "Обновлены push-уведомления"
   achievementEarned: "Получено достижение"
   _types:
     all: "Все"
@@ -1746,11 +1812,13 @@ _notification:
     renote: "Репосты"
     quote: "Цитаты"
     reaction: "Реакции"
+    pollEnded: "Окончания опросов"
     receiveFollowRequest: "Получен запрос на подписку"
     followRequestAccepted: "Запрос на подписку одобрен"
     groupInvited: "Приглашение в группы"
     app: "Уведомления из приложений"
   _actions:
+    followBack: "отвечает взаимной подпиской"
     reply: "Ответить"
     renote: "Репост"
 _deck:
@@ -1764,7 +1832,12 @@ _deck:
   swapDown: "Переставить ниже"
   stackLeft: "В столбик влево"
   popRight: "Из столбика вправо"
-  profile: "Профиль"
+  profile: "Расстановка"
+  newProfile: "Новая расстановка"
+  deleteProfile: "Удаление расстановки"
+  introduction: "Создайте идеальный интерфейс расставляя колонки как угодно"
+  introduction2: "Чтобы добавлять колонки в любом месте, жмите «+» справа экрана."
+  widgetsIntroduction: "Чтобы добавлять виджеты, выбирайте «Редактировать виджеты» в меню колонки."
   _columns:
     main: "Основная"
     widgets: "Виджеты"
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index 47c9a3a41..ca23e44fa 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -944,48 +944,236 @@ _achievements:
   _types:
     _notes1:
       title: "เพียงแค่ตั้งค่า msky ของฉัน"
+      description: "โพสต์โน้ตครั้งแรกของคุณ"
+      flavor: "ขอให้มีช่วงเวลาที่ดีกับ Misskey นะคะ!"
+    _notes10:
+      title: "โน้ตบางอย่าง"
+      description: "โพสต์ 10 โน้ต"
+    _notes100:
+      title: "โน้ตจำนวนมาก"
+      description: "โพสต์ 100 โน้ต"
+    _notes500:
+      title: "ครอบคลุมในโน้ต"
+      description: "โพสต์ 500 โน้ต"
+    _notes1000:
+      title: "ภูเขาแห่งโน้ต"
+      description: "โพสต์ 1,000 โน้ต"
+    _notes5000:
+      title: "โน้ตล้น"
+      description: "โพสต์ 5,000 โน้ต"
+    _notes10000:
+      title: "ซุปเปอร์โน้ต"
+      description: "โพสต์ 10,000 โน้ต"
+    _notes20000:
+      title: "ต้องการ... เพิ่มเติม... โน้ต..."
+      description: "โพสต์ 20,000 โน้ต"
+    _notes30000:
+      title: "โน้ต โน้ต โน้ต!"
+      description: "โพสต์ 30,000 โน้ต"
+    _notes40000:
+      title: "โน้ตโรงงาน"
+      description: "โพสต์ 40,000 โน้ต"
+    _notes50000:
+      title: "ดาวเคราะห์แห่งโน้ต"
+      description: "โพสต์ 50,000 โน้ต"
+    _notes60000:
+      title: "โน้ตควอซาร์"
+      description: "โพสต์ 60,000 โน้ต"
+    _notes70000:
+      title: "โน้ตหลุมดำ"
+      description: "โพสต์ 70,000 โน้ต"
+    _notes80000:
+      title: "โน้ต กาแล็กซี่"
+      description: "โพสต์ 80,000 โน้ต"
+    _notes90000:
+      title: "โน้ต จักรวาล"
+      description: "โพสต์ 90,000 โน้ต"
+    _notes100000:
+      title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "โพสต์ 100,000 โน้ต"
+      flavor: "นายแน่ใจล่ะก็ มีอะไรพูดมาได้นะ"
+    _login3:
+      title: "มือใหม่ I"
+      description: "เข้าสู่ระบบเป็นเวลารวม 3 วัน"
+      flavor: "เริ่มตั้งแต่วันนี้ เรียกฉันว่ามิสคิสต์"
+    _login7:
+      title: "มือใหม่ II"
+      description: "เข้าสู่ระบบเป็นเวลารวม 7 วัน"
+      flavor: "รู้สึกเหมือนคุณได้แขวนของสิ่งต่างๆ หรือยังคะ?"
+    _login15:
+      title: "มือใหม่ III"
+      description: "เข้าสู่ระบบเป็นเวลารวม 15 วัน"
+    _login30:
+      title: "มิสคิสท์ I"
+      description: "เข้าสู่ระบบเป็นเวลารวม 30 วัน"
+    _login60:
+      title: "มิสคิสท์ II"
+      description: "เข้าสู่ระบบเป็นเวลารวม 60 วัน"
+    _login100:
+      title: "มิสคิสท์ III"
+      description: "เข้าสู่ระบบเป็นเวลารวม 100 วัน"
+      flavor: "ความรุนแรง Misskist"
+    _login200:
+      title: "ลูกค้าประจำ I"
+      description: "เข้าสู่ระบบเป็นเวลารวม 200 วัน"
+    _login300:
+      title: "ลูกค้าประจำ II"
+      description: "เข้าสู่ระบบเป็นเวลารวม 300 วัน"
+    _login400:
+      title: "ลูกค้าประจำ III"
+      description: "เข้าสู่ระบบเป็นเวลารวม 400 วัน"
+    _login500:
+      title: "ผู้เชี่ยวชาญ I"
+      description: "เข้าสู่ระบบเป็นเวลารวม 500 วัน"
+      flavor: "เพื่อนของผมนะมักจะกล่าวว่าผมนะชอบจดโน้ต"
+    _login600:
+      title: "ผู้เชี่ยวชาญ II"
+      description: "เข้าสู่ระบบเป็นเวลารวม 600 วัน"
+    _login700:
+      title: "ผู้เชี่ยวชาญ III"
+      description: "เข้าสู่ระบบเป็นเวลารวม 700 วัน"
+    _login800:
+      title: "ปรมาจารย์ด้านโน้ต I"
+      description: "เข้าสู่ระบบเป็นเวลารวม 800 วัน"
+    _login900:
+      title: "ปรมาจารย์ด้านโน้ต II"
+      description: "เข้าสู่ระบบเป็นเวลารวม 900 วัน"
+    _login1000:
+      title: "ปรมาจารย์ด้านโน้ต III"
+      description: "เข้าสู่ระบบเป็นเวลารวม 1,000 วัน"
+      flavor: "ขอบคุณที่ใช้ Misskey นะ !"
+    _noteClipped1:
+      title: "จะต้อง... คลิป..."
+      description: "คลิปโน้ตตัวแรกของคุณ"
+    _noteFavorited1:
+      title: "สตาร์เกเซอร์"
+      description: "ชื่นชอบโน้ตแรกของคุณ"
+    _myNoteFavorited1:
+      title: "แสวงหาดวงดาว"
+      description: "มีคนอื่นๆที่ชื่นชอบหนึ่งในโน้ตของคุณ"
+    _profileFilled:
+      title: "เตรียมไว้อย่างดี"
+      description: "ตั้งค่าโปรไฟล์ของคุณ"
+    _markedAsCat:
+      title: "ฉันเป็นแมว"
+      description: "ทำเครื่องหมายบัญชีของคุณว่าเป็นแมว"
+      flavor: "ฉันจะให้ชื่อคุณภายหลังนะ"
+    _following1:
+      title: "กำลังติดตามผู้ใช้คนแรกของคุณ"
+      description: "ติดตามผู้ใช้"
+    _following10:
+      title: "ทำต่อไป... ทำต่อไป..."
+      description: "ติดตาม 10 บัญชีผู้ใช้"
+    _following50:
+      title: "มีเพื่อนมากมาย"
+      description: "ติดตาม 50 บัญชี"
+    _following100:
+      title: "เพื่อน 100 คน"
+      description: "ติดตาม 100 บัญชี"
+    _following300:
+      title: "เพื่อนโอเวอร์โหลด"
+      description: "ติดตาม 300 บัญชี"
+    _followers1:
+      title: "ผู้ติดตามคนแรก"
+      description: "ได้รับ 1 ผู้ติดตาม"
+    _followers10:
+      title: "ติดตามฉัน!"
+      description: "ได้รับ 10 คนผู้ติดตาม"
+    _followers50:
+      title: "มากันเป็นฝูง"
+      description: "ได้รับ 50 ผู้ติดตาม"
     _followers100:
       title: "บุคคลที่เป็นที่นิยม"
+      description: "ได้รับ 100 ผู้ติดตาม"
+    _followers300:
+      title: "กรุณาสร้างบรรทัดเดียวนะคะ"
+      description: "ได้รับ 300 คนผู้ติดตาม"
     _followers500:
       title: "เสาสัญญาณ"
+      description: "ได้รับ 500 คนผู้ติดตาม"
     _followers1000:
       title: "ผู้ทรงอิทธิพล"
+      description: "ได้รับ 1,000 ผู้ติดตาม"
+    _collectAchievements30:
+      title: "นักสะสมความสำเร็จ"
+      description: "ได้รับความสำเร็จ 30 ครั้ง"
+    _viewAchievements3min:
+      title: "ชอบบรรลุผลสําเร็จ"
+      description: "มองดูรายการความสำเร็จของคุณเป็นเวลาอย่างน้อย 3 นาที"
     _iLoveMisskey:
       title: "ฉันรัก Misskey"
       description: "โพสต์ \"I ❤ #Misskey\""
+      flavor: "ทีมผู้พัฒนา Misskey ได้ขอบคุณสำหรับการสนับสนุนของคุณ!"
     _foundTreasure:
       title: "ล่าสมบัติ"
       description: "คุณพบสมบัติที่ซ่อนอยู่"
     _client30min:
       title: "พักผ่อนสักหน่อย"
+      description: "ใช้เวลา 30 นาทีบน Misskey"
     _noteDeletedWithin1min:
       title: "ไม่เป็นไร"
+      description: "ลบโน้ตภายในหนึ่งนาทีหลังจากที่โพสต์"
     _postedAtLateNight:
       title: "กลางคืน"
+      description: "โพสต์โน้ตตอนดึกๆ"
+      flavor: "ได้เวลาเข้านอนแล้วนะ"
+    _postedAt0min0sec:
+      title: "นาฬิกาพูดได้"
+      description: "โพสต์บนโน้ตเมื่อเวลา 00:00 น."
+      flavor: "คลิก คลิก คลิก แกล๊งๆ"
+    _selfQuote:
+      title: "อ้างอิงตนเอง"
+      description: "อ้างโน้ตย่อของคุณเอง"
+    _htl20npm:
+      title: "ไทม์ไลน์ไหล"
+      description: "มีการทำความเร็วของไทม์ไลน์ที่บ้านของคุณเกิน 20 npm (โน้ตต่อนาที)"
     _viewInstanceChart:
       title: "วิเคราะห์"
       description: "ดูแผนภูมิอินสแตนซ์ของคุณ"
+    _outputHelloWorldOnScratchpad:
+      title: "หวัดดีชาวโลก!"
+      description: "เอาพุต \"hello world\" ใน Scratchpad"
+    _open3windows:
+      title: "มัลติวินโดว์"
+      description: "มีการเปิดหน้าต่างอย่างน้อย 3 หน้าต่างพร้อมกัน"
     _driveFolderCircularReference:
       title: "อ้างอิงวงจร"
+      description: "พยายามสร้างโฟลเดอร์ที่ซ้อนกันแบบวนซ้ำในไดรฟ์"
+    _reactWithoutRead:
+      title: "คุณอ่านมันจริงๆหรือเปล่า?"
+      description: "มีการโต้ตอบกับโน้ตที่มีความยาวมากกว่า 100 ตัวอักษรภายใน 3 วินาทีหลังจากที่โพสต์"
     _clickedClickHere:
       title: "คลิ๊กที่นี่"
       description: "คุณได้คลิกที่นี่"
+    _justPlainLucky:
+      title: "แค่ลัคกี้ธรรมดา"
+      description: "มีโอกาสที่จะได้รับด้วยความน่าจะเป็นไปได้ 0.01% ทุก ๆ 10 วินาที"
+    _setNameToSyuilo:
+      title: "พระเจ้าคอมเพล็กซ์"
+      description: "ตั้งชื่อของคุณเป็น \"syuilo\""
     _passedSinceAccountCreated1:
       title: "ครบรอบหนึ่งปี"
+      description: "ผ่านไปหนึ่งปีแล้วนะตั้งแต่บัญชีของคุณถูกสร้างขึ้นมาน่ะ"
     _passedSinceAccountCreated2:
       title: "ครบรอบสองปี"
+      description: "ผ่านไปสองปีแล้วนะตั้งแต่บัญชีของคุณถูกสร้างขึ้นมาน่ะ"
     _passedSinceAccountCreated3:
       title: "ครบรอบสามปี"
+      description: "ผ่านไปสามปีแล้วนะตั้งแต่บัญชีของคุณถูกสร้างขึ้นมาน่ะ"
     _loggedInOnBirthday:
       title: "สุขสันต์วันเกิด"
       description: "เข้าสู่ระบบในวันเกิดของคุณ"
     _loggedInOnNewYearsDay:
       title: "สวัสดีปีใหม่!"
       description: "เข้าสู่ระบบในวันแรกของปี"
+      flavor: "อีกปีที่ยอดเยี่ยมในโอกาสนี้เลย"
     _cookieClicked:
+      title: "เกมที่คุณคลิกที่คุกกี้"
       description: "คลิกคุกกี้"
+      flavor: "เดี๋ยวก่อนนะ คุณอยู่ในเว็บไซต์ที่ถูกต้องแน่อย่างงั้นเหรอ?"
     _brainDiver:
       title: "Brain Diver"
+      description: "โพสต์ลิงก์ไปยัง Brain Diver"
       flavor: "Misskey-Misskey La-Tu-Ma"
 _role:
   new: "บทบาทใหม่"
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index a6ba27e4f..e660635d9 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -904,7 +904,7 @@ _achievements:
   earnedAt: "Відкрито"
   _types:
     _notes1:
-      title: "налаштовую свій msky"
+      title: "Привіт, Misskey!"
       description: "Перша нотатка"
       flavor: "Приємного часу з Misskey!"
     _notes10:
@@ -1042,6 +1042,7 @@ _achievements:
       title: "Популярна особа"
       description: "Кількість підписників досягла 100"
     _followers300:
+      title: "Ставайте в чергу"
       description: "Кількість підписників досягла 300"
     _followers500:
       title: "Радіовежа"
@@ -1049,6 +1050,46 @@ _achievements:
     _followers1000:
       title: "Інфлюенсер"
       description: "Кількість підписників досягла 1000"
+    _collectAchievements30:
+      title: "Збирач досягнень"
+      description: "Отримано 30 досягнень"
+    _viewAchievements3min:
+      title: "Шанувальник досягнень"
+      description: "Переглядати список досягнень принаймні 3 хвилини"
+    _iLoveMisskey:
+      title: "I Love Misskey"
+      description: "Відправлено \"I ❤ #Misskey\""
+      flavor: "Дякуємо вам, що користуєтесь Misskey!  – команда розробників"
+    _foundTreasure:
+      title: "Пошуки скарбів"
+      description: "Ви знайшли прихований скарб"
+    _client30min:
+      title: "Коротка перерва"
+      description: "З моменту запуску клієнта минуло 30 хвилин"
+    _noteDeletedWithin1min:
+      title: "Не зважай"
+      description: "Допис видалено протягом 1 хвилини після публікації"
+    _postedAtLateNight:
+      title: "Нічне життя"
+      description: "Відправити нотатку посеред ночі"
+      flavor: "Час лягати спати"
+    _postedAt0min0sec:
+      title: "Сигнал часу"
+      description: "Відправити нотатку о 00:00"
+    _selfQuote:
+      title: "Самопосилання"
+      description: "Процитувати власну нотатку"
+    _htl20npm:
+      title: "Плинна стрічка"
+      description: "Перевищити швидкість домашньої стрічки 20npm (нотаток на хвилину)"
+    _viewInstanceChart:
+      title: "Аналітик"
+    _clickedClickHere:
+      title: "Натисніть тут"
+      description: "Натиснуто тут"
+    _setNameToSyuilo:
+      title: "Комплекс бога"
+      description: "Встановлено ім'я \"syuilo\""
     _passedSinceAccountCreated1:
       title: "Перша річниця"
     _passedSinceAccountCreated2:
@@ -1062,6 +1103,7 @@ _achievements:
       description: "Увійшли в перший день року"
     _brainDiver:
       title: "Brain Diver"
+      description: "Відправити посилання на \"Brain Diver\""
       flavor: "Misskey-Misskey La-Tu-Ma"
 _role:
   priority: "Пріоритет"
@@ -1335,7 +1377,7 @@ _tutorial:
   step3_1: "Ви успішно налаштували свій обліковий запис?"
   step3_2: "Наступним кроком є написання нотатки. Це можна зробити, натиснувши зображення олівця на екрані."
   step3_3: "Після написання вмісту ви можете опублікувати його, натиснувши кнопку у верхньому правому куті форми."
-  step3_4: "Не знаєте що написати? Спробуйте \"налаштовую свій msky\"!"
+  step3_4: "Не знаєте що написати? Спробуйте \"Привіт, Misskey!\""
   step4_1: "Ви розмістили свій перший запис?"
   step4_2: "Ура! Ваш перший запис відображається на вашій стрічці подій."
   step5_1: "Настав час оживити вашу стрічку подій підписавшись на інших користувачів."
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 9d20b8544..651221fe6 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -995,52 +995,152 @@ _achievements:
     _login3:
       title: "初学者 I"
       description: "连续登录3天"
+      flavor: "今天开始我就是Misskist！"
     _login7:
+      title: "初学者 II"
       description: "连续登录7天"
+      flavor: "您开始习惯了吗？"
     _login15:
+      title: "初学者 III"
       description: "连续登录15天"
     _login30:
+      title: "Misskist Ⅰ"
       description: "连续登录30天"
     _login60:
+      title: "Misskist Ⅱ"
       description: "连续登录60天"
+    _login100:
+      title: "Misskist Ⅲ"
+      description: "总登入100天"
+      flavor: "那个用户，是Misskist喔"
+    _login200:
+      title: "定期联系Ⅰ"
+      description: "总登录天数200天"
+    _login300:
+      title: "定期联系Ⅱ"
+      description: "总登录天数300天"
+    _login400:
+      title: "定期联系Ⅲ"
+      description: "总登录天数400天"
+    _login500:
+      description: "总登录天数500天"
+      flavor: "诸君，我喜欢贴文"
+    _login600:
+      description: "总登录天数600天"
+    _login700:
+      description: "总登录天数700天"
+    _login800:
+      description: "总登录天数800天"
+    _login900:
+      description: "总登录天数900天"
     _login1000:
+      description: "总登录天数1000天"
       flavor: "感谢您使用Misskey！"
+    _noteClipped1:
+      title: "忍不住要收藏到便签"
+      description: "第一次将贴文贴进便签"
     _noteFavorited1:
       title: "观星者"
+      description: "第一次将帖子加入收藏"
+    _myNoteFavorited1:
+      title: "想要星星"
+      description: "自己的帖子被其他人加入收藏了"
     _profileFilled:
       title: "整装待发"
       description: "设置了个人资料"
     _markedAsCat:
       title: "我是猫"
       description: "将账户设定为一只猫"
+      flavor: "还没有名字"
+    _following1:
+      title: "首次关注"
+      description: "第一次关注别人"
     _following10:
       title: "关注，跟随"
+      description: "关注超过10人"
     _following50:
       title: "我的朋友很多"
+      description: "关注超过50人"
+    _following100:
+      title: "我的朋友很多"
+      description: "关注超过100人"
     _following300:
+      title: "朋友成群"
       description: "关注数超过300"
+    _followers1:
+      title: "最初的关注者"
+      description: "第一次被关注"
+    _followers10:
+      title: "关注我吧！"
+      description: "关注者超过10人"
+    _followers50:
+      title: "三五成群"
+      description: "关注者超过50人"
     _followers100:
       title: "胜友如云"
+      description: "关注者超过100人"
+    _followers300:
+      title: "排列成行"
+      description: "关注者超过300人"
+    _followers500:
+      title: "风向标"
+      description: "关注者超过500人"
     _collectAchievements30:
+      title: "成就收藏家"
       description: "获得超过30个成就"
     _viewAchievements3min:
+      title: "成就爱好者"
       description: "盯着成就看三分钟"
     _iLoveMisskey:
       title: "I Love Misskey"
       description: "发布\"I ❤ #Misskey\"帖子"
       flavor: "感谢您使用 Misskey ！ by 开发团队"
+    _foundTreasure:
+      description: "发现了隐藏的宝藏"
+    _client30min:
+      title: "休息一下！"
+      description: "启动客户端超过30分钟"
     _noteDeletedWithin1min:
+      title: "无话可说"
       description: "发帖后一分钟内就将其删除"
     _postedAtLateNight:
       title: "夜行者"
       description: "深夜发布帖子"
+      flavor: "差不多该去睡了喔。"
+    _postedAt0min0sec:
+      title: "报时"
+      description: "在0点发布一篇帖子"
+      flavor: "嘣 嘣 嘣 Biu——！"
+    _selfQuote:
+      title: "自我提及"
+      description: "引用了自己的帖子"
     _outputHelloWorldOnScratchpad:
       title: "Hello, world!"
+    _open3windows:
+      title: "多窗口"
+      description: "打开了三个或更多的窗口"
+    _driveFolderCircularReference:
+      title: "循环引用"
+    _reactWithoutRead:
+      title: "有好好读过吗？"
+      description: "在含有100字以上的帖子被发出三秒内做出回应"
+    _clickedClickHere:
+      title: "点这里"
+      description: "点了这里"
+    _justPlainLucky:
+      title: "超高校级的幸运"
+      description: "每10秒有0.01的概率获得"
+    _setNameToSyuilo:
+      title: "像神一样呐"
+      description: "将名称设定为syuilo"
     _passedSinceAccountCreated1:
+      title: "一周年"
       description: "账户创建时间超过1年"
     _passedSinceAccountCreated2:
+      title: "二周年"
       description: "账户创建时间超过2年"
     _passedSinceAccountCreated3:
+      title: "三周年"
       description: "账户创建时间超过3年"
     _loggedInOnBirthday:
       title: "生日快乐"
@@ -1048,6 +1148,15 @@ _achievements:
     _loggedInOnNewYearsDay:
       title: "恭贺新禧"
       description: "在元旦登入"
+      flavor: "今年也请对本实例多多指教！"
+    _cookieClicked:
+      title: "点击饼干小游戏"
+      description: "点击了可疑的饼干"
+      flavor: "是不是软件有问题？"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "发布了包含Brain Diver链接的帖子"
+      flavor: "Misskey-Misskey La-Tu-Ma"
 _role:
   new: "创建角色"
   edit: "编辑角色"
@@ -1566,7 +1675,7 @@ _profile:
   name: "昵称"
   username: "用户名"
   description: "个人简介"
-  youCanIncludeHashtags: "您可以包含一个哈希标签。"
+  youCanIncludeHashtags: "你可以在个人简介中包含一个#标签。"
   metadata: "附加信息"
   metadataEdit: "附加信息编辑"
   metadataDescription: "最多可以在个人资料中以表格形式显示四条其他信息。"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index c40476c34..058ee416e 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -240,7 +240,7 @@ removeAreYouSure: "確定要刪掉「{x}」嗎？"
 deleteAreYouSure: "確定要刪掉「{x}」嗎？"
 resetAreYouSure: "確定要重設嗎？"
 saved: "已儲存"
-messaging: "傳送訊息"
+messaging: "聊天"
 upload: "上傳"
 keepOriginalUploading: "保留原圖"
 keepOriginalUploadingDescription: "上傳圖片時保留原始圖片。關閉時，瀏覽器會在上傳時生成一張用於web發布的圖片。"
@@ -331,10 +331,10 @@ registration: "註冊"
 enableRegistration: "開啟新使用者註冊"
 invite: "邀請"
 driveCapacityPerLocalAccount: "每個本地用戶的雲端空間大小"
-driveCapacityPerRemoteAccount: "每個非本地用戶的雲端容量"
+driveCapacityPerRemoteAccount: "每個非本地用戶的雲端空間大小"
 inMb: "以Mbps為單位"
-iconUrl: "圖像URL"
-bannerUrl: "橫幅圖像URL"
+iconUrl: "圖標URL"
+bannerUrl: "橫幅圖片URL"
 backgroundImageUrl: "背景圖片的來源網址 "
 basicInfo: "基本資訊"
 pinnedUsers: "置頂用戶"
@@ -373,8 +373,8 @@ connectedTo: "您的帳戶已連接到以下社交帳戶"
 notesAndReplies: "貼文與回覆"
 withFiles: "附件"
 silence: "禁言"
-silenceConfirm: "確定要禁言此用戶嗎？"
-unsilence: "解除禁言"
+silenceConfirm: "確定要靜音此使用者嗎？"
+unsilence: "解除靜音"
 unsilenceConfirm: "確定要解除禁言嗎？"
 popularUsers: "熱門使用者"
 recentlyUpdatedUsers: "最近發文的使用者"
@@ -383,13 +383,13 @@ recentlyDiscoveredUsers: "最近發現的使用者"
 exploreUsersCount: "有{count}個使用者"
 exploreFediverse: "探索聯邦世界"
 popularTags: "熱門標籤"
-userList: "清單"
-about: "資訊"
+userList: "使用者清單"
+about: "關於"
 aboutMisskey: "關於 Misskey"
 administrator: "管理員"
 token: "權杖"
 twoStepAuthentication: "兩階段驗證"
-moderator: "監察員"
+moderator: "審核員"
 moderation: "監察"
 nUsersMentioned: "提到了{n}"
 securityKey: "安全金鑰"
@@ -421,7 +421,7 @@ invites: "邀請"
 groupName: "群組名稱"
 members: "成員"
 transfer: "轉讓"
-messagingWithUser: "傳送訊息給其他使用者"
+messagingWithUser: "與其他使用者聊天"
 messagingWithGroup: "發送訊息至群組"
 title: "標題"
 text: "文字"
@@ -473,7 +473,7 @@ createAccount: "建立帳戶"
 existingAccount: "現有帳戶"
 regenerate: "再生"
 fontSize: "字體大小"
-noFollowRequests: "沒有要求跟隨您的申請"
+noFollowRequests: "沒有跟隨您的請求"
 openImageInNewTab: "於新分頁中開啟圖片"
 dashboard: "儀表板"
 local: "本地"
@@ -530,8 +530,8 @@ installedDate: "安裝時間"
 lastUsedDate: "最後上線日期"
 state: "狀態"
 sort: "排序"
-ascendingOrder: "昇冪"
-descendingOrder: "降冪"
+ascendingOrder: "遞增"
+descendingOrder: "遞減"
 scratchpad: "暫存記憶體"
 scratchpadDescription: "AiScript控制台為AiScript提供了實驗環境。您可以在此編寫、執行和確認代碼與Misskey互動的结果。"
 output: "輸出"
@@ -995,24 +995,24 @@ _achievements:
     _login3:
       title: "初學者Ⅰ"
       description: "總登入天數為3天"
-      flavor: "從今天開始，我就是Misskeyist"
+      flavor: "從今天開始，我就是Misskist"
     _login7:
       title: "初學者ⅠⅠ"
       description: "總登入天數為7天"
       flavor: "您開始習慣了嗎？"
     _login15:
-      title: "初學者III"
+      title: "初學者ⅠⅠⅠ"
       description: "總登入天數為15天"
     _login30:
-      title: "Misskeyist Ⅰ"
+      title: "Misskist Ⅰ"
       description: "總登入天數為30天"
     _login60:
-      title: "Misskeyist ⅠⅠ"
+      title: "Misskist ⅠⅠ"
       description: "總登入天數為60天"
     _login100:
-      title: "Misskeyist ⅠⅠⅠ"
+      title: "Misskist ⅠⅠⅠ"
       description: "總登入天數為100天"
-      flavor: "辣個 Misskeyist 用戶"
+      flavor: "辣個 Misskist 用戶"
     _login200:
       title: "普通Ⅰ"
       description: "總登入天數為200天"
@@ -1089,7 +1089,7 @@ _achievements:
       title: "請排成一排"
       description: "跟隨者超過300人了"
     _followers500:
-      title: "基站"
+      title: "基地台"
       description: "超過500名追隨者了"
     _followers1000:
       title: "影響者"
@@ -1111,7 +1111,7 @@ _achievements:
       title: "休息一下"
       description: "用戶端啟動已超過30分鐘"
     _noteDeletedWithin1min:
-      title: "現在沒有"
+      title: "現在沒有了"
       description: "發文後1分鐘內刪文"
     _postedAtLateNight:
       title: "夜行性"

From 2a41f6c383cc9963aa4a56efafd8dd50abd38709 Mon Sep 17 00:00:00 2001
From: YS <47836716+yszkst@users.noreply.github.com>
Date: Wed, 1 Feb 2023 11:25:13 +0900
Subject: [PATCH 159/177] =?UTF-8?q?enhance:=20Unicode=E7=B5=B5=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E5=90=8D=E9=80=86=E5=BC=95=E3=81=8D=E5=8A=B9=E7=8E=87?=
 =?UTF-8?q?=E5=8C=96=20(#9757)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Unicode絵文字名前取得を連想配列で行う

* Unicode絵文字事前カテゴリ集計

* Mapを使用

* Update packages/frontend/src/scripts/emojilist.ts

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
---
 .../frontend/src/components/MkEmojiPicker.vue |  4 ++--
 packages/frontend/src/scripts/emojilist.ts    | 21 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue
index 39e274ba1..2063ab4de 100644
--- a/packages/frontend/src/components/MkEmojiPicker.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.vue
@@ -74,7 +74,7 @@
 		</div>
 		<div v-once class="group">
 			<header class="_acrylic">{{ i18n.ts.emoji }}</header>
-			<XSection v-for="category in categories" :key="category" :emojis="emojilist.filter(e => e.category === category).map(e => e.char)" @chosen="chosen">{{ category }}</XSection>
+			<XSection v-for="category in categories" :key="category" :emojis="emojiCharByCategory.get(category) ?? []" @chosen="chosen">{{ category }}</XSection>
 		</div>
 	</div>
 	<div class="tabs">
@@ -90,7 +90,7 @@
 import { ref, shallowRef, computed, watch, onMounted } from 'vue';
 import * as Misskey from 'misskey-js';
 import XSection from '@/components/MkEmojiPicker.section.vue';
-import { emojilist, UnicodeEmojiDef, unicodeEmojiCategories as categories } from '@/scripts/emojilist';
+import { emojilist, emojiCharByCategory, UnicodeEmojiDef, unicodeEmojiCategories as categories } from '@/scripts/emojilist';
 import MkRippleEffect from '@/components/MkRippleEffect.vue';
 import * as os from '@/os';
 import { isTouchUsing } from '@/scripts/touch';
diff --git a/packages/frontend/src/scripts/emojilist.ts b/packages/frontend/src/scripts/emojilist.ts
index bc52fa7a4..2e853b58b 100644
--- a/packages/frontend/src/scripts/emojilist.ts
+++ b/packages/frontend/src/scripts/emojilist.ts
@@ -12,6 +12,25 @@ import _emojilist from '../emojilist.json';
 
 export const emojilist = _emojilist as UnicodeEmojiDef[];
 
+const _indexByChar = new Map<string, number>();
+const _charGroupByCategory = new Map<string, string[]>();
+emojilist.forEach((emo, i) => {
+	_indexByChar.set(emo.char, i);
+
+	if (_charGroupByCategory.has(emo.category)) {
+		_charGroupByCategory.get(emo.category)?.push(emo.char);
+	} else {
+		_charGroupByCategory.set(emo.category, [emo.char]);
+	}
+});
+
+export const emojiCharByCategory = _charGroupByCategory;
+
 export function getEmojiName(char: string): string | undefined {
-	return emojilist.find(emo => emo.char === char)?.name;
+	const idx = _indexByChar.get(char);
+	if (typeof idx === 'undefined') {
+		return undefined;
+	} else {
+		return emojilist[idx].name;
+	}
 }

From e42938cad62da524d94ff09d2df979389b170880 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 1 Feb 2023 11:27:37 +0900
Subject: [PATCH 160/177] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ee0d0295..4b20206e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,12 @@ You should also include the user name that made the change.
 ### Changes
 - docker-compose.ymlをdocker-compose.yml.exampleにしました。docker-compose.ymlとしてコピーしてから使用してください。
 
+### Improvements
+- 絵文字ピッカーのパフォーマンスを改善
+- AiScriptを0.12.4に更新
+
 ### Bugfixes
+- Server: リレーと通信できない問題を修正
 - Client: classicモード使用時にwindowサイズによってdefaultに変更された後に、windowサイズが元に戻ったらclassicに戻すように修正 #9669
 - Client: Chromeで検索ダイアログで変換確定するとそのまま検索されてしまう問題を修正
 

From 843f1aed4fd2c60df87ebc15bb85b6dca049622e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 1 Feb 2023 11:29:17 +0900
Subject: [PATCH 161/177] 13.2.6

---
 CHANGELOG.md | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b20206e8..436c99a22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@
 You should also include the user name that made the change.
 -->
 
-## 13.x.x (unreleased)
+## 13.2.6 (2023/02/01)
 ### Changes
 - docker-compose.ymlをdocker-compose.yml.exampleにしました。docker-compose.ymlとしてコピーしてから使用してください。
 
diff --git a/package.json b/package.json
index 34beb5772..2cb239641 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.2.5",
+	"version": "13.2.6",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From ebc64379773d10b14527beb71396dc5ddc8eaa7e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 1 Feb 2023 16:24:50 +0900
Subject: [PATCH 162/177] refactor: tweak variable name

---
 packages/backend/src/core/chart/core.ts | 46 ++++++++++++-------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/packages/backend/src/core/chart/core.ts b/packages/backend/src/core/chart/core.ts
index 2092b13b7..d352adcc1 100644
--- a/packages/backend/src/core/chart/core.ts
+++ b/packages/backend/src/core/chart/core.ts
@@ -11,9 +11,9 @@ import type Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
 import type { Repository, DataSource } from 'typeorm';
 
-const columnPrefix = '___' as const;
-const uniqueTempColumnPrefix = 'unique_temp___' as const;
-const columnDot = '_' as const;
+const COLUMN_PREFIX = '___' as const;
+const UNIQUE_TEMP_COLUMN_PREFIX = 'unique_temp___' as const;
+const COLUMN_DELIMITER = '_' as const;
 
 type Schema = Record<string, {
 	uniqueIncrement?: boolean;
@@ -26,14 +26,14 @@ type Schema = Record<string, {
 	accumulate?: boolean;
 }>;
 
-type KeyToColumnName<T extends string> = T extends `${infer R1}.${infer R2}` ? `${R1}${typeof columnDot}${KeyToColumnName<R2>}` : T;
+type KeyToColumnName<T extends string> = T extends `${infer R1}.${infer R2}` ? `${R1}${typeof COLUMN_DELIMITER}${KeyToColumnName<R2>}` : T;
 
 type Columns<S extends Schema> = {
-	[K in keyof S as `${typeof columnPrefix}${KeyToColumnName<string & K>}`]: number;
+	[K in keyof S as `${typeof COLUMN_PREFIX}${KeyToColumnName<string & K>}`]: number;
 };
 
 type TempColumnsForUnique<S extends Schema> = {
-	[K in keyof S as `${typeof uniqueTempColumnPrefix}${KeyToColumnName<string & K>}`]: S[K]['uniqueIncrement'] extends true ? string[] : never;
+	[K in keyof S as `${typeof UNIQUE_TEMP_COLUMN_PREFIX}${KeyToColumnName<string & K>}`]: S[K]['uniqueIncrement'] extends true ? string[] : never;
 };
 
 type RawRecord<S extends Schema> = {
@@ -138,20 +138,20 @@ export default abstract class Chart<T extends Schema> {
 	private static convertSchemaToColumnDefinitions(schema: Schema): Record<string, { type: string; array?: boolean; default?: any; }> {
 		const columns = {} as Record<string, { type: string; array?: boolean; default?: any; }>;
 		for (const [k, v] of Object.entries(schema)) {
-			const name = k.replaceAll('.', columnDot);
+			const name = k.replaceAll('.', COLUMN_DELIMITER);
 			const type = v.range === 'big' ? 'bigint' : v.range === 'small' ? 'smallint' : 'integer';
 			if (v.uniqueIncrement) {
-				columns[uniqueTempColumnPrefix + name] = {
+				columns[UNIQUE_TEMP_COLUMN_PREFIX + name] = {
 					type: 'varchar',
 					array: true,
 					default: '{}',
 				};
-				columns[columnPrefix + name] = {
+				columns[COLUMN_PREFIX + name] = {
 					type,
 					default: 0,
 				};
 			} else {
-				columns[columnPrefix + name] = {
+				columns[COLUMN_PREFIX + name] = {
 					type,
 					default: 0,
 				};
@@ -253,8 +253,8 @@ export default abstract class Chart<T extends Schema> {
 	@bindThis
 	private convertRawRecord(x: RawRecord<T>): KVs<T> {
 		const kvs = {} as Record<string, number>;
-		for (const k of Object.keys(x).filter((k) => k.startsWith(columnPrefix)) as (keyof Columns<T>)[]) {
-			kvs[(k as string).substr(columnPrefix.length).split(columnDot).join('.')] = x[k] as unknown as number;
+		for (const k of Object.keys(x).filter((k) => k.startsWith(COLUMN_PREFIX)) as (keyof Columns<T>)[]) {
+			kvs[(k as string).substr(COLUMN_PREFIX.length).split(COLUMN_DELIMITER).join('.')] = x[k] as unknown as number;
 		}
 		return kvs as KVs<T>;
 	}
@@ -357,8 +357,8 @@ export default abstract class Chart<T extends Schema> {
 
 			const columns = {} as Record<string, number | unknown[]>;
 			for (const [k, v] of Object.entries(data)) {
-				const name = k.replaceAll('.', columnDot);
-				columns[columnPrefix + name] = v;
+				const name = k.replaceAll('.', COLUMN_DELIMITER);
+				columns[COLUMN_PREFIX + name] = v;
 			}
 
 			// 新規ログ挿入
@@ -419,13 +419,13 @@ export default abstract class Chart<T extends Schema> {
 			const queryForDay: Record<keyof RawRecord<T>, number | (() => string)> = {} as any;
 			for (const [k, v] of Object.entries(finalDiffs)) {
 				if (typeof v === 'number') {
-					const name = columnPrefix + k.replaceAll('.', columnDot) as string & keyof Columns<T>;
+					const name = COLUMN_PREFIX + k.replaceAll('.', COLUMN_DELIMITER) as string & keyof Columns<T>;
 					if (v > 0) queryForHour[name] = () => `"${name}" + ${v}`;
 					if (v < 0) queryForHour[name] = () => `"${name}" - ${Math.abs(v)}`;
 					if (v > 0) queryForDay[name] = () => `"${name}" + ${v}`;
 					if (v < 0) queryForDay[name] = () => `"${name}" - ${Math.abs(v)}`;
 				} else if (Array.isArray(v) && v.length > 0) { // ユニークインクリメント
-					const tempColumnName = uniqueTempColumnPrefix + k.replaceAll('.', columnDot) as string & keyof TempColumnsForUnique<T>;
+					const tempColumnName = UNIQUE_TEMP_COLUMN_PREFIX + k.replaceAll('.', COLUMN_DELIMITER) as string & keyof TempColumnsForUnique<T>;
 					// TODO: item をSQLエスケープ
 					const itemsForHour = v.filter(item => !(logHour[tempColumnName] as unknown as string[]).includes(item)).map(item => `"${item}"`);
 					const itemsForDay = v.filter(item => !(logDay[tempColumnName] as unknown as string[]).includes(item)).map(item => `"${item}"`);
@@ -437,8 +437,8 @@ export default abstract class Chart<T extends Schema> {
 			// bake unique count
 			for (const [k, v] of Object.entries(finalDiffs)) {
 				if (this.schema[k].uniqueIncrement) {
-					const name = columnPrefix + k.replaceAll('.', columnDot) as keyof Columns<T>;
-					const tempColumnName = uniqueTempColumnPrefix + k.replaceAll('.', columnDot) as keyof TempColumnsForUnique<T>;
+					const name = COLUMN_PREFIX + k.replaceAll('.', COLUMN_DELIMITER) as keyof Columns<T>;
+					const tempColumnName = UNIQUE_TEMP_COLUMN_PREFIX + k.replaceAll('.', COLUMN_DELIMITER) as keyof TempColumnsForUnique<T>;
 					queryForHour[name] = new Set([...(v as string[]), ...(logHour[tempColumnName] as unknown as string[])]).size;
 					queryForDay[name] = new Set([...(v as string[]), ...(logDay[tempColumnName] as unknown as string[])]).size;
 				}
@@ -449,15 +449,15 @@ export default abstract class Chart<T extends Schema> {
 			for (const [k, v] of Object.entries(this.schema)) {
 				const intersection = v.intersection;
 				if (intersection) {
-					const name = columnPrefix + k.replaceAll('.', columnDot) as keyof Columns<T>;
+					const name = COLUMN_PREFIX + k.replaceAll('.', COLUMN_DELIMITER) as keyof Columns<T>;
 					const firstKey = intersection[0];
-					const firstTempColumnName = uniqueTempColumnPrefix + firstKey.replaceAll('.', columnDot) as keyof TempColumnsForUnique<T>;
+					const firstTempColumnName = UNIQUE_TEMP_COLUMN_PREFIX + firstKey.replaceAll('.', COLUMN_DELIMITER) as keyof TempColumnsForUnique<T>;
 					const firstValues = finalDiffs[firstKey] as string[] | undefined;
 					const currentValuesForHour = new Set([...(firstValues ?? []), ...(logHour[firstTempColumnName] as unknown as string[])]);
 					const currentValuesForDay = new Set([...(firstValues ?? []), ...(logDay[firstTempColumnName] as unknown as string[])]);
 					for (let i = 1; i < intersection.length; i++) {
 						const targetKey = intersection[i];
-						const targetTempColumnName = uniqueTempColumnPrefix + targetKey.replaceAll('.', columnDot) as keyof TempColumnsForUnique<T>;
+						const targetTempColumnName = UNIQUE_TEMP_COLUMN_PREFIX + targetKey.replaceAll('.', COLUMN_DELIMITER) as keyof TempColumnsForUnique<T>;
 						const targetValues = finalDiffs[targetKey] as string[] | undefined;
 						const targetValuesForHour = new Set([...(targetValues ?? []), ...(logHour[targetTempColumnName] as unknown as string[])]);
 						const targetValuesForDay = new Set([...(targetValues ?? []), ...(logDay[targetTempColumnName] as unknown as string[])]);
@@ -510,7 +510,7 @@ export default abstract class Chart<T extends Schema> {
 
 		const columns = {} as Record<keyof Columns<T>, number>;
 		for (const [k, v] of Object.entries(data) as ([keyof typeof data, number])[]) {
-			const name = columnPrefix + (k as string).replaceAll('.', columnDot) as keyof Columns<T>;
+			const name = COLUMN_PREFIX + (k as string).replaceAll('.', COLUMN_DELIMITER) as keyof Columns<T>;
 			columns[name] = v;
 		}
 
@@ -556,7 +556,7 @@ export default abstract class Chart<T extends Schema> {
 		const columns = {} as Record<keyof TempColumnsForUnique<T>, []>;
 		for (const [k, v] of Object.entries(this.schema)) {
 			if (v.uniqueIncrement) {
-				const name = uniqueTempColumnPrefix + k.replaceAll('.', columnDot) as keyof TempColumnsForUnique<T>;
+				const name = UNIQUE_TEMP_COLUMN_PREFIX + k.replaceAll('.', COLUMN_DELIMITER) as keyof TempColumnsForUnique<T>;
 				columns[name] = [];
 			}
 		}

From 387fcd5c5df04a461f346781bf5621d343b15e66 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 1 Feb 2023 17:29:28 +0900
Subject: [PATCH 163/177] refactor: fix type

---
 packages/backend/src/core/NoteReadService.ts           | 10 ++--------
 .../backend/src/misc/extract-custom-emojis-from-mfm.ts |  2 +-
 packages/backend/src/misc/extract-hashtags.ts          |  2 +-
 .../src/server/api/integration/DiscordServerService.ts |  2 +-
 .../src/server/api/integration/GithubServerService.ts  |  2 +-
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/packages/backend/src/core/NoteReadService.ts b/packages/backend/src/core/NoteReadService.ts
index 82825b8b1..f4395725d 100644
--- a/packages/backend/src/core/NoteReadService.ts
+++ b/packages/backend/src/core/NoteReadService.ts
@@ -9,9 +9,9 @@ import { IdService } from '@/core/IdService.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import type { UsersRepository, NoteUnreadsRepository, MutingsRepository, NoteThreadMutingsRepository, FollowingsRepository, ChannelFollowingsRepository, AntennaNotesRepository } from '@/models/index.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import { bindThis } from '@/decorators.js';
 import { NotificationService } from './NotificationService.js';
 import { AntennaService } from './AntennaService.js';
-import { bindThis } from '@/decorators.js';
 import { PushNotificationService } from './PushNotificationService.js';
 
 @Injectable()
@@ -107,12 +107,6 @@ export class NoteReadService {
 			followingChannels: Set<Channel['id']>;
 		},
 	): Promise<void> {
-		const following = info?.following ? info.following : new Set<string>((await this.followingsRepository.find({
-			where: {
-				followerId: userId,
-			},
-			select: ['followeeId'],
-		})).map(x => x.followeeId));
 		const followingChannels = info?.followingChannels ? info.followingChannels : new Set<string>((await this.channelFollowingsRepository.find({
 			where: {
 				followerId: userId,
@@ -139,7 +133,7 @@ export class NoteReadService {
 	
 			if (note.user != null) { // たぶんnullになることは無いはずだけど一応
 				for (const antenna of myAntennas) {
-					if (await this.antennaService.checkHitAntenna(antenna, note, note.user, undefined, Array.from(following))) {
+					if (await this.antennaService.checkHitAntenna(antenna, note, note.user)) {
 						readAntennaNotes.push(note);
 					}
 				}
diff --git a/packages/backend/src/misc/extract-custom-emojis-from-mfm.ts b/packages/backend/src/misc/extract-custom-emojis-from-mfm.ts
index 8fb3f4b19..14c25922a 100644
--- a/packages/backend/src/misc/extract-custom-emojis-from-mfm.ts
+++ b/packages/backend/src/misc/extract-custom-emojis-from-mfm.ts
@@ -4,7 +4,7 @@ import { unique } from '@/misc/prelude/array.js';
 export function extractCustomEmojisFromMfm(nodes: mfm.MfmNode[]): string[] {
 	const emojiNodes = mfm.extract(nodes, (node) => {
 		return (node.type === 'emojiCode' && node.props.name.length <= 100);
-	});
+	}) as mfm.MfmEmojiCode[];
 
 	return unique(emojiNodes.map(x => x.props.name));
 }
diff --git a/packages/backend/src/misc/extract-hashtags.ts b/packages/backend/src/misc/extract-hashtags.ts
index f8cabda3d..d293fd7f5 100644
--- a/packages/backend/src/misc/extract-hashtags.ts
+++ b/packages/backend/src/misc/extract-hashtags.ts
@@ -2,7 +2,7 @@ import * as mfm from 'mfm-js';
 import { unique } from '@/misc/prelude/array.js';
 
 export function extractHashtags(nodes: mfm.MfmNode[]): string[] {
-	const hashtagNodes = mfm.extract(nodes, (node) => node.type === 'hashtag');
+	const hashtagNodes = mfm.extract(nodes, (node) => node.type === 'hashtag') as mfm.MfmHashtag[];
 	const hashtags = unique(hashtagNodes.map(x => x.props.hashtag));
 
 	return hashtags;
diff --git a/packages/backend/src/server/api/integration/DiscordServerService.ts b/packages/backend/src/server/api/integration/DiscordServerService.ts
index 0ac273381..cbced901e 100644
--- a/packages/backend/src/server/api/integration/DiscordServerService.ts
+++ b/packages/backend/src/server/api/integration/DiscordServerService.ts
@@ -134,7 +134,7 @@ export class DiscordServerService {
 			reply.redirect(oauth2!.getAuthorizeUrl(params));
 		});
 
-		fastify.get('/dc/cb', async (request, reply) => {
+		fastify.get<{ Querystring: { code: string; state: string; } }>('/dc/cb', async (request, reply) => {
 			const userToken = this.getUserToken(request);
 
 			const oauth2 = await getOAuth2();
diff --git a/packages/backend/src/server/api/integration/GithubServerService.ts b/packages/backend/src/server/api/integration/GithubServerService.ts
index a8c745d2d..76089c935 100644
--- a/packages/backend/src/server/api/integration/GithubServerService.ts
+++ b/packages/backend/src/server/api/integration/GithubServerService.ts
@@ -132,7 +132,7 @@ export class GithubServerService {
 			reply.redirect(oauth2!.getAuthorizeUrl(params));
 		});
 
-		fastify.get('/gh/cb', async (request, reply) => {
+		fastify.get<{ Querystring: { code: string; state: string; } }>('/gh/cb', async (request, reply) => {
 			const userToken = this.getUserToken(request);
 
 			const oauth2 = await getOath2();

From 7c3143b8e5cc4a5875ed9ec4013c55c4e989efe2 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 1 Feb 2023 20:04:01 +0900
Subject: [PATCH 164/177] enhance(backend): enhance SchemaType handling of
 anyOf (#9762)

* enhance(backend): enhance anyOf handling

* clean up
---
 packages/backend/src/misc/schema.ts           | 27 +++++--
 .../src/server/api/endpoints/notes/create.ts  | 76 ++++++++++---------
 .../users/search-by-username-and-host.ts      | 16 +++-
 3 files changed, 71 insertions(+), 48 deletions(-)

diff --git a/packages/backend/src/misc/schema.ts b/packages/backend/src/misc/schema.ts
index fdecc278d..7aeb65f29 100644
--- a/packages/backend/src/misc/schema.ts
+++ b/packages/backend/src/misc/schema.ts
@@ -132,11 +132,27 @@ type NullOrUndefined<p extends Schema, T> =
 // https://stackoverflow.com/questions/54938141/typescript-convert-union-to-intersection
 // Get intersection from union 
 type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never;
+type PartialIntersection<T> = Partial<UnionToIntersection<T>>;
 
 // https://github.com/misskey-dev/misskey/pull/8144#discussion_r785287552
 // To get union, we use `Foo extends any ? Hoge<Foo> : never`
 type UnionSchemaType<a extends readonly any[], X extends Schema = a[number]> = X extends any ? SchemaType<X> : never;
-type ArrayUnion<T> = T extends any ? Array<T> : never; 
+type UnionObjectSchemaType<a extends readonly any[], X extends Schema = a[number]> = X extends any ? ObjectSchemaType<X> : never;
+type ArrayUnion<T> = T extends any ? Array<T> : never;
+
+type ObjectSchemaTypeDef<p extends Schema> =
+	p['ref'] extends keyof typeof refs ? Packed<p['ref']> :
+	p['properties'] extends NonNullable<Obj> ?
+		p['anyOf'] extends ReadonlyArray<Schema> ?
+			ObjType<p['properties'], NonNullable<p['required']>[number]> & UnionObjectSchemaType<p['anyOf']> & PartialIntersection<UnionObjectSchemaType<p['anyOf']>>
+			:
+			ObjType<p['properties'], NonNullable<p['required']>[number]>
+	:
+	p['anyOf'] extends ReadonlyArray<Schema> ? UnionObjectSchemaType<p['anyOf']> & PartialIntersection<UnionObjectSchemaType<p['anyOf']>> :
+	p['allOf'] extends ReadonlyArray<Schema> ? UnionToIntersection<UnionSchemaType<p['allOf']>> :
+	any
+
+type ObjectSchemaType<p extends Schema> = NullOrUndefined<p, ObjectSchemaTypeDef<p>>;
 
 export type SchemaTypeDef<p extends Schema> =
 	p['type'] extends 'null' ? null :
@@ -149,13 +165,7 @@ export type SchemaTypeDef<p extends Schema> =
 		string
 	) :
 	p['type'] extends 'boolean' ? boolean :
-	p['type'] extends 'object' ? (
-		p['ref'] extends keyof typeof refs ? Packed<p['ref']> :
-		p['properties'] extends NonNullable<Obj> ? ObjType<p['properties'], NonNullable<p['required']>[number]> :
-		p['anyOf'] extends ReadonlyArray<Schema> ? UnionSchemaType<p['anyOf']> & Partial<UnionToIntersection<UnionSchemaType<p['anyOf']>>> :
-		p['allOf'] extends ReadonlyArray<Schema> ? UnionToIntersection<UnionSchemaType<p['allOf']>> :
-		any
-	) :
+	p['type'] extends 'object' ? ObjectSchemaTypeDef<p> :
 	p['type'] extends 'array' ? (
 		p['items'] extends OfSchema ? (
 			p['items']['anyOf'] extends ReadonlyArray<Schema> ? UnionSchemaType<NonNullable<p['items']['anyOf']>>[] :
@@ -166,6 +176,7 @@ export type SchemaTypeDef<p extends Schema> =
 		p['items'] extends NonNullable<Schema> ? SchemaTypeDef<p['items']>[] :
 		any[]
 	) :
+	p['anyOf'] extends ReadonlyArray<Schema> ? UnionSchemaType<p['anyOf']> & PartialIntersection<UnionSchemaType<p['anyOf']>> :
 	p['oneOf'] extends ReadonlyArray<Schema> ? UnionSchemaType<p['oneOf']> :
 	any;
 
diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts
index 92bc8a759..a709ab2f7 100644
--- a/packages/backend/src/server/api/endpoints/notes/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/create.ts
@@ -90,48 +90,13 @@ export const paramDef = {
 		visibleUserIds: { type: 'array', uniqueItems: true, items: {
 			type: 'string', format: 'misskey:id',
 		} },
-		text: { type: 'string', maxLength: MAX_NOTE_TEXT_LENGTH, nullable: true },
 		cw: { type: 'string', nullable: true, maxLength: 100 },
 		localOnly: { type: 'boolean', default: false },
 		noExtractMentions: { type: 'boolean', default: false },
 		noExtractHashtags: { type: 'boolean', default: false },
 		noExtractEmojis: { type: 'boolean', default: false },
-		fileIds: {
-			type: 'array',
-			uniqueItems: true,
-			minItems: 1,
-			maxItems: 16,
-			items: { type: 'string', format: 'misskey:id' },
-		},
-		mediaIds: {
-			deprecated: true,
-			description: 'Use `fileIds` instead. If both are specified, this property is discarded.',
-			type: 'array',
-			uniqueItems: true,
-			minItems: 1,
-			maxItems: 16,
-			items: { type: 'string', format: 'misskey:id' },
-		},
 		replyId: { type: 'string', format: 'misskey:id', nullable: true },
-		renoteId: { type: 'string', format: 'misskey:id', nullable: true },
 		channelId: { type: 'string', format: 'misskey:id', nullable: true },
-		poll: {
-			type: 'object',
-			nullable: true,
-			properties: {
-				choices: {
-					type: 'array',
-					uniqueItems: true,
-					minItems: 2,
-					maxItems: 10,
-					items: { type: 'string', minLength: 1, maxLength: 50 },
-				},
-				multiple: { type: 'boolean', default: false },
-				expiresAt: { type: 'integer', nullable: true },
-				expiredAfter: { type: 'integer', nullable: true, minimum: 1 },
-			},
-			required: ['choices'],
-		},
 	},
 	anyOf: [
 		{
@@ -143,21 +108,60 @@ export const paramDef = {
 		},
 		{
 			// (re)note with files, text and poll are optional
+			properties: {
+				fileIds: {
+					type: 'array',
+					uniqueItems: true,
+					minItems: 1,
+					maxItems: 16,
+					items: { type: 'string', format: 'misskey:id' },
+				},
+			},
 			required: ['fileIds'],
 		},
 		{
 			// (re)note with files, text and poll are optional
+			properties: {
+				mediaIds: {
+					deprecated: true,
+					description: 'Use `fileIds` instead. If both are specified, this property is discarded.',
+					type: 'array',
+					uniqueItems: true,
+					minItems: 1,
+					maxItems: 16,
+					items: { type: 'string', format: 'misskey:id' },
+				},
+			},
 			required: ['mediaIds'],
 		},
 		{
 			// (re)note with poll, text and files are optional
 			properties: {
-				poll: { type: 'object', nullable: false },
+				poll: {
+					type: 'object',
+					nullable: true,
+					properties: {
+						choices: {
+							type: 'array',
+							uniqueItems: true,
+							minItems: 2,
+							maxItems: 10,
+							items: { type: 'string', minLength: 1, maxLength: 50 },
+						},
+						multiple: { type: 'boolean' },
+						expiresAt: { type: 'integer', nullable: true },
+						expiredAfter: { type: 'integer', nullable: true, minimum: 1 },
+					},
+					required: ['choices'],
+				},
 			},
 			required: ['poll'],
 		},
 		{
 			// pure renote
+			properties: {
+				renoteId: { type: 'string', format: 'misskey:id', nullable: true },
+			},
 			required: ['renoteId'],
 		},
 	],
diff --git a/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts b/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts
index 95491211b..b176e6c65 100644
--- a/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts
+++ b/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts
@@ -29,14 +29,22 @@ export const meta = {
 export const paramDef = {
 	type: 'object',
 	properties: {
-		username: { type: 'string', nullable: true },
-		host: { type: 'string', nullable: true },
 		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
 		detail: { type: 'boolean', default: true },
 	},
 	anyOf: [
-		{ required: ['username'] },
-		{ required: ['host'] },
+		{
+			properties: {
+				username: { type: 'string', nullable: true },
+			},
+			required: ['username']
+		},
+		{
+			properties: {
+				host: { type: 'string', nullable: true },
+			},
+			required: ['host']
+		},
 	],
 } as const;
 

From d9d98f84bf3fe71c8182d86522cc0d8abf72fd96 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 1 Feb 2023 20:12:42 +0900
Subject: [PATCH 165/177] refactor: fix type

---
 .../backend/src/server/api/stream/types.ts    | 78 ++++++++++---------
 1 file changed, 41 insertions(+), 37 deletions(-)

diff --git a/packages/backend/src/server/api/stream/types.ts b/packages/backend/src/server/api/stream/types.ts
index fc145cf0e..36bfa7836 100644
--- a/packages/backend/src/server/api/stream/types.ts
+++ b/packages/backend/src/server/api/stream/types.ts
@@ -18,31 +18,26 @@ import { Following, Role, RoleAssignment } from '@/models';
 import type Emitter from 'strict-event-emitter-types';
 import type { EventEmitter } from 'events';
 
-// redis通すとDateのインスタンスはstringに変換されるので
-type Serialized<T> = {
-	[K in keyof T]: T[K] extends Date ? string : T[K];
-};
-
 //#region Stream type-body definitions
 export interface InternalStreamTypes {
-	userChangeSuspendedState: Serialized<{ id: User['id']; isSuspended: User['isSuspended']; }>;
-	userTokenRegenerated: Serialized<{ id: User['id']; oldToken: User['token']; newToken: User['token']; }>;
-	remoteUserUpdated: Serialized<{ id: User['id']; }>;
-	follow: Serialized<{ followerId: User['id']; followeeId: User['id']; }>;
-	unfollow: Serialized<{ followerId: User['id']; followeeId: User['id']; }>;
-	policiesUpdated: Serialized<Role['policies']>;
-	roleCreated: Serialized<Role>;
-	roleDeleted: Serialized<Role>;
-	roleUpdated: Serialized<Role>;
-	userRoleAssigned: Serialized<RoleAssignment>;
-	userRoleUnassigned: Serialized<RoleAssignment>;
-	webhookCreated: Serialized<Webhook>;
-	webhookDeleted: Serialized<Webhook>;
-	webhookUpdated: Serialized<Webhook>;
-	antennaCreated: Serialized<Antenna>;
-	antennaDeleted: Serialized<Antenna>;
-	antennaUpdated: Serialized<Antenna>;
-	metaUpdated: Serialized<Meta>;
+	userChangeSuspendedState: { id: User['id']; isSuspended: User['isSuspended']; };
+	userTokenRegenerated: { id: User['id']; oldToken: User['token']; newToken: User['token']; };
+	remoteUserUpdated: { id: User['id']; };
+	follow: { followerId: User['id']; followeeId: User['id']; };
+	unfollow: { followerId: User['id']; followeeId: User['id']; };
+	policiesUpdated: Role['policies'];
+	roleCreated: Role;
+	roleDeleted: Role;
+	roleUpdated: Role;
+	userRoleAssigned: RoleAssignment;
+	userRoleUnassigned: RoleAssignment;
+	webhookCreated: Webhook;
+	webhookDeleted: Webhook;
+	webhookUpdated: Webhook;
+	antennaCreated: Antenna;
+	antennaDeleted: Antenna;
+	antennaUpdated: Antenna;
+	metaUpdated: Meta;
 }
 
 export interface BroadcastTypes {
@@ -210,63 +205,72 @@ type EventUnionFromDictionary<
 	U = Events<T>
 > = U[keyof U];
 
+// redis通すとDateのインスタンスはstringに変換されるので
+type Serialized<T> = {
+	[K in keyof T]: T[K] extends Date ? string : T[K] extends Record<string, any> ? Serialized<T[K]> : T[K];
+};
+
+type SerializedAll<T> = {
+	[K in keyof T]: Serialized<T[K]>;
+};
+
 // name/messages(spec) pairs dictionary
 export type StreamMessages = {
 	internal: {
 		name: 'internal';
-		payload: EventUnionFromDictionary<InternalStreamTypes>;
+		payload: EventUnionFromDictionary<SerializedAll<InternalStreamTypes>>;
 	};
 	broadcast: {
 		name: 'broadcast';
-		payload: EventUnionFromDictionary<BroadcastTypes>;
+		payload: EventUnionFromDictionary<SerializedAll<BroadcastTypes>>;
 	};
 	user: {
 		name: `user:${User['id']}`;
-		payload: EventUnionFromDictionary<UserStreamTypes>;
+		payload: EventUnionFromDictionary<SerializedAll<UserStreamTypes>>;
 	};
 	main: {
 		name: `mainStream:${User['id']}`;
-		payload: EventUnionFromDictionary<MainStreamTypes>;
+		payload: EventUnionFromDictionary<SerializedAll<MainStreamTypes>>;
 	};
 	drive: {
 		name: `driveStream:${User['id']}`;
-		payload: EventUnionFromDictionary<DriveStreamTypes>;
+		payload: EventUnionFromDictionary<SerializedAll<DriveStreamTypes>>;
 	};
 	note: {
 		name: `noteStream:${Note['id']}`;
-		payload: EventUnionFromDictionary<NoteStreamEventTypes>;
+		payload: EventUnionFromDictionary<SerializedAll<NoteStreamEventTypes>>;
 	};
 	channel: {
 		name: `channelStream:${Channel['id']}`;
-		payload: EventUnionFromDictionary<ChannelStreamTypes>;
+		payload: EventUnionFromDictionary<SerializedAll<ChannelStreamTypes>>;
 	};
 	userList: {
 		name: `userListStream:${UserList['id']}`;
-		payload: EventUnionFromDictionary<UserListStreamTypes>;
+		payload: EventUnionFromDictionary<SerializedAll<UserListStreamTypes>>;
 	};
 	antenna: {
 		name: `antennaStream:${Antenna['id']}`;
-		payload: EventUnionFromDictionary<AntennaStreamTypes>;
+		payload: EventUnionFromDictionary<SerializedAll<AntennaStreamTypes>>;
 	};
 	messaging: {
 		name: `messagingStream:${User['id']}-${User['id']}`;
-		payload: EventUnionFromDictionary<MessagingStreamTypes>;
+		payload: EventUnionFromDictionary<SerializedAll<MessagingStreamTypes>>;
 	};
 	groupMessaging: {
 		name: `messagingStream:${UserGroup['id']}`;
-		payload: EventUnionFromDictionary<GroupMessagingStreamTypes>;
+		payload: EventUnionFromDictionary<SerializedAll<GroupMessagingStreamTypes>>;
 	};
 	messagingIndex: {
 		name: `messagingIndexStream:${User['id']}`;
-		payload: EventUnionFromDictionary<MessagingIndexStreamTypes>;
+		payload: EventUnionFromDictionary<SerializedAll<MessagingIndexStreamTypes>>;
 	};
 	admin: {
 		name: `adminStream:${User['id']}`;
-		payload: EventUnionFromDictionary<AdminStreamTypes>;
+		payload: EventUnionFromDictionary<SerializedAll<AdminStreamTypes>>;
 	};
 	notes: {
 		name: 'notesStream';
-		payload: Packed<'Note'>;
+		payload: Serialized<Packed<'Note'>>;
 	};
 };
 

From fa296efdf6ad38f19595c3e7fe1b951e4b9d7cbc Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 1 Feb 2023 20:13:22 +0900
Subject: [PATCH 166/177] refactor: fix type

---
 packages/backend/src/core/HttpRequestService.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/HttpRequestService.ts b/packages/backend/src/core/HttpRequestService.ts
index baf74acfa..e32026b04 100644
--- a/packages/backend/src/core/HttpRequestService.ts
+++ b/packages/backend/src/core/HttpRequestService.ts
@@ -95,7 +95,7 @@ export class HttpRequestService {
 	}
 
 	@bindThis
-	public async getJson(url: string, accept = 'application/json, */*', headers?: Record<string, string>): Promise<unknown> {
+	public async getJson<T = unknown>(url: string, accept = 'application/json, */*', headers?: Record<string, string>): Promise<T> {
 		const res = await this.send(url, {
 			method: 'GET',
 			headers: Object.assign({
@@ -106,7 +106,7 @@ export class HttpRequestService {
 			size: 1024 * 256,
 		});
 
-		return await res.json();
+		return await res.json() as T;
 	}
 
 	@bindThis

From 4610d8dfe3695a08188cffe5ce6d8594af364604 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 1 Feb 2023 20:15:11 +0900
Subject: [PATCH 167/177] refactor: fix type

---
 packages/backend/src/core/WebhookService.ts       | 15 ++++++++++++---
 .../core/entities/NotificationEntityService.ts    |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/core/WebhookService.ts b/packages/backend/src/core/WebhookService.ts
index 36110490a..30caa9682 100644
--- a/packages/backend/src/core/WebhookService.ts
+++ b/packages/backend/src/core/WebhookService.ts
@@ -44,16 +44,25 @@ export class WebhookService implements OnApplicationShutdown {
 			switch (type) {
 				case 'webhookCreated':
 					if (body.active) {
-						this.webhooks.push(body);
+						this.webhooks.push({
+							...body,
+							createdAt: new Date(body.createdAt),
+						});
 					}
 					break;
 				case 'webhookUpdated':
 					if (body.active) {
 						const i = this.webhooks.findIndex(a => a.id === body.id);
 						if (i > -1) {
-							this.webhooks[i] = body;
+							this.webhooks[i] = {
+								...body,
+								createdAt: new Date(body.createdAt),
+							};
 						} else {
-							this.webhooks.push(body);
+							this.webhooks.push({
+								...body,
+								createdAt: new Date(body.createdAt),
+							});
 						}
 					} else {
 						this.webhooks = this.webhooks.filter(a => a.id !== body.id);
diff --git a/packages/backend/src/core/entities/NotificationEntityService.ts b/packages/backend/src/core/entities/NotificationEntityService.ts
index ded1b512a..4140b3f35 100644
--- a/packages/backend/src/core/entities/NotificationEntityService.ts
+++ b/packages/backend/src/core/entities/NotificationEntityService.ts
@@ -2,7 +2,7 @@ import { Inject, Injectable } from '@nestjs/common';
 import { In } from 'typeorm';
 import { ModuleRef } from '@nestjs/core';
 import { DI } from '@/di-symbols.js';
-import type { AccessTokensRepository, NoteReactionsRepository, NotificationsRepository } from '@/models/index.js';
+import type { AccessTokensRepository, NoteReactionsRepository, NotificationsRepository, User } from '@/models/index.js';
 import { awaitAll } from '@/misc/prelude/await-all.js';
 import type { Notification } from '@/models/entities/Notification.js';
 import type { NoteReaction } from '@/models/entities/NoteReaction.js';

From 9db2f60053ff60403a33ce18e06469ed099ad85e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 2 Feb 2023 09:00:34 +0900
Subject: [PATCH 168/177] refactor(client): use top-level await

---
 packages/frontend/src/init.ts | 924 +++++++++++++++++-----------------
 1 file changed, 461 insertions(+), 463 deletions(-)

diff --git a/packages/frontend/src/init.ts b/packages/frontend/src/init.ts
index 2432b5f6f..8f4bbec11 100644
--- a/packages/frontend/src/init.ts
+++ b/packages/frontend/src/init.ts
@@ -47,498 +47,496 @@ import { miLocalStorage } from './local-storage';
 import { claimAchievement, claimedAchievements } from './scripts/achievements';
 import { fetchCustomEmojis } from './custom-emojis';
 
-(async () => {
-	console.info(`Misskey v${version}`);
+console.info(`Misskey v${version}`);
 
-	if (_DEV_) {
-		console.warn('Development mode!!!');
+if (_DEV_) {
+	console.warn('Development mode!!!');
 
-		console.info(`vue ${vueVersion}`);
+	console.info(`vue ${vueVersion}`);
 
-		(window as any).$i = $i;
-		(window as any).$store = defaultStore;
+	(window as any).$i = $i;
+	(window as any).$store = defaultStore;
 
-		window.addEventListener('error', event => {
-			console.error(event);
-			/*
-			alert({
-				type: 'error',
-				title: 'DEV: Unhandled error',
-				text: event.message
-			});
-			*/
+	window.addEventListener('error', event => {
+		console.error(event);
+		/*
+		alert({
+			type: 'error',
+			title: 'DEV: Unhandled error',
+			text: event.message
 		});
-
-		window.addEventListener('unhandledrejection', event => {
-			console.error(event);
-			/*
-			alert({
-				type: 'error',
-				title: 'DEV: Unhandled promise rejection',
-				text: event.reason
-			});
-			*/
-		});
-	}
-
-	//#region Detect language & fetch translations
-	const localeVersion = miLocalStorage.getItem('localeVersion');
-	const localeOutdated = (localeVersion == null || localeVersion !== version);
-	if (localeOutdated) {
-		const res = await window.fetch(`/assets/locales/${lang}.${version}.json`);
-		if (res.status === 200) {
-			const newLocale = await res.text();
-			const parsedNewLocale = JSON.parse(newLocale);
-			miLocalStorage.setItem('locale', newLocale);
-			miLocalStorage.setItem('localeVersion', version);
-			updateLocale(parsedNewLocale);
-			updateI18n(parsedNewLocale);
-		}
-	}
-	//#endregion
-
-	// タッチデバイスでCSSの:hoverを機能させる
-	document.addEventListener('touchend', () => {}, { passive: true });
-
-	// 一斉リロード
-	reloadChannel.addEventListener('message', path => {
-		if (path !== null) location.href = path;
-		else location.reload();
+		*/
 	});
 
-	// If mobile, insert the viewport meta tag
-	if (['smartphone', 'tablet'].includes(deviceKind)) {
-		const viewport = document.getElementsByName('viewport').item(0);
-		viewport.setAttribute('content',
-			`${viewport.getAttribute('content')}, minimum-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover`);
+	window.addEventListener('unhandledrejection', event => {
+		console.error(event);
+		/*
+		alert({
+			type: 'error',
+			title: 'DEV: Unhandled promise rejection',
+			text: event.reason
+		});
+		*/
+	});
+}
+
+//#region Detect language & fetch translations
+const localeVersion = miLocalStorage.getItem('localeVersion');
+const localeOutdated = (localeVersion == null || localeVersion !== version);
+if (localeOutdated) {
+	const res = await window.fetch(`/assets/locales/${lang}.${version}.json`);
+	if (res.status === 200) {
+		const newLocale = await res.text();
+		const parsedNewLocale = JSON.parse(newLocale);
+		miLocalStorage.setItem('locale', newLocale);
+		miLocalStorage.setItem('localeVersion', version);
+		updateLocale(parsedNewLocale);
+		updateI18n(parsedNewLocale);
 	}
+}
+//#endregion
 
-	//#region Set lang attr
-	const html = document.documentElement;
-	html.setAttribute('lang', lang);
-	//#endregion
+// タッチデバイスでCSSの:hoverを機能させる
+document.addEventListener('touchend', () => {}, { passive: true });
 
-	//#region loginId
-	const params = new URLSearchParams(location.search);
-	const loginId = params.get('loginId');
+// 一斉リロード
+reloadChannel.addEventListener('message', path => {
+	if (path !== null) location.href = path;
+	else location.reload();
+});
 
-	if (loginId) {
-		const target = getUrlWithoutLoginId(location.href);
+// If mobile, insert the viewport meta tag
+if (['smartphone', 'tablet'].includes(deviceKind)) {
+	const viewport = document.getElementsByName('viewport').item(0);
+	viewport.setAttribute('content',
+		`${viewport.getAttribute('content')}, minimum-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover`);
+}
 
-		if (!$i || $i.id !== loginId) {
-			const account = await getAccountFromId(loginId);
-			if (account) {
-				await login(account.token, target);
-			}
+//#region Set lang attr
+const html = document.documentElement;
+html.setAttribute('lang', lang);
+//#endregion
+
+//#region loginId
+const params = new URLSearchParams(location.search);
+const loginId = params.get('loginId');
+
+if (loginId) {
+	const target = getUrlWithoutLoginId(location.href);
+
+	if (!$i || $i.id !== loginId) {
+		const account = await getAccountFromId(loginId);
+		if (account) {
+			await login(account.token, target);
 		}
-
-		history.replaceState({ misskey: 'loginId' }, '', target);
 	}
 
-	//#endregion
+	history.replaceState({ misskey: 'loginId' }, '', target);
+}
 
-	//#region Fetch user
-	if ($i && $i.token) {
+//#endregion
+
+//#region Fetch user
+if ($i && $i.token) {
+	if (_DEV_) {
+		console.log('account cache found. refreshing...');
+	}
+
+	refreshAccount();
+} else {
+	if (_DEV_) {
+		console.log('no account cache found.');
+	}
+
+	// 連携ログインの場合用にCookieを参照する
+	const i = (document.cookie.match(/igi=(\w+)/) ?? [null, null])[1];
+
+	if (i != null && i !== 'null') {
 		if (_DEV_) {
-			console.log('account cache found. refreshing...');
+			console.log('signing...');
 		}
 
-		refreshAccount();
+		try {
+			document.body.innerHTML = '<div>Please wait...</div>';
+			await login(i);
+		} catch (err) {
+			// Render the error screen
+			// TODO: ちゃんとしたコンポーネントをレンダリングする(v10とかのトラブルシューティングゲーム付きのやつみたいな)
+			document.body.innerHTML = '<div id="err">Oops!</div>';
+		}
 	} else {
 		if (_DEV_) {
-			console.log('no account cache found.');
-		}
-
-		// 連携ログインの場合用にCookieを参照する
-		const i = (document.cookie.match(/igi=(\w+)/) ?? [null, null])[1];
-
-		if (i != null && i !== 'null') {
-			if (_DEV_) {
-				console.log('signing...');
-			}
-
-			try {
-				document.body.innerHTML = '<div>Please wait...</div>';
-				await login(i);
-			} catch (err) {
-				// Render the error screen
-				// TODO: ちゃんとしたコンポーネントをレンダリングする(v10とかのトラブルシューティングゲーム付きのやつみたいな)
-				document.body.innerHTML = '<div id="err">Oops!</div>';
-			}
-		} else {
-			if (_DEV_) {
-				console.log('not signed in');
-			}
+			console.log('not signed in');
 		}
 	}
-	//#endregion
+}
+//#endregion
 
-	const fetchInstanceMetaPromise = fetchInstance();
+const fetchInstanceMetaPromise = fetchInstance();
 
-	fetchInstanceMetaPromise.then(() => {
-		miLocalStorage.setItem('v', instance.version);
+fetchInstanceMetaPromise.then(() => {
+	miLocalStorage.setItem('v', instance.version);
 
-		// Init service worker
-		initializeSw();
-	});
+	// Init service worker
+	initializeSw();
+});
 
-	try {
-		await fetchCustomEmojis();
-	} catch (err) {}
+try {
+	await fetchCustomEmojis();
+} catch (err) {}
 
-	const app = createApp(
-		window.location.search === '?zen' ? defineAsyncComponent(() => import('@/ui/zen.vue')) :
-		!$i ? defineAsyncComponent(() => import('@/ui/visitor.vue')) :
-		ui === 'deck' ? defineAsyncComponent(() => import('@/ui/deck.vue')) :
-		ui === 'classic' ? defineAsyncComponent(() => import('@/ui/classic.vue')) :
-		defineAsyncComponent(() => import('@/ui/universal.vue')),
-	);
+const app = createApp(
+	window.location.search === '?zen' ? defineAsyncComponent(() => import('@/ui/zen.vue')) :
+	!$i ? defineAsyncComponent(() => import('@/ui/visitor.vue')) :
+	ui === 'deck' ? defineAsyncComponent(() => import('@/ui/deck.vue')) :
+	ui === 'classic' ? defineAsyncComponent(() => import('@/ui/classic.vue')) :
+	defineAsyncComponent(() => import('@/ui/universal.vue')),
+);
 
-	if (_DEV_) {
-		app.config.performance = true;
+if (_DEV_) {
+	app.config.performance = true;
+}
+
+// TODO: 廃止
+app.config.globalProperties = {
+	$i,
+	$store: defaultStore,
+	$instance: instance,
+	$t: i18n.t,
+	$ts: i18n.ts,
+};
+
+widgets(app);
+directives(app);
+components(app);
+
+const splash = document.getElementById('splash');
+// 念のためnullチェック(HTMLが古い場合があるため(そのうち消す))
+if (splash) splash.addEventListener('transitionend', () => {
+	splash.remove();
+});
+
+// https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210
+// なぜかinit.tsの内容が2回実行されることがあるため、mountするdivを1つに制限する
+const rootEl = (() => {
+	const MISSKEY_MOUNT_DIV_ID = 'misskey_app';
+
+	const currentEl = document.getElementById(MISSKEY_MOUNT_DIV_ID);
+
+	if (currentEl) {
+		console.warn('multiple import detected');
+		return currentEl;
 	}
 
-	// TODO: 廃止
-	app.config.globalProperties = {
-		$i,
-		$store: defaultStore,
-		$instance: instance,
-		$t: i18n.t,
-		$ts: i18n.ts,
-	};
-
-	widgets(app);
-	directives(app);
-	components(app);
-
-	const splash = document.getElementById('splash');
-	// 念のためnullチェック(HTMLが古い場合があるため(そのうち消す))
-	if (splash) splash.addEventListener('transitionend', () => {
-		splash.remove();
-	});
-
-	// https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210
-	// なぜかinit.tsの内容が2回実行されることがあるため、mountするdivを1つに制限する
-	const rootEl = (() => {
-		const MISSKEY_MOUNT_DIV_ID = 'misskey_app';
-
-		const currentEl = document.getElementById(MISSKEY_MOUNT_DIV_ID);
-
-		if (currentEl) {
-			console.warn('multiple import detected');
-			return currentEl;
-		}
-
-		const rootEl = document.createElement('div');
-		rootEl.id = MISSKEY_MOUNT_DIV_ID;
-		document.body.appendChild(rootEl);
-		return rootEl;
-	})();
-
-	app.mount(rootEl);
-
-	// boot.jsのやつを解除
-	window.onerror = null;
-	window.onunhandledrejection = null;
-
-	reactionPicker.init();
-
-	if (splash) {
-		splash.style.opacity = '0';
-		splash.style.pointerEvents = 'none';
-	}
-
-	// クライアントが更新されたか？
-	const lastVersion = miLocalStorage.getItem('lastVersion');
-	if (lastVersion !== version) {
-		miLocalStorage.setItem('lastVersion', version);
-
-		// テーマリビルドするため
-		miLocalStorage.removeItem('theme');
-
-		try { // 変なバージョン文字列来るとcompareVersionsでエラーになるため
-			if (lastVersion != null && compareVersions(version, lastVersion) === 1) {
-				// ログインしてる場合だけ
-				if ($i) {
-					popup(defineAsyncComponent(() => import('@/components/MkUpdated.vue')), {}, {}, 'closed');
-				}
-			}
-		} catch (err) {
-		}
-	}
-
-	// NOTE: この処理は必ず↑のクライアント更新時処理より後に来ること(テーマ再構築のため)
-	watch(defaultStore.reactiveState.darkMode, (darkMode) => {
-		applyTheme(darkMode ? ColdDeviceStorage.get('darkTheme') : ColdDeviceStorage.get('lightTheme'));
-	}, { immediate: miLocalStorage.getItem('theme') == null });
-
-	const darkTheme = computed(ColdDeviceStorage.makeGetterSetter('darkTheme'));
-	const lightTheme = computed(ColdDeviceStorage.makeGetterSetter('lightTheme'));
-
-	watch(darkTheme, (theme) => {
-		if (defaultStore.state.darkMode) {
-			applyTheme(theme);
-		}
-	});
-
-	watch(lightTheme, (theme) => {
-		if (!defaultStore.state.darkMode) {
-			applyTheme(theme);
-		}
-	});
-
-	//#region Sync dark mode
-	if (ColdDeviceStorage.get('syncDeviceDarkMode')) {
-		defaultStore.set('darkMode', isDeviceDarkmode());
-	}
-
-	window.matchMedia('(prefers-color-scheme: dark)').addListener(mql => {
-		if (ColdDeviceStorage.get('syncDeviceDarkMode')) {
-			defaultStore.set('darkMode', mql.matches);
-		}
-	});
-	//#endregion
-
-	fetchInstanceMetaPromise.then(() => {
-		if (defaultStore.state.themeInitial) {
-			if (instance.defaultLightTheme != null) ColdDeviceStorage.set('lightTheme', JSON5.parse(instance.defaultLightTheme));
-			if (instance.defaultDarkTheme != null) ColdDeviceStorage.set('darkTheme', JSON5.parse(instance.defaultDarkTheme));
-			defaultStore.set('themeInitial', false);
-		}
-	});
-
-	watch(defaultStore.reactiveState.useBlurEffectForModal, v => {
-		document.documentElement.style.setProperty('--modalBgFilter', v ? 'blur(4px)' : 'none');
-	}, { immediate: true });
-
-	watch(defaultStore.reactiveState.useBlurEffect, v => {
-		if (v) {
-			document.documentElement.style.removeProperty('--blur');
-		} else {
-			document.documentElement.style.setProperty('--blur', 'none');
-		}
-	}, { immediate: true });
-
-	let reloadDialogShowing = false;
-	stream.on('_disconnected_', async () => {
-		if (defaultStore.state.serverDisconnectedBehavior === 'reload') {
-			location.reload();
-		} else if (defaultStore.state.serverDisconnectedBehavior === 'dialog') {
-			if (reloadDialogShowing) return;
-			reloadDialogShowing = true;
-			const { canceled } = await confirm({
-				type: 'warning',
-				title: i18n.ts.disconnectedFromServer,
-				text: i18n.ts.reloadConfirm,
-			});
-			reloadDialogShowing = false;
-			if (!canceled) {
-				location.reload();
-			}
-		}
-	});
-
-	for (const plugin of ColdDeviceStorage.get('plugins').filter(p => p.active)) {
-		import('./plugin').then(({ install }) => {
-			install(plugin);
-		});
-	}
-
-	const hotkeys = {
-		'd': (): void => {
-			defaultStore.set('darkMode', !defaultStore.state.darkMode);
-		},
-		's': search,
-	};
-
-	if ($i) {
-		// only add post shortcuts if logged in
-		hotkeys['p|n'] = post;
-
-		if ($i.isDeleted) {
-			alert({
-				type: 'warning',
-				text: i18n.ts.accountDeletionInProgress,
-			});
-		}
-
-		const now = new Date();
-		const m = now.getMonth() + 1;
-		const d = now.getDate();
-		
-		if ($i.birthday) {
-			const bm = parseInt($i.birthday.split('-')[1]);
-			const bd = parseInt($i.birthday.split('-')[2]);
-			if (m === bm && d === bd) {
-				claimAchievement('loggedInOnBirthday');
-			}
-		}
-
-		if (m === 1 && d === 1) {
-			claimAchievement('loggedInOnNewYearsDay');
-		}
-
-		if ($i.loggedInDays >= 3) claimAchievement('login3');
-		if ($i.loggedInDays >= 7) claimAchievement('login7');
-		if ($i.loggedInDays >= 15) claimAchievement('login15');
-		if ($i.loggedInDays >= 30) claimAchievement('login30');
-		if ($i.loggedInDays >= 60) claimAchievement('login60');
-		if ($i.loggedInDays >= 100) claimAchievement('login100');
-		if ($i.loggedInDays >= 200) claimAchievement('login200');
-		if ($i.loggedInDays >= 300) claimAchievement('login300');
-		if ($i.loggedInDays >= 400) claimAchievement('login400');
-		if ($i.loggedInDays >= 500) claimAchievement('login500');
-		if ($i.loggedInDays >= 600) claimAchievement('login600');
-		if ($i.loggedInDays >= 700) claimAchievement('login700');
-		if ($i.loggedInDays >= 800) claimAchievement('login800');
-		if ($i.loggedInDays >= 900) claimAchievement('login900');
-		if ($i.loggedInDays >= 1000) claimAchievement('login1000');
-
-		if ($i.notesCount > 0) claimAchievement('notes1');
-		if ($i.notesCount >= 10) claimAchievement('notes10');
-		if ($i.notesCount >= 100) claimAchievement('notes100');
-		if ($i.notesCount >= 500) claimAchievement('notes500');
-		if ($i.notesCount >= 1000) claimAchievement('notes1000');
-		if ($i.notesCount >= 5000) claimAchievement('notes5000');
-		if ($i.notesCount >= 10000) claimAchievement('notes10000');
-		if ($i.notesCount >= 20000) claimAchievement('notes20000');
-		if ($i.notesCount >= 30000) claimAchievement('notes30000');
-		if ($i.notesCount >= 40000) claimAchievement('notes40000');
-		if ($i.notesCount >= 50000) claimAchievement('notes50000');
-		if ($i.notesCount >= 60000) claimAchievement('notes60000');
-		if ($i.notesCount >= 70000) claimAchievement('notes70000');
-		if ($i.notesCount >= 80000) claimAchievement('notes80000');
-		if ($i.notesCount >= 90000) claimAchievement('notes90000');
-		if ($i.notesCount >= 100000) claimAchievement('notes100000');
-
-		if ($i.followersCount > 0) claimAchievement('followers1');
-		if ($i.followersCount >= 10) claimAchievement('followers10');
-		if ($i.followersCount >= 50) claimAchievement('followers50');
-		if ($i.followersCount >= 100) claimAchievement('followers100');
-		if ($i.followersCount >= 300) claimAchievement('followers300');
-		if ($i.followersCount >= 500) claimAchievement('followers500');
-		if ($i.followersCount >= 1000) claimAchievement('followers1000');
-
-		if (Date.now() - new Date($i.createdAt).getTime() > 1000 * 60 * 60 * 24 * 365) {
-			claimAchievement('passedSinceAccountCreated1');
-		}
-		if (Date.now() - new Date($i.createdAt).getTime() > 1000 * 60 * 60 * 24 * 365 * 2) {
-			claimAchievement('passedSinceAccountCreated2');
-		}
-		if (Date.now() - new Date($i.createdAt).getTime() > 1000 * 60 * 60 * 24 * 365 * 3) {
-			claimAchievement('passedSinceAccountCreated3');
-		}
-
-		if (claimedAchievements.length >= 30) {
-			claimAchievement('collectAchievements30');
-		}
-	
-		window.setInterval(() => {
-			if (Math.floor(Math.random() * 10000) === 0) {
-				claimAchievement('justPlainLucky');
-			}
-		}, 1000 * 10);
-
-		window.setTimeout(() => {
-			claimAchievement('client30min');
-		}, 1000 * 60 * 30);
-
-		const lastUsed = miLocalStorage.getItem('lastUsed');
-		if (lastUsed) {
-			const lastUsedDate = parseInt(lastUsed, 10);
-			// 二時間以上前なら
-			if (Date.now() - lastUsedDate > 1000 * 60 * 60 * 2) {
-				toast(i18n.t('welcomeBackWithName', {
-					name: $i.name || $i.username,
-				}));
-			}
-		}
-		miLocalStorage.setItem('lastUsed', Date.now().toString());
-
-		const latestDonationInfoShownAt = miLocalStorage.getItem('latestDonationInfoShownAt');
-		const neverShowDonationInfo = miLocalStorage.getItem('neverShowDonationInfo');
-		if (neverShowDonationInfo !== 'true' && (new Date($i.createdAt).getTime() < (Date.now() - (1000 * 60 * 60 * 24 * 3)))) {
-			if (latestDonationInfoShownAt == null || (new Date(latestDonationInfoShownAt).getTime() < (Date.now() - (1000 * 60 * 60 * 24 * 30)))) {
-				popup(defineAsyncComponent(() => import('@/components/MkDonation.vue')), {}, {}, 'closed');
-			}
-		}
-
-		if ('Notification' in window) {
-			// 許可を得ていなかったらリクエスト
-			if (Notification.permission === 'default') {
-				Notification.requestPermission();
-			}
-		}
-
-		const main = markRaw(stream.useChannel('main', null, 'System'));
-
-		// 自分の情報が更新されたとき
-		main.on('meUpdated', i => {
-			updateAccount(i);
-		});
-
-		main.on('readAllNotifications', () => {
-			updateAccount({ hasUnreadNotification: false });
-		});
-
-		main.on('unreadNotification', () => {
-			updateAccount({ hasUnreadNotification: true });
-		});
-
-		main.on('unreadMention', () => {
-			updateAccount({ hasUnreadMentions: true });
-		});
-
-		main.on('readAllUnreadMentions', () => {
-			updateAccount({ hasUnreadMentions: false });
-		});
-
-		main.on('unreadSpecifiedNote', () => {
-			updateAccount({ hasUnreadSpecifiedNotes: true });
-		});
-
-		main.on('readAllUnreadSpecifiedNotes', () => {
-			updateAccount({ hasUnreadSpecifiedNotes: false });
-		});
-
-		main.on('readAllMessagingMessages', () => {
-			updateAccount({ hasUnreadMessagingMessage: false });
-		});
-
-		main.on('unreadMessagingMessage', () => {
-			updateAccount({ hasUnreadMessagingMessage: true });
-			sound.play('chatBg');
-		});
-
-		main.on('readAllAntennas', () => {
-			updateAccount({ hasUnreadAntenna: false });
-		});
-
-		main.on('unreadAntenna', () => {
-			updateAccount({ hasUnreadAntenna: true });
-			sound.play('antenna');
-		});
-
-		main.on('readAllAnnouncements', () => {
-			updateAccount({ hasUnreadAnnouncement: false });
-		});
-
-		main.on('readAllChannels', () => {
-			updateAccount({ hasUnreadChannel: false });
-		});
-
-		main.on('unreadChannel', () => {
-			updateAccount({ hasUnreadChannel: true });
-			sound.play('channel');
-		});
-
-		// トークンが再生成されたとき
-		// このままではMisskeyが利用できないので強制的にサインアウトさせる
-		main.on('myTokenRegenerated', () => {
-			signout();
-		});
-	}
-
-	// shortcut
-	document.addEventListener('keydown', makeHotkey(hotkeys));
+	const rootEl = document.createElement('div');
+	rootEl.id = MISSKEY_MOUNT_DIV_ID;
+	document.body.appendChild(rootEl);
+	return rootEl;
 })();
+
+app.mount(rootEl);
+
+// boot.jsのやつを解除
+window.onerror = null;
+window.onunhandledrejection = null;
+
+reactionPicker.init();
+
+if (splash) {
+	splash.style.opacity = '0';
+	splash.style.pointerEvents = 'none';
+}
+
+// クライアントが更新されたか？
+const lastVersion = miLocalStorage.getItem('lastVersion');
+if (lastVersion !== version) {
+	miLocalStorage.setItem('lastVersion', version);
+
+	// テーマリビルドするため
+	miLocalStorage.removeItem('theme');
+
+	try { // 変なバージョン文字列来るとcompareVersionsでエラーになるため
+		if (lastVersion != null && compareVersions(version, lastVersion) === 1) {
+			// ログインしてる場合だけ
+			if ($i) {
+				popup(defineAsyncComponent(() => import('@/components/MkUpdated.vue')), {}, {}, 'closed');
+			}
+		}
+	} catch (err) {
+	}
+}
+
+// NOTE: この処理は必ず↑のクライアント更新時処理より後に来ること(テーマ再構築のため)
+watch(defaultStore.reactiveState.darkMode, (darkMode) => {
+	applyTheme(darkMode ? ColdDeviceStorage.get('darkTheme') : ColdDeviceStorage.get('lightTheme'));
+}, { immediate: miLocalStorage.getItem('theme') == null });
+
+const darkTheme = computed(ColdDeviceStorage.makeGetterSetter('darkTheme'));
+const lightTheme = computed(ColdDeviceStorage.makeGetterSetter('lightTheme'));
+
+watch(darkTheme, (theme) => {
+	if (defaultStore.state.darkMode) {
+		applyTheme(theme);
+	}
+});
+
+watch(lightTheme, (theme) => {
+	if (!defaultStore.state.darkMode) {
+		applyTheme(theme);
+	}
+});
+
+//#region Sync dark mode
+if (ColdDeviceStorage.get('syncDeviceDarkMode')) {
+	defaultStore.set('darkMode', isDeviceDarkmode());
+}
+
+window.matchMedia('(prefers-color-scheme: dark)').addListener(mql => {
+	if (ColdDeviceStorage.get('syncDeviceDarkMode')) {
+		defaultStore.set('darkMode', mql.matches);
+	}
+});
+//#endregion
+
+fetchInstanceMetaPromise.then(() => {
+	if (defaultStore.state.themeInitial) {
+		if (instance.defaultLightTheme != null) ColdDeviceStorage.set('lightTheme', JSON5.parse(instance.defaultLightTheme));
+		if (instance.defaultDarkTheme != null) ColdDeviceStorage.set('darkTheme', JSON5.parse(instance.defaultDarkTheme));
+		defaultStore.set('themeInitial', false);
+	}
+});
+
+watch(defaultStore.reactiveState.useBlurEffectForModal, v => {
+	document.documentElement.style.setProperty('--modalBgFilter', v ? 'blur(4px)' : 'none');
+}, { immediate: true });
+
+watch(defaultStore.reactiveState.useBlurEffect, v => {
+	if (v) {
+		document.documentElement.style.removeProperty('--blur');
+	} else {
+		document.documentElement.style.setProperty('--blur', 'none');
+	}
+}, { immediate: true });
+
+let reloadDialogShowing = false;
+stream.on('_disconnected_', async () => {
+	if (defaultStore.state.serverDisconnectedBehavior === 'reload') {
+		location.reload();
+	} else if (defaultStore.state.serverDisconnectedBehavior === 'dialog') {
+		if (reloadDialogShowing) return;
+		reloadDialogShowing = true;
+		const { canceled } = await confirm({
+			type: 'warning',
+			title: i18n.ts.disconnectedFromServer,
+			text: i18n.ts.reloadConfirm,
+		});
+		reloadDialogShowing = false;
+		if (!canceled) {
+			location.reload();
+		}
+	}
+});
+
+for (const plugin of ColdDeviceStorage.get('plugins').filter(p => p.active)) {
+	import('./plugin').then(({ install }) => {
+		install(plugin);
+	});
+}
+
+const hotkeys = {
+	'd': (): void => {
+		defaultStore.set('darkMode', !defaultStore.state.darkMode);
+	},
+	's': search,
+};
+
+if ($i) {
+	// only add post shortcuts if logged in
+	hotkeys['p|n'] = post;
+
+	if ($i.isDeleted) {
+		alert({
+			type: 'warning',
+			text: i18n.ts.accountDeletionInProgress,
+		});
+	}
+
+	const now = new Date();
+	const m = now.getMonth() + 1;
+	const d = now.getDate();
+	
+	if ($i.birthday) {
+		const bm = parseInt($i.birthday.split('-')[1]);
+		const bd = parseInt($i.birthday.split('-')[2]);
+		if (m === bm && d === bd) {
+			claimAchievement('loggedInOnBirthday');
+		}
+	}
+
+	if (m === 1 && d === 1) {
+		claimAchievement('loggedInOnNewYearsDay');
+	}
+
+	if ($i.loggedInDays >= 3) claimAchievement('login3');
+	if ($i.loggedInDays >= 7) claimAchievement('login7');
+	if ($i.loggedInDays >= 15) claimAchievement('login15');
+	if ($i.loggedInDays >= 30) claimAchievement('login30');
+	if ($i.loggedInDays >= 60) claimAchievement('login60');
+	if ($i.loggedInDays >= 100) claimAchievement('login100');
+	if ($i.loggedInDays >= 200) claimAchievement('login200');
+	if ($i.loggedInDays >= 300) claimAchievement('login300');
+	if ($i.loggedInDays >= 400) claimAchievement('login400');
+	if ($i.loggedInDays >= 500) claimAchievement('login500');
+	if ($i.loggedInDays >= 600) claimAchievement('login600');
+	if ($i.loggedInDays >= 700) claimAchievement('login700');
+	if ($i.loggedInDays >= 800) claimAchievement('login800');
+	if ($i.loggedInDays >= 900) claimAchievement('login900');
+	if ($i.loggedInDays >= 1000) claimAchievement('login1000');
+
+	if ($i.notesCount > 0) claimAchievement('notes1');
+	if ($i.notesCount >= 10) claimAchievement('notes10');
+	if ($i.notesCount >= 100) claimAchievement('notes100');
+	if ($i.notesCount >= 500) claimAchievement('notes500');
+	if ($i.notesCount >= 1000) claimAchievement('notes1000');
+	if ($i.notesCount >= 5000) claimAchievement('notes5000');
+	if ($i.notesCount >= 10000) claimAchievement('notes10000');
+	if ($i.notesCount >= 20000) claimAchievement('notes20000');
+	if ($i.notesCount >= 30000) claimAchievement('notes30000');
+	if ($i.notesCount >= 40000) claimAchievement('notes40000');
+	if ($i.notesCount >= 50000) claimAchievement('notes50000');
+	if ($i.notesCount >= 60000) claimAchievement('notes60000');
+	if ($i.notesCount >= 70000) claimAchievement('notes70000');
+	if ($i.notesCount >= 80000) claimAchievement('notes80000');
+	if ($i.notesCount >= 90000) claimAchievement('notes90000');
+	if ($i.notesCount >= 100000) claimAchievement('notes100000');
+
+	if ($i.followersCount > 0) claimAchievement('followers1');
+	if ($i.followersCount >= 10) claimAchievement('followers10');
+	if ($i.followersCount >= 50) claimAchievement('followers50');
+	if ($i.followersCount >= 100) claimAchievement('followers100');
+	if ($i.followersCount >= 300) claimAchievement('followers300');
+	if ($i.followersCount >= 500) claimAchievement('followers500');
+	if ($i.followersCount >= 1000) claimAchievement('followers1000');
+
+	if (Date.now() - new Date($i.createdAt).getTime() > 1000 * 60 * 60 * 24 * 365) {
+		claimAchievement('passedSinceAccountCreated1');
+	}
+	if (Date.now() - new Date($i.createdAt).getTime() > 1000 * 60 * 60 * 24 * 365 * 2) {
+		claimAchievement('passedSinceAccountCreated2');
+	}
+	if (Date.now() - new Date($i.createdAt).getTime() > 1000 * 60 * 60 * 24 * 365 * 3) {
+		claimAchievement('passedSinceAccountCreated3');
+	}
+
+	if (claimedAchievements.length >= 30) {
+		claimAchievement('collectAchievements30');
+	}
+
+	window.setInterval(() => {
+		if (Math.floor(Math.random() * 10000) === 0) {
+			claimAchievement('justPlainLucky');
+		}
+	}, 1000 * 10);
+
+	window.setTimeout(() => {
+		claimAchievement('client30min');
+	}, 1000 * 60 * 30);
+
+	const lastUsed = miLocalStorage.getItem('lastUsed');
+	if (lastUsed) {
+		const lastUsedDate = parseInt(lastUsed, 10);
+		// 二時間以上前なら
+		if (Date.now() - lastUsedDate > 1000 * 60 * 60 * 2) {
+			toast(i18n.t('welcomeBackWithName', {
+				name: $i.name || $i.username,
+			}));
+		}
+	}
+	miLocalStorage.setItem('lastUsed', Date.now().toString());
+
+	const latestDonationInfoShownAt = miLocalStorage.getItem('latestDonationInfoShownAt');
+	const neverShowDonationInfo = miLocalStorage.getItem('neverShowDonationInfo');
+	if (neverShowDonationInfo !== 'true' && (new Date($i.createdAt).getTime() < (Date.now() - (1000 * 60 * 60 * 24 * 3)))) {
+		if (latestDonationInfoShownAt == null || (new Date(latestDonationInfoShownAt).getTime() < (Date.now() - (1000 * 60 * 60 * 24 * 30)))) {
+			popup(defineAsyncComponent(() => import('@/components/MkDonation.vue')), {}, {}, 'closed');
+		}
+	}
+
+	if ('Notification' in window) {
+		// 許可を得ていなかったらリクエスト
+		if (Notification.permission === 'default') {
+			Notification.requestPermission();
+		}
+	}
+
+	const main = markRaw(stream.useChannel('main', null, 'System'));
+
+	// 自分の情報が更新されたとき
+	main.on('meUpdated', i => {
+		updateAccount(i);
+	});
+
+	main.on('readAllNotifications', () => {
+		updateAccount({ hasUnreadNotification: false });
+	});
+
+	main.on('unreadNotification', () => {
+		updateAccount({ hasUnreadNotification: true });
+	});
+
+	main.on('unreadMention', () => {
+		updateAccount({ hasUnreadMentions: true });
+	});
+
+	main.on('readAllUnreadMentions', () => {
+		updateAccount({ hasUnreadMentions: false });
+	});
+
+	main.on('unreadSpecifiedNote', () => {
+		updateAccount({ hasUnreadSpecifiedNotes: true });
+	});
+
+	main.on('readAllUnreadSpecifiedNotes', () => {
+		updateAccount({ hasUnreadSpecifiedNotes: false });
+	});
+
+	main.on('readAllMessagingMessages', () => {
+		updateAccount({ hasUnreadMessagingMessage: false });
+	});
+
+	main.on('unreadMessagingMessage', () => {
+		updateAccount({ hasUnreadMessagingMessage: true });
+		sound.play('chatBg');
+	});
+
+	main.on('readAllAntennas', () => {
+		updateAccount({ hasUnreadAntenna: false });
+	});
+
+	main.on('unreadAntenna', () => {
+		updateAccount({ hasUnreadAntenna: true });
+		sound.play('antenna');
+	});
+
+	main.on('readAllAnnouncements', () => {
+		updateAccount({ hasUnreadAnnouncement: false });
+	});
+
+	main.on('readAllChannels', () => {
+		updateAccount({ hasUnreadChannel: false });
+	});
+
+	main.on('unreadChannel', () => {
+		updateAccount({ hasUnreadChannel: true });
+		sound.play('channel');
+	});
+
+	// トークンが再生成されたとき
+	// このままではMisskeyが利用できないので強制的にサインアウトさせる
+	main.on('myTokenRegenerated', () => {
+		signout();
+	});
+}
+
+// shortcut
+document.addEventListener('keydown', makeHotkey(hotkeys));

From 4b43745e7ca43bdac7ad8e58c49951b5cb816849 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 2 Feb 2023 10:26:29 +0900
Subject: [PATCH 169/177] fix(test): add @jest/globals

---
 packages/backend/package.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index f68fde8b4..e677c1cf9 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -78,6 +78,7 @@
 		"misskey-js": "0.0.14",
 		"ms": "3.0.0-canary.1",
 		"nested-property": "4.0.0",
+		"node-fetch": "3.3.0",
 		"nodemailer": "6.9.0",
 		"nsfwjs": "2.4.2",
 		"oauth": "^0.10.0",
@@ -125,10 +126,10 @@
 		"web-push": "3.5.0",
 		"websocket": "1.0.34",
 		"ws": "8.12.0",
-		"xev": "3.0.2",
-		"node-fetch": "3.3.0"
+		"xev": "3.0.2"
 	},
 	"devDependencies": {
+		"@jest/globals": "^29.4.1",
 		"@redocly/openapi-core": "1.0.0-beta.120",
 		"@swc/cli": "^0.1.59",
 		"@swc/core": "1.3.29",

From e8f3c587c9cf65ac38e51ef8f946b211bcf8046f Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 2 Feb 2023 10:26:43 +0900
Subject: [PATCH 170/177] Update pnpm-lock.yaml

---
 pnpm-lock.yaml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 40f2b3606..48201611b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -59,6 +59,7 @@ importers:
       '@fastify/multipart': 7.4.0
       '@fastify/static': 6.7.0
       '@fastify/view': 7.4.1
+      '@jest/globals': ^29.4.1
       '@nestjs/common': 9.2.1
       '@nestjs/core': 9.2.1
       '@nestjs/testing': 9.2.1
@@ -317,6 +318,7 @@ importers:
       '@tensorflow/tfjs': 4.2.0_seedrandom@3.0.5
       '@tensorflow/tfjs-node': 4.2.0_seedrandom@3.0.5
     devDependencies:
+      '@jest/globals': 29.4.1
       '@redocly/openapi-core': 1.0.0-beta.120
       '@swc/cli': 0.1.59_dbbgdut2njxjatv5n3st5z6gqa
       '@swc/core': 1.3.29
@@ -3741,7 +3743,7 @@ packages:
   /axios/0.24.0:
     resolution: {integrity: sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==}
     dependencies:
-      follow-redirects: 1.15.2
+      follow-redirects: 1.15.2_debug@4.3.4
     transitivePeerDependencies:
       - debug
     dev: false
@@ -3749,7 +3751,7 @@ packages:
   /axios/0.27.2_debug@4.3.4:
     resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
     dependencies:
-      follow-redirects: 1.15.2
+      follow-redirects: 1.15.2_debug@4.3.4
       form-data: 4.0.0
     transitivePeerDependencies:
       - debug
@@ -6804,7 +6806,7 @@ packages:
       readable-stream: 2.3.7
     dev: false
 
-  /follow-redirects/1.15.2:
+  /follow-redirects/1.15.2_debug@4.3.4:
     resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
     engines: {node: '>=4.0'}
     peerDependencies:
@@ -6812,6 +6814,8 @@ packages:
     peerDependenciesMeta:
       debug:
         optional: true
+    dependencies:
+      debug: 4.3.4
 
   /for-each/0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}

From 1f39d1fe26e9c69165f4783fddd5e7b91040ede2 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 2 Feb 2023 10:26:59 +0900
Subject: [PATCH 171/177] test: add test of RoleService

---
 packages/backend/test/unit/RoleService.ts | 145 ++++++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100644 packages/backend/test/unit/RoleService.ts

diff --git a/packages/backend/test/unit/RoleService.ts b/packages/backend/test/unit/RoleService.ts
new file mode 100644
index 000000000..c6410393f
--- /dev/null
+++ b/packages/backend/test/unit/RoleService.ts
@@ -0,0 +1,145 @@
+process.env.NODE_ENV = 'test';
+
+import { jest } from '@jest/globals';
+import { ModuleMocker } from 'jest-mock';
+import { Test } from '@nestjs/testing';
+import { DataSource } from 'typeorm';
+import { GlobalModule } from '@/GlobalModule.js';
+import { RoleService } from '@/core/RoleService.js';
+import type { Role, RolesRepository, RoleAssignmentsRepository, UsersRepository } from '@/models/index.js';
+import { DI } from '@/di-symbols.js';
+import { CoreModule } from '@/core/CoreModule.js';
+import { MetaService } from '@/core/MetaService.js';
+import type { TestingModule } from '@nestjs/testing';
+import type { MockFunctionMetadata } from 'jest-mock';
+
+const moduleMocker = new ModuleMocker(global);
+
+describe('RoleService', () => {
+	let app: TestingModule;
+	let roleService: RoleService;
+	let usersRepository: UsersRepository;
+	let rolesRepository: RolesRepository;
+	let roleAssignmentsRepository: RoleAssignmentsRepository;
+	let metaService: jest.Mocked<MetaService>;
+
+	function createUser() {
+		return usersRepository.insert({
+			id: 'a',
+			createdAt: new Date(),
+			username: 'a',
+			usernameLower: 'a',
+		})
+			.then(x => usersRepository.findOneByOrFail(x.identifiers[0]));
+	}
+
+	function createRole(data: Partial<Role>) {
+		return rolesRepository.insert({
+			id: 'a',
+			createdAt: new Date(),
+			updatedAt: new Date(),
+			lastUsedAt: new Date(),
+			description: '',
+			...data,
+		})
+			.then(x => rolesRepository.findOneByOrFail(x.identifiers[0]));
+	}
+
+	beforeEach(async () => {
+		app = await Test.createTestingModule({
+			imports: [
+				GlobalModule,
+			],
+			providers: [
+				RoleService,
+			],
+		})
+			.useMocker((token) => {
+				if (token === MetaService) {
+					return { fetch: jest.fn() };
+				}
+				if (typeof token === 'function') {
+					const mockMetadata = moduleMocker.getMetadata(token) as MockFunctionMetadata<any, any>;
+					const Mock = moduleMocker.generateFromMetadata(mockMetadata);
+					return new Mock();
+				}
+			})
+			.compile();
+
+		app.enableShutdownHooks();
+
+		roleService = app.get<RoleService>(RoleService);
+		usersRepository = app.get<UsersRepository>(DI.usersRepository);
+		rolesRepository = app.get<RolesRepository>(DI.rolesRepository);
+		roleAssignmentsRepository = app.get<RoleAssignmentsRepository>(DI.roleAssignmentsRepository);
+
+		metaService = app.get<MetaService>(MetaService) as jest.Mocked<MetaService>;
+	});
+
+	afterEach(async () => {
+		await Promise.all([
+			app.get(DI.metasRepository).delete({}),
+			usersRepository.delete({}),
+			rolesRepository.delete({}),
+			roleAssignmentsRepository.delete({}),
+		]);
+		await app.close();
+	});
+
+	describe('getUserPolicies', () => {
+		it('instance default policies', async () => {	
+			const user = await createUser();
+			metaService.fetch.mockResolvedValue({
+				policies: {
+					canManageCustomEmojis: false,
+				},
+			});
+	
+			const result = await roleService.getUserPolicies(user.id);
+	
+			expect(result.canManageCustomEmojis).toBe(false);
+		});
+	
+		it('instance default policies 2', async () => {	
+			const user = await createUser();
+			metaService.fetch.mockResolvedValue({
+				policies: {
+					canManageCustomEmojis: true,
+				},
+			});
+	
+			const result = await roleService.getUserPolicies(user.id);
+	
+			expect(result.canManageCustomEmojis).toBe(true);
+		});
+	
+		it('with role', async () => {	
+			const user = await createUser();
+			const role = await createRole({
+				name: 'a',
+				policies: {
+					canManageCustomEmojis: {
+						useDefault: false,
+						priority: 0,
+						value: true,
+					},
+				},
+			});
+			await roleAssignmentsRepository.insert({
+				id: 'a',
+				createdAt: new Date(),
+				roleId: role.id,
+				userId: user.id,
+			});
+			metaService.fetch.mockResolvedValue({
+				policies: {
+					canManageCustomEmojis: false,
+				},
+			});
+	
+			const result = await roleService.getUserPolicies(user.id);
+	
+			expect(result.canManageCustomEmojis).toBe(true);
+		});
+	});
+});

From 16646dd77af8ef2f13e0a1d74ce6d73f23515358 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 2 Feb 2023 10:31:13 +0900
Subject: [PATCH 172/177] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index c27327064..c12882ca3 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,8 @@
 	
 ---
 
+[![codecov](https://codecov.io/gh/misskey-dev/misskey/branch/develop/graph/badge.svg?token=R6IQZ3QJOL)](https://codecov.io/gh/misskey-dev/misskey)
+
 </div>
 
 <div>

From 00e3453ce1d6fa25a3e812e331f8647302c9e4d1 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 2 Feb 2023 14:28:29 +0900
Subject: [PATCH 173/177] improve role test

---
 packages/backend/test/unit/RoleService.ts | 68 +++++++++++++++++++----
 1 file changed, 58 insertions(+), 10 deletions(-)

diff --git a/packages/backend/test/unit/RoleService.ts b/packages/backend/test/unit/RoleService.ts
index c6410393f..8229bf78d 100644
--- a/packages/backend/test/unit/RoleService.ts
+++ b/packages/backend/test/unit/RoleService.ts
@@ -4,12 +4,15 @@ import { jest } from '@jest/globals';
 import { ModuleMocker } from 'jest-mock';
 import { Test } from '@nestjs/testing';
 import { DataSource } from 'typeorm';
+import rndstr from 'rndstr';
 import { GlobalModule } from '@/GlobalModule.js';
 import { RoleService } from '@/core/RoleService.js';
-import type { Role, RolesRepository, RoleAssignmentsRepository, UsersRepository } from '@/models/index.js';
+import type { Role, RolesRepository, RoleAssignmentsRepository, UsersRepository, User } from '@/models/index.js';
 import { DI } from '@/di-symbols.js';
 import { CoreModule } from '@/core/CoreModule.js';
 import { MetaService } from '@/core/MetaService.js';
+import { genAid } from '@/misc/id/aid.js';
+import { UserCacheService } from '@/core/UserCacheService.js';
 import type { TestingModule } from '@nestjs/testing';
 import type { MockFunctionMetadata } from 'jest-mock';
 
@@ -23,19 +26,21 @@ describe('RoleService', () => {
 	let roleAssignmentsRepository: RoleAssignmentsRepository;
 	let metaService: jest.Mocked<MetaService>;
 
-	function createUser() {
+	function createUser(data: Partial<User> = {}) {
+		const un = rndstr('a-z0-9', 16);
 		return usersRepository.insert({
-			id: 'a',
+			id: genAid(new Date()),
 			createdAt: new Date(),
-			username: 'a',
-			usernameLower: 'a',
+			username: un,
+			usernameLower: un,
+			...data,
 		})
 			.then(x => usersRepository.findOneByOrFail(x.identifiers[0]));
 	}
 
-	function createRole(data: Partial<Role>) {
+	function createRole(data: Partial<Role> = {}) {
 		return rolesRepository.insert({
-			id: 'a',
+			id: genAid(new Date()),
 			createdAt: new Date(),
 			updatedAt: new Date(),
 			lastUsedAt: new Date(),
@@ -52,6 +57,7 @@ describe('RoleService', () => {
 			],
 			providers: [
 				RoleService,
+				UserCacheService,
 			],
 		})
 			.useMocker((token) => {
@@ -93,7 +99,7 @@ describe('RoleService', () => {
 				policies: {
 					canManageCustomEmojis: false,
 				},
-			});
+			} as any);
 	
 			const result = await roleService.getUserPolicies(user.id);
 	
@@ -106,7 +112,7 @@ describe('RoleService', () => {
 				policies: {
 					canManageCustomEmojis: true,
 				},
-			});
+			} as any);
 	
 			const result = await roleService.getUserPolicies(user.id);
 	
@@ -135,11 +141,53 @@ describe('RoleService', () => {
 				policies: {
 					canManageCustomEmojis: false,
 				},
-			});
+			} as any);
 	
 			const result = await roleService.getUserPolicies(user.id);
 	
 			expect(result.canManageCustomEmojis).toBe(true);
 		});
+
+		it('conditional role', async () => {	
+			const user1 = await createUser({
+				createdAt: new Date(Date.now() - (1000 * 60 * 60 * 24 * 365)),
+			});
+			const user2 = await createUser({
+				createdAt: new Date(Date.now() - (1000 * 60 * 60 * 24 * 365)),
+				followersCount: 10,
+			});
+			const role = await createRole({
+				name: 'a',
+				policies: {
+					canManageCustomEmojis: {
+						useDefault: false,
+						priority: 0,
+						value: true,
+					},
+				},
+				target: 'conditional',
+				condFormula: {
+					type: 'and',
+					values: [{
+						type: 'followersMoreThanOrEq',
+						value: 10,
+					}, {
+						type: 'createdMoreThan',
+						sec: 60 * 60 * 24 * 7,
+					}],
+				},
+			});
+
+			metaService.fetch.mockResolvedValue({
+				policies: {
+					canManageCustomEmojis: false,
+				},
+			} as any);
+	
+			const user1Policies = await roleService.getUserPolicies(user1.id);
+			const user2Policies = await roleService.getUserPolicies(user2.id);
+			expect(user1Policies.canManageCustomEmojis).toBe(false);
+			expect(user2Policies.canManageCustomEmojis).toBe(true);
+		});
 	});
 });

From 8a6f73c5ff3ff4d94f6dc21bca407b6bb640ada9 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 2 Feb 2023 16:43:56 +0900
Subject: [PATCH 174/177] =?UTF-8?q?enhance:=20Pizzax=E3=83=87=E3=83=BC?=
 =?UTF-8?q?=E3=82=BF=E3=82=92indexedDB=E3=81=AB=E4=BF=9D=E5=AD=98=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(#9225)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Revert "Revert #8098"

This reverts commit 8b9dc962ae7b04354c65f6e80ad0e9a6bafd57ea.

* fix

* use deepClone instead of deepclone

* defaultStore.loaded

* fix load

* wait ready

* use top-level await, await in device-kind.ts
---
 packages/frontend/src/init.ts                 |   5 +
 packages/frontend/src/pizzax.ts               | 271 ++++++++++++------
 packages/frontend/src/scripts/device-kind.ts  |   2 +
 packages/frontend/src/store.ts                |  10 +
 .../frontend/src/ui/_common_/sw-inject.ts     |   2 -
 packages/frontend/src/ui/classic.vue          |   2 +-
 packages/frontend/src/ui/universal.vue        |   2 +-
 7 files changed, 202 insertions(+), 92 deletions(-)

diff --git a/packages/frontend/src/init.ts b/packages/frontend/src/init.ts
index 8f4bbec11..4227f5cf4 100644
--- a/packages/frontend/src/init.ts
+++ b/packages/frontend/src/init.ts
@@ -43,6 +43,7 @@ import { reloadChannel } from '@/scripts/unison-reload';
 import { reactionPicker } from '@/scripts/reaction-picker';
 import { getUrlWithoutLoginId } from '@/scripts/login-id';
 import { getAccountFromId } from '@/scripts/get-account-from-id';
+import { deckStore } from './ui/deck/deck-store';
 import { miLocalStorage } from './local-storage';
 import { claimAchievement, claimedAchievements } from './scripts/achievements';
 import { fetchCustomEmojis } from './custom-emojis';
@@ -216,6 +217,8 @@ if (splash) splash.addEventListener('transitionend', () => {
 	splash.remove();
 });
 
+await deckStore.ready;
+
 // https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210
 // なぜかinit.tsの内容が2回実行されることがあるため、mountするdivを1つに制限する
 const rootEl = (() => {
@@ -266,6 +269,8 @@ if (lastVersion !== version) {
 	}
 }
 
+await defaultStore.ready;
+
 // NOTE: この処理は必ず↑のクライアント更新時処理より後に来ること(テーマ再構築のため)
 watch(defaultStore.reactiveState.darkMode, (darkMode) => {
 	applyTheme(darkMode ? ColdDeviceStorage.get('darkTheme') : ColdDeviceStorage.get('lightTheme'));
diff --git a/packages/frontend/src/pizzax.ts b/packages/frontend/src/pizzax.ts
index 7ff09f75f..2ca89b735 100644
--- a/packages/frontend/src/pizzax.ts
+++ b/packages/frontend/src/pizzax.ts
@@ -1,136 +1,209 @@
 // PIZZAX --- A lightweight store
 
 import { onUnmounted, Ref, ref, watch } from 'vue';
+import { BroadcastChannel } from 'broadcast-channel';
 import { $i } from './account';
 import { api } from './os';
+import { get, set } from './scripts/idb-proxy';
+import { defaultStore } from './store';
 import { stream } from './stream';
+import { deepClone } from './scripts/clone';
 
 type StateDef = Record<string, {
 	where: 'account' | 'device' | 'deviceAccount';
 	default: any;
 }>;
 
+type State<T extends StateDef> = { [K in keyof T]: T[K]['default']; };
+type ReactiveState<T extends StateDef> = { [K in keyof T]: Ref<T[K]['default']>; };
+
 type ArrayElement<A> = A extends readonly (infer T)[] ? T : never;
 
+type PizzaxChannelMessage<T extends StateDef> = {
+	where: 'device' | 'deviceAccount';
+	key: keyof T;
+	value: T[keyof T]['default'];
+	userId?: string;
+};
+
 const connection = $i && stream.useChannel('main');
 
 export class Storage<T extends StateDef> {
+	public readonly ready: Promise<void>;
+	public readonly loaded: Promise<void>;
+
 	public readonly key: string;
-	public readonly keyForLocalStorage: string;
+	public readonly deviceStateKeyName: `pizzax::${this['key']}`;
+	public readonly deviceAccountStateKeyName: `pizzax::${this['key']}::${string}` | '';
+	public readonly registryCacheKeyName: `pizzax::${this['key']}::cache::${string}` | '';
 
 	public readonly def: T;
 
 	// TODO: これが実装されたらreadonlyにしたい: https://github.com/microsoft/TypeScript/issues/37487
-	public readonly state: { [K in keyof T]: T[K]['default'] };
-	public readonly reactiveState: { [K in keyof T]: Ref<T[K]['default']> };
-	public readonly ready: Promise<void>;
-	private markAsReady: () => void = () => {};
+	public readonly state: State<T>;
+	public readonly reactiveState: ReactiveState<T>;
+
+	private pizzaxChannel: BroadcastChannel<PizzaxChannelMessage<T>>;
+
+	// 簡易的にキューイングして占有ロックとする
+	private currentIdbJob: Promise<any> = Promise.resolve();
+	private addIdbSetJob<T>(job: () => Promise<T>) {
+		const promise = this.currentIdbJob.then(job, e => {
+			console.error('Pizzax failed to save data to idb!', e);
+			return job();
+		});
+		this.currentIdbJob = promise;
+		return promise;
+	}
 
 	constructor(key: string, def: T) {
-		this.ready = new Promise((res) => {
-			this.markAsReady = res;
-		});
 		this.key = key;
-		this.keyForLocalStorage = 'pizzax::' + key;
+		this.deviceStateKeyName = `pizzax::${key}`;
+		this.deviceAccountStateKeyName = $i ? `pizzax::${key}::${$i.id}` : '';
+		this.registryCacheKeyName = $i ? `pizzax::${key}::cache::${$i.id}` : '';
 		this.def = def;
 
-		// TODO: indexedDBにする
-		const deviceState = JSON.parse(localStorage.getItem(this.keyForLocalStorage) || '{}');
-		const deviceAccountState = $i ? JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::' + $i.id) || '{}') : {};
-		const registryCache = $i ? JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::cache::' + $i.id) || '{}') : {};
+		this.pizzaxChannel = new BroadcastChannel(`pizzax::${key}`);
 
-		const state = {};
-		const reactiveState = {};
-		for (const [k, v] of Object.entries(def)) {
+		this.state = {} as State<T>;
+		this.reactiveState = {} as ReactiveState<T>;
+
+		for (const [k, v] of Object.entries(def) as [keyof T, T[keyof T]['default']][]) {
+			this.state[k] = v.default;
+			this.reactiveState[k] = ref(v.default);
+		}
+	
+		this.ready = this.init();
+		this.loaded = this.ready.then(() => this.load());
+	}
+
+	private async init(): Promise<void> {
+		await this.migrate();
+
+		const deviceState: State<T> = await get(this.deviceStateKeyName) || {};
+		const deviceAccountState = $i ? await get(this.deviceAccountStateKeyName) || {} : {};
+		const registryCache = $i ? await get(this.registryCacheKeyName) || {} : {};
+	
+		for (const [k, v] of Object.entries(this.def) as [keyof T, T[keyof T]['default']][]) {
 			if (v.where === 'device' && Object.prototype.hasOwnProperty.call(deviceState, k)) {
-				state[k] = deviceState[k];
+				this.reactiveState[k].value = this.state[k] = deviceState[k];
 			} else if (v.where === 'account' && $i && Object.prototype.hasOwnProperty.call(registryCache, k)) {
-				state[k] = registryCache[k];
+				this.reactiveState[k].value = this.state[k] = registryCache[k];
 			} else if (v.where === 'deviceAccount' && Object.prototype.hasOwnProperty.call(deviceAccountState, k)) {
-				state[k] = deviceAccountState[k];
+				this.reactiveState[k].value = this.state[k] = deviceAccountState[k];
 			} else {
-				state[k] = v.default;
+				this.reactiveState[k].value = this.state[k] = v.default;
 				if (_DEV_) console.log('Use default value', k, v.default);
 			}
 		}
-		for (const [k, v] of Object.entries(state)) {
-			reactiveState[k] = ref(v);
-		}
-		this.state = state as any;
-		this.reactiveState = reactiveState as any;
-	
+
+		this.pizzaxChannel.addEventListener('message', ({ where, key, value, userId }) => {
+			// アカウント変更すればunisonReloadが効くため、このreturnが発火することは
+			// まずないと思うけど一応弾いておく
+			if (where === 'deviceAccount' && !($i && userId !== $i.id)) return;
+			this.reactiveState[key].value = this.state[key] = value;
+		});
+
 		if ($i) {
-			// なぜかsetTimeoutしないとapi関数内でエラーになる(おそらく循環参照してることに原因がありそう)
-			window.setTimeout(() => {
-				api('i/registry/get-all', { scope: ['client', this.key] }).then(kvs => {
-					const cache = {};
-					for (const [k, v] of Object.entries(def)) {
-						if (v.where === 'account') {
-							if (Object.prototype.hasOwnProperty.call(kvs, k)) {
-								state[k] = kvs[k];
-								reactiveState[k].value = kvs[k];
-								cache[k] = kvs[k];
-							} else {
-								state[k] = v.default;
-								reactiveState[k].value = v.default;
-							}
-						}
-					}
-					localStorage.setItem(this.keyForLocalStorage + '::cache::' + $i.id, JSON.stringify(cache));
-					this.markAsReady();
-				});
-			}, 1);
 			// streamingのuser storage updateイベントを監視して更新
-			connection?.on('registryUpdated', ({ scope, key, value }: { scope: string[], key: keyof T, value: T[typeof key]['default'] }) => {
-				if (scope.length !== 2 || scope[0] !== 'client' || scope[1] !== this.key || this.state[key] === value) return;
+			connection?.on('registryUpdated', ({ scope, key, value }: { scope?: string[], key: keyof T, value: T[typeof key]['default'] }) => {
+				if (!scope || scope.length !== 2 || scope[0] !== 'client' || scope[1] !== this.key || this.state[key] === value) return;
 
-				this.state[key] = value;
-				this.reactiveState[key].value = value;
-
-				const cache = JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::cache::' + $i.id) || '{}');
-				if (cache[key] !== value) {
-					cache[key] = value;
-					localStorage.setItem(this.keyForLocalStorage + '::cache::' + $i.id, JSON.stringify(cache));
-				}
+				this.reactiveState[key].value = this.state[key] = value;
+	
+				this.addIdbSetJob(async () => {
+					const cache = await get(this.registryCacheKeyName);
+					if (cache[key] !== value) {
+						cache[key] = value;
+						await set(this.registryCacheKeyName, cache);
+					}
+				});
 			});
-		} else {
-			this.markAsReady();
 		}
 	}
 
-	public set<K extends keyof T>(key: K, value: T[K]['default']): void {
-		if (_DEV_) console.log('set', key, value);
+	private load(): Promise<void> {
+		return new Promise((resolve, reject) => {
+			if ($i) {
+				// api関数と循環参照なので一応setTimeoutしておく
+				window.setTimeout(async () => {
+					await defaultStore.ready;
 
-		this.state[key] = value;
-		this.reactiveState[key].value = value;
+					api('i/registry/get-all', { scope: ['client', this.key] })
+					.then(kvs => {
+						const cache: Partial<T> = {};
+						for (const [k, v] of Object.entries(this.def) as [keyof T, T[keyof T]['default']][]) {
+							if (v.where === 'account') {
+								if (Object.prototype.hasOwnProperty.call(kvs, k)) {
+									this.reactiveState[k].value = this.state[k] = (kvs as Partial<T>)[k];
+									cache[k] = (kvs as Partial<T>)[k];
+								} else {
+									this.reactiveState[k].value = this.state[k] = v.default;
+								}
+							}
+						}
+	
+						return set(this.registryCacheKeyName, cache);
+					})
+					.then(() => resolve());
+				}, 1);
+			} else {
+				resolve();
+			}
+		});
+	}
 
-		switch (this.def[key].where) {
-			case 'device': {
-				const deviceState = JSON.parse(localStorage.getItem(this.keyForLocalStorage) || '{}');
-				deviceState[key] = value;
-				localStorage.setItem(this.keyForLocalStorage, JSON.stringify(deviceState));
-				break;
+	public set<K extends keyof T>(key: K, value: T[K]['default']): Promise<void> {
+		// IndexedDBやBroadcastChannelで扱うために単純なオブジェクトにする
+		// (JSON.parse(JSON.stringify(value))の代わり)
+		const rawValue = deepClone(value);
+
+		if (_DEV_) console.log('set', key, rawValue, value);
+
+		this.reactiveState[key].value = this.state[key] = rawValue;
+
+		return this.addIdbSetJob(async () => {
+			if (_DEV_) console.log(`set ${key} start`);
+			switch (this.def[key].where) {
+				case 'device': {
+					this.pizzaxChannel.postMessage({
+						where: 'device',
+						key,
+						value: rawValue,
+					});
+					const deviceState = await get(this.deviceStateKeyName) || {};
+					deviceState[key] = rawValue;
+					await set(this.deviceStateKeyName, deviceState);
+					break;
+				}
+				case 'deviceAccount': {
+					if ($i == null) break;
+					this.pizzaxChannel.postMessage({
+						where: 'deviceAccount',
+						key,
+						value: rawValue,
+						userId: $i.id,
+					});
+					const deviceAccountState = await get(this.deviceAccountStateKeyName) || {};
+					deviceAccountState[key] = rawValue;
+					await set(this.deviceAccountStateKeyName, deviceAccountState);
+					break;
+				}
+				case 'account': {
+					if ($i == null) break;
+					const cache = await get(this.registryCacheKeyName) || {};
+					cache[key] = rawValue;
+					await set(this.registryCacheKeyName, cache);
+					await api('i/registry/set', {
+						scope: ['client', this.key],
+						key: key.toString(),
+						value: rawValue,
+					});
+					break;
+				}
 			}
-			case 'deviceAccount': {
-				if ($i == null) break;
-				const deviceAccountState = JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::' + $i.id) || '{}');
-				deviceAccountState[key] = value;
-				localStorage.setItem(this.keyForLocalStorage + '::' + $i.id, JSON.stringify(deviceAccountState));
-				break;
-			}
-			case 'account': {
-				if ($i == null) break;
-				const cache = JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::cache::' + $i.id) || '{}');
-				cache[key] = value;
-				localStorage.setItem(this.keyForLocalStorage + '::cache::' + $i.id, JSON.stringify(cache));
-				api('i/registry/set', {
-					scope: ['client', this.key],
-					key: key,
-					value: value,
-				});
-				break;
-			}
-		}
+			if (_DEV_) console.log(`set ${key} complete`);
+		});
 	}
 
 	public push<K extends keyof T>(key: K, value: ArrayElement<T[K]['default']>): void {
@@ -140,6 +213,7 @@ export class Storage<T extends StateDef> {
 
 	public reset(key: keyof T) {
 		this.set(key, this.def[key].default);
+		return this.def[key].default;
 	}
 
 	/**
@@ -174,4 +248,25 @@ export class Storage<T extends StateDef> {
 			},
 		};
 	}
+
+	// localStorage => indexedDBのマイグレーション
+	private async migrate() {
+		const deviceState = localStorage.getItem(this.deviceStateKeyName);
+		if (deviceState) { 
+			await set(this.deviceStateKeyName, JSON.parse(deviceState));
+			localStorage.removeItem(this.deviceStateKeyName);
+		}
+
+		const deviceAccountState = $i && localStorage.getItem(this.deviceAccountStateKeyName);
+		if ($i && deviceAccountState) {
+			await set(this.deviceAccountStateKeyName, JSON.parse(deviceAccountState));
+			localStorage.removeItem(this.deviceAccountStateKeyName);
+		}
+
+		const registryCache = $i && localStorage.getItem(this.registryCacheKeyName);
+		if ($i && registryCache) {
+			await set(this.registryCacheKeyName, JSON.parse(registryCache));
+			localStorage.removeItem(this.registryCacheKeyName);
+		}
+	}
 }
diff --git a/packages/frontend/src/scripts/device-kind.ts b/packages/frontend/src/scripts/device-kind.ts
index 6bb349c55..b575db960 100644
--- a/packages/frontend/src/scripts/device-kind.ts
+++ b/packages/frontend/src/scripts/device-kind.ts
@@ -1,5 +1,7 @@
 import { defaultStore } from '@/store';
 
+await defaultStore.ready;
+
 const ua = navigator.userAgent.toLowerCase();
 const isTablet = /ipad/.test(ua) || (/mobile|iphone|android/.test(ua) && window.innerWidth > 700);
 const isSmartphone = !isTablet && /mobile|iphone|android/.test(ua);
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index f9ad50b30..89a37ab08 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -333,6 +333,16 @@ export class ColdDeviceStorage {
 		}
 	}
 
+	public static getAll(): Partial<typeof this.default> {
+		return (Object.keys(this.default) as (keyof typeof this.default)[]).reduce((acc, key) => {
+			const value = localStorage.getItem(PREFIX + key);
+			if (value != null) {
+				acc[key] = JSON.parse(value);
+			}
+			return acc;
+		}, {} as any);
+	}
+
 	public static set<T extends keyof typeof ColdDeviceStorage.default>(key: T, value: typeof ColdDeviceStorage.default[T]): void {
 		// 呼び出し側のバグ等で undefined が来ることがある
 		// undefined を文字列として miLocalStorage に入れると参照する際の JSON.parse でコケて不具合の元になるため無視
diff --git a/packages/frontend/src/ui/_common_/sw-inject.ts b/packages/frontend/src/ui/_common_/sw-inject.ts
index 8676d2d48..a92a06bd3 100644
--- a/packages/frontend/src/ui/_common_/sw-inject.ts
+++ b/packages/frontend/src/ui/_common_/sw-inject.ts
@@ -1,7 +1,5 @@
-import { inject } from 'vue';
 import { post } from '@/os';
 import { $i, login } from '@/account';
-import { defaultStore } from '@/store';
 import { getAccountFromId } from '@/scripts/get-account-from-id';
 import { mainRouter } from '@/router';
 
diff --git a/packages/frontend/src/ui/classic.vue b/packages/frontend/src/ui/classic.vue
index a5c2f8ca2..02dafcc3b 100644
--- a/packages/frontend/src/ui/classic.vue
+++ b/packages/frontend/src/ui/classic.vue
@@ -132,7 +132,7 @@ if (window.innerWidth < 1024) {
 
 document.documentElement.style.overflowY = 'scroll';
 
-defaultStore.ready.then(() => {
+defaultStore.loaded.then(() => {
 	if (defaultStore.state.widgets.length === 0) {
 		defaultStore.set('widgets', [{
 			name: 'calendar',
diff --git a/packages/frontend/src/ui/universal.vue b/packages/frontend/src/ui/universal.vue
index a9bb85ab6..eac7e7e85 100644
--- a/packages/frontend/src/ui/universal.vue
+++ b/packages/frontend/src/ui/universal.vue
@@ -150,7 +150,7 @@ if (window.innerWidth > 1024) {
 	}
 }
 
-defaultStore.ready.then(() => {
+defaultStore.loaded.then(() => {
 	if (defaultStore.state.widgets.length === 0) {
 		defaultStore.set('widgets', [{
 			name: 'calendar',

From 2cc98226cac2e0a08332e1ce281ba8917c5b58fc Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 2 Feb 2023 18:06:23 +0900
Subject: [PATCH 175/177] improve RoleService test

---
 packages/backend/test/unit/RoleService.ts | 45 +++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/packages/backend/test/unit/RoleService.ts b/packages/backend/test/unit/RoleService.ts
index 8229bf78d..fdfafdb83 100644
--- a/packages/backend/test/unit/RoleService.ts
+++ b/packages/backend/test/unit/RoleService.ts
@@ -148,6 +148,51 @@ describe('RoleService', () => {
 			expect(result.canManageCustomEmojis).toBe(true);
 		});
 
+		it('priority', async () => {	
+			const user = await createUser();
+			const role1 = await createRole({
+				name: 'role1',
+				policies: {
+					driveCapacityMb: {
+						useDefault: false,
+						priority: 0,
+						value: 200,
+					},
+				},
+			});
+			const role2 = await createRole({
+				name: 'role2',
+				policies: {
+					driveCapacityMb: {
+						useDefault: false,
+						priority: 1,
+						value: 100,
+					},
+				},
+			});
+			await roleAssignmentsRepository.insert({
+				id: genAid(new Date()),
+				createdAt: new Date(),
+				roleId: role1.id,
+				userId: user.id,
+			});
+			await roleAssignmentsRepository.insert({
+				id: genAid(new Date()),
+				createdAt: new Date(),
+				roleId: role2.id,
+				userId: user.id,
+			});
+			metaService.fetch.mockResolvedValue({
+				policies: {
+					driveCapacityMb: 50,
+				},
+			} as any);
+	
+			const result = await roleService.getUserPolicies(user.id);
+	
+			expect(result.driveCapacityMb).toBe(100);
+		});
+
 		it('conditional role', async () => {	
 			const user1 = await createUser({
 				createdAt: new Date(Date.now() - (1000 * 60 * 60 * 24 * 365)),

From 07f885fea8f1d2bce9f92acfc9fb7cac2251e863 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 2 Feb 2023 18:08:34 +0900
Subject: [PATCH 176/177] refactor

---
 packages/backend/test/unit/RoleService.ts | 30 +++++++++--------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/packages/backend/test/unit/RoleService.ts b/packages/backend/test/unit/RoleService.ts
index fdfafdb83..c4011593b 100644
--- a/packages/backend/test/unit/RoleService.ts
+++ b/packages/backend/test/unit/RoleService.ts
@@ -50,6 +50,15 @@ describe('RoleService', () => {
 			.then(x => rolesRepository.findOneByOrFail(x.identifiers[0]));
 	}
 
+	async function assign(roleId: Role['id'], userId: User['id']) {
+		await roleAssignmentsRepository.insert({
+			id: genAid(new Date()),
+			createdAt: new Date(),
+			roleId,
+			userId,
+		});
+	}
+
 	beforeEach(async () => {
 		app = await Test.createTestingModule({
 			imports: [
@@ -131,12 +140,7 @@ describe('RoleService', () => {
 					},
 				},
 			});
-			await roleAssignmentsRepository.insert({
-				id: 'a',
-				createdAt: new Date(),
-				roleId: role.id,
-				userId: user.id,
-			});
+			await assign(role.id, user.id);
 			metaService.fetch.mockResolvedValue({
 				policies: {
 					canManageCustomEmojis: false,
@@ -170,18 +174,8 @@ describe('RoleService', () => {
 					},
 				},
 			});
-			await roleAssignmentsRepository.insert({
-				id: genAid(new Date()),
-				createdAt: new Date(),
-				roleId: role1.id,
-				userId: user.id,
-			});
-			await roleAssignmentsRepository.insert({
-				id: genAid(new Date()),
-				createdAt: new Date(),
-				roleId: role2.id,
-				userId: user.id,
-			});
+			await assign(role1.id, user.id);
+			await assign(role2.id, user.id);
 			metaService.fetch.mockResolvedValue({
 				policies: {
 					driveCapacityMb: 50,

From ed3e035ad60d806a7e5b1546d514260f46b6d6cf Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 2 Feb 2023 18:18:25 +0900
Subject: [PATCH 177/177] refactor: use test

---
 packages/backend/test/_e2e/api-visibility.ts  | 134 ++++++++---------
 packages/backend/test/_e2e/api.ts             |  14 +-
 packages/backend/test/_e2e/block.ts           |  12 +-
 packages/backend/test/_e2e/endpoints.ts       | 142 +++++++++---------
 packages/backend/test/_e2e/fetch-resource.ts  |  50 +++---
 packages/backend/test/_e2e/ff-visibility.ts   |  14 +-
 packages/backend/test/_e2e/mute.ts            |  16 +-
 packages/backend/test/_e2e/note.ts            |  50 +++---
 packages/backend/test/_e2e/streaming.ts       |  66 ++++----
 packages/backend/test/_e2e/thread-mute.ts     |   8 +-
 packages/backend/test/_e2e/user-notes.ts      |   4 +-
 packages/backend/test/prelude/maybe.ts        |   6 +-
 packages/backend/test/prelude/url.ts          |   2 +-
 packages/backend/test/tests/activitypub.ts    |   6 +-
 packages/backend/test/tests/ap-request.ts     |   4 +-
 .../backend/test/tests/extract-mentions.ts    |   4 +-
 packages/backend/test/tests/mfm.ts            |  38 ++---
 packages/backend/test/tests/reaction-lib.ts   |  38 ++---
 packages/backend/test/unit/FileInfoService.ts |  18 +--
 packages/backend/test/unit/MetaService.ts     |   4 +-
 packages/backend/test/unit/RelayService.ts    |   8 +-
 packages/backend/test/unit/RoleService.ts     |  10 +-
 packages/backend/test/unit/chart.ts           |  36 ++---
 23 files changed, 342 insertions(+), 342 deletions(-)

diff --git a/packages/backend/test/_e2e/api-visibility.ts b/packages/backend/test/_e2e/api-visibility.ts
index 9c2184084..d29b9acb3 100644
--- a/packages/backend/test/_e2e/api-visibility.ts
+++ b/packages/backend/test/_e2e/api-visibility.ts
@@ -100,90 +100,90 @@ describe('API visibility', () => {
 
 		//#region show post
 		// public
-		it('[show] public-postを自分が見れる', async () => {
+		test('[show] public-postを自分が見れる', async () => {
 			const res = await show(pub.id, alice);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] public-postをフォロワーが見れる', async () => {
+		test('[show] public-postをフォロワーが見れる', async () => {
 			const res = await show(pub.id, follower);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] public-postを非フォロワーが見れる', async () => {
+		test('[show] public-postを非フォロワーが見れる', async () => {
 			const res = await show(pub.id, other);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] public-postを未認証が見れる', async () => {
+		test('[show] public-postを未認証が見れる', async () => {
 			const res = await show(pub.id, null);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
 		// home
-		it('[show] home-postを自分が見れる', async () => {
+		test('[show] home-postを自分が見れる', async () => {
 			const res = await show(home.id, alice);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] home-postをフォロワーが見れる', async () => {
+		test('[show] home-postをフォロワーが見れる', async () => {
 			const res = await show(home.id, follower);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] home-postを非フォロワーが見れる', async () => {
+		test('[show] home-postを非フォロワーが見れる', async () => {
 			const res = await show(home.id, other);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] home-postを未認証が見れる', async () => {
+		test('[show] home-postを未認証が見れる', async () => {
 			const res = await show(home.id, null);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
 		// followers
-		it('[show] followers-postを自分が見れる', async () => {
+		test('[show] followers-postを自分が見れる', async () => {
 			const res = await show(fol.id, alice);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] followers-postをフォロワーが見れる', async () => {
+		test('[show] followers-postをフォロワーが見れる', async () => {
 			const res = await show(fol.id, follower);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] followers-postを非フォロワーが見れない', async () => {
+		test('[show] followers-postを非フォロワーが見れない', async () => {
 			const res = await show(fol.id, other);
 			assert.strictEqual(res.body.isHidden, true);
 		});
 
-		it('[show] followers-postを未認証が見れない', async () => {
+		test('[show] followers-postを未認証が見れない', async () => {
 			const res = await show(fol.id, null);
 			assert.strictEqual(res.body.isHidden, true);
 		});
 
 		// specified
-		it('[show] specified-postを自分が見れる', async () => {
+		test('[show] specified-postを自分が見れる', async () => {
 			const res = await show(spe.id, alice);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] specified-postを指定ユーザーが見れる', async () => {
+		test('[show] specified-postを指定ユーザーが見れる', async () => {
 			const res = await show(spe.id, target);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] specified-postをフォロワーが見れない', async () => {
+		test('[show] specified-postをフォロワーが見れない', async () => {
 			const res = await show(spe.id, follower);
 			assert.strictEqual(res.body.isHidden, true);
 		});
 
-		it('[show] specified-postを非フォロワーが見れない', async () => {
+		test('[show] specified-postを非フォロワーが見れない', async () => {
 			const res = await show(spe.id, other);
 			assert.strictEqual(res.body.isHidden, true);
 		});
 
-		it('[show] specified-postを未認証が見れない', async () => {
+		test('[show] specified-postを未認証が見れない', async () => {
 			const res = await show(spe.id, null);
 			assert.strictEqual(res.body.isHidden, true);
 		});
@@ -191,110 +191,110 @@ describe('API visibility', () => {
 
 		//#region show reply
 		// public
-		it('[show] public-replyを自分が見れる', async () => {
+		test('[show] public-replyを自分が見れる', async () => {
 			const res = await show(pubR.id, alice);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] public-replyをされた人が見れる', async () => {
+		test('[show] public-replyをされた人が見れる', async () => {
 			const res = await show(pubR.id, target);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] public-replyをフォロワーが見れる', async () => {
+		test('[show] public-replyをフォロワーが見れる', async () => {
 			const res = await show(pubR.id, follower);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] public-replyを非フォロワーが見れる', async () => {
+		test('[show] public-replyを非フォロワーが見れる', async () => {
 			const res = await show(pubR.id, other);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] public-replyを未認証が見れる', async () => {
+		test('[show] public-replyを未認証が見れる', async () => {
 			const res = await show(pubR.id, null);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
 		// home
-		it('[show] home-replyを自分が見れる', async () => {
+		test('[show] home-replyを自分が見れる', async () => {
 			const res = await show(homeR.id, alice);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] home-replyをされた人が見れる', async () => {
+		test('[show] home-replyをされた人が見れる', async () => {
 			const res = await show(homeR.id, target);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] home-replyをフォロワーが見れる', async () => {
+		test('[show] home-replyをフォロワーが見れる', async () => {
 			const res = await show(homeR.id, follower);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] home-replyを非フォロワーが見れる', async () => {
+		test('[show] home-replyを非フォロワーが見れる', async () => {
 			const res = await show(homeR.id, other);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] home-replyを未認証が見れる', async () => {
+		test('[show] home-replyを未認証が見れる', async () => {
 			const res = await show(homeR.id, null);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
 		// followers
-		it('[show] followers-replyを自分が見れる', async () => {
+		test('[show] followers-replyを自分が見れる', async () => {
 			const res = await show(folR.id, alice);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] followers-replyを非フォロワーでもリプライされていれば見れる', async () => {
+		test('[show] followers-replyを非フォロワーでもリプライされていれば見れる', async () => {
 			const res = await show(folR.id, target);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] followers-replyをフォロワーが見れる', async () => {
+		test('[show] followers-replyをフォロワーが見れる', async () => {
 			const res = await show(folR.id, follower);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] followers-replyを非フォロワーが見れない', async () => {
+		test('[show] followers-replyを非フォロワーが見れない', async () => {
 			const res = await show(folR.id, other);
 			assert.strictEqual(res.body.isHidden, true);
 		});
 
-		it('[show] followers-replyを未認証が見れない', async () => {
+		test('[show] followers-replyを未認証が見れない', async () => {
 			const res = await show(folR.id, null);
 			assert.strictEqual(res.body.isHidden, true);
 		});
 
 		// specified
-		it('[show] specified-replyを自分が見れる', async () => {
+		test('[show] specified-replyを自分が見れる', async () => {
 			const res = await show(speR.id, alice);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] specified-replyを指定ユーザーが見れる', async () => {
+		test('[show] specified-replyを指定ユーザーが見れる', async () => {
 			const res = await show(speR.id, target);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] specified-replyをされた人が指定されてなくても見れる', async () => {
+		test('[show] specified-replyをされた人が指定されてなくても見れる', async () => {
 			const res = await show(speR.id, target);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
-		it('[show] specified-replyをフォロワーが見れない', async () => {
+		test('[show] specified-replyをフォロワーが見れない', async () => {
 			const res = await show(speR.id, follower);
 			assert.strictEqual(res.body.isHidden, true);
 		});
 
-		it('[show] specified-replyを非フォロワーが見れない', async () => {
+		test('[show] specified-replyを非フォロワーが見れない', async () => {
 			const res = await show(speR.id, other);
 			assert.strictEqual(res.body.isHidden, true);
 		});
 
-		it('[show] specified-replyを未認証が見れない', async () => {
+		test('[show] specified-replyを未認証が見れない', async () => {
 			const res = await show(speR.id, null);
 			assert.strictEqual(res.body.isHidden, true);
 		});
@@ -302,131 +302,131 @@ describe('API visibility', () => {
 
 		//#region show mention
 		// public
-		it('[show] public-mentionを自分が見れる', async () => {
+		test('[show] public-mentionを自分が見れる', async () => {
 			const res = await show(pubM.id, alice);
 			assert.strictEqual(res.body.text, '@target x');
 		});
 
-		it('[show] public-mentionをされた人が見れる', async () => {
+		test('[show] public-mentionをされた人が見れる', async () => {
 			const res = await show(pubM.id, target);
 			assert.strictEqual(res.body.text, '@target x');
 		});
 
-		it('[show] public-mentionをフォロワーが見れる', async () => {
+		test('[show] public-mentionをフォロワーが見れる', async () => {
 			const res = await show(pubM.id, follower);
 			assert.strictEqual(res.body.text, '@target x');
 		});
 
-		it('[show] public-mentionを非フォロワーが見れる', async () => {
+		test('[show] public-mentionを非フォロワーが見れる', async () => {
 			const res = await show(pubM.id, other);
 			assert.strictEqual(res.body.text, '@target x');
 		});
 
-		it('[show] public-mentionを未認証が見れる', async () => {
+		test('[show] public-mentionを未認証が見れる', async () => {
 			const res = await show(pubM.id, null);
 			assert.strictEqual(res.body.text, '@target x');
 		});
 
 		// home
-		it('[show] home-mentionを自分が見れる', async () => {
+		test('[show] home-mentionを自分が見れる', async () => {
 			const res = await show(homeM.id, alice);
 			assert.strictEqual(res.body.text, '@target x');
 		});
 
-		it('[show] home-mentionをされた人が見れる', async () => {
+		test('[show] home-mentionをされた人が見れる', async () => {
 			const res = await show(homeM.id, target);
 			assert.strictEqual(res.body.text, '@target x');
 		});
 
-		it('[show] home-mentionをフォロワーが見れる', async () => {
+		test('[show] home-mentionをフォロワーが見れる', async () => {
 			const res = await show(homeM.id, follower);
 			assert.strictEqual(res.body.text, '@target x');
 		});
 
-		it('[show] home-mentionを非フォロワーが見れる', async () => {
+		test('[show] home-mentionを非フォロワーが見れる', async () => {
 			const res = await show(homeM.id, other);
 			assert.strictEqual(res.body.text, '@target x');
 		});
 
-		it('[show] home-mentionを未認証が見れる', async () => {
+		test('[show] home-mentionを未認証が見れる', async () => {
 			const res = await show(homeM.id, null);
 			assert.strictEqual(res.body.text, '@target x');
 		});
 
 		// followers
-		it('[show] followers-mentionを自分が見れる', async () => {
+		test('[show] followers-mentionを自分が見れる', async () => {
 			const res = await show(folM.id, alice);
 			assert.strictEqual(res.body.text, '@target x');
 		});
 
-		it('[show] followers-mentionをメンションされていれば非フォロワーでも見れる', async () => {
+		test('[show] followers-mentionをメンションされていれば非フォロワーでも見れる', async () => {
 			const res = await show(folM.id, target);
 			assert.strictEqual(res.body.text, '@target x');
 		});
 
-		it('[show] followers-mentionをフォロワーが見れる', async () => {
+		test('[show] followers-mentionをフォロワーが見れる', async () => {
 			const res = await show(folM.id, follower);
 			assert.strictEqual(res.body.text, '@target x');
 		});
 
-		it('[show] followers-mentionを非フォロワーが見れない', async () => {
+		test('[show] followers-mentionを非フォロワーが見れない', async () => {
 			const res = await show(folM.id, other);
 			assert.strictEqual(res.body.isHidden, true);
 		});
 
-		it('[show] followers-mentionを未認証が見れない', async () => {
+		test('[show] followers-mentionを未認証が見れない', async () => {
 			const res = await show(folM.id, null);
 			assert.strictEqual(res.body.isHidden, true);
 		});
 
 		// specified
-		it('[show] specified-mentionを自分が見れる', async () => {
+		test('[show] specified-mentionを自分が見れる', async () => {
 			const res = await show(speM.id, alice);
 			assert.strictEqual(res.body.text, '@target2 x');
 		});
 
-		it('[show] specified-mentionを指定ユーザーが見れる', async () => {
+		test('[show] specified-mentionを指定ユーザーが見れる', async () => {
 			const res = await show(speM.id, target);
 			assert.strictEqual(res.body.text, '@target2 x');
 		});
 
-		it('[show] specified-mentionをされた人が指定されてなかったら見れない', async () => {
+		test('[show] specified-mentionをされた人が指定されてなかったら見れない', async () => {
 			const res = await show(speM.id, target2);
 			assert.strictEqual(res.body.isHidden, true);
 		});
 
-		it('[show] specified-mentionをフォロワーが見れない', async () => {
+		test('[show] specified-mentionをフォロワーが見れない', async () => {
 			const res = await show(speM.id, follower);
 			assert.strictEqual(res.body.isHidden, true);
 		});
 
-		it('[show] specified-mentionを非フォロワーが見れない', async () => {
+		test('[show] specified-mentionを非フォロワーが見れない', async () => {
 			const res = await show(speM.id, other);
 			assert.strictEqual(res.body.isHidden, true);
 		});
 
-		it('[show] specified-mentionを未認証が見れない', async () => {
+		test('[show] specified-mentionを未認証が見れない', async () => {
 			const res = await show(speM.id, null);
 			assert.strictEqual(res.body.isHidden, true);
 		});
 		//#endregion
 
 		//#region HTL
-		it('[HTL] public-post が 自分が見れる', async () => {
+		test('[HTL] public-post が 自分が見れる', async () => {
 			const res = await request('/notes/timeline', { limit: 100 }, alice);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id === pub.id);
 			assert.strictEqual(notes[0].text, 'x');
 		});
 
-		it('[HTL] public-post が 非フォロワーから見れない', async () => {
+		test('[HTL] public-post が 非フォロワーから見れない', async () => {
 			const res = await request('/notes/timeline', { limit: 100 }, other);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id === pub.id);
 			assert.strictEqual(notes.length, 0);
 		});
 
-		it('[HTL] followers-post が フォロワーから見れる', async () => {
+		test('[HTL] followers-post が フォロワーから見れる', async () => {
 			const res = await request('/notes/timeline', { limit: 100 }, follower);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id === fol.id);
@@ -435,21 +435,21 @@ describe('API visibility', () => {
 		//#endregion
 
 		//#region RTL
-		it('[replies] followers-reply が フォロワーから見れる', async () => {
+		test('[replies] followers-reply が フォロワーから見れる', async () => {
 			const res = await request('/notes/replies', { noteId: tgt.id, limit: 100 }, follower);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id === folR.id);
 			assert.strictEqual(notes[0].text, 'x');
 		});
 
-		it('[replies] followers-reply が 非フォロワー (リプライ先ではない) から見れない', async () => {
+		test('[replies] followers-reply が 非フォロワー (リプライ先ではない) から見れない', async () => {
 			const res = await request('/notes/replies', { noteId: tgt.id, limit: 100 }, other);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id === folR.id);
 			assert.strictEqual(notes.length, 0);
 		});
 
-		it('[replies] followers-reply が 非フォロワー (リプライ先である) から見れる', async () => {
+		test('[replies] followers-reply が 非フォロワー (リプライ先である) から見れる', async () => {
 			const res = await request('/notes/replies', { noteId: tgt.id, limit: 100 }, target);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id === folR.id);
@@ -458,14 +458,14 @@ describe('API visibility', () => {
 		//#endregion
 
 		//#region MTL
-		it('[mentions] followers-reply が 非フォロワー (リプライ先である) から見れる', async () => {
+		test('[mentions] followers-reply が 非フォロワー (リプライ先である) から見れる', async () => {
 			const res = await request('/notes/mentions', { limit: 100 }, target);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id === folR.id);
 			assert.strictEqual(notes[0].text, 'x');
 		});
 
-		it('[mentions] followers-mention が 非フォロワー (メンション先である) から見れる', async () => {
+		test('[mentions] followers-mention が 非フォロワー (メンション先である) から見れる', async () => {
 			const res = await request('/notes/mentions', { limit: 100 }, target);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id === folM.id);
diff --git a/packages/backend/test/_e2e/api.ts b/packages/backend/test/_e2e/api.ts
index 3c0802203..7542c34db 100644
--- a/packages/backend/test/_e2e/api.ts
+++ b/packages/backend/test/_e2e/api.ts
@@ -22,7 +22,7 @@ describe('API', () => {
 	});
 
 	describe('General validation', () => {
-		it('wrong type', async(async () => {
+		test('wrong type', async(async () => {
 			const res = await request('/test', {
 				required: true,
 				string: 42,
@@ -30,14 +30,14 @@ describe('API', () => {
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('missing require param', async(async () => {
+		test('missing require param', async(async () => {
 			const res = await request('/test', {
 				string: 'a',
 			});
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('invalid misskey:id (empty string)', async(async () => {
+		test('invalid misskey:id (empty string)', async(async () => {
 			const res = await request('/test', {
 				required: true,
 				id: '',
@@ -45,7 +45,7 @@ describe('API', () => {
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('valid misskey:id', async(async () => {
+		test('valid misskey:id', async(async () => {
 			const res = await request('/test', {
 				required: true,
 				id: '8wvhjghbxu',
@@ -53,7 +53,7 @@ describe('API', () => {
 			assert.strictEqual(res.status, 200);
 		}));
 
-		it('default value', async(async () => {
+		test('default value', async(async () => {
 			const res = await request('/test', {
 				required: true,
 				string: 'a',
@@ -62,7 +62,7 @@ describe('API', () => {
 			assert.strictEqual(res.body.default, 'hello');
 		}));
 
-		it('can set null even if it has default value', async(async () => {
+		test('can set null even if it has default value', async(async () => {
 			const res = await request('/test', {
 				required: true,
 				nullableDefault: null,
@@ -71,7 +71,7 @@ describe('API', () => {
 			assert.strictEqual(res.body.nullableDefault, null);
 		}));
 
-		it('cannot set undefined if it has default value', async(async () => {
+		test('cannot set undefined if it has default value', async(async () => {
 			const res = await request('/test', {
 				required: true,
 				nullableDefault: undefined,
diff --git a/packages/backend/test/_e2e/block.ts b/packages/backend/test/_e2e/block.ts
index bb31983a3..c5f43e153 100644
--- a/packages/backend/test/_e2e/block.ts
+++ b/packages/backend/test/_e2e/block.ts
@@ -23,7 +23,7 @@ describe('Block', () => {
 		await shutdownServer(p);
 	});
 
-	it('Block作成', async () => {
+	test('Block作成', async () => {
 		const res = await request('/blocking/create', {
 			userId: bob.id,
 		}, alice);
@@ -31,14 +31,14 @@ describe('Block', () => {
 		assert.strictEqual(res.status, 200);
 	});
 
-	it('ブロックされているユーザーをフォローできない', async () => {
+	test('ブロックされているユーザーをフォローできない', async () => {
 		const res = await request('/following/create', { userId: alice.id }, bob);
 
 		assert.strictEqual(res.status, 400);
 		assert.strictEqual(res.body.error.id, 'c4ab57cc-4e41-45e9-bfd9-584f61e35ce0');
 	});
 
-	it('ブロックされているユーザーにリアクションできない', async () => {
+	test('ブロックされているユーザーにリアクションできない', async () => {
 		const note = await post(alice, { text: 'hello' });
 
 		const res = await request('/notes/reactions/create', { noteId: note.id, reaction: '👍' }, bob);
@@ -47,7 +47,7 @@ describe('Block', () => {
 		assert.strictEqual(res.body.error.id, '20ef5475-9f38-4e4c-bd33-de6d979498ec');
 	});
 
-	it('ブロックされているユーザーに返信できない', async () => {
+	test('ブロックされているユーザーに返信できない', async () => {
 		const note = await post(alice, { text: 'hello' });
 
 		const res = await request('/notes/create', { replyId: note.id, text: 'yo' }, bob);
@@ -56,7 +56,7 @@ describe('Block', () => {
 		assert.strictEqual(res.body.error.id, 'b390d7e1-8a5e-46ed-b625-06271cafd3d3');
 	});
 
-	it('ブロックされているユーザーのノートをRenoteできない', async () => {
+	test('ブロックされているユーザーのノートをRenoteできない', async () => {
 		const note = await post(alice, { text: 'hello' });
 
 		const res = await request('/notes/create', { renoteId: note.id, text: 'yo' }, bob);
@@ -69,7 +69,7 @@ describe('Block', () => {
 
 	// TODO: ユーザーリストから除外されるテスト
 
-	it('タイムライン(LTL)にブロックされているユーザーの投稿が含まれない', async () => {
+	test('タイムライン(LTL)にブロックされているユーザーの投稿が含まれない', async () => {
 		const aliceNote = await post(alice);
 		const bobNote = await post(bob);
 		const carolNote = await post(carol);
diff --git a/packages/backend/test/_e2e/endpoints.ts b/packages/backend/test/_e2e/endpoints.ts
index 05b74a65d..ea8433dfa 100644
--- a/packages/backend/test/_e2e/endpoints.ts
+++ b/packages/backend/test/_e2e/endpoints.ts
@@ -22,7 +22,7 @@ describe('Endpoints', () => {
 	});
 
 	describe('signup', () => {
-		it('不正なユーザー名でアカウントが作成できない', async () => {
+		test('不正なユーザー名でアカウントが作成できない', async () => {
 			const res = await request('api/signup', {
 				username: 'test.',
 				password: 'test',
@@ -30,7 +30,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('空のパスワードでアカウントが作成できない', async () => {
+		test('空のパスワードでアカウントが作成できない', async () => {
 			const res = await request('api/signup', {
 				username: 'test',
 				password: '',
@@ -38,7 +38,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('正しくアカウントが作成できる', async () => {
+		test('正しくアカウントが作成できる', async () => {
 			const me = {
 				username: 'test1',
 				password: 'test1',
@@ -51,7 +51,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.body.username, me.username);
 		});
 
-		it('同じユーザー名のアカウントは作成できない', async () => {
+		test('同じユーザー名のアカウントは作成できない', async () => {
 			const res = await request('api/signup', {
 				username: 'test1',
 				password: 'test1',
@@ -62,7 +62,7 @@ describe('Endpoints', () => {
 	});
 
 	describe('signin', () => {
-		it('間違ったパスワードでサインインできない', async () => {
+		test('間違ったパスワードでサインインできない', async () => {
 			const res = await request('api/signin', {
 				username: 'test1',
 				password: 'bar',
@@ -71,7 +71,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.status, 403);
 		});
 
-		it('クエリをインジェクションできない', async () => {
+		test('クエリをインジェクションできない', async () => {
 			const res = await request('api/signin', {
 				username: 'test1',
 				password: {
@@ -82,7 +82,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('正しい情報でサインインできる', async () => {
+		test('正しい情報でサインインできる', async () => {
 			const res = await request('api/signin', {
 				username: 'test1',
 				password: 'test1',
@@ -93,7 +93,7 @@ describe('Endpoints', () => {
 	});
 
 	describe('i/update', () => {
-		it('アカウント設定を更新できる', async () => {
+		test('アカウント設定を更新できる', async () => {
 			const myName = '大室櫻子';
 			const myLocation = '七森中';
 			const myBirthday = '2000-09-07';
@@ -111,14 +111,14 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.body.birthday, myBirthday);
 		});
 
-		it('名前を空白にできない', async () => {
+		test('名前を空白にできない', async () => {
 			const res = await api('/i/update', {
 				name: ' ',
 			}, alice);
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('誕生日の設定を削除できる', async () => {
+		test('誕生日の設定を削除できる', async () => {
 			await api('/i/update', {
 				birthday: '2000-09-07',
 			}, alice);
@@ -132,7 +132,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.body.birthday, null);
 		});
 
-		it('不正な誕生日の形式で怒られる', async () => {
+		test('不正な誕生日の形式で怒られる', async () => {
 			const res = await api('/i/update', {
 				birthday: '2000/09/07',
 			}, alice);
@@ -141,7 +141,7 @@ describe('Endpoints', () => {
 	});
 
 	describe('users/show', () => {
-		it('ユーザーが取得できる', async () => {
+		test('ユーザーが取得できる', async () => {
 			const res = await api('/users/show', {
 				userId: alice.id,
 			}, alice);
@@ -151,14 +151,14 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.body.id, alice.id);
 		});
 
-		it('ユーザーが存在しなかったら怒る', async () => {
+		test('ユーザーが存在しなかったら怒る', async () => {
 			const res = await api('/users/show', {
 				userId: '000000000000000000000000',
 			});
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('間違ったIDで怒られる', async () => {
+		test('間違ったIDで怒られる', async () => {
 			const res = await api('/users/show', {
 				userId: 'kyoppie',
 			});
@@ -167,7 +167,7 @@ describe('Endpoints', () => {
 	});
 
 	describe('notes/show', () => {
-		it('投稿が取得できる', async () => {
+		test('投稿が取得できる', async () => {
 			const myPost = await post(alice, {
 				text: 'test',
 			});
@@ -182,14 +182,14 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.body.text, myPost.text);
 		});
 
-		it('投稿が存在しなかったら怒る', async () => {
+		test('投稿が存在しなかったら怒る', async () => {
 			const res = await api('/notes/show', {
 				noteId: '000000000000000000000000',
 			});
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('間違ったIDで怒られる', async () => {
+		test('間違ったIDで怒られる', async () => {
 			const res = await api('/notes/show', {
 				noteId: 'kyoppie',
 			});
@@ -198,7 +198,7 @@ describe('Endpoints', () => {
 	});
 
 	describe('notes/reactions/create', () => {
-		it('リアクションできる', async () => {
+		test('リアクションできる', async () => {
 			const bobPost = await post(bob);
 
 			const alice = await signup({ username: 'alice' });
@@ -217,7 +217,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(resNote.body.reactions['🚀'], [alice.id]);
 		});
 
-		it('自分の投稿にもリアクションできる', async () => {
+		test('自分の投稿にもリアクションできる', async () => {
 			const myPost = await post(alice);
 
 			const res = await api('/notes/reactions/create', {
@@ -228,7 +228,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.status, 204);
 		});
 
-		it('二重にリアクションできない', async () => {
+		test('二重にリアクションできない', async () => {
 			const bobPost = await post(bob);
 
 			await api('/notes/reactions/create', {
@@ -244,7 +244,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('存在しない投稿にはリアクションできない', async () => {
+		test('存在しない投稿にはリアクションできない', async () => {
 			const res = await api('/notes/reactions/create', {
 				noteId: '000000000000000000000000',
 				reaction: '🚀',
@@ -253,13 +253,13 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('空のパラメータで怒られる', async () => {
+		test('空のパラメータで怒られる', async () => {
 			const res = await api('/notes/reactions/create', {}, alice);
 
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('間違ったIDで怒られる', async () => {
+		test('間違ったIDで怒られる', async () => {
 			const res = await api('/notes/reactions/create', {
 				noteId: 'kyoppie',
 				reaction: '🚀',
@@ -270,7 +270,7 @@ describe('Endpoints', () => {
 	});
 
 	describe('following/create', () => {
-		it('フォローできる', async () => {
+		test('フォローできる', async () => {
 			const res = await api('/following/create', {
 				userId: alice.id,
 			}, bob);
@@ -278,7 +278,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.status, 200);
 		});
 
-		it('既にフォローしている場合は怒る', async () => {
+		test('既にフォローしている場合は怒る', async () => {
 			const res = await api('/following/create', {
 				userId: alice.id,
 			}, bob);
@@ -286,7 +286,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('存在しないユーザーはフォローできない', async () => {
+		test('存在しないユーザーはフォローできない', async () => {
 			const res = await api('/following/create', {
 				userId: '000000000000000000000000',
 			}, alice);
@@ -294,7 +294,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('自分自身はフォローできない', async () => {
+		test('自分自身はフォローできない', async () => {
 			const res = await api('/following/create', {
 				userId: alice.id,
 			}, alice);
@@ -302,13 +302,13 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('空のパラメータで怒られる', async () => {
+		test('空のパラメータで怒られる', async () => {
 			const res = await api('/following/create', {}, alice);
 
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('間違ったIDで怒られる', async () => {
+		test('間違ったIDで怒られる', async () => {
 			const res = await api('/following/create', {
 				userId: 'foo',
 			}, alice);
@@ -318,7 +318,7 @@ describe('Endpoints', () => {
 	});
 
 	describe('following/delete', () => {
-		it('フォロー解除できる', async () => {
+		test('フォロー解除できる', async () => {
 			await api('/following/create', {
 				userId: alice.id,
 			}, bob);
@@ -330,7 +330,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.status, 200);
 		});
 
-		it('フォローしていない場合は怒る', async () => {
+		test('フォローしていない場合は怒る', async () => {
 			const res = await api('/following/delete', {
 				userId: alice.id,
 			}, bob);
@@ -338,7 +338,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('存在しないユーザーはフォロー解除できない', async () => {
+		test('存在しないユーザーはフォロー解除できない', async () => {
 			const res = await api('/following/delete', {
 				userId: '000000000000000000000000',
 			}, alice);
@@ -346,7 +346,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('自分自身はフォロー解除できない', async () => {
+		test('自分自身はフォロー解除できない', async () => {
 			const res = await api('/following/delete', {
 				userId: alice.id,
 			}, alice);
@@ -354,13 +354,13 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('空のパラメータで怒られる', async () => {
+		test('空のパラメータで怒られる', async () => {
 			const res = await api('/following/delete', {}, alice);
 
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('間違ったIDで怒られる', async () => {
+		test('間違ったIDで怒られる', async () => {
 			const res = await api('/following/delete', {
 				userId: 'kyoppie',
 			}, alice);
@@ -371,7 +371,7 @@ describe('Endpoints', () => {
 
 	/*
 	describe('/i', () => {
-		it('', async () => {
+		test('', async () => {
 		});
 	});
 	*/
@@ -402,7 +402,7 @@ describe('API: Endpoints', () => {
 	});
 
 	describe('drive', () => {
-		it('ドライブ情報を取得できる', async () => {
+		test('ドライブ情報を取得できる', async () => {
 			await uploadFile({
 				userId: alice.id,
 				size: 256
@@ -423,7 +423,7 @@ describe('API: Endpoints', () => {
 	});
 
 	describe('drive/files/create', () => {
-		it('ファイルを作成できる', async () => {
+		test('ファイルを作成できる', async () => {
 			const res = await uploadFile(alice);
 
 			assert.strictEqual(res.status, 200);
@@ -431,7 +431,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.body.name, 'Lenna.png');
 		}));
 
-		it('ファイルに名前を付けられる', async () => {
+		test('ファイルに名前を付けられる', async () => {
 			const res = await assert.request(server)
 				.post('/drive/files/create')
 				.field('i', alice.token)
@@ -443,13 +443,13 @@ describe('API: Endpoints', () => {
 			expect(res.body).have.property('name').eql('Belmond.png');
 		}));
 
-		it('ファイル無しで怒られる', async () => {
+		test('ファイル無しで怒られる', async () => {
 			const res = await api('/drive/files/create', {}, alice);
 
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('SVGファイルを作成できる', async () => {
+		test('SVGファイルを作成できる', async () => {
 			const res = await uploadFile(alice, __dirname + '/resources/image.svg');
 
 			assert.strictEqual(res.status, 200);
@@ -460,7 +460,7 @@ describe('API: Endpoints', () => {
 	});
 
 	describe('drive/files/update', () => {
-		it('名前を更新できる', async () => {
+		test('名前を更新できる', async () => {
 			const file = await uploadFile(alice);
 			const newName = 'いちごパスタ.png';
 
@@ -474,7 +474,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.body.name, newName);
 		}));
 
-		it('他人のファイルは更新できない', async () => {
+		test('他人のファイルは更新できない', async () => {
 			const file = await uploadFile(bob);
 
 			const res = await api('/drive/files/update', {
@@ -485,7 +485,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('親フォルダを更新できる', async () => {
+		test('親フォルダを更新できる', async () => {
 			const file = await uploadFile(alice);
 			const folder = (await api('/drive/folders/create', {
 				name: 'test'
@@ -501,7 +501,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.body.folderId, folder.id);
 		}));
 
-		it('親フォルダを無しにできる', async () => {
+		test('親フォルダを無しにできる', async () => {
 			const file = await uploadFile(alice);
 
 			const folder = (await api('/drive/folders/create', {
@@ -523,7 +523,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.body.folderId, null);
 		}));
 
-		it('他人のフォルダには入れられない', async () => {
+		test('他人のフォルダには入れられない', async () => {
 			const file = await uploadFile(alice);
 			const folder = (await api('/drive/folders/create', {
 				name: 'test'
@@ -537,7 +537,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('存在しないフォルダで怒られる', async () => {
+		test('存在しないフォルダで怒られる', async () => {
 			const file = await uploadFile(alice);
 
 			const res = await api('/drive/files/update', {
@@ -548,7 +548,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('不正なフォルダIDで怒られる', async () => {
+		test('不正なフォルダIDで怒られる', async () => {
 			const file = await uploadFile(alice);
 
 			const res = await api('/drive/files/update', {
@@ -559,7 +559,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('ファイルが存在しなかったら怒る', async () => {
+		test('ファイルが存在しなかったら怒る', async () => {
 			const res = await api('/drive/files/update', {
 				fileId: '000000000000000000000000',
 				name: 'いちごパスタ.png'
@@ -568,7 +568,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('間違ったIDで怒られる', async () => {
+		test('間違ったIDで怒られる', async () => {
 			const res = await api('/drive/files/update', {
 				fileId: 'kyoppie',
 				name: 'いちごパスタ.png'
@@ -579,7 +579,7 @@ describe('API: Endpoints', () => {
 	});
 
 	describe('drive/folders/create', () => {
-		it('フォルダを作成できる', async () => {
+		test('フォルダを作成できる', async () => {
 			const res = await api('/drive/folders/create', {
 				name: 'test'
 			}, alice);
@@ -591,7 +591,7 @@ describe('API: Endpoints', () => {
 	});
 
 	describe('drive/folders/update', () => {
-		it('名前を更新できる', async () => {
+		test('名前を更新できる', async () => {
 			const folder = (await api('/drive/folders/create', {
 				name: 'test'
 			}, alice)).body;
@@ -606,7 +606,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.body.name, 'new name');
 		}));
 
-		it('他人のフォルダを更新できない', async () => {
+		test('他人のフォルダを更新できない', async () => {
 			const folder = (await api('/drive/folders/create', {
 				name: 'test'
 			}, bob)).body;
@@ -619,7 +619,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('親フォルダを更新できる', async () => {
+		test('親フォルダを更新できる', async () => {
 			const folder = (await api('/drive/folders/create', {
 				name: 'test'
 			}, alice)).body;
@@ -637,7 +637,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.body.parentId, parentFolder.id);
 		}));
 
-		it('親フォルダを無しに更新できる', async () => {
+		test('親フォルダを無しに更新できる', async () => {
 			const folder = (await api('/drive/folders/create', {
 				name: 'test'
 			}, alice)).body;
@@ -659,7 +659,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.body.parentId, null);
 		}));
 
-		it('他人のフォルダを親フォルダに設定できない', async () => {
+		test('他人のフォルダを親フォルダに設定できない', async () => {
 			const folder = (await api('/drive/folders/create', {
 				name: 'test'
 			}, alice)).body;
@@ -675,7 +675,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('フォルダが循環するような構造にできない', async () => {
+		test('フォルダが循環するような構造にできない', async () => {
 			const folder = (await api('/drive/folders/create', {
 				name: 'test'
 			}, alice)).body;
@@ -695,7 +695,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('フォルダが循環するような構造にできない(再帰的)', async () => {
+		test('フォルダが循環するような構造にできない(再帰的)', async () => {
 			const folderA = (await api('/drive/folders/create', {
 				name: 'test'
 			}, alice)).body;
@@ -722,7 +722,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('フォルダが循環するような構造にできない(自身)', async () => {
+		test('フォルダが循環するような構造にできない(自身)', async () => {
 			const folderA = (await api('/drive/folders/create', {
 				name: 'test'
 			}, alice)).body;
@@ -735,7 +735,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('存在しない親フォルダを設定できない', async () => {
+		test('存在しない親フォルダを設定できない', async () => {
 			const folder = (await api('/drive/folders/create', {
 				name: 'test'
 			}, alice)).body;
@@ -748,7 +748,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('不正な親フォルダIDで怒られる', async () => {
+		test('不正な親フォルダIDで怒られる', async () => {
 			const folder = (await api('/drive/folders/create', {
 				name: 'test'
 			}, alice)).body;
@@ -761,7 +761,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('存在しないフォルダを更新できない', async () => {
+		test('存在しないフォルダを更新できない', async () => {
 			const res = await api('/drive/folders/update', {
 				folderId: '000000000000000000000000'
 			}, alice);
@@ -769,7 +769,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('不正なフォルダIDで怒られる', async () => {
+		test('不正なフォルダIDで怒られる', async () => {
 			const res = await api('/drive/folders/update', {
 				folderId: 'foo'
 			}, alice);
@@ -779,7 +779,7 @@ describe('API: Endpoints', () => {
 	});
 
 	describe('messaging/messages/create', () => {
-		it('メッセージを送信できる', async () => {
+		test('メッセージを送信できる', async () => {
 			const res = await api('/messaging/messages/create', {
 				userId: bob.id,
 				text: 'test'
@@ -790,7 +790,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.body.text, 'test');
 		}));
 
-		it('自分自身にはメッセージを送信できない', async () => {
+		test('自分自身にはメッセージを送信できない', async () => {
 			const res = await api('/messaging/messages/create', {
 				userId: alice.id,
 				text: 'Yo'
@@ -799,7 +799,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('存在しないユーザーにはメッセージを送信できない', async () => {
+		test('存在しないユーザーにはメッセージを送信できない', async () => {
 			const res = await api('/messaging/messages/create', {
 				userId: '000000000000000000000000',
 				text: 'test'
@@ -808,7 +808,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('不正なユーザーIDで怒られる', async () => {
+		test('不正なユーザーIDで怒られる', async () => {
 			const res = await api('/messaging/messages/create', {
 				userId: 'foo',
 				text: 'test'
@@ -817,7 +817,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('テキストが無くて怒られる', async () => {
+		test('テキストが無くて怒られる', async () => {
 			const res = await api('/messaging/messages/create', {
 				userId: bob.id
 			}, alice);
@@ -825,7 +825,7 @@ describe('API: Endpoints', () => {
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('文字数オーバーで怒られる', async () => {
+		test('文字数オーバーで怒られる', async () => {
 			const res = await api('/messaging/messages/create', {
 				userId: bob.id,
 				text: '!'.repeat(1001)
@@ -836,7 +836,7 @@ describe('API: Endpoints', () => {
 	});
 
 	describe('notes/replies', () => {
-		it('自分に閲覧権限のない投稿は含まれない', async () => {
+		test('自分に閲覧権限のない投稿は含まれない', async () => {
 			const alicePost = await post(alice, {
 				text: 'foo'
 			});
@@ -859,7 +859,7 @@ describe('API: Endpoints', () => {
 	});
 
 	describe('notes/timeline', () => {
-		it('フォロワー限定投稿が含まれる', async () => {
+		test('フォロワー限定投稿が含まれる', async () => {
 			await api('/following/create', {
 				userId: alice.id
 			}, bob);
diff --git a/packages/backend/test/_e2e/fetch-resource.ts b/packages/backend/test/_e2e/fetch-resource.ts
index 344022dec..7ae133496 100644
--- a/packages/backend/test/_e2e/fetch-resource.ts
+++ b/packages/backend/test/_e2e/fetch-resource.ts
@@ -35,38 +35,38 @@ describe('Fetch resource', () => {
 	});
 
 	describe('Common', () => {
-		it('meta', async () => {
+		test('meta', async () => {
 			const res = await request('/meta', {
 			});
 
 			assert.strictEqual(res.status, 200);
 		});
 
-		it('GET root', async () => {
+		test('GET root', async () => {
 			const res = await simpleGet('/');
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, HTML);
 		});
 
-		it('GET docs', async () => {
+		test('GET docs', async () => {
 			const res = await simpleGet('/docs/ja-JP/about');
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, HTML);
 		});
 
-		it('GET api-doc', async () => {
+		test('GET api-doc', async () => {
 			const res = await simpleGet('/api-doc');
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, HTML);
 		});
 
-		it('GET api.json', async () => {
+		test('GET api.json', async () => {
 			const res = await simpleGet('/api.json');
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, JSON);
 		});
 
-		it('Validate api.json', async () => {
+		test('Validate api.json', async () => {
 			const config = await openapi.loadConfig();
 			const result = await openapi.bundle({
 				config,
@@ -80,25 +80,25 @@ describe('Fetch resource', () => {
 			assert.strictEqual(result.problems.length, 0);
 		});
 
-		it('GET favicon.ico', async () => {
+		test('GET favicon.ico', async () => {
 			const res = await simpleGet('/favicon.ico');
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, 'image/x-icon');
 		});
 
-		it('GET apple-touch-icon.png', async () => {
+		test('GET apple-touch-icon.png', async () => {
 			const res = await simpleGet('/apple-touch-icon.png');
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, 'image/png');
 		});
 
-		it('GET twemoji svg', async () => {
+		test('GET twemoji svg', async () => {
 			const res = await simpleGet('/twemoji/2764.svg');
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, 'image/svg+xml');
 		});
 
-		it('GET twemoji svg with hyphen', async () => {
+		test('GET twemoji svg with hyphen', async () => {
 			const res = await simpleGet('/twemoji/2764-fe0f-200d-1f525.svg');
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, 'image/svg+xml');
@@ -106,25 +106,25 @@ describe('Fetch resource', () => {
 	});
 
 	describe('/@:username', () => {
-		it('Only AP => AP', async () => {
+		test('Only AP => AP', async () => {
 			const res = await simpleGet(`/@${alice.username}`, ONLY_AP);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, AP);
 		});
 
-		it('Prefer AP => AP', async () => {
+		test('Prefer AP => AP', async () => {
 			const res = await simpleGet(`/@${alice.username}`, PREFER_AP);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, AP);
 		});
 
-		it('Prefer HTML => HTML', async () => {
+		test('Prefer HTML => HTML', async () => {
 			const res = await simpleGet(`/@${alice.username}`, PREFER_HTML);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, HTML);
 		});
 
-		it('Unspecified => HTML', async () => {
+		test('Unspecified => HTML', async () => {
 			const res = await simpleGet(`/@${alice.username}`, UNSPECIFIED);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, HTML);
@@ -132,25 +132,25 @@ describe('Fetch resource', () => {
 	});
 
 	describe('/users/:id', () => {
-		it('Only AP => AP', async () => {
+		test('Only AP => AP', async () => {
 			const res = await simpleGet(`/users/${alice.id}`, ONLY_AP);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, AP);
 		});
 
-		it('Prefer AP => AP', async () => {
+		test('Prefer AP => AP', async () => {
 			const res = await simpleGet(`/users/${alice.id}`, PREFER_AP);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, AP);
 		});
 
-		it('Prefer HTML => Redirect to /@:username', async () => {
+		test('Prefer HTML => Redirect to /@:username', async () => {
 			const res = await simpleGet(`/users/${alice.id}`, PREFER_HTML);
 			assert.strictEqual(res.status, 302);
 			assert.strictEqual(res.location, `/@${alice.username}`);
 		});
 
-		it('Undecided => HTML', async () => {
+		test('Undecided => HTML', async () => {
 			const res = await simpleGet(`/users/${alice.id}`, UNSPECIFIED);
 			assert.strictEqual(res.status, 302);
 			assert.strictEqual(res.location, `/@${alice.username}`);
@@ -158,25 +158,25 @@ describe('Fetch resource', () => {
 	});
 
 	describe('/notes/:id', () => {
-		it('Only AP => AP', async () => {
+		test('Only AP => AP', async () => {
 			const res = await simpleGet(`/notes/${alicesPost.id}`, ONLY_AP);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, AP);
 		});
 
-		it('Prefer AP => AP', async () => {
+		test('Prefer AP => AP', async () => {
 			const res = await simpleGet(`/notes/${alicesPost.id}`, PREFER_AP);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, AP);
 		});
 
-		it('Prefer HTML => HTML', async () => {
+		test('Prefer HTML => HTML', async () => {
 			const res = await simpleGet(`/notes/${alicesPost.id}`, PREFER_HTML);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, HTML);
 		});
 
-		it('Unspecified => HTML', async () => {
+		test('Unspecified => HTML', async () => {
 			const res = await simpleGet(`/notes/${alicesPost.id}`, UNSPECIFIED);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, HTML);
@@ -184,19 +184,19 @@ describe('Fetch resource', () => {
 	});
 
 	describe('Feeds', () => {
-		it('RSS', async () => {
+		test('RSS', async () => {
 			const res = await simpleGet(`/@${alice.username}.rss`, UNSPECIFIED);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, 'application/rss+xml; charset=utf-8');
 		});
 
-		it('ATOM', async () => {
+		test('ATOM', async () => {
 			const res = await simpleGet(`/@${alice.username}.atom`, UNSPECIFIED);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, 'application/atom+xml; charset=utf-8');
 		});
 
-		it('JSON', async () => {
+		test('JSON', async () => {
 			const res = await simpleGet(`/@${alice.username}.json`, UNSPECIFIED);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, 'application/json; charset=utf-8');
diff --git a/packages/backend/test/_e2e/ff-visibility.ts b/packages/backend/test/_e2e/ff-visibility.ts
index 38be0eba2..84a5b5ef2 100644
--- a/packages/backend/test/_e2e/ff-visibility.ts
+++ b/packages/backend/test/_e2e/ff-visibility.ts
@@ -22,7 +22,7 @@ describe('FF visibility', () => {
 		await shutdownServer(p);
 	});
 
-	it('ffVisibility が public なユーザーのフォロー/フォロワーを誰でも見れる', async () => {
+	test('ffVisibility が public なユーザーのフォロー/フォロワーを誰でも見れる', async () => {
 		await request('/i/update', {
 			ffVisibility: 'public',
 		}, alice);
@@ -40,7 +40,7 @@ describe('FF visibility', () => {
 		assert.strictEqual(Array.isArray(followersRes.body), true);
 	});
 
-	it('ffVisibility が followers なユーザーのフォロー/フォロワーを自分で見れる', async () => {
+	test('ffVisibility が followers なユーザーのフォロー/フォロワーを自分で見れる', async () => {
 		await request('/i/update', {
 			ffVisibility: 'followers',
 		}, alice);
@@ -58,7 +58,7 @@ describe('FF visibility', () => {
 		assert.strictEqual(Array.isArray(followersRes.body), true);
 	});
 
-	it('ffVisibility が followers なユーザーのフォロー/フォロワーを非フォロワーが見れない', async () => {
+	test('ffVisibility が followers なユーザーのフォロー/フォロワーを非フォロワーが見れない', async () => {
 		await request('/i/update', {
 			ffVisibility: 'followers',
 		}, alice);
@@ -74,7 +74,7 @@ describe('FF visibility', () => {
 		assert.strictEqual(followersRes.status, 400);
 	});
 
-	it('ffVisibility が followers なユーザーのフォロー/フォロワーをフォロワーが見れる', async () => {
+	test('ffVisibility が followers なユーザーのフォロー/フォロワーをフォロワーが見れる', async () => {
 		await request('/i/update', {
 			ffVisibility: 'followers',
 		}, alice);
@@ -96,7 +96,7 @@ describe('FF visibility', () => {
 		assert.strictEqual(Array.isArray(followersRes.body), true);
 	});
 
-	it('ffVisibility が private なユーザーのフォロー/フォロワーを自分で見れる', async () => {
+	test('ffVisibility が private なユーザーのフォロー/フォロワーを自分で見れる', async () => {
 		await request('/i/update', {
 			ffVisibility: 'private',
 		}, alice);
@@ -114,7 +114,7 @@ describe('FF visibility', () => {
 		assert.strictEqual(Array.isArray(followersRes.body), true);
 	});
 
-	it('ffVisibility が private なユーザーのフォロー/フォロワーを他人が見れない', async () => {
+	test('ffVisibility が private なユーザーのフォロー/フォロワーを他人が見れない', async () => {
 		await request('/i/update', {
 			ffVisibility: 'private',
 		}, alice);
@@ -131,7 +131,7 @@ describe('FF visibility', () => {
 	});
 
 	describe('AP', () => {
-		it('ffVisibility が public 以外ならばAPからは取得できない', async () => {
+		test('ffVisibility が public 以外ならばAPからは取得できない', async () => {
 			{
 				await request('/i/update', {
 					ffVisibility: 'public',
diff --git a/packages/backend/test/_e2e/mute.ts b/packages/backend/test/_e2e/mute.ts
index 231377367..8f7f72bb9 100644
--- a/packages/backend/test/_e2e/mute.ts
+++ b/packages/backend/test/_e2e/mute.ts
@@ -23,7 +23,7 @@ describe('Mute', () => {
 		await shutdownServer(p);
 	});
 
-	it('ミュート作成', async () => {
+	test('ミュート作成', async () => {
 		const res = await request('/mute/create', {
 			userId: carol.id,
 		}, alice);
@@ -31,7 +31,7 @@ describe('Mute', () => {
 		assert.strictEqual(res.status, 204);
 	});
 
-	it('「自分宛ての投稿」にミュートしているユーザーの投稿が含まれない', async () => {
+	test('「自分宛ての投稿」にミュートしているユーザーの投稿が含まれない', async () => {
 		const bobNote = await post(bob, { text: '@alice hi' });
 		const carolNote = await post(carol, { text: '@alice hi' });
 
@@ -43,7 +43,7 @@ describe('Mute', () => {
 		assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
 	});
 
-	it('ミュートしているユーザーからメンションされても、hasUnreadMentions が true にならない', async () => {
+	test('ミュートしているユーザーからメンションされても、hasUnreadMentions が true にならない', async () => {
 		// 状態リセット
 		await request('/i/read-all-unread-notes', {}, alice);
 
@@ -55,7 +55,7 @@ describe('Mute', () => {
 		assert.strictEqual(res.body.hasUnreadMentions, false);
 	});
 
-	it('ミュートしているユーザーからメンションされても、ストリームに unreadMention イベントが流れてこない', async () => {
+	test('ミュートしているユーザーからメンションされても、ストリームに unreadMention イベントが流れてこない', async () => {
 		// 状態リセット
 		await request('/i/read-all-unread-notes', {}, alice);
 
@@ -64,7 +64,7 @@ describe('Mute', () => {
 		assert.strictEqual(fired, false);
 	});
 
-	it('ミュートしているユーザーからメンションされても、ストリームに unreadNotification イベントが流れてこない', async () => {
+	test('ミュートしているユーザーからメンションされても、ストリームに unreadNotification イベントが流れてこない', async () => {
 		// 状態リセット
 		await request('/i/read-all-unread-notes', {}, alice);
 		await request('/notifications/mark-all-as-read', {}, alice);
@@ -75,7 +75,7 @@ describe('Mute', () => {
 	});
 
 	describe('Timeline', () => {
-		it('タイムラインにミュートしているユーザーの投稿が含まれない', async () => {
+		test('タイムラインにミュートしているユーザーの投稿が含まれない', async () => {
 			const aliceNote = await post(alice);
 			const bobNote = await post(bob);
 			const carolNote = await post(carol);
@@ -89,7 +89,7 @@ describe('Mute', () => {
 			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
 		});
 
-		it('タイムラインにミュートしているユーザーの投稿のRenoteが含まれない', async () => {
+		test('タイムラインにミュートしているユーザーの投稿のRenoteが含まれない', async () => {
 			const aliceNote = await post(alice);
 			const carolNote = await post(carol);
 			const bobNote = await post(bob, {
@@ -107,7 +107,7 @@ describe('Mute', () => {
 	});
 
 	describe('Notification', () => {
-		it('通知にミュートしているユーザーの通知が含まれない(リアクション)', async () => {
+		test('通知にミュートしているユーザーの通知が含まれない(リアクション)', async () => {
 			const aliceNote = await post(alice);
 			await react(bob, aliceNote, 'like');
 			await react(carol, aliceNote, 'like');
diff --git a/packages/backend/test/_e2e/note.ts b/packages/backend/test/_e2e/note.ts
index d75a5c828..47af6808f 100644
--- a/packages/backend/test/_e2e/note.ts
+++ b/packages/backend/test/_e2e/note.ts
@@ -24,7 +24,7 @@ describe('Note', () => {
 		await shutdownServer(p);
 	});
 
-	it('投稿できる', async () => {
+	test('投稿できる', async () => {
 		const post = {
 			text: 'test',
 		};
@@ -36,7 +36,7 @@ describe('Note', () => {
 		assert.strictEqual(res.body.createdNote.text, post.text);
 	});
 
-	it('ファイルを添付できる', async () => {
+	test('ファイルを添付できる', async () => {
 		const file = await uploadUrl(alice, 'https://raw.githubusercontent.com/misskey-dev/misskey/develop/packages/backend/test/resources/Lenna.jpg');
 
 		const res = await request('/notes/create', {
@@ -48,7 +48,7 @@ describe('Note', () => {
 		assert.deepStrictEqual(res.body.createdNote.fileIds, [file.id]);
 	}, 1000 * 10);
 
-	it('他人のファイルは無視', async () => {
+	test('他人のファイルは無視', async () => {
 		const file = await uploadUrl(bob, 'https://raw.githubusercontent.com/misskey-dev/misskey/develop/packages/backend/test/resources/Lenna.jpg');
 
 		const res = await request('/notes/create', {
@@ -61,7 +61,7 @@ describe('Note', () => {
 		assert.deepStrictEqual(res.body.createdNote.fileIds, []);
 	}, 1000 * 10);
 
-	it('存在しないファイルは無視', async () => {
+	test('存在しないファイルは無視', async () => {
 		const res = await request('/notes/create', {
 			text: 'test',
 			fileIds: ['000000000000000000000000'],
@@ -72,7 +72,7 @@ describe('Note', () => {
 		assert.deepStrictEqual(res.body.createdNote.fileIds, []);
 	});
 
-	it('不正なファイルIDは無視', async () => {
+	test('不正なファイルIDは無視', async () => {
 		const res = await request('/notes/create', {
 			fileIds: ['kyoppie'],
 		}, alice);
@@ -81,7 +81,7 @@ describe('Note', () => {
 		assert.deepStrictEqual(res.body.createdNote.fileIds, []);
 	});
 
-	it('返信できる', async () => {
+	test('返信できる', async () => {
 		const bobPost = await post(bob, {
 			text: 'foo',
 		});
@@ -100,7 +100,7 @@ describe('Note', () => {
 		assert.strictEqual(res.body.createdNote.reply.text, bobPost.text);
 	});
 
-	it('renoteできる', async () => {
+	test('renoteできる', async () => {
 		const bobPost = await post(bob, {
 			text: 'test',
 		});
@@ -117,7 +117,7 @@ describe('Note', () => {
 		assert.strictEqual(res.body.createdNote.renote.text, bobPost.text);
 	});
 
-	it('引用renoteできる', async () => {
+	test('引用renoteできる', async () => {
 		const bobPost = await post(bob, {
 			text: 'test',
 		});
@@ -136,7 +136,7 @@ describe('Note', () => {
 		assert.strictEqual(res.body.createdNote.renote.text, bobPost.text);
 	});
 
-	it('文字数ぎりぎりで怒られない', async () => {
+	test('文字数ぎりぎりで怒られない', async () => {
 		const post = {
 			text: '!'.repeat(3000),
 		};
@@ -144,7 +144,7 @@ describe('Note', () => {
 		assert.strictEqual(res.status, 200);
 	});
 
-	it('文字数オーバーで怒られる', async () => {
+	test('文字数オーバーで怒られる', async () => {
 		const post = {
 			text: '!'.repeat(3001),
 		};
@@ -152,7 +152,7 @@ describe('Note', () => {
 		assert.strictEqual(res.status, 400);
 	});
 
-	it('存在しないリプライ先で怒られる', async () => {
+	test('存在しないリプライ先で怒られる', async () => {
 		const post = {
 			text: 'test',
 			replyId: '000000000000000000000000',
@@ -161,7 +161,7 @@ describe('Note', () => {
 		assert.strictEqual(res.status, 400);
 	});
 
-	it('存在しないrenote対象で怒られる', async () => {
+	test('存在しないrenote対象で怒られる', async () => {
 		const post = {
 			renoteId: '000000000000000000000000',
 		};
@@ -169,7 +169,7 @@ describe('Note', () => {
 		assert.strictEqual(res.status, 400);
 	});
 
-	it('不正なリプライ先IDで怒られる', async () => {
+	test('不正なリプライ先IDで怒られる', async () => {
 		const post = {
 			text: 'test',
 			replyId: 'foo',
@@ -178,7 +178,7 @@ describe('Note', () => {
 		assert.strictEqual(res.status, 400);
 	});
 
-	it('不正なrenote対象IDで怒られる', async () => {
+	test('不正なrenote対象IDで怒られる', async () => {
 		const post = {
 			renoteId: 'foo',
 		};
@@ -186,7 +186,7 @@ describe('Note', () => {
 		assert.strictEqual(res.status, 400);
 	});
 
-	it('存在しないユーザーにメンションできる', async () => {
+	test('存在しないユーザーにメンションできる', async () => {
 		const post = {
 			text: '@ghost yo',
 		};
@@ -198,7 +198,7 @@ describe('Note', () => {
 		assert.strictEqual(res.body.createdNote.text, post.text);
 	});
 
-	it('同じユーザーに複数メンションしても内部的にまとめられる', async () => {
+	test('同じユーザーに複数メンションしても内部的にまとめられる', async () => {
 		const post = {
 			text: '@bob @bob @bob yo',
 		};
@@ -214,7 +214,7 @@ describe('Note', () => {
 	});
 
 	describe('notes/create', () => {
-		it('投票を添付できる', async () => {
+		test('投票を添付できる', async () => {
 			const res = await request('/notes/create', {
 				text: 'test',
 				poll: {
@@ -227,14 +227,14 @@ describe('Note', () => {
 			assert.strictEqual(res.body.createdNote.poll != null, true);
 		});
 
-		it('投票の選択肢が無くて怒られる', async () => {
+		test('投票の選択肢が無くて怒られる', async () => {
 			const res = await request('/notes/create', {
 				poll: {},
 			}, alice);
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('投票の選択肢が無くて怒られる (空の配列)', async () => {
+		test('投票の選択肢が無くて怒られる (空の配列)', async () => {
 			const res = await request('/notes/create', {
 				poll: {
 					choices: [],
@@ -243,7 +243,7 @@ describe('Note', () => {
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('投票の選択肢が1つで怒られる', async () => {
+		test('投票の選択肢が1つで怒られる', async () => {
 			const res = await request('/notes/create', {
 				poll: {
 					choices: ['Strawberry Pasta'],
@@ -252,7 +252,7 @@ describe('Note', () => {
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('投票できる', async () => {
+		test('投票できる', async () => {
 			const { body } = await request('/notes/create', {
 				text: 'test',
 				poll: {
@@ -268,7 +268,7 @@ describe('Note', () => {
 			assert.strictEqual(res.status, 204);
 		});
 
-		it('複数投票できない', async () => {
+		test('複数投票できない', async () => {
 			const { body } = await request('/notes/create', {
 				text: 'test',
 				poll: {
@@ -289,7 +289,7 @@ describe('Note', () => {
 			assert.strictEqual(res.status, 400);
 		});
 
-		it('許可されている場合は複数投票できる', async () => {
+		test('許可されている場合は複数投票できる', async () => {
 			const { body } = await request('/notes/create', {
 				text: 'test',
 				poll: {
@@ -316,7 +316,7 @@ describe('Note', () => {
 			assert.strictEqual(res.status, 204);
 		});
 
-		it('締め切られている場合は投票できない', async () => {
+		test('締め切られている場合は投票できない', async () => {
 			const { body } = await request('/notes/create', {
 				text: 'test',
 				poll: {
@@ -337,7 +337,7 @@ describe('Note', () => {
 	});
 
 	describe('notes/delete', () => {
-		it('delete a reply', async () => {
+		test('delete a reply', async () => {
 			const mainNoteRes = await api('notes/create', {
 				text: 'main post',
 			}, alice);
diff --git a/packages/backend/test/_e2e/streaming.ts b/packages/backend/test/_e2e/streaming.ts
index 4dad322e9..790451d9b 100644
--- a/packages/backend/test/_e2e/streaming.ts
+++ b/packages/backend/test/_e2e/streaming.ts
@@ -78,7 +78,7 @@ describe('Streaming', () => {
 		});
 
 		describe('Events', () => {
-			it('mention event', async () => {
+			test('mention event', async () => {
 				const fired = await waitFire(
 					kyoko, 'main',	// kyoko:main
 					() => post(ayano, { text: 'foo @kyoko bar' }),	// ayano mention => kyoko
@@ -88,7 +88,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, true);
 			});
 
-			it('renote event', async () => {
+			test('renote event', async () => {
 				const fired = await waitFire(
 					kyoko, 'main',	// kyoko:main
 					() => post(ayano, { renoteId: kyokoNote.id }),	// ayano renote
@@ -100,7 +100,7 @@ describe('Streaming', () => {
 		});
 
 		describe('Home Timeline', () => {
-			it('自分の投稿が流れる', async () => {
+			test('自分の投稿が流れる', async () => {
 				const fired = await waitFire(
 					ayano, 'homeTimeline',	// ayano:Home
 					() => api('notes/create', { text: 'foo' }, ayano),	// ayano posts
@@ -110,7 +110,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしているユーザーの投稿が流れる', async () => {
+			test('フォローしているユーザーの投稿が流れる', async () => {
 				const fired = await waitFire(
 					ayano, 'homeTimeline',		// ayano:home
 					() => api('notes/create', { text: 'foo' }, kyoko),	// kyoko posts
@@ -120,7 +120,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしていないユーザーの投稿は流れない', async () => {
+			test('フォローしていないユーザーの投稿は流れない', async () => {
 				const fired = await waitFire(
 					kyoko, 'homeTimeline',	// kyoko:home
 					() => api('notes/create', { text: 'foo' }, ayano),	// ayano posts
@@ -130,7 +130,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, false);
 			});
 
-			it('フォローしているユーザーのダイレクト投稿が流れる', async () => {
+			test('フォローしているユーザーのダイレクト投稿が流れる', async () => {
 				const fired = await waitFire(
 					ayano, 'homeTimeline',	// ayano:home
 					() => api('notes/create', { text: 'foo', visibility: 'specified', visibleUserIds: [ayano.id] }, kyoko),	// kyoko dm => ayano
@@ -140,7 +140,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしているユーザーでも自分が指定されていないダイレクト投稿は流れない', async () => {
+			test('フォローしているユーザーでも自分が指定されていないダイレクト投稿は流れない', async () => {
 				const fired = await waitFire(
 					ayano, 'homeTimeline',	// ayano:home
 					() => api('notes/create', { text: 'foo', visibility: 'specified', visibleUserIds: [chitose.id] }, kyoko),	// kyoko dm => chitose
@@ -152,7 +152,7 @@ describe('Streaming', () => {
 		});	// Home
 
 		describe('Local Timeline', () => {
-			it('自分の投稿が流れる', async () => {
+			test('自分の投稿が流れる', async () => {
 				const fired = await waitFire(
 					ayano, 'localTimeline',	// ayano:Local
 					() => api('notes/create', { text: 'foo' }, ayano),	// ayano posts
@@ -162,7 +162,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしていないローカルユーザーの投稿が流れる', async () => {
+			test('フォローしていないローカルユーザーの投稿が流れる', async () => {
 				const fired = await waitFire(
 					ayano, 'localTimeline',	// ayano:Local
 					() => api('notes/create', { text: 'foo' }, chitose),	// chitose posts
@@ -172,7 +172,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, true);
 			});
 
-			it('リモートユーザーの投稿は流れない', async () => {
+			test('リモートユーザーの投稿は流れない', async () => {
 				const fired = await waitFire(
 					ayano, 'localTimeline',	// ayano:Local
 					() => api('notes/create', { text: 'foo' }, chinatsu),	// chinatsu posts
@@ -182,7 +182,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, false);
 			});
 
-			it('フォローしてたとしてもリモートユーザーの投稿は流れない', async () => {
+			test('フォローしてたとしてもリモートユーザーの投稿は流れない', async () => {
 				const fired = await waitFire(
 					ayano, 'localTimeline',	// ayano:Local
 					() => api('notes/create', { text: 'foo' }, akari),	// akari posts
@@ -192,7 +192,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, false);
 			});
 
-			it('ホーム指定の投稿は流れない', async () => {
+			test('ホーム指定の投稿は流れない', async () => {
 				const fired = await waitFire(
 					ayano, 'localTimeline',	// ayano:Local
 					() => api('notes/create', { text: 'foo', visibility: 'home' }, kyoko),	// kyoko home posts
@@ -202,7 +202,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, false);
 			});
 
-			it('フォローしているローカルユーザーのダイレクト投稿は流れない', async () => {
+			test('フォローしているローカルユーザーのダイレクト投稿は流れない', async () => {
 				const fired = await waitFire(
 					ayano, 'localTimeline',	// ayano:Local
 					() => api('notes/create', { text: 'foo', visibility: 'specified', visibleUserIds: [ayano.id] }, kyoko),	// kyoko DM => ayano
@@ -212,7 +212,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, false);
 			});
 
-			it('フォローしていないローカルユーザーのフォロワー宛て投稿は流れない', async () => {
+			test('フォローしていないローカルユーザーのフォロワー宛て投稿は流れない', async () => {
 				const fired = await waitFire(
 					ayano, 'localTimeline',	// ayano:Local
 					() => api('notes/create', { text: 'foo', visibility: 'followers' }, chitose),
@@ -224,7 +224,7 @@ describe('Streaming', () => {
 		});
 
 		describe('Hybrid Timeline', () => {
-			it('自分の投稿が流れる', async () => {
+			test('自分の投稿が流れる', async () => {
 				const fired = await waitFire(
 					ayano, 'hybridTimeline',	// ayano:Hybrid
 					() => api('notes/create', { text: 'foo' }, ayano),	// ayano posts
@@ -234,7 +234,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしていないローカルユーザーの投稿が流れる', async () => {
+			test('フォローしていないローカルユーザーの投稿が流れる', async () => {
 				const fired = await waitFire(
 					ayano, 'hybridTimeline',	// ayano:Hybrid
 					() => api('notes/create', { text: 'foo' }, chitose),	// chitose posts
@@ -244,7 +244,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしているリモートユーザーの投稿が流れる', async () => {
+			test('フォローしているリモートユーザーの投稿が流れる', async () => {
 				const fired = await waitFire(
 					ayano, 'hybridTimeline',	// ayano:Hybrid
 					() => api('notes/create', { text: 'foo' }, akari),	// akari posts
@@ -254,7 +254,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしていないリモートユーザーの投稿は流れない', async () => {
+			test('フォローしていないリモートユーザーの投稿は流れない', async () => {
 				const fired = await waitFire(
 					ayano, 'hybridTimeline',	// ayano:Hybrid
 					() => api('notes/create', { text: 'foo' }, chinatsu),	// chinatsu posts
@@ -264,7 +264,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, false);
 			});
 
-			it('フォローしているユーザーのダイレクト投稿が流れる', async () => {
+			test('フォローしているユーザーのダイレクト投稿が流れる', async () => {
 				const fired = await waitFire(
 					ayano, 'hybridTimeline',	// ayano:Hybrid
 					() => api('notes/create', { text: 'foo', visibility: 'specified', visibleUserIds: [ayano.id] }, kyoko),
@@ -274,7 +274,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしているユーザーのホーム投稿が流れる', async () => {
+			test('フォローしているユーザーのホーム投稿が流れる', async () => {
 				const fired = await waitFire(
 					ayano, 'hybridTimeline',	// ayano:Hybrid
 					() => api('notes/create', { text: 'foo', visibility: 'home' }, kyoko),
@@ -284,7 +284,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしていないローカルユーザーのホーム投稿は流れない', async () => {
+			test('フォローしていないローカルユーザーのホーム投稿は流れない', async () => {
 				const fired = await waitFire(
 					ayano, 'hybridTimeline',	// ayano:Hybrid
 					() => api('notes/create', { text: 'foo', visibility: 'home' }, chitose),
@@ -294,7 +294,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, false);
 			});
 
-			it('フォローしていないローカルユーザーのフォロワー宛て投稿は流れない', async () => {
+			test('フォローしていないローカルユーザーのフォロワー宛て投稿は流れない', async () => {
 				const fired = await waitFire(
 					ayano, 'hybridTimeline',	// ayano:Hybrid
 					() => api('notes/create', { text: 'foo', visibility: 'followers' }, chitose),
@@ -306,7 +306,7 @@ describe('Streaming', () => {
 		});
 
 		describe('Global Timeline', () => {
-			it('フォローしていないローカルユーザーの投稿が流れる', async () => {
+			test('フォローしていないローカルユーザーの投稿が流れる', async () => {
 				const fired = await waitFire(
 					ayano, 'globalTimeline',	// ayano:Global
 					() => api('notes/create', { text: 'foo' }, chitose),	// chitose posts
@@ -316,7 +316,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしていないリモートユーザーの投稿が流れる', async () => {
+			test('フォローしていないリモートユーザーの投稿が流れる', async () => {
 				const fired = await waitFire(
 					ayano, 'globalTimeline',	// ayano:Global
 					() => api('notes/create', { text: 'foo' }, chinatsu),	// chinatsu posts
@@ -326,7 +326,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, true);
 			});
 
-			it('ホーム投稿は流れない', async () => {
+			test('ホーム投稿は流れない', async () => {
 				const fired = await waitFire(
 					ayano, 'globalTimeline',	// ayano:Global
 					() => api('notes/create', { text: 'foo', visibility: 'home' }, kyoko),	// kyoko posts
@@ -338,7 +338,7 @@ describe('Streaming', () => {
 		});
 
 		describe('UserList Timeline', () => {
-			it('リストに入れているユーザーの投稿が流れる', async () => {
+			test('リストに入れているユーザーの投稿が流れる', async () => {
 				const fired = await waitFire(
 					chitose, 'userList',
 					() => api('notes/create', { text: 'foo' }, ayano),
@@ -349,7 +349,7 @@ describe('Streaming', () => {
 				assert.strictEqual(fired, true);
 			});
 
-			it('リストに入れていないユーザーの投稿は流れない', async () => {
+			test('リストに入れていないユーザーの投稿は流れない', async () => {
 				const fired = await waitFire(
 					chitose, 'userList',
 					() => api('notes/create', { text: 'foo' }, chinatsu),
@@ -361,7 +361,7 @@ describe('Streaming', () => {
 			});
 
 			// #4471
-			it('リストに入れているユーザーのダイレクト投稿が流れる', async () => {
+			test('リストに入れているユーザーのダイレクト投稿が流れる', async () => {
 				const fired = await waitFire(
 					chitose, 'userList',
 					() => api('notes/create', { text: 'foo', visibility: 'specified', visibleUserIds: [chitose.id] }, ayano),
@@ -373,7 +373,7 @@ describe('Streaming', () => {
 			});
 
 			// #4335
-			it('リストに入れているがフォローはしてないユーザーのフォロワー宛て投稿は流れない', async () => {
+			test('リストに入れているがフォローはしてないユーザーのフォロワー宛て投稿は流れない', async () => {
 				const fired = await waitFire(
 					chitose, 'userList',
 					() => api('notes/create', { text: 'foo', visibility: 'followers' }, kyoko),
@@ -386,7 +386,7 @@ describe('Streaming', () => {
 		});
 
 		describe('Hashtag Timeline', () => {
-			it('指定したハッシュタグの投稿が流れる', () => new Promise<void>(async done => {
+			test('指定したハッシュタグの投稿が流れる', () => new Promise<void>(async done => {
 				const ws = await connectStream(chitose, 'hashtag', ({ type, body }) => {
 					if (type === 'note') {
 						assert.deepStrictEqual(body.text, '#foo');
@@ -404,7 +404,7 @@ describe('Streaming', () => {
 				});
 			}));
 
-			it('指定したハッシュタグの投稿が流れる (AND)', () => new Promise<void>(async done => {
+			test('指定したハッシュタグの投稿が流れる (AND)', () => new Promise<void>(async done => {
 				let fooCount = 0;
 				let barCount = 0;
 				let fooBarCount = 0;
@@ -442,7 +442,7 @@ describe('Streaming', () => {
 				}, 3000);
 			}));
 
-			it('指定したハッシュタグの投稿が流れる (OR)', () => new Promise<void>(async done => {
+			test('指定したハッシュタグの投稿が流れる (OR)', () => new Promise<void>(async done => {
 				let fooCount = 0;
 				let barCount = 0;
 				let fooBarCount = 0;
@@ -488,7 +488,7 @@ describe('Streaming', () => {
 				}, 3000);
 			}));
 
-			it('指定したハッシュタグの投稿が流れる (AND + OR)', () => new Promise<void>(async done => {
+			test('指定したハッシュタグの投稿が流れる (AND + OR)', () => new Promise<void>(async done => {
 				let fooCount = 0;
 				let barCount = 0;
 				let fooBarCount = 0;
diff --git a/packages/backend/test/_e2e/thread-mute.ts b/packages/backend/test/_e2e/thread-mute.ts
index 0ed9aa066..890b52a8c 100644
--- a/packages/backend/test/_e2e/thread-mute.ts
+++ b/packages/backend/test/_e2e/thread-mute.ts
@@ -22,7 +22,7 @@ describe('Note thread mute', () => {
 		await shutdownServer(p);
 	});
 
-	it('notes/mentions にミュートしているスレッドの投稿が含まれない', async () => {
+	test('notes/mentions にミュートしているスレッドの投稿が含まれない', async () => {
 		const bobNote = await post(bob, { text: '@alice @carol root note' });
 		const aliceReply = await post(alice, { replyId: bobNote.id, text: '@bob @carol child note' });
 
@@ -40,7 +40,7 @@ describe('Note thread mute', () => {
 		assert.strictEqual(res.body.some((note: any) => note.id === carolReplyWithoutMention.id), false);
 	});
 
-	it('ミュートしているスレッドからメンションされても、hasUnreadMentions が true にならない', async () => {
+	test('ミュートしているスレッドからメンションされても、hasUnreadMentions が true にならない', async () => {
 		// 状態リセット
 		await request('/i/read-all-unread-notes', {}, alice);
 
@@ -56,7 +56,7 @@ describe('Note thread mute', () => {
 		assert.strictEqual(res.body.hasUnreadMentions, false);
 	});
 
-	it('ミュートしているスレッドからメンションされても、ストリームに unreadMention イベントが流れてこない', () => new Promise(async done => {
+	test('ミュートしているスレッドからメンションされても、ストリームに unreadMention イベントが流れてこない', () => new Promise(async done => {
 		// 状態リセット
 		await request('/i/read-all-unread-notes', {}, alice);
 
@@ -82,7 +82,7 @@ describe('Note thread mute', () => {
 		}, 5000);
 	}));
 
-	it('i/notifications にミュートしているスレッドの通知が含まれない', async () => {
+	test('i/notifications にミュートしているスレッドの通知が含まれない', async () => {
 		const bobNote = await post(bob, { text: '@alice @carol root note' });
 		const aliceReply = await post(alice, { replyId: bobNote.id, text: '@bob @carol child note' });
 
diff --git a/packages/backend/test/_e2e/user-notes.ts b/packages/backend/test/_e2e/user-notes.ts
index 353875634..a6cc1057f 100644
--- a/packages/backend/test/_e2e/user-notes.ts
+++ b/packages/backend/test/_e2e/user-notes.ts
@@ -32,7 +32,7 @@ describe('users/notes', () => {
 		await shutdownServer(p);
 	});
 
-	it('ファイルタイプ指定 (jpg)', async () => {
+	test('ファイルタイプ指定 (jpg)', async () => {
 		const res = await request('/users/notes', {
 			userId: alice.id,
 			fileType: ['image/jpeg'],
@@ -45,7 +45,7 @@ describe('users/notes', () => {
 		assert.strictEqual(res.body.some((note: any) => note.id === jpgPngNote.id), true);
 	});
 
-	it('ファイルタイプ指定 (jpg or png)', async () => {
+	test('ファイルタイプ指定 (jpg or png)', async () => {
 		const res = await request('/users/notes', {
 			userId: alice.id,
 			fileType: ['image/jpeg', 'image/png'],
diff --git a/packages/backend/test/prelude/maybe.ts b/packages/backend/test/prelude/maybe.ts
index c1ff63ead..b8679c107 100644
--- a/packages/backend/test/prelude/maybe.ts
+++ b/packages/backend/test/prelude/maybe.ts
@@ -2,17 +2,17 @@ import * as assert from 'assert';
 import { just, nothing } from '../../src/misc/prelude/maybe.js';
 
 describe('just', () => {
-	it('has a value', () => {
+	test('has a value', () => {
 		assert.deepStrictEqual(just(3).isJust(), true);
 	});
 
-	it('has the inverse called get', () => {
+	test('has the inverse called get', () => {
 		assert.deepStrictEqual(just(3).get(), 3);
 	});
 });
 
 describe('nothing', () => {
-	it('has no value', () => {
+	test('has no value', () => {
 		assert.deepStrictEqual(nothing().isJust(), false);
 	});
 });
diff --git a/packages/backend/test/prelude/url.ts b/packages/backend/test/prelude/url.ts
index 574f2fffd..23b6b22bb 100644
--- a/packages/backend/test/prelude/url.ts
+++ b/packages/backend/test/prelude/url.ts
@@ -2,7 +2,7 @@ import * as assert from 'assert';
 import { query } from '../../src/misc/prelude/url.js';
 
 describe('url', () => {
-	it('query', () => {
+	test('query', () => {
 		const s = query({
 			foo: 'ふぅ',
 			bar: 'b a r',
diff --git a/packages/backend/test/tests/activitypub.ts b/packages/backend/test/tests/activitypub.ts
index 08ec0a59e..19fb5d90d 100644
--- a/packages/backend/test/tests/activitypub.ts
+++ b/packages/backend/test/tests/activitypub.ts
@@ -27,7 +27,7 @@ describe('ActivityPub', () => {
 			content: 'あ',
 		};
 
-		it('Minimum Actor', async () => {
+		test('Minimum Actor', async () => {
 			const { MockResolver } = await import('../misc/mock-resolver.js');
 			const { createPerson } = await import('../../src/activitypub/models/person.js');
 
@@ -41,7 +41,7 @@ describe('ActivityPub', () => {
 			assert.deepStrictEqual(user.inbox, actor.inbox);
 		});
 
-		it('Minimum Note', async () => {
+		test('Minimum Note', async () => {
 			const { MockResolver } = await import('../misc/mock-resolver.js');
 			const { createNote } = await import('../../src/activitypub/models/note.js');
 
@@ -74,7 +74,7 @@ describe('ActivityPub', () => {
 			outbox: `${actorId}/outbox`,
 		};
 
-		it('Actor', async () => {
+		test('Actor', async () => {
 			const { MockResolver } = await import('../misc/mock-resolver.js');
 			const { createPerson } = await import('../../src/activitypub/models/person.js');
 
diff --git a/packages/backend/test/tests/ap-request.ts b/packages/backend/test/tests/ap-request.ts
index d628f03f4..8c586861a 100644
--- a/packages/backend/test/tests/ap-request.ts
+++ b/packages/backend/test/tests/ap-request.ts
@@ -19,7 +19,7 @@ export const buildParsedSignature = (signingString: string, signature: string, a
 };
 
 describe('ap-request', () => {
-	it('createSignedPost with verify', async () => {
+	test('createSignedPost with verify', async () => {
 		const keypair = await genRsaKeyPair();
 		const key = { keyId: 'x', 'privateKeyPem': keypair.privateKey };
 		const url = 'https://example.com/inbox';
@@ -37,7 +37,7 @@ describe('ap-request', () => {
 		assert.deepStrictEqual(result, true);
 	});
 
-	it('createSignedGet with verify', async () => {
+	test('createSignedGet with verify', async () => {
 		const keypair = await genRsaKeyPair();
 		const key = { keyId: 'x', 'privateKeyPem': keypair.privateKey };
 		const url = 'https://example.com/outbox';
diff --git a/packages/backend/test/tests/extract-mentions.ts b/packages/backend/test/tests/extract-mentions.ts
index 4f9cb6876..e81d04c2d 100644
--- a/packages/backend/test/tests/extract-mentions.ts
+++ b/packages/backend/test/tests/extract-mentions.ts
@@ -4,7 +4,7 @@ import { parse } from 'mfm-js';
 import { extractMentions } from '../../src/misc/extract-mentions.js';
 
 describe('Extract mentions', () => {
-	it('simple', () => {
+	test('simple', () => {
 		const ast = parse('@foo @bar @baz')!;
 		const mentions = extractMentions(ast);
 		assert.deepStrictEqual(mentions, [{
@@ -22,7 +22,7 @@ describe('Extract mentions', () => {
 		}]);
 	});
 
-	it('nested', () => {
+	test('nested', () => {
 		const ast = parse('@foo **@bar** @baz')!;
 		const mentions = extractMentions(ast);
 		assert.deepStrictEqual(mentions, [{
diff --git a/packages/backend/test/tests/mfm.ts b/packages/backend/test/tests/mfm.ts
index 5087e84a1..884f39d7f 100644
--- a/packages/backend/test/tests/mfm.ts
+++ b/packages/backend/test/tests/mfm.ts
@@ -5,13 +5,13 @@ import { toHtml } from '../../src/mfm/to-html.js';
 import { fromHtml } from '../../src/mfm/from-html.js';
 
 describe('toHtml', () => {
-	it('br', () => {
+	test('br', () => {
 		const input = 'foo\nbar\nbaz';
 		const output = '<p><span>foo<br>bar<br>baz</span></p>';
 		assert.equal(toHtml(mfm.parse(input)), output);
 	});
 
-	it('br alt', () => {
+	test('br alt', () => {
 		const input = 'foo\r\nbar\rbaz';
 		const output = '<p><span>foo<br>bar<br>baz</span></p>';
 		assert.equal(toHtml(mfm.parse(input)), output);
@@ -19,71 +19,71 @@ describe('toHtml', () => {
 });
 
 describe('fromHtml', () => {
-	it('p', () => {
+	test('p', () => {
 		assert.deepStrictEqual(fromHtml('<p>a</p><p>b</p>'), 'a\n\nb');
 	});
 
-	it('block element', () => {
+	test('block element', () => {
 		assert.deepStrictEqual(fromHtml('<div>a</div><div>b</div>'), 'a\nb');
 	});
 
-	it('inline element', () => {
+	test('inline element', () => {
 		assert.deepStrictEqual(fromHtml('<ul><li>a</li><li>b</li></ul>'), 'a\nb');
 	});
 
-	it('block code', () => {
+	test('block code', () => {
 		assert.deepStrictEqual(fromHtml('<pre><code>a\nb</code></pre>'), '```\na\nb\n```');
 	});
 
-	it('inline code', () => {
+	test('inline code', () => {
 		assert.deepStrictEqual(fromHtml('<code>a</code>'), '`a`');
 	});
 
-	it('quote', () => {
+	test('quote', () => {
 		assert.deepStrictEqual(fromHtml('<blockquote>a\nb</blockquote>'), '> a\n> b');
 	});
 
-	it('br', () => {
+	test('br', () => {
 		assert.deepStrictEqual(fromHtml('<p>abc<br><br/>d</p>'), 'abc\n\nd');
 	});
 
-	it('link with different text', () => {
+	test('link with different text', () => {
 		assert.deepStrictEqual(fromHtml('<p>a <a href="https://example.com/b">c</a> d</p>'), 'a [c](https://example.com/b) d');
 	});
 
-	it('link with different text, but not encoded', () => {
+	test('link with different text, but not encoded', () => {
 		assert.deepStrictEqual(fromHtml('<p>a <a href="https://example.com/ä">c</a> d</p>'), 'a [c](<https://example.com/ä>) d');
 	});
 
-	it('link with same text', () => {
+	test('link with same text', () => {
 		assert.deepStrictEqual(fromHtml('<p>a <a href="https://example.com/b">https://example.com/b</a> d</p>'), 'a https://example.com/b d');
 	});
 
-	it('link with same text, but not encoded', () => {
+	test('link with same text, but not encoded', () => {
 		assert.deepStrictEqual(fromHtml('<p>a <a href="https://example.com/ä">https://example.com/ä</a> d</p>'), 'a <https://example.com/ä> d');
 	});
 
-	it('link with no url', () => {
+	test('link with no url', () => {
 		assert.deepStrictEqual(fromHtml('<p>a <a href="b">c</a> d</p>'), 'a [c](b) d');
 	});
 
-	it('link without href', () => {
+	test('link without href', () => {
 		assert.deepStrictEqual(fromHtml('<p>a <a>c</a> d</p>'), 'a c d');
 	});
 
-	it('link without text', () => {
+	test('link without text', () => {
 		assert.deepStrictEqual(fromHtml('<p>a <a href="https://example.com/b"></a> d</p>'), 'a https://example.com/b d');
 	});
 
-	it('link without both', () => {
+	test('link without both', () => {
 		assert.deepStrictEqual(fromHtml('<p>a <a></a> d</p>'), 'a  d');
 	});
 
-	it('mention', () => {
+	test('mention', () => {
 		assert.deepStrictEqual(fromHtml('<p>a <a href="https://example.com/@user" class="u-url mention">@user</a> d</p>'), 'a @user@example.com d');
 	});
 
-	it('hashtag', () => {
+	test('hashtag', () => {
 		assert.deepStrictEqual(fromHtml('<p>a <a href="https://example.com/tags/a">#a</a> d</p>', ['#a']), 'a #a d');
 	});
 });
diff --git a/packages/backend/test/tests/reaction-lib.ts b/packages/backend/test/tests/reaction-lib.ts
index 7c61dc76c..2e767f769 100644
--- a/packages/backend/test/tests/reaction-lib.ts
+++ b/packages/backend/test/tests/reaction-lib.ts
@@ -4,79 +4,79 @@ import * as assert from 'assert';
 import { toDbReaction } from '../src/misc/reaction-lib.js';
 
 describe('toDbReaction', async () => {
-	it('既存の文字列リアクションはそのまま', async () => {
+	test('既存の文字列リアクションはそのまま', async () => {
 		assert.strictEqual(await toDbReaction('like'), 'like');
 	});
 
-	it('Unicodeプリンは寿司化不能とするため文字列化しない', async () => {
+	test('Unicodeプリンは寿司化不能とするため文字列化しない', async () => {
 		assert.strictEqual(await toDbReaction('🍮'), '🍮');
 	});
 
-	it('プリン以外の既存のリアクションは文字列化する like', async () => {
+	test('プリン以外の既存のリアクションは文字列化する like', async () => {
 		assert.strictEqual(await toDbReaction('👍'), 'like');
 	});
 
-	it('プリン以外の既存のリアクションは文字列化する love', async () => {
+	test('プリン以外の既存のリアクションは文字列化する love', async () => {
 		assert.strictEqual(await toDbReaction('❤️'), 'love');
 	});
 
-	it('プリン以外の既存のリアクションは文字列化する love 異体字セレクタなし', async () => {
+	test('プリン以外の既存のリアクションは文字列化する love 異体字セレクタなし', async () => {
 		assert.strictEqual(await toDbReaction('❤'), 'love');
 	});
 
-	it('プリン以外の既存のリアクションは文字列化する laugh', async () => {
+	test('プリン以外の既存のリアクションは文字列化する laugh', async () => {
 		assert.strictEqual(await toDbReaction('😆'), 'laugh');
 	});
 
-	it('プリン以外の既存のリアクションは文字列化する hmm', async () => {
+	test('プリン以外の既存のリアクションは文字列化する hmm', async () => {
 		assert.strictEqual(await toDbReaction('🤔'), 'hmm');
 	});
 
-	it('プリン以外の既存のリアクションは文字列化する surprise', async () => {
+	test('プリン以外の既存のリアクションは文字列化する surprise', async () => {
 		assert.strictEqual(await toDbReaction('😮'), 'surprise');
 	});
 
-	it('プリン以外の既存のリアクションは文字列化する congrats', async () => {
+	test('プリン以外の既存のリアクションは文字列化する congrats', async () => {
 		assert.strictEqual(await toDbReaction('🎉'), 'congrats');
 	});
 
-	it('プリン以外の既存のリアクションは文字列化する angry', async () => {
+	test('プリン以外の既存のリアクションは文字列化する angry', async () => {
 		assert.strictEqual(await toDbReaction('💢'), 'angry');
 	});
 
-	it('プリン以外の既存のリアクションは文字列化する confused', async () => {
+	test('プリン以外の既存のリアクションは文字列化する confused', async () => {
 		assert.strictEqual(await toDbReaction('😥'), 'confused');
 	});
 
-	it('プリン以外の既存のリアクションは文字列化する rip', async () => {
+	test('プリン以外の既存のリアクションは文字列化する rip', async () => {
 		assert.strictEqual(await toDbReaction('😇'), 'rip');
 	});
 
-	it('それ以外はUnicodeのまま', async () => {
+	test('それ以外はUnicodeのまま', async () => {
 		assert.strictEqual(await toDbReaction('🍅'), '🍅');
 	});
 
-	it('異体字セレクタ除去', async () => {
+	test('異体字セレクタ除去', async () => {
 		assert.strictEqual(await toDbReaction('㊗️'), '㊗');
 	});
 
-	it('異体字セレクタ除去 必要なし', async () => {
+	test('異体字セレクタ除去 必要なし', async () => {
 		assert.strictEqual(await toDbReaction('㊗'), '㊗');
 	});
 
-	it('fallback - undefined', async () => {
+	test('fallback - undefined', async () => {
 		assert.strictEqual(await toDbReaction(undefined), 'like');
 	});
 
-	it('fallback - null', async () => {
+	test('fallback - null', async () => {
 		assert.strictEqual(await toDbReaction(null), 'like');
 	});
 
-	it('fallback - empty', async () => {
+	test('fallback - empty', async () => {
 		assert.strictEqual(await toDbReaction(''), 'like');
 	});
 
-	it('fallback - unknown', async () => {
+	test('fallback - unknown', async () => {
 		assert.strictEqual(await toDbReaction('unknown'), 'like');
 	});
 });
diff --git a/packages/backend/test/unit/FileInfoService.ts b/packages/backend/test/unit/FileInfoService.ts
index b876deb54..d05833560 100644
--- a/packages/backend/test/unit/FileInfoService.ts
+++ b/packages/backend/test/unit/FileInfoService.ts
@@ -54,7 +54,7 @@ describe('FileInfoService', () => {
 		await app.close();
 	});
 
-	it('Empty file', async () => {
+	test('Empty file', async () => {
 		const path = `${resources}/emptyfile`;
 		const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
 		delete info.warnings;
@@ -74,7 +74,7 @@ describe('FileInfoService', () => {
 		});
 	});
 
-	it('Generic JPEG', async () => {
+	test('Generic JPEG', async () => {
 		const path = `${resources}/Lenna.jpg`;
 		const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
 		delete info.warnings;
@@ -94,7 +94,7 @@ describe('FileInfoService', () => {
 		});
 	});
 
-	it('Generic APNG', async () => {
+	test('Generic APNG', async () => {
 		const path = `${resources}/anime.png`;
 		const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
 		delete info.warnings;
@@ -114,7 +114,7 @@ describe('FileInfoService', () => {
 		});
 	});
 
-	it('Generic AGIF', async () => {
+	test('Generic AGIF', async () => {
 		const path = `${resources}/anime.gif`;
 		const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
 		delete info.warnings;
@@ -134,7 +134,7 @@ describe('FileInfoService', () => {
 		});
 	});
 
-	it('PNG with alpha', async () => {
+	test('PNG with alpha', async () => {
 		const path = `${resources}/with-alpha.png`;
 		const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
 		delete info.warnings;
@@ -154,7 +154,7 @@ describe('FileInfoService', () => {
 		});
 	});
 
-	it('Generic SVG', async () => {
+	test('Generic SVG', async () => {
 		const path = `${resources}/image.svg`;
 		const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
 		delete info.warnings;
@@ -174,7 +174,7 @@ describe('FileInfoService', () => {
 		});
 	});
 
-	it('SVG with XML definition', async () => {
+	test('SVG with XML definition', async () => {
 		// https://github.com/misskey-dev/misskey/issues/4413
 		const path = `${resources}/with-xml-def.svg`;
 		const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
@@ -195,7 +195,7 @@ describe('FileInfoService', () => {
 		});
 	});
 
-	it('Dimension limit', async () => {
+	test('Dimension limit', async () => {
 		const path = `${resources}/25000x25000.png`;
 		const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
 		delete info.warnings;
@@ -215,7 +215,7 @@ describe('FileInfoService', () => {
 		});
 	});
 
-	it('Rotate JPEG', async () => {
+	test('Rotate JPEG', async () => {
 		const path = `${resources}/rotate.jpg`;
 		const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
 		delete info.warnings;
diff --git a/packages/backend/test/unit/MetaService.ts b/packages/backend/test/unit/MetaService.ts
index 26649d92a..9efd8bbe7 100644
--- a/packages/backend/test/unit/MetaService.ts
+++ b/packages/backend/test/unit/MetaService.ts
@@ -35,7 +35,7 @@ describe('MetaService', () => {
 		await app.close();
 	});
 
-	it('fetch (cache)', async () => {
+	test('fetch (cache)', async () => {
 		const db = app.get<DataSource>(DI.db);
 		const spy = jest.spyOn(db, 'transaction');
 
@@ -45,7 +45,7 @@ describe('MetaService', () => {
 		expect(spy).toHaveBeenCalledTimes(0);
 	});
 
-	it('fetch (force)', async () => {
+	test('fetch (force)', async () => {
 		const db = app.get<DataSource>(DI.db);
 		const spy = jest.spyOn(db, 'transaction');
 
diff --git a/packages/backend/test/unit/RelayService.ts b/packages/backend/test/unit/RelayService.ts
index 5f87fea7a..529e923b2 100644
--- a/packages/backend/test/unit/RelayService.ts
+++ b/packages/backend/test/unit/RelayService.ts
@@ -57,7 +57,7 @@ describe('RelayService', () => {
 		await app.close();
 	});
 
-	it('addRelay', async () => {	
+	test('addRelay', async () => {	
 		const result = await relayService.addRelay('https://example.com');
 
 		expect(result.inbox).toBe('https://example.com');
@@ -68,7 +68,7 @@ describe('RelayService', () => {
 		//expect(queueService.deliver.mock.lastCall![0].username).toBe('relay.actor');
 	});
 
-	it('listRelay', async () => {	
+	test('listRelay', async () => {	
 		const result = await relayService.listRelay();
 
 		expect(result.length).toBe(1);
@@ -76,7 +76,7 @@ describe('RelayService', () => {
 		expect(result[0].status).toBe('requesting');
 	});
 
-	it('removeRelay: succ', async () => {	
+	test('removeRelay: succ', async () => {	
 		await relayService.removeRelay('https://example.com');
 
 		expect(queueService.deliver).toHaveBeenCalled();
@@ -89,7 +89,7 @@ describe('RelayService', () => {
 		expect(list.length).toBe(0);
 	});
 
-	it('removeRelay: fail', async () => {	
+	test('removeRelay: fail', async () => {	
 		await expect(relayService.removeRelay('https://x.example.com'))
 			.rejects.toThrow('relay not found');
 	});
diff --git a/packages/backend/test/unit/RoleService.ts b/packages/backend/test/unit/RoleService.ts
index c4011593b..221f743d3 100644
--- a/packages/backend/test/unit/RoleService.ts
+++ b/packages/backend/test/unit/RoleService.ts
@@ -102,7 +102,7 @@ describe('RoleService', () => {
 	});
 
 	describe('getUserPolicies', () => {
-		it('instance default policies', async () => {	
+		test('instance default policies', async () => {	
 			const user = await createUser();
 			metaService.fetch.mockResolvedValue({
 				policies: {
@@ -115,7 +115,7 @@ describe('RoleService', () => {
 			expect(result.canManageCustomEmojis).toBe(false);
 		});
 	
-		it('instance default policies 2', async () => {	
+		test('instance default policies 2', async () => {	
 			const user = await createUser();
 			metaService.fetch.mockResolvedValue({
 				policies: {
@@ -128,7 +128,7 @@ describe('RoleService', () => {
 			expect(result.canManageCustomEmojis).toBe(true);
 		});
 	
-		it('with role', async () => {	
+		test('with role', async () => {	
 			const user = await createUser();
 			const role = await createRole({
 				name: 'a',
@@ -152,7 +152,7 @@ describe('RoleService', () => {
 			expect(result.canManageCustomEmojis).toBe(true);
 		});
 
-		it('priority', async () => {	
+		test('priority', async () => {	
 			const user = await createUser();
 			const role1 = await createRole({
 				name: 'role1',
@@ -187,7 +187,7 @@ describe('RoleService', () => {
 			expect(result.driveCapacityMb).toBe(100);
 		});
 
-		it('conditional role', async () => {	
+		test('conditional role', async () => {	
 			const user1 = await createUser({
 				createdAt: new Date(Date.now() - (1000 * 60 * 60 * 24 * 365)),
 			});
diff --git a/packages/backend/test/unit/chart.ts b/packages/backend/test/unit/chart.ts
index 036d0e19f..1e9a51bc8 100644
--- a/packages/backend/test/unit/chart.ts
+++ b/packages/backend/test/unit/chart.ts
@@ -78,7 +78,7 @@ describe('Chart', () => {
 		if (db) await db.destroy();
 	});
 
-	it('Can updates', async () => {
+	test('Can updates', async () => {
 		await testChart.increment();
 		await testChart.save();
 
@@ -102,7 +102,7 @@ describe('Chart', () => {
 		});
 	});
 
-	it('Can updates (dec)', async () => {
+	test('Can updates (dec)', async () => {
 		await testChart.decrement();
 		await testChart.save();
 
@@ -126,7 +126,7 @@ describe('Chart', () => {
 		});
 	});
 
-	it('Empty chart', async () => {
+	test('Empty chart', async () => {
 		const chartHours = await testChart.getChart('hour', 3, null);
 		const chartDays = await testChart.getChart('day', 3, null);
 
@@ -147,7 +147,7 @@ describe('Chart', () => {
 		});
 	});
 
-	it('Can updates at multiple times at same time', async () => {
+	test('Can updates at multiple times at same time', async () => {
 		await testChart.increment();
 		await testChart.increment();
 		await testChart.increment();
@@ -173,7 +173,7 @@ describe('Chart', () => {
 		});
 	});
 
-	it('複数回saveされてもデータの更新は一度だけ', async () => {
+	test('複数回saveされてもデータの更新は一度だけ', async () => {
 		await testChart.increment();
 		await testChart.save();
 		await testChart.save();
@@ -199,7 +199,7 @@ describe('Chart', () => {
 		});
 	});
 
-	it('Can updates at different times', async () => {
+	test('Can updates at different times', async () => {
 		await testChart.increment();
 		await testChart.save();
 
@@ -230,7 +230,7 @@ describe('Chart', () => {
 
 	// 仕様上はこうなってほしいけど、実装は難しそうなのでskip
 	/*
-	it('Can updates at different times without save', async () => {
+	test('Can updates at different times without save', async () => {
 		await testChart.increment();
 
 		clock.tick('01:00:00');
@@ -259,7 +259,7 @@ describe('Chart', () => {
 	});
 	*/
 
-	it('Can padding', async () => {
+	test('Can padding', async () => {
 		await testChart.increment();
 		await testChart.save();
 
@@ -289,7 +289,7 @@ describe('Chart', () => {
 	});
 
 	// 要求された範囲にログがひとつもない場合でもパディングできる
-	it('Can padding from past range', async () => {
+	test('Can padding from past range', async () => {
 		await testChart.increment();
 		await testChart.save();
 
@@ -317,7 +317,7 @@ describe('Chart', () => {
 
 	// 要求された範囲の最も古い箇所に位置するログが存在しない場合でもパディングできる
 	// Issue #3190
-	it('Can padding from past range 2', async () => {
+	test('Can padding from past range 2', async () => {
 		await testChart.increment();
 		await testChart.save();
 
@@ -346,7 +346,7 @@ describe('Chart', () => {
 		});
 	});
 
-	it('Can specify offset', async () => {
+	test('Can specify offset', async () => {
 		await testChart.increment();
 		await testChart.save();
 
@@ -375,7 +375,7 @@ describe('Chart', () => {
 		});
 	});
 
-	it('Can specify offset (floor time)', async () => {
+	test('Can specify offset (floor time)', async () => {
 		clock.tick('00:30:00');
 
 		await testChart.increment();
@@ -407,7 +407,7 @@ describe('Chart', () => {
 	});
 
 	describe('Grouped', () => {
-		it('Can updates', async () => {
+		test('Can updates', async () => {
 			await testGroupedChart.increment('alice');
 			await testGroupedChart.save();
 
@@ -451,7 +451,7 @@ describe('Chart', () => {
 	});
 
 	describe('Unique increment', () => {
-		it('Can updates', async () => {
+		test('Can updates', async () => {
 			await testUniqueChart.uniqueIncrement('alice');
 			await testUniqueChart.uniqueIncrement('alice');
 			await testUniqueChart.uniqueIncrement('bob');
@@ -470,7 +470,7 @@ describe('Chart', () => {
 		});
 
 		describe('Intersection', () => {
-			it('条件が満たされていない場合はカウントされない', async () => {
+			test('条件が満たされていない場合はカウントされない', async () => {
 				await testIntersectionChart.addA('alice');
 				await testIntersectionChart.addA('bob');
 				await testIntersectionChart.addB('carol');
@@ -492,7 +492,7 @@ describe('Chart', () => {
 				});
 			});
 
-			it('条件が満たされている場合にカウントされる', async () => {
+			test('条件が満たされている場合にカウントされる', async () => {
 				await testIntersectionChart.addA('alice');
 				await testIntersectionChart.addA('bob');
 				await testIntersectionChart.addB('carol');
@@ -518,7 +518,7 @@ describe('Chart', () => {
 	});
 
 	describe('Resync', () => {
-		it('Can resync', async () => {
+		test('Can resync', async () => {
 			testChart.total = 1;
 
 			await testChart.resync();
@@ -543,7 +543,7 @@ describe('Chart', () => {
 			});
 		});
 
-		it('Can resync (2)', async () => {
+		test('Can resync (2)', async () => {
 			await testChart.increment();
 			await testChart.save();