From bc79ca77679aef80cf128c0cd8cfbb38e171c507 Mon Sep 17 00:00:00 2001
From: jolupa <jolupameister@gmail.com>
Date: Sat, 8 Jul 2023 22:48:22 +0000
Subject: [PATCH 01/68] chore: Translated using Weblate (Catalan)

Currently translated at 100.0% (1819 of 1819 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
---
 locales/ca-ES.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index 6cda10f969..1f291ac22d 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -2144,3 +2144,6 @@ _skinTones:
 swipeOnMobile: Permet lliscar entre pàgines
 enableIdenticonGeneration: Habilitar la generació d'Identicon
 enableServerMachineStats: Habilitar les estadístiques del maquinari del servidor
+showPopup: Notificar els usuaris amb una finestra emergent
+showWithSparkles: Mostra amb espurnes
+youHaveUnreadAnnouncements: Tens anuncis sense llegir

From 4795a501626414c898e8b9792431d96daff4c74a Mon Sep 17 00:00:00 2001
From: freeplay <freeplay@duck.com>
Date: Sun, 9 Jul 2023 21:59:57 -0400
Subject: [PATCH 02/68] Isolate text directions in posts

---
 packages/client/src/components/MkSubNoteContent.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 586c3678c8..34ee945ad5 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -35,7 +35,7 @@
 		/>
 	</p>
 	<div class="wrmlmaau">
-		<div
+		<bdi
 			class="content"
 			:class="{
 				collapsed,
@@ -154,7 +154,7 @@
 				v-model="showContent"
 				:note="note"
 			/>
-		</div>
+		</bdi>
 		<MkButton
 			v-if="hasMfm && defaultStore.state.animatedMfm"
 			@click.stop="toggleMfm"

From 5bae3d5d2441902e2494ffa43e3a87f1488d6ce3 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 9 Jul 2023 19:54:33 -0700
Subject: [PATCH 03/68] build: :zap: parallel build (pnpm 8.6.7)

---
 package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index ec899739fb..defe75bb39 100644
--- a/package.json
+++ b/package.json
@@ -6,11 +6,11 @@
 		"type": "git",
 		"url": "https://codeberg.org/calckey/calckey.git"
 	},
-	"packageManager": "pnpm@8.6.6",
+	"packageManager": "pnpm@8.6.7",
 	"private": true,
 	"scripts": {
-		"rebuild": "pnpm run clean && pnpm node ./scripts/build-greet.js && pnpm -r run build && pnpm run gulp",
-		"build": "pnpm node ./scripts/build-greet.js && pnpm -r run build && pnpm run gulp",
+		"rebuild": "pnpm run clean && pnpm node ./scripts/build-greet.js && pnpm -r --parallel run build && pnpm run gulp",
+		"build": "pnpm node ./scripts/build-greet.js && pnpm -r --parallel run build && pnpm run gulp",
 		"start": "pnpm --filter backend run start",
 		"start:test": "pnpm --filter backend run start:test",
 		"init": "pnpm run migrate",
@@ -21,13 +21,13 @@
 		"watch": "pnpm run dev",
 		"dev": "pnpm node ./scripts/dev.js",
 		"dev:staging": "NODE_OPTIONS=--max_old_space_size=3072 NODE_ENV=development pnpm run build && pnpm run start",
-		"lint": "pnpm -r run lint",
+		"lint": "pnpm -r --parallel run lint",
 		"cy:open": "cypress open --browser --e2e --config-file=cypress.config.ts",
 		"cy:run": "cypress run",
 		"e2e": "start-server-and-test start:test http://localhost:61812 cy:run",
 		"mocha": "pnpm --filter backend run mocha",
 		"test": "pnpm run mocha",
-		"format": "pnpm -r run format",
+		"format": "pnpm -r --parallel run format",
 		"clean": "pnpm node ./scripts/clean.js",
 		"clean-all": "pnpm node ./scripts/clean-all.js",
 		"cleanall": "pnpm run clean-all"

From 5f3c676b5a9e3a209c27ef0f3a78326b90aa5316 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Mon, 10 Jul 2023 02:59:16 +0000
Subject: [PATCH 04/68] revert 4795a501626414c898e8b9792431d96daff4c74a

revert Isolate text directions in posts
---
 packages/client/src/components/MkSubNoteContent.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 34ee945ad5..586c3678c8 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -35,7 +35,7 @@
 		/>
 	</p>
 	<div class="wrmlmaau">
-		<bdi
+		<div
 			class="content"
 			:class="{
 				collapsed,
@@ -154,7 +154,7 @@
 				v-model="showContent"
 				:note="note"
 			/>
-		</bdi>
+		</div>
 		<MkButton
 			v-if="hasMfm && defaultStore.state.animatedMfm"
 			@click.stop="toggleMfm"

From 22ab154215c9283285dcb026f3dccceeba9da713 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 9 Jul 2023 20:00:55 -0700
Subject: [PATCH 05/68] Revert "Isolate text directions in posts"

This reverts commit 4795a501626414c898e8b9792431d96daff4c74a.
---
 packages/client/src/components/MkSubNoteContent.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 34ee945ad5..586c3678c8 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -35,7 +35,7 @@
 		/>
 	</p>
 	<div class="wrmlmaau">
-		<bdi
+		<div
 			class="content"
 			:class="{
 				collapsed,
@@ -154,7 +154,7 @@
 				v-model="showContent"
 				:note="note"
 			/>
-		</bdi>
+		</div>
 		<MkButton
 			v-if="hasMfm && defaultStore.state.animatedMfm"
 			@click.stop="toggleMfm"

From 84b70a4fcc1d794ae9751c624d17f6cb3fa6f308 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 9 Jul 2023 20:01:01 -0700
Subject: [PATCH 06/68] Revert "style: link underlines"

This reverts commit 46d97d49a2298c1b8c1537ef1ed3eff376b49285.
---
 packages/client/src/components/MkUrlPreview.vue |  3 +--
 packages/client/src/components/global/MkUrl.vue |  2 --
 packages/client/src/components/mfm.ts           |  1 -
 packages/client/src/style.scss                  | 16 ++++------------
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/packages/client/src/components/MkUrlPreview.vue b/packages/client/src/components/MkUrlPreview.vue
index 8fa8092b8a..6452e135da 100644
--- a/packages/client/src/components/MkUrlPreview.vue
+++ b/packages/client/src/components/MkUrlPreview.vue
@@ -196,7 +196,6 @@ onUnmounted(() => {
 	> a {
 		display: flex;
 		transition: background 0.2s;
-		text-decoration: none;
 		> div:first-child:not(:last-child) {
 			position: relative;
 			width: 90px;
@@ -278,7 +277,7 @@ onUnmounted(() => {
 		&:focus,
 		&:focus-within {
 			background: var(--panelHighlight);
-			h3 {
+			h1 {
 				text-decoration: underline;
 			}
 		}
diff --git a/packages/client/src/components/global/MkUrl.vue b/packages/client/src/components/global/MkUrl.vue
index 3453bf5ed6..98ba8d94e9 100644
--- a/packages/client/src/components/global/MkUrl.vue
+++ b/packages/client/src/components/global/MkUrl.vue
@@ -80,8 +80,6 @@ const target = self ? null : "_blank";
 	display: inline-block;
 	overflow: clip;
 	text-overflow: ellipsis;
-	text-decoration: none !important;
-	line-height: 1.05;
 
 	> .icon {
 		padding-left: 2px;
diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index 63465f38b5..cb0942a338 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -409,7 +409,6 @@ export default defineComponent({
 										key: Math.random(),
 										to: `/tags/${encodeURIComponent(token.props.hashtag)}`,
 										style: "color:var(--hashtag);",
-										class: "_link",
 									},
 									`#${token.props.hashtag}`,
 								),
diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index be12f8b156..a6ef73015b 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -145,9 +145,6 @@ a {
 	cursor: pointer;
 	color: inherit;
 	-webkit-tap-highlight-color: transparent;
-	&:hover {
-		text-decoration: underline;
-	}
 }
 
 // i {
@@ -232,7 +229,6 @@ hr {
 	font-size: 1em;
 	font-family: inherit;
 	line-height: inherit;
-	text-decoration: none;
 
 	&,
 	* {
@@ -632,22 +628,18 @@ hr {
 ._link {
 	position: relative;
 	color: var(--link);
-	text-decoration: none !important;
 
-	&::before, &::after {
+	&:after {
 		content: "";
 		position: absolute;
 		bottom: 0;
 		left: 0;
 		width: 0%;
-		border-bottom: 1px solid var(--link);
+		border-bottom: 2px solid var(--link);
 		transition: 0.3s ease-in-out;
 	}
-	&::before {
-		width: 100%;
-		opacity: .4;
-	}
-	&:hover:after, &:focus:after {
+
+	&:hover:after {
 		width: 100%;
 	}
 }

From 6e6c3c5845a2720d4220c0e075fd89a8dc47c59e Mon Sep 17 00:00:00 2001
From: naskya <naskya@noreply.codeberg.org>
Date: Mon, 10 Jul 2023 03:05:27 +0000
Subject: [PATCH 07/68] revert Chinese cat mode for now

https://codeberg.org/calckey/calckey/issues/9746#issuecomment-978014
---
 packages/backend/src/misc/nyaize.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/backend/src/misc/nyaize.ts b/packages/backend/src/misc/nyaize.ts
index 2ae3ceccd4..13a112ce57 100644
--- a/packages/backend/src/misc/nyaize.ts
+++ b/packages/backend/src/misc/nyaize.ts
@@ -20,8 +20,6 @@ export function nyaize(text: string): string {
 			)
 			.replace(/(다$)|(다(?=\.))|(다(?= ))|(다(?=!))|(다(?=\?))/gm, "다냥")
 			.replace(/(야(?=\?))|(야$)|(야(?= ))/gm, "냥")
-			// zh-CN, zh-TW
-			.replace(/(妙|庙|描|渺|瞄|秒|苗|藐|廟)/g, "喵")
 			// el-GR
 			.replaceAll("να", "νια")
 			.replaceAll("ΝΑ", "ΝΙΑ")

From dfd9bd5dd106f27fc6dde09d80d40c07116ae517 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 9 Jul 2023 20:12:13 -0700
Subject: [PATCH 08/68] Revert "[mastodon-client] send proper user preferences"

This reverts commit 3fe156f79578d8506cfbb70f3f6f806f50a818b9.
---
 packages/megalodon/src/misskey.ts            | 24 +++++++++++++++-----
 packages/megalodon/src/misskey/api_client.ts |  4 ++--
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/packages/megalodon/src/misskey.ts b/packages/megalodon/src/misskey.ts
index 026b8e9b7a..b4a9c6adb9 100644
--- a/packages/megalodon/src/misskey.ts
+++ b/packages/megalodon/src/misskey.ts
@@ -1079,11 +1079,23 @@ export default class Misskey implements MegalodonInterface {
   // accounts/preferences
   // ======================================
   public async getPreferences(): Promise<Response<Entity.Preferences>> {
-    return this.client.post<MisskeyAPI.Entity.UserDetailMe>('/api/i').then(async res => {
-			return Object.assign(res, {
-				data: this.converter.userPreferences(res.data, await this.getDefaultPostPrivacy())
-			})
-		})
+    return this.client.post<MisskeyAPI.Entity.UserDetailMe>('/api/i').then(res => {
+      /*
+      return this.client.post<MisskeyAPI.Entity.GetAll>('/api/i/registry/get-all', {
+        scope: ['client', 'base'],
+      }).then(ga => {
+        return Object.assign(res, {
+          data: this.converter.userPreferences(res.data, ga.data)
+        })
+      })
+      */
+
+      // TODO:
+      // FIXME: get this from api
+      return Object.assign(res, {
+          data: this.converter.userPreferences(res.data, {defaultNoteVisibility: "followers", tutorial: -1})
+        })
+      })
   }
 
   // ======================================
@@ -1527,7 +1539,7 @@ export default class Misskey implements MegalodonInterface {
         .then(res => res.data[0] ?? '⭐');
   }
 
-	private async getDefaultPostPrivacy(): Promise<'public' | 'unlisted' | 'private' | 'direct'> {
+	private async getDefaultPostPrivacy(): Promise<string> {
 		// NOTE: get-unsecure is calckey's extension.
 		//       Misskey doesn't have this endpoint and regular `/i/registry/get` won't work
 		//       unless you have a 'nativeToken', which is reserved for the frontend webapp.
diff --git a/packages/megalodon/src/misskey/api_client.ts b/packages/megalodon/src/misskey/api_client.ts
index f80d5a4421..aabb1f3ee5 100644
--- a/packages/megalodon/src/misskey/api_client.ts
+++ b/packages/megalodon/src/misskey/api_client.ts
@@ -175,13 +175,13 @@ namespace MisskeyAPI {
       }
     }
 
-    userPreferences = (u: MisskeyAPI.Entity.UserDetailMe, v: 'public' | 'unlisted' | 'private' | 'direct'): MegalodonEntity.Preferences => {
+    userPreferences = (u: MisskeyAPI.Entity.UserDetailMe, g: MisskeyAPI.Entity.GetAll): MegalodonEntity.Preferences => {
       return {
         "reading:expand:media": "default",
         "reading:expand:spoilers": false,
         "posting:default:language": u.lang,
         "posting:default:sensitive": u.alwaysMarkNsfw,
-        "posting:default:visibility": v
+        "posting:default:visibility": this.visibility(g.defaultNoteVisibility)
       }
     }
 

From a441cc6067c487c563bf673be261a179d96e0533 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 9 Jul 2023 20:12:16 -0700
Subject: [PATCH 09/68] Revert "[mastodon-client] send actual default post
 privacy instead of fallback value"

This reverts commit 81145570fcb458a9239f88fe9a273d6c2f1810d3.
---
 .../api/endpoints/i/registry/get-unsecure.ts    |  2 +-
 .../server/api/mastodon/endpoints/account.ts    |  2 +-
 packages/megalodon/src/misskey.ts               | 17 -----------------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/i/registry/get-unsecure.ts b/packages/backend/src/server/api/endpoints/i/registry/get-unsecure.ts
index a9bcf69351..f98c6c929f 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/get-unsecure.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/get-unsecure.ts
@@ -33,7 +33,7 @@ export const paramDef = {
 } as const;
 
 export default define(meta, paramDef, async (ps, user) => {
-	if (ps.key !== "reactions" && ps.key !== "defaultNoteVisibility") return;
+	if (ps.key !== "reactions") return;
 	const query = RegistryItems.createQueryBuilder("item")
 		.where("item.domain IS NULL")
 		.andWhere("item.userId = :userId", { userId: user.id })
diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 5d0abdedd6..3fb1c9cbe4 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -48,7 +48,7 @@ export function apiAccountMastodon(router: Router): void {
 			acct.source = {
 				note: acct.note,
 				fields: acct.fields,
-				privacy: await client.getDefaultPostPrivacy(),
+				privacy: "public",
 				sensitive: false,
 				language: "",
 			};
diff --git a/packages/megalodon/src/misskey.ts b/packages/megalodon/src/misskey.ts
index b4a9c6adb9..de62b98509 100644
--- a/packages/megalodon/src/misskey.ts
+++ b/packages/megalodon/src/misskey.ts
@@ -1539,23 +1539,6 @@ export default class Misskey implements MegalodonInterface {
         .then(res => res.data[0] ?? '⭐');
   }
 
-	private async getDefaultPostPrivacy(): Promise<string> {
-		// NOTE: get-unsecure is calckey's extension.
-		//       Misskey doesn't have this endpoint and regular `/i/registry/get` won't work
-		//       unless you have a 'nativeToken', which is reserved for the frontend webapp.
-
-		return this.client
-			.post<string>('/api/i/registry/get-unsecure', {
-				key: 'defaultNoteVisibility',
-				scope: ['client', 'base'],
-			})
-			.then(res => {
-				if (!res.data || (res.data != 'public' && res.data != 'home' && res.data != 'followers' && res.data != 'specified'))
-					return 'public';
-				return this.converter.visibility(res.data);
-			});
-	}
-
   public async unfavouriteStatus(id: string): Promise<Response<Entity.Status>> {
     // NOTE: Misskey allows only one reaction per status, so we don't need to care what that emoji was.
     return this.deleteEmojiReaction(id, '');

From a5f84ec30b8ebe3eae6dad19441efc475d539b0b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 9 Jul 2023 20:46:53 -0700
Subject: [PATCH 10/68] feat: :sparkles: Timestamps on announcements

Closes #10453
---
 packages/client/src/components/MkAnnouncement.vue | 11 +++++++++++
 packages/client/src/pages/announcements.vue       | 13 +++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkAnnouncement.vue b/packages/client/src/components/MkAnnouncement.vue
index 24bf886dd8..bd1091b7f2 100644
--- a/packages/client/src/components/MkAnnouncement.vue
+++ b/packages/client/src/components/MkAnnouncement.vue
@@ -5,6 +5,13 @@
 				<MkSparkle v-if="isGoodNews">{{ title }}</MkSparkle>
 				<p v-else>{{ title }}</p>
 			</div>
+			<div :class="$style.time">
+				<MkTime :time="announcement.createdAt" />
+				<div v-if="announcement.updatedAt">
+					{{ i18n.ts.updatedAt }}:
+					<MkTime :time="announcement.createdAt" />
+				</div>
+			</div>
 			<Mfm :text="text" />
 			<img
 				v-if="imageUrl != null"
@@ -68,6 +75,10 @@ const gotIt = () => {
 	}
 }
 
+.time {
+	font-size: 0.8rem;
+}
+
 .gotIt {
 	margin: 8px 0 0 0;
 }
diff --git a/packages/client/src/pages/announcements.vue b/packages/client/src/pages/announcements.vue
index 8e99750207..cc62ce0f57 100644
--- a/packages/client/src/pages/announcements.vue
+++ b/packages/client/src/pages/announcements.vue
@@ -15,8 +15,13 @@
 					class="_card announcement"
 				>
 					<div class="_title">
-						<span v-if="$i && !announcement.isRead">🆕 </span
-						>{{ announcement.title }}
+						<span v-if="$i && !announcement.isRead">🆕 </span>
+						<h3>{{ announcement.title }}</h3>
+						<MkTime :time="announcement.createdAt" />
+						<div v-if="announcement.updatedAt">
+							{{ i18n.ts.updatedAt }}:
+							<MkTime :time="announcement.createdAt" />
+						</div>
 					</div>
 					<div class="_content">
 						<Mfm :text="announcement.text" />
@@ -76,6 +81,10 @@ definePageMetadata({
 			margin-bottom: var(--margin);
 		}
 
+		> ._title {
+			padding: 14px 32px !important;
+		}
+
 		> ._content {
 			> img {
 				display: block;

From 645480f889e38ab93fdce689dc14b091c5097f81 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 9 Jul 2023 20:46:58 -0700
Subject: [PATCH 11/68] chore: :art: format

---
 packages/client/src/components/MkMedia.vue | 10 +++++++---
 packages/client/src/pages/user/home.vue    | 13 +++++++------
 packages/client/src/ui/_common_/navbar.vue | 11 +++++++----
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/packages/client/src/components/MkMedia.vue b/packages/client/src/components/MkMedia.vue
index d697054b6a..4c023f1310 100644
--- a/packages/client/src/components/MkMedia.vue
+++ b/packages/client/src/components/MkMedia.vue
@@ -226,11 +226,13 @@ watch(
 		display: flex;
 		min-width: max-content;
 		width: 110px;
-		transition: width 0.2s cubic-bezier(0,0,0,1);
+		transition: width 0.2s cubic-bezier(0, 0, 0, 1);
 		[data-plyr="volume"] {
 			width: 0;
 			flex-grow: 1;
-			transition: margin 0.3s, opacity .2s 0.2s;
+			transition:
+				margin 0.3s,
+				opacity 0.2s 0.2s;
 		}
 		&:not(:hover):not(:focus-within) {
 			width: 0px;
@@ -238,7 +240,9 @@ watch(
 			[data-plyr="volume"] {
 				margin-inline: 0px;
 				opacity: 0;
-				transition: margin 0.3s, opacity 0.1s;
+				transition:
+					margin 0.3s,
+					opacity 0.1s;
 			}
 		}
 	}
diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index 5a8482fb81..e87052ea2d 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -26,12 +26,13 @@
 								class="banner"
 								:style="{
 									backgroundImage: `url('${user.bannerUrl}')`,
-									'--backgroundImageStatic': defaultStore
-										.state.useBlurEffect && user.bannerUrl
-										? `url('${getStaticImageUrl(
-												user.bannerUrl,
-										  )}')`
-										: null,
+									'--backgroundImageStatic':
+										defaultStore.state.useBlurEffect &&
+										user.bannerUrl
+											? `url('${getStaticImageUrl(
+													user.bannerUrl,
+											  )}')`
+											: null,
 								}"
 							></div>
 							<div class="fade"></div>
diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index e98aa738c7..ef9f473f35 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -285,7 +285,8 @@ function more(ev: MouseEvent) {
 		box-sizing: border-box;
 		color: var(--navFg);
 
-		&:before, &.post::after {
+		&:before,
+		&.post::after {
 			content: "";
 			display: block;
 			width: calc(100% - 34px);
@@ -342,7 +343,9 @@ function more(ev: MouseEvent) {
 		&.active {
 			color: var(--accent);
 			opacity: 1;
-			transition: color 0.4s, opacity 0.4s;
+			transition:
+				color 0.4s,
+				opacity 0.4s;
 			&::before {
 				opacity: 1;
 			}
@@ -536,7 +539,6 @@ function more(ev: MouseEvent) {
 					width: calc(100% - 32px);
 					border-top: solid 0.5px var(--divider);
 				}
-
 			}
 		}
 		.nav-item {
@@ -571,7 +573,8 @@ function more(ev: MouseEvent) {
 			width: 100%;
 			height: 52px;
 			margin-bottom: 16px;
-			&:before, &::after {
+			&:before,
+			&::after {
 				inset: 0;
 				margin: auto;
 				width: 52px;

From ce239565a7b5d9c4dd64346a35b0cba32a2607ff Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 9 Jul 2023 21:08:24 -0700
Subject: [PATCH 12/68] Revert "fix: nav post button gradient transition
 (#10401) + half refactor ?"

This reverts commit 6031e11721d02c26afae99b800a483b5aa514e1a.
---
 packages/client/src/ui/_common_/navbar.vue | 410 ++++++++++++---------
 1 file changed, 229 insertions(+), 181 deletions(-)

diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index ef9f473f35..7905c331c7 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -26,7 +26,7 @@
 				<MkA
 					v-click-anime
 					v-tooltip.noDelay.right="i18n.ts.timeline"
-					class="nav-item index"
+					class="item index"
 					active-class="active"
 					to="/"
 					exact
@@ -46,7 +46,7 @@
 						v-tooltip.noDelay.right="
 							i18n.ts[navbarItemDef[item].title]
 						"
-						class="nav-item _button"
+						class="item _button"
 						:class="[item, { active: navbarItemDef[item].active }]"
 						active-class="active"
 						:to="navbarItemDef[item].to"
@@ -66,9 +66,6 @@
 						<span
 							v-if="navbarItemDef[item].indicated"
 							class="indicator"
-							:class="{
-								animateIndicator: $store.state.animation,
-							}"
 							><i class="icon ph-circle ph-fill"></i
 						></span>
 					</component>
@@ -78,7 +75,7 @@
 					v-if="$i.isAdmin || $i.isModerator"
 					v-click-anime
 					v-tooltip.noDelay.right="i18n.ts.controlPanel"
-					class="nav-item _button"
+					class="item _button"
 					active-class="active"
 					to="/admin"
 				>
@@ -91,7 +88,6 @@
 							updateAvailable
 						"
 						class="indicator"
-						:class="{ animateIndicator: $store.state.animation }"
 					></span
 					><i class="icon ph-door ph-bold ph-fw ph-lg"></i
 					><span class="text">{{ i18n.ts.controlPanel }}</span>
@@ -99,24 +95,21 @@
 				<button
 					v-click-anime
 					v-tooltip.noDelay.right="i18n.ts.more"
-					class="nav-item _button"
+					class="item _button"
 					@click="more"
 				>
 					<i
 						class="icon ph-dots-three-outline ph-bold ph-fw ph-lg"
 					></i
 					><span class="text">{{ i18n.ts.more }}</span>
-					<span
-						v-if="otherMenuItemIndicated"
-						class="indicator"
-						:class="{ animateIndicator: $store.state.animation }"
+					<span v-if="otherMenuItemIndicated" class="indicator"
 						><i class="icon ph-circle ph-fill"></i
 					></span>
 				</button>
 				<MkA
 					v-click-anime
 					v-tooltip.noDelay.right="i18n.ts.settings"
-					class="nav-item _button"
+					class="item _button"
 					active-class="active"
 					to="/settings"
 				>
@@ -127,7 +120,7 @@
 			<div class="bottom">
 				<button
 					v-tooltip.noDelay.right="i18n.ts.note"
-					class="nav-item _button post"
+					class="item _button post"
 					data-cy-open-post-form
 					@click="os.post"
 				>
@@ -224,7 +217,7 @@ function openAccountMenu(ev: MouseEvent) {
 		{
 			withExtraOperation: true,
 		},
-		ev,
+		ev
 	);
 }
 
@@ -239,7 +232,7 @@ function more(ev: MouseEvent) {
 			src: ev.currentTarget ?? ev.target,
 		},
 		{},
-		"closed",
+		"closed"
 	);
 }
 </script>
@@ -272,128 +265,6 @@ function more(ev: MouseEvent) {
 		flex-direction: column;
 	}
 
-	.nav-item {
-		position: relative;
-		display: flex;
-		align-items: center;
-		padding-inline: 30px;
-		line-height: 2.85rem;
-		margin-bottom: 0.5rem;
-		white-space: nowrap;
-		width: 100%;
-		text-align: left;
-		box-sizing: border-box;
-		color: var(--navFg);
-
-		&:before,
-		&.post::after {
-			content: "";
-			display: block;
-			width: calc(100% - 34px);
-			height: 100%;
-			margin: auto;
-			position: absolute;
-			top: 0;
-			left: 0;
-			right: 0;
-			bottom: 0;
-			border-radius: 999px;
-			background: var(--accentedBg);
-			opacity: 0;
-			z-index: -2;
-		}
-
-		> .icon {
-			position: relative;
-			width: 32px;
-			margin-right: 8px;
-		}
-
-		> .indicator {
-			position: absolute;
-			top: 0;
-			left: 20px;
-			color: var(--navIndicator);
-			font-size: 8px;
-		}
-
-		> .animateIndicator {
-			animation: blink 1s infinite;
-		}
-		> .text {
-			position: relative;
-			font-size: 0.9em;
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
-
-		&:hover,
-		&:focus-within {
-			text-decoration: none;
-			color: var(--navHoverFg);
-			transition: color 0.4s ease;
-		}
-
-		&.active {
-			color: var(--navActive);
-		}
-
-		&:hover,
-		&:focus-within,
-		&.active {
-			color: var(--accent);
-			opacity: 1;
-			transition:
-				color 0.4s,
-				opacity 0.4s;
-			&::before {
-				opacity: 1;
-			}
-		}
-	}
-	.post {
-		padding-inline: 0;
-		color: var(--fgOnAccent);
-		font-weight: bold;
-
-		&::before {
-			opacity: 1;
-			background: linear-gradient(
-				90deg,
-				var(--buttonGradateA),
-				var(--buttonGradateB)
-			);
-		}
-		&::after {
-			background: var(--accentLighten) !important;
-			opacity: 0;
-			z-index: -1;
-			transition: opacity 0.2s;
-		}
-
-		&:hover,
-		&:focus-within,
-		&.active {
-			&::after {
-				opacity: 1;
-			}
-		}
-
-		> .icon,
-		> .text {
-			position: relative;
-			left: 3rem;
-			margin: 0;
-			width: auto;
-			color: var(--fgOnAccent);
-			transform: translateY(0em);
-		}
-
-		> .text {
-			margin-left: 1rem;
-		}
-	}
-
 	&:not(.iconOnly) {
 		> .body {
 			margin-left: -200px;
@@ -434,6 +305,57 @@ function more(ev: MouseEvent) {
 			> .bottom {
 				padding: 20px 0;
 
+				> .post {
+					position: relative;
+					width: 100%;
+					height: 40px;
+					color: var(--fgOnAccent);
+					font-weight: bold;
+					text-align: left;
+					display: flex;
+					align-items: center;
+
+					&:before {
+						content: "";
+						display: block;
+						width: calc(100% - 38px);
+						height: 100%;
+						margin: auto;
+						position: absolute;
+						top: 0;
+						left: 0;
+						right: 0;
+						bottom: 0;
+						border-radius: 999px;
+						background: linear-gradient(
+							90deg,
+							var(--buttonGradateA),
+							var(--buttonGradateB)
+						);
+					}
+
+					&:hover,
+					&:focus-within,
+					&.active {
+						&:before {
+							background: var(--accentLighten);
+							transition: all 0.4s ease;
+						}
+					}
+
+					> .icon,
+					> .text {
+						position: relative;
+						left: 3rem;
+						color: var(--fgOnAccent);
+						transform: translateY(0em);
+					}
+
+					> .text {
+						margin-left: 1rem;
+					}
+				}
+
 				> .instance {
 					position: relative;
 					display: block;
@@ -471,6 +393,75 @@ function more(ev: MouseEvent) {
 					margin: 16px 16px;
 					border-top: solid 0.5px var(--divider);
 				}
+
+				> .item {
+					position: relative;
+					display: flex;
+					align-items: center;
+					padding-left: 30px;
+					line-height: 2.85rem;
+					margin-bottom: 0.5rem;
+					white-space: nowrap;
+					width: 100%;
+					text-align: left;
+					box-sizing: border-box;
+					color: var(--navFg);
+
+					> .icon {
+						position: relative;
+						width: 32px;
+						margin-right: 8px;
+					}
+
+					> .indicator {
+						position: absolute;
+						top: 0;
+						left: 20px;
+						color: var(--navIndicator);
+						font-size: 8px;
+						animation: blink 1s infinite;
+					}
+
+					> .text {
+						position: relative;
+						font-size: 0.9em;
+						overflow: hidden;
+						text-overflow: ellipsis;
+					}
+
+					&:hover,
+					&:focus-within {
+						text-decoration: none;
+						color: var(--navHoverFg);
+						transition: all 0.4s ease;
+					}
+
+					&.active {
+						color: var(--navActive);
+					}
+
+					&:hover,
+					&:focus-within,
+					&.active {
+						color: var(--accent);
+						transition: all 0.4s ease;
+
+						&:before {
+							content: "";
+							display: block;
+							width: calc(100% - 34px);
+							height: 100%;
+							margin: auto;
+							position: absolute;
+							top: 0;
+							left: 0;
+							right: 0;
+							bottom: 0;
+							border-radius: 999px;
+							background: var(--accentedBg);
+						}
+					}
+				}
 			}
 		}
 	}
@@ -502,6 +493,52 @@ function more(ev: MouseEvent) {
 			> .bottom {
 				padding: 20px 0;
 
+				> .post {
+					display: block;
+					position: relative;
+					width: 100%;
+					height: 52px;
+					margin-bottom: 16px;
+					text-align: center;
+
+					&:before {
+						content: "";
+						display: block;
+						position: absolute;
+						top: 0;
+						left: 0;
+						right: 0;
+						bottom: 0;
+						margin: auto;
+						width: 52px;
+						aspect-ratio: 1/1;
+						border-radius: 100%;
+						background: linear-gradient(
+							90deg,
+							var(--buttonGradateA),
+							var(--buttonGradateB)
+						);
+					}
+
+					&:hover,
+					&:focus-within,
+					&.active {
+						&:before {
+							background: var(--accentLighten);
+							transition: all 0.4s ease;
+						}
+					}
+
+					> .icon {
+						position: relative;
+						color: var(--fgOnAccent);
+					}
+
+					> .text {
+						display: none;
+					}
+				}
+
 				> .help {
 					position: relative;
 					display: block;
@@ -539,57 +576,68 @@ function more(ev: MouseEvent) {
 					width: calc(100% - 32px);
 					border-top: solid 0.5px var(--divider);
 				}
-			}
-		}
-		.nav-item {
-			padding: 1.1rem 0;
-			margin-bottom: 0.2rem;
-			text-align: center;
 
-			> .icon {
-				display: block;
-				margin: 0 auto;
-				opacity: 0.7;
-				transform: translateY(0em);
-			}
+				> .item {
+					display: block;
+					position: relative;
+					padding: 1.1rem 0;
+					margin-bottom: 0.2rem;
+					width: 100%;
+					text-align: center;
 
-			> .text {
-				display: none;
-			}
+					> .icon {
+						display: block;
+						margin: 0 auto;
+						opacity: 0.7;
+						transform: translateY(0em);
+					}
 
-			> .indicator {
-				position: absolute;
-				top: 6px;
-				left: 24px;
-				color: var(--navIndicator);
-				font-size: 8px;
-			}
+					> .text {
+						display: none;
+					}
 
-			> .animateIndicator {
-				animation: blink 1s infinite;
-			}
-		}
-		.post {
-			width: 100%;
-			height: 52px;
-			margin-bottom: 16px;
-			&:before,
-			&::after {
-				inset: 0;
-				margin: auto;
-				width: 52px;
-				aspect-ratio: 1/1;
-			}
-			> .icon {
-				left: unset;
-			}
-			> .text {
-				display: none;
+					> .indicator {
+						position: absolute;
+						top: 6px;
+						left: 24px;
+						color: var(--navIndicator);
+						font-size: 8px;
+						animation: blink 1s infinite;
+					}
+
+					&:hover,
+					&:focus-within,
+					&.active {
+						text-decoration: none;
+						color: var(--accent);
+						transition: all 0.4s ease;
+
+						&:before {
+							content: "";
+							display: block;
+							height: 100%;
+							aspect-ratio: 1;
+							margin: auto;
+							position: absolute;
+							top: 0;
+							left: 0;
+							right: 0;
+							bottom: 0;
+							border-radius: 999px;
+							background: var(--accentedBg);
+						}
+
+						> .icon,
+						> .text {
+							opacity: 1;
+						}
+					}
+				}
 			}
 		}
 	}
 
-	.nav-item {
+	.item {
 		outline: none;
 		&:focus-visible:before {
 			outline: auto;

From 66fbca321c8eec3e5cfa2b7febf4c2e01ddf4b82 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@waah.day>
Date: Mon, 10 Jul 2023 12:50:54 -0400
Subject: [PATCH 13/68] docs: fix typo

---
 docs/migrate.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/migrate.md b/docs/migrate.md
index 7e9653e70f..ae7df286ad 100644
--- a/docs/migrate.md
+++ b/docs/migrate.md
@@ -83,9 +83,9 @@ NODE_ENV=production pnpm run migrate
 cd packages/backend
 
 LINE_NUM="$(npx typeorm migration:show -d ormconfig.js | grep -n uniformThemecolor1652859567549 | cut -d ':' -f 1)"
-NUM_MIGRATIONS="$(npx typeorm migration:show -d ormconfig.js | tail -n+"$LINE_NUM" | grep '\[X\]' | nl)"
+NUM_MIGRATIONS="$(npx typeorm migration:show -d ormconfig.js | tail -n+"$LINE_NUM" | grep '\[X\]' | wc -l)"
 
-for i in $(seq 1 $NUM_MIGRAIONS); do
+for i in $(seq 1 $NUM_MIGRATIONS); do
     npx typeorm migration:revert -d ormconfig.js
 done
 

From 3e1b112f92922bb73ede14a511789743445fe981 Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Mon, 10 Jul 2023 18:50:07 +0200
Subject: [PATCH 14/68] Revert "Revert "[mastodon-client] send actual default
 post privacy instead of fallback value""

This reverts commit a441cc6067c487c563bf673be261a179d96e0533.
---
 .../api/endpoints/i/registry/get-unsecure.ts    |  2 +-
 .../server/api/mastodon/endpoints/account.ts    |  2 +-
 packages/megalodon/src/misskey.ts               | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/i/registry/get-unsecure.ts b/packages/backend/src/server/api/endpoints/i/registry/get-unsecure.ts
index f98c6c929f..a9bcf69351 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/get-unsecure.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/get-unsecure.ts
@@ -33,7 +33,7 @@ export const paramDef = {
 } as const;
 
 export default define(meta, paramDef, async (ps, user) => {
-	if (ps.key !== "reactions") return;
+	if (ps.key !== "reactions" && ps.key !== "defaultNoteVisibility") return;
 	const query = RegistryItems.createQueryBuilder("item")
 		.where("item.domain IS NULL")
 		.andWhere("item.userId = :userId", { userId: user.id })
diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 3fb1c9cbe4..5d0abdedd6 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -48,7 +48,7 @@ export function apiAccountMastodon(router: Router): void {
 			acct.source = {
 				note: acct.note,
 				fields: acct.fields,
-				privacy: "public",
+				privacy: await client.getDefaultPostPrivacy(),
 				sensitive: false,
 				language: "",
 			};
diff --git a/packages/megalodon/src/misskey.ts b/packages/megalodon/src/misskey.ts
index de62b98509..b4a9c6adb9 100644
--- a/packages/megalodon/src/misskey.ts
+++ b/packages/megalodon/src/misskey.ts
@@ -1539,6 +1539,23 @@ export default class Misskey implements MegalodonInterface {
         .then(res => res.data[0] ?? '⭐');
   }
 
+	private async getDefaultPostPrivacy(): Promise<string> {
+		// NOTE: get-unsecure is calckey's extension.
+		//       Misskey doesn't have this endpoint and regular `/i/registry/get` won't work
+		//       unless you have a 'nativeToken', which is reserved for the frontend webapp.
+
+		return this.client
+			.post<string>('/api/i/registry/get-unsecure', {
+				key: 'defaultNoteVisibility',
+				scope: ['client', 'base'],
+			})
+			.then(res => {
+				if (!res.data || (res.data != 'public' && res.data != 'home' && res.data != 'followers' && res.data != 'specified'))
+					return 'public';
+				return this.converter.visibility(res.data);
+			});
+	}
+
   public async unfavouriteStatus(id: string): Promise<Response<Entity.Status>> {
     // NOTE: Misskey allows only one reaction per status, so we don't need to care what that emoji was.
     return this.deleteEmojiReaction(id, '');

From dc0194a842462bfe73dcb95b1fd3a947b8e657b1 Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Mon, 10 Jul 2023 18:50:12 +0200
Subject: [PATCH 15/68] Revert "Revert "[mastodon-client] send proper user
 preferences""

This reverts commit dfd9bd5dd106f27fc6dde09d80d40c07116ae517.
---
 packages/megalodon/src/misskey.ts            | 24 +++++---------------
 packages/megalodon/src/misskey/api_client.ts |  4 ++--
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/packages/megalodon/src/misskey.ts b/packages/megalodon/src/misskey.ts
index b4a9c6adb9..026b8e9b7a 100644
--- a/packages/megalodon/src/misskey.ts
+++ b/packages/megalodon/src/misskey.ts
@@ -1079,23 +1079,11 @@ export default class Misskey implements MegalodonInterface {
   // accounts/preferences
   // ======================================
   public async getPreferences(): Promise<Response<Entity.Preferences>> {
-    return this.client.post<MisskeyAPI.Entity.UserDetailMe>('/api/i').then(res => {
-      /*
-      return this.client.post<MisskeyAPI.Entity.GetAll>('/api/i/registry/get-all', {
-        scope: ['client', 'base'],
-      }).then(ga => {
-        return Object.assign(res, {
-          data: this.converter.userPreferences(res.data, ga.data)
-        })
-      })
-      */
-
-      // TODO:
-      // FIXME: get this from api
-      return Object.assign(res, {
-          data: this.converter.userPreferences(res.data, {defaultNoteVisibility: "followers", tutorial: -1})
-        })
-      })
+    return this.client.post<MisskeyAPI.Entity.UserDetailMe>('/api/i').then(async res => {
+			return Object.assign(res, {
+				data: this.converter.userPreferences(res.data, await this.getDefaultPostPrivacy())
+			})
+		})
   }
 
   // ======================================
@@ -1539,7 +1527,7 @@ export default class Misskey implements MegalodonInterface {
         .then(res => res.data[0] ?? '⭐');
   }
 
-	private async getDefaultPostPrivacy(): Promise<string> {
+	private async getDefaultPostPrivacy(): Promise<'public' | 'unlisted' | 'private' | 'direct'> {
 		// NOTE: get-unsecure is calckey's extension.
 		//       Misskey doesn't have this endpoint and regular `/i/registry/get` won't work
 		//       unless you have a 'nativeToken', which is reserved for the frontend webapp.
diff --git a/packages/megalodon/src/misskey/api_client.ts b/packages/megalodon/src/misskey/api_client.ts
index aabb1f3ee5..f80d5a4421 100644
--- a/packages/megalodon/src/misskey/api_client.ts
+++ b/packages/megalodon/src/misskey/api_client.ts
@@ -175,13 +175,13 @@ namespace MisskeyAPI {
       }
     }
 
-    userPreferences = (u: MisskeyAPI.Entity.UserDetailMe, g: MisskeyAPI.Entity.GetAll): MegalodonEntity.Preferences => {
+    userPreferences = (u: MisskeyAPI.Entity.UserDetailMe, v: 'public' | 'unlisted' | 'private' | 'direct'): MegalodonEntity.Preferences => {
       return {
         "reading:expand:media": "default",
         "reading:expand:spoilers": false,
         "posting:default:language": u.lang,
         "posting:default:sensitive": u.alwaysMarkNsfw,
-        "posting:default:visibility": this.visibility(g.defaultNoteVisibility)
+        "posting:default:visibility": v
       }
     }
 

From 5c3a3ac02b53e8d12480b18726ce0d544a1ae1f3 Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Mon, 10 Jul 2023 18:05:34 +0200
Subject: [PATCH 16/68] [mastodon-client] userDetail: fallback to username if
 displayname is null

---
 packages/megalodon/src/misskey/api_client.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/megalodon/src/misskey/api_client.ts b/packages/megalodon/src/misskey/api_client.ts
index f80d5a4421..1c198ecc95 100644
--- a/packages/megalodon/src/misskey/api_client.ts
+++ b/packages/megalodon/src/misskey/api_client.ts
@@ -156,7 +156,7 @@ namespace MisskeyAPI {
         id: u.id,
         username: u.username,
         acct: acct,
-        display_name: u.name,
+        display_name: u.name || u.username,
         locked: u.isLocked,
         created_at: u.createdAt,
         followers_count: u.followersCount,

From 5bb7707649e691a5f38890499e1dfc7cdc14a5a8 Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Mon, 10 Jul 2023 18:45:01 +0200
Subject: [PATCH 17/68] [mastodon-client] fix getDefaultPostPrivacy

---
 packages/megalodon/src/misskey.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/megalodon/src/misskey.ts b/packages/megalodon/src/misskey.ts
index 026b8e9b7a..ca418439e9 100644
--- a/packages/megalodon/src/misskey.ts
+++ b/packages/megalodon/src/misskey.ts
@@ -1541,7 +1541,7 @@ export default class Misskey implements MegalodonInterface {
 				if (!res.data || (res.data != 'public' && res.data != 'home' && res.data != 'followers' && res.data != 'specified'))
 					return 'public';
 				return this.converter.visibility(res.data);
-			});
+			}).catch(_ => 'public')
 	}
 
   public async unfavouriteStatus(id: string): Promise<Response<Entity.Status>> {

From ac2f75857f54ce744303c57947bdf867e5c841aa Mon Sep 17 00:00:00 2001
From: freeplay <freeplay@duck.com>
Date: Mon, 10 Jul 2023 13:09:44 -0400
Subject: [PATCH 18/68] =?UTF-8?q?style:=20link=20underlines,=20attempt=20t?=
 =?UTF-8?q?wo=E2=84=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/src/components/MkUrlPreview.vue    |  8 ++++++--
 .../client/src/components/global/MkUrl.vue    |  2 ++
 packages/client/src/style.scss                | 19 +++++++++++++++----
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/components/MkUrlPreview.vue b/packages/client/src/components/MkUrlPreview.vue
index 6452e135da..73938cf86c 100644
--- a/packages/client/src/components/MkUrlPreview.vue
+++ b/packages/client/src/components/MkUrlPreview.vue
@@ -196,6 +196,7 @@ onUnmounted(() => {
 	> a {
 		display: flex;
 		transition: background 0.2s;
+		text-decoration: none;
 		> div:first-child:not(:last-child) {
 			position: relative;
 			width: 90px;
@@ -252,6 +253,9 @@ onUnmounted(() => {
 			font-size: 1em;
 			white-space: nowrap;
 			margin-bottom: 0.2em;
+			text-decoration: underline;
+			text-decoration-color: transparent;
+			transition: text-decoration-color .2s;
 		}
 		p {
 			margin-bottom: -0.5em;
@@ -277,8 +281,8 @@ onUnmounted(() => {
 		&:focus,
 		&:focus-within {
 			background: var(--panelHighlight);
-			h1 {
-				text-decoration: underline;
+			h3 {
+				text-decoration-color: currentColor;
 			}
 		}
 	}
diff --git a/packages/client/src/components/global/MkUrl.vue b/packages/client/src/components/global/MkUrl.vue
index 98ba8d94e9..3453bf5ed6 100644
--- a/packages/client/src/components/global/MkUrl.vue
+++ b/packages/client/src/components/global/MkUrl.vue
@@ -80,6 +80,8 @@ const target = self ? null : "_blank";
 	display: inline-block;
 	overflow: clip;
 	text-overflow: ellipsis;
+	text-decoration: none !important;
+	line-height: 1.05;
 
 	> .icon {
 		padding-left: 2px;
diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index a6ef73015b..7f37138816 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -145,6 +145,12 @@ a {
 	cursor: pointer;
 	color: inherit;
 	-webkit-tap-highlight-color: transparent;
+	text-decoration: underline;
+	text-decoration-color: transparent;
+	transition: text-decoration-color .2s;
+	&:hover {
+		text-decoration-color: currentColor;
+	}
 }
 
 // i {
@@ -229,6 +235,7 @@ hr {
 	font-size: 1em;
 	font-family: inherit;
 	line-height: inherit;
+	text-decoration: none;
 
 	&,
 	* {
@@ -628,18 +635,22 @@ hr {
 ._link {
 	position: relative;
 	color: var(--link);
+	text-decoration: none !important;
 
-	&:after {
+	&::before, &::after {
 		content: "";
 		position: absolute;
 		bottom: 0;
 		left: 0;
 		width: 0%;
-		border-bottom: 2px solid var(--link);
+		border-bottom: 1px solid currentColor;
 		transition: 0.3s ease-in-out;
 	}
-
-	&:hover:after {
+	&::before {
+		width: 100%;
+		opacity: .4;
+	}
+	&:hover:after, &:focus:after {
 		width: 100%;
 	}
 }

From 69efd3df76d88a17a263bae2056bd3cfb0fd3032 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 10 Jul 2023 14:02:44 -0700
Subject: [PATCH 19/68] chore: :busts_in_silhouette: patrons

---
 patrons.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/patrons.json b/patrons.json
index fbd46ee064..cf56fa839a 100644
--- a/patrons.json
+++ b/patrons.json
@@ -86,6 +86,13 @@
 		"@irfan@calckey.social",
 		"@dvd@dvd.chat",
 		"@charlie2alpha@electricrequiem.com",
+		"@arndot@layer8.space",
+		"@ryan@c.ryanccn.dev",
+		"@lapastora_deprova@calckey.social",
+		"@rameez@calckey.social",
+		"@dracoling@firetribe.org",
+		"@Space6host@calckey.social",
+		"@zakalwe@plasmatrap.com",
 		"\nInterkosmos Link"
 	]
 }

From ff7df3cc01bc9c20a66092f56023722e0d960253 Mon Sep 17 00:00:00 2001
From: freeplay <freeplay@duck.com>
Date: Mon, 10 Jul 2023 17:43:02 -0400
Subject: [PATCH 20/68] style: use muted repeat icon instead of forbidden for
 disabled boosts

---
 packages/client/src/components/MkNote.vue         | 3 +++
 packages/client/src/components/MkNoteSub.vue      | 3 +++
 packages/client/src/components/MkRenoteButton.vue | 9 +++++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index a1a519f79f..2f524c64ad 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -869,6 +869,9 @@ defineExpose({
 					margin: 0;
 					padding: 8px;
 					opacity: 0.7;
+					&:disabled {
+						opacity: 0.5 !important;
+					}
 					flex-grow: 1;
 					max-width: 3.5em;
 					width: max-content;
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 113abefd63..9b7f1f5f5d 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -477,6 +477,9 @@ function noteClick(e) {
 					margin: 0;
 					padding: 8px;
 					opacity: 0.7;
+					&:disabled {
+						opacity: 0.5 !important;
+					}
 					flex-grow: 1;
 					max-width: 3.5em;
 					width: max-content;
diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue
index 15fd627fd7..16a8b95361 100644
--- a/packages/client/src/components/MkRenoteButton.vue
+++ b/packages/client/src/components/MkRenoteButton.vue
@@ -10,8 +10,13 @@
 		<i class="ph-repeat ph-bold ph-lg"></i>
 		<p v-if="count > 0 && !detailedView" class="count">{{ count }}</p>
 	</button>
-	<button v-else class="eddddedb _button">
-		<i class="ph-prohibit ph-bold ph-lg"></i>
+	<button
+		v-else
+		class="eddddedb _button"
+		disabled="true"
+		v-tooltip.noDelay.bottom="i18n.ts.disabled"
+	>
+		<i class="ph-repeat ph-bold ph-lg"></i>
 	</button>
 </template>
 

From b46d43797169c02334970d1efd32c1b075a759df Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Mon, 10 Jul 2023 23:44:31 +0200
Subject: [PATCH 21/68] Fix Postgres error loop when indexing notes

---
 .../processors/background/index-all-notes.ts  | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/backend/src/queue/processors/background/index-all-notes.ts b/packages/backend/src/queue/processors/background/index-all-notes.ts
index 1dce4406a9..fc453eb264 100644
--- a/packages/backend/src/queue/processors/background/index-all-notes.ts
+++ b/packages/backend/src/queue/processors/background/index-all-notes.ts
@@ -1,4 +1,5 @@
 import type Bull from "bull";
+import type { DoneCallback } from "bull";
 
 import { queueLogger } from "../../logger.js";
 import { Notes } from "@/models/index.js";
@@ -11,7 +12,7 @@ const logger = queueLogger.createSubLogger("index-all-notes");
 
 export default async function indexAllNotes(
 	job: Bull.Job<Record<string, unknown>>,
-	done: () => void,
+	done: DoneCallback,
 ): Promise<void> {
 	logger.info("Indexing all notes...");
 
@@ -20,7 +21,7 @@ export default async function indexAllNotes(
 	let total: number = (job.data.total as number) ?? 0;
 
 	let running = true;
-	const take = 100000;
+	const take = 10000;
 	const batch = 100;
 	while (running) {
 		logger.info(
@@ -41,13 +42,14 @@ export default async function indexAllNotes(
 				},
 				relations: ["user"],
 			});
-		} catch (e) {
+		} catch (e: any) {
 			logger.error(`Failed to query notes ${e}`);
-			continue;
+			done(e);
+			break;
 		}
 
 		if (notes.length === 0) {
-			job.progress(100);
+			await job.progress(100);
 			running = false;
 			break;
 		}
@@ -55,7 +57,7 @@ export default async function indexAllNotes(
 		try {
 			const count = await Notes.count();
 			total = count;
-			job.update({ indexedCount, cursor, total });
+			await job.update({indexedCount, cursor, total});
 		} catch (e) {}
 
 		for (let i = 0; i < notes.length; i += batch) {
@@ -69,12 +71,12 @@ export default async function indexAllNotes(
 
 			indexedCount += chunk.length;
 			const pct = (indexedCount / total) * 100;
-			job.update({ indexedCount, cursor, total });
-			job.progress(+pct.toFixed(1));
+			await job.update({ indexedCount, cursor, total });
+			await job.progress(+pct.toFixed(1));
 			logger.info(`Indexed notes ${indexedCount}/${total ? total : "?"}`);
 		}
 		cursor = notes[notes.length - 1].id;
-		job.update({ indexedCount, cursor, total });
+		await job.update({ indexedCount, cursor, total });
 
 		if (notes.length < take) {
 			running = false;

From a37daacc56d7e711fb6ce715e0a62548664740fb Mon Sep 17 00:00:00 2001
From: freeplay <freeplay@duck.com>
Date: Mon, 10 Jul 2023 19:02:31 -0400
Subject: [PATCH 22/68] style: don't truncate URL's

---
 .../client/src/components/MkUrlPreview.vue    |  2 +-
 .../client/src/components/global/MkUrl.vue    | 14 ++++---
 packages/client/src/style.scss                | 37 ++++++++++---------
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/packages/client/src/components/MkUrlPreview.vue b/packages/client/src/components/MkUrlPreview.vue
index 73938cf86c..29d045ebf1 100644
--- a/packages/client/src/components/MkUrlPreview.vue
+++ b/packages/client/src/components/MkUrlPreview.vue
@@ -255,7 +255,7 @@ onUnmounted(() => {
 			margin-bottom: 0.2em;
 			text-decoration: underline;
 			text-decoration-color: transparent;
-			transition: text-decoration-color .2s;
+			transition: text-decoration-color 0.2s;
 		}
 		p {
 			margin-bottom: -0.5em;
diff --git a/packages/client/src/components/global/MkUrl.vue b/packages/client/src/components/global/MkUrl.vue
index 3453bf5ed6..6e50c851eb 100644
--- a/packages/client/src/components/global/MkUrl.vue
+++ b/packages/client/src/components/global/MkUrl.vue
@@ -75,13 +75,11 @@ const target = self ? null : "_blank";
 
 <style lang="scss" scoped>
 .url {
-	white-space: nowrap;
-	max-width: 80%;
-	display: inline-block;
-	overflow: clip;
-	text-overflow: ellipsis;
 	text-decoration: none !important;
-	line-height: 1.05;
+	> span {
+		text-decoration: underline var(--fgTransparent);
+		transition: text-decoration-color 0.2s;
+	}
 
 	> .icon {
 		padding-left: 2px;
@@ -111,5 +109,9 @@ const target = self ? null : "_blank";
 	> .hash {
 		font-style: italic;
 	}
+
+	&:hover span {
+		text-decoration-color: var(--link);
+	}
 }
 </style>
diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index 7f37138816..a53f47f142 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -147,7 +147,7 @@ a {
 	-webkit-tap-highlight-color: transparent;
 	text-decoration: underline;
 	text-decoration-color: transparent;
-	transition: text-decoration-color .2s;
+	transition: text-decoration-color 0.2s;
 	&:hover {
 		text-decoration-color: currentColor;
 	}
@@ -635,24 +635,25 @@ hr {
 ._link {
 	position: relative;
 	color: var(--link);
-	text-decoration: none !important;
 
-	&::before, &::after {
-		content: "";
-		position: absolute;
-		bottom: 0;
-		left: 0;
-		width: 0%;
-		border-bottom: 1px solid currentColor;
-		transition: 0.3s ease-in-out;
-	}
-	&::before {
-		width: 100%;
-		opacity: .4;
-	}
-	&:hover:after, &:focus:after {
-		width: 100%;
-	}
+	// &::before,
+	// &::after {
+	// 	content: "";
+	// 	position: absolute;
+	// 	bottom: 0;
+	// 	left: 0;
+	// 	width: 0%;
+	// 	border-bottom: 1px solid currentColor;
+	// 	transition: 0.3s ease-in-out;
+	// }
+	// &::before {
+	// 	width: 100%;
+	// 	opacity: 0.4;
+	// }
+	// &:hover:after,
+	// &:focus:after {
+	// 	width: 100%;
+	// }
 }
 
 ._caption {

From 6c85183da7988a410853c4b688cef3f1f93d9c98 Mon Sep 17 00:00:00 2001
From: freeplay <freeplay@duck.com>
Date: Mon, 10 Jul 2023 19:38:32 -0400
Subject: [PATCH 23/68] style: underline-offset tweak

---
 packages/client/src/style.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index a53f47f142..9df882ec76 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -635,6 +635,7 @@ hr {
 ._link {
 	position: relative;
 	color: var(--link);
+	text-underline-offset: 0.2em;
 
 	// &::before,
 	// &::after {

From 8d9154c8c03fedf7e5a3a02db95f6f381da59c5a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 10 Jul 2023 21:09:07 -0700
Subject: [PATCH 24/68] perf: :zap: use fast-blurhash for blurhash decoding, up
 deps

---
 package.json                                  |  12 +-
 .../processors/background/index-all-notes.ts  |   2 +-
 packages/client/package.json                  |  35 +-
 .../src/components/MkImgWithBlurhash.vue      |   6 +-
 .../extract-avg-color-from-blurhash.ts        |  21 +-
 packages/client/src/ui/_common_/navbar.vue    |   4 +-
 pnpm-lock.yaml                                | 751 +++++++++++-------
 7 files changed, 484 insertions(+), 347 deletions(-)

diff --git a/package.json b/package.json
index defe75bb39..5927883165 100644
--- a/package.json
+++ b/package.json
@@ -36,17 +36,17 @@
 		"chokidar": "^3.3.1"
 	},
 	"dependencies": {
-		"@bull-board/api": "5.2.0",
-		"@bull-board/ui": "5.2.0",
+		"@bull-board/api": "5.6.0",
+		"@bull-board/ui": "5.6.0",
 		"@napi-rs/cli": "^2.16.1",
 		"@tensorflow/tfjs": "^3.21.0",
 		"js-yaml": "4.1.0",
 		"seedrandom": "^3.0.5"
 	},
 	"devDependencies": {
-		"@types/node": "18.11.18",
-		"@types/gulp": "4.0.10",
-		"@types/gulp-rename": "2.0.1",
+		"@types/gulp": "4.0.13",
+		"@types/gulp-rename": "2.0.2",
+		"@types/node": "20.4.1",
 		"chalk": "4.1.2",
 		"cross-env": "7.0.3",
 		"cypress": "10.11.0",
@@ -59,6 +59,6 @@
 		"install-peers": "^1.0.4",
 		"rome": "^12.1.3",
 		"start-server-and-test": "1.15.2",
-		"typescript": "4.9.4"
+		"typescript": "5.1.6"
 	}
 }
diff --git a/packages/backend/src/queue/processors/background/index-all-notes.ts b/packages/backend/src/queue/processors/background/index-all-notes.ts
index fc453eb264..c0275b420a 100644
--- a/packages/backend/src/queue/processors/background/index-all-notes.ts
+++ b/packages/backend/src/queue/processors/background/index-all-notes.ts
@@ -57,7 +57,7 @@ export default async function indexAllNotes(
 		try {
 			const count = await Notes.count();
 			total = count;
-			await job.update({indexedCount, cursor, total});
+			await job.update({ indexedCount, cursor, total });
 		} catch (e) {}
 
 		for (let i = 0; i < notes.length; i += batch) {
diff --git a/packages/client/package.json b/packages/client/package.json
index e34773ffe8..81c252d664 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -16,7 +16,7 @@
 		"@syuilo/aiscript": "0.11.1",
 		"@types/escape-regexp": "0.0.1",
 		"@types/glob": "8.1.0",
-		"@types/gulp": "4.0.11",
+		"@types/gulp": "4.0.13",
 		"@types/gulp-rename": "2.0.2",
 		"@types/katex": "0.16.0",
 		"@types/matter-js": "0.18.2",
@@ -29,8 +29,8 @@
 		"@vue/compiler-sfc": "3.3.4",
 		"autobind-decorator": "2.4.0",
 		"autosize": "5.0.2",
-		"blurhash": "1.1.5",
-		"broadcast-channel": "4.19.1",
+		"blurhash": "2.0.5",
+		"broadcast-channel": "5.1.0",
 		"browser-image-resizer": "github:misskey-dev/browser-image-resizer",
 		"calckey-js": "workspace:*",
 		"chart.js": "4.3.0",
@@ -39,51 +39,52 @@
 		"chartjs-plugin-gradient": "0.6.1",
 		"chartjs-plugin-zoom": "2.0.1",
 		"city-timezones": "^1.2.1",
-		"compare-versions": "5.0.3",
+		"compare-versions": "6.0.0",
 		"cropperjs": "2.0.0-beta.2",
 		"cross-env": "7.0.3",
 		"cypress": "10.11.0",
 		"date-fns": "2.30.0",
 		"emojilib": "github:thatonecalculator/emojilib",
 		"escape-regexp": "0.0.1",
-		"eventemitter3": "4.0.7",
-		"focus-trap": "^7.4.3",
+		"eventemitter3": "5.0.1",
+		"fast-blurhash": "^1.1.2",
+		"focus-trap": "^7.5.2",
 		"focus-trap-vue": "^4.0.2",
-		"gsap": "^3.11.5",
+		"gsap": "^3.12.2",
 		"idb-keyval": "6.2.1",
 		"insert-text-at-cursor": "0.3.0",
 		"json5": "2.2.3",
-		"katex": "0.16.7",
+		"katex": "0.16.8",
 		"matter-js": "0.18.0",
 		"mfm-js": "0.23.3",
-		"photoswipe": "5.3.7",
+		"photoswipe": "5.3.8",
 		"prettier": "3.0.0",
 		"prettier-plugin-vue": "1.1.6",
 		"prismjs": "1.29.0",
-		"punycode": "2.1.1",
+		"punycode": "2.3.0",
 		"querystring": "0.2.1",
 		"rndstr": "1.0.0",
-		"rollup": "3.23.1",
+		"rollup": "3.26.2",
 		"s-age": "1.1.2",
-		"sass": "1.62.1",
+		"sass": "1.63.6",
 		"seedrandom": "3.0.5",
 		"start-server-and-test": "1.15.2",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
-		"swiper": "9.3.2",
+		"swiper": "10.0.4",
 		"syuilo-password-strength": "0.0.1",
 		"textarea-caret": "3.1.0",
 		"three": "0.146.0",
 		"throttle-debounce": "5.0.0",
-		"tinycolor2": "1.5.2",
-		"tsc-alias": "1.8.6",
+		"tinycolor2": "1.6.0",
+		"tsc-alias": "1.8.7",
 		"tsconfig-paths": "4.2.0",
 		"twemoji-parser": "14.0.0",
-		"typescript": "5.1.3",
+		"typescript": "5.1.6",
 		"unicode-emoji-json": "^0.4.0",
 		"uuid": "9.0.0",
 		"vanilla-tilt": "1.8.0",
-		"vite": "4.3.9",
+		"vite": "4.4.2",
 		"vite-plugin-compression": "^0.5.1",
 		"vue": "3.3.4",
 		"vue-isyourpasswordsafe": "^2.0.0",
diff --git a/packages/client/src/components/MkImgWithBlurhash.vue b/packages/client/src/components/MkImgWithBlurhash.vue
index 03e6ea5037..5a0cefec2c 100644
--- a/packages/client/src/components/MkImgWithBlurhash.vue
+++ b/packages/client/src/components/MkImgWithBlurhash.vue
@@ -21,7 +21,7 @@
 
 <script lang="ts" setup>
 import { onMounted } from "vue";
-import { decode } from "blurhash";
+import { decodeBlurHash } from "fast-blurhash";
 
 const props = withDefaults(
 	defineProps<{
@@ -47,8 +47,8 @@ const canvas = $ref<HTMLCanvasElement>();
 let loaded = $ref(false);
 
 function draw() {
-	if (props.hash == null) return;
-	const pixels = decode(props.hash, props.size, props.size);
+	if (props.hash == null || canvas == null) return;
+	const pixels = decodeBlurHash(props.hash, props.size, props.size);
 	const ctx = canvas.getContext("2d");
 	const imageData = ctx!.createImageData(props.size, props.size);
 	imageData.data.set(pixels);
diff --git a/packages/client/src/scripts/extract-avg-color-from-blurhash.ts b/packages/client/src/scripts/extract-avg-color-from-blurhash.ts
index 9f758cd6d5..08e9972f47 100644
--- a/packages/client/src/scripts/extract-avg-color-from-blurhash.ts
+++ b/packages/client/src/scripts/extract-avg-color-from-blurhash.ts
@@ -1,13 +1,16 @@
+import { getBlurHashAverageColor } from "fast-blurhash";
+
+function rgbToHex(rgb: number[]): string {
+	return `#${rgb
+		.map((x) => {
+			const hex = x.toString(16);
+			return hex.length === 1 ? `0${hex}` : hex;
+		})
+		.join("")}`;
+}
+
 export function extractAvgColorFromBlurhash(hash: string) {
 	return typeof hash === "string"
-		? `#${[...hash.slice(2, 6)]
-				.map((x) =>
-					"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz#$%*+,-.:;=?@[]^_{|}~".indexOf(
-						x,
-					),
-				)
-				.reduce((a, c) => a * 83 + c, 0)
-				.toString(16)
-				.padStart(6, "0")}`
+		? rgbToHex(getBlurHashAverageColor(hash))
 		: undefined;
 }
diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index 7905c331c7..17c05884d1 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -217,7 +217,7 @@ function openAccountMenu(ev: MouseEvent) {
 		{
 			withExtraOperation: true,
 		},
-		ev
+		ev,
 	);
 }
 
@@ -232,7 +232,7 @@ function more(ev: MouseEvent) {
 			src: ev.currentTarget ?? ev.target,
 		},
 		{},
-		"closed"
+		"closed",
 	);
 }
 </script>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b18c938542..8285d327cc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12,11 +12,11 @@ importers:
   .:
     dependencies:
       '@bull-board/api':
-        specifier: 5.2.0
-        version: 5.2.0(@bull-board/ui@5.2.0)
+        specifier: 5.6.0
+        version: 5.6.0(@bull-board/ui@5.6.0)
       '@bull-board/ui':
-        specifier: 5.2.0
-        version: 5.2.0
+        specifier: 5.6.0
+        version: 5.6.0
       '@napi-rs/cli':
         specifier: ^2.16.1
         version: 2.16.1
@@ -31,14 +31,14 @@ importers:
         version: 3.0.5
     devDependencies:
       '@types/gulp':
-        specifier: 4.0.10
-        version: 4.0.10
+        specifier: 4.0.13
+        version: 4.0.13
       '@types/gulp-rename':
-        specifier: 2.0.1
-        version: 2.0.1
+        specifier: 2.0.2
+        version: 2.0.2
       '@types/node':
-        specifier: 18.11.18
-        version: 18.11.18
+        specifier: 20.4.1
+        version: 20.4.1
       chalk:
         specifier: 4.1.2
         version: 4.1.2
@@ -76,8 +76,8 @@ importers:
         specifier: 1.15.2
         version: 1.15.2
       typescript:
-        specifier: 4.9.4
-        version: 4.9.4
+        specifier: 5.1.6
+        version: 5.1.6
 
   packages/backend:
     dependencies:
@@ -666,7 +666,7 @@ importers:
         version: 9.0.8
       ts-jest:
         specifier: ^27.1.2
-        version: 27.1.2(@babel/core@7.22.5)(@types/jest@27.4.0)(jest@27.4.5)(typescript@5.1.3)
+        version: 27.1.2(@babel/core@7.22.8)(@types/jest@27.4.0)(jest@27.4.5)(typescript@5.1.3)
       ts-node:
         specifier: 10.4.0
         version: 10.4.0(@swc/core@1.3.62)(@types/node@20.3.1)(typescript@5.1.3)
@@ -687,10 +687,10 @@ importers:
         version: 2.0.3
       '@rollup/plugin-alias':
         specifier: 3.1.9
-        version: 3.1.9(rollup@3.23.1)
+        version: 3.1.9(rollup@3.26.2)
       '@rollup/plugin-json':
         specifier: 4.1.0
-        version: 4.1.0(rollup@3.23.1)
+        version: 4.1.0(rollup@3.26.2)
       '@rollup/pluginutils':
         specifier: ^4.2.1
         version: 4.2.1
@@ -704,8 +704,8 @@ importers:
         specifier: 8.1.0
         version: 8.1.0
       '@types/gulp':
-        specifier: 4.0.11
-        version: 4.0.11
+        specifier: 4.0.13
+        version: 4.0.13
       '@types/gulp-rename':
         specifier: 2.0.2
         version: 2.0.2
@@ -732,7 +732,7 @@ importers:
         version: 8.3.4
       '@vitejs/plugin-vue':
         specifier: 4.2.3
-        version: 4.2.3(vite@4.3.9)(vue@3.3.4)
+        version: 4.2.3(vite@4.4.2)(vue@3.3.4)
       '@vue/compiler-sfc':
         specifier: 3.3.4
         version: 3.3.4
@@ -743,11 +743,11 @@ importers:
         specifier: 5.0.2
         version: 5.0.2
       blurhash:
-        specifier: 1.1.5
-        version: 1.1.5
+        specifier: 2.0.5
+        version: 2.0.5
       broadcast-channel:
-        specifier: 4.19.1
-        version: 4.19.1
+        specifier: 5.1.0
+        version: 5.1.0
       browser-image-resizer:
         specifier: github:misskey-dev/browser-image-resizer
         version: github.com/misskey-dev/browser-image-resizer/56f504427ad7f6500e141a6d9f3aee42023d7f3e
@@ -773,8 +773,8 @@ importers:
         specifier: ^1.2.1
         version: 1.2.1
       compare-versions:
-        specifier: 5.0.3
-        version: 5.0.3
+        specifier: 6.0.0
+        version: 6.0.0
       cropperjs:
         specifier: 2.0.0-beta.2
         version: 2.0.0-beta.2
@@ -789,22 +789,25 @@ importers:
         version: 2.30.0
       emojilib:
         specifier: github:thatonecalculator/emojilib
-        version: github.com/thatonecalculator/emojilib/9d16541664dc8fef3201ae9b647477070676a52e
+        version: github.com/thatonecalculator/emojilib/15fd9504f943763a057ff803ee2009ec0524c96b
       escape-regexp:
         specifier: 0.0.1
         version: 0.0.1
       eventemitter3:
-        specifier: 4.0.7
-        version: 4.0.7
+        specifier: 5.0.1
+        version: 5.0.1
+      fast-blurhash:
+        specifier: ^1.1.2
+        version: 1.1.2
       focus-trap:
-        specifier: ^7.4.3
-        version: 7.4.3
+        specifier: ^7.5.2
+        version: 7.5.2
       focus-trap-vue:
         specifier: ^4.0.2
-        version: 4.0.2(focus-trap@7.4.3)(vue@3.3.4)
+        version: 4.0.2(focus-trap@7.5.2)(vue@3.3.4)
       gsap:
-        specifier: ^3.11.5
-        version: 3.11.5
+        specifier: ^3.12.2
+        version: 3.12.2
       idb-keyval:
         specifier: 6.2.1
         version: 6.2.1
@@ -815,8 +818,8 @@ importers:
         specifier: 2.2.3
         version: 2.2.3
       katex:
-        specifier: 0.16.7
-        version: 0.16.7
+        specifier: 0.16.8
+        version: 0.16.8
       matter-js:
         specifier: 0.18.0
         version: 0.18.0
@@ -824,8 +827,8 @@ importers:
         specifier: 0.23.3
         version: 0.23.3
       photoswipe:
-        specifier: 5.3.7
-        version: 5.3.7
+        specifier: 5.3.8
+        version: 5.3.8
       prettier:
         specifier: 3.0.0
         version: 3.0.0
@@ -836,8 +839,8 @@ importers:
         specifier: 1.29.0
         version: 1.29.0
       punycode:
-        specifier: 2.1.1
-        version: 2.1.1
+        specifier: 2.3.0
+        version: 2.3.0
       querystring:
         specifier: 0.2.1
         version: 0.2.1
@@ -845,14 +848,14 @@ importers:
         specifier: 1.0.0
         version: 1.0.0
       rollup:
-        specifier: 3.23.1
-        version: 3.23.1
+        specifier: 3.26.2
+        version: 3.26.2
       s-age:
         specifier: 1.1.2
         version: 1.1.2
       sass:
-        specifier: 1.62.1
-        version: 1.62.1
+        specifier: 1.63.6
+        version: 1.63.6
       seedrandom:
         specifier: 3.0.5
         version: 3.0.5
@@ -866,8 +869,8 @@ importers:
         specifier: 2.1.0
         version: 2.1.0
       swiper:
-        specifier: 9.3.2
-        version: 9.3.2
+        specifier: 10.0.4
+        version: 10.0.4
       syuilo-password-strength:
         specifier: 0.0.1
         version: 0.0.1
@@ -881,11 +884,11 @@ importers:
         specifier: 5.0.0
         version: 5.0.0
       tinycolor2:
-        specifier: 1.5.2
-        version: 1.5.2
+        specifier: 1.6.0
+        version: 1.6.0
       tsc-alias:
-        specifier: 1.8.6
-        version: 1.8.6
+        specifier: 1.8.7
+        version: 1.8.7
       tsconfig-paths:
         specifier: 4.2.0
         version: 4.2.0
@@ -893,8 +896,8 @@ importers:
         specifier: 14.0.0
         version: 14.0.0
       typescript:
-        specifier: 5.1.3
-        version: 5.1.3
+        specifier: 5.1.6
+        version: 5.1.6
       unicode-emoji-json:
         specifier: ^0.4.0
         version: 0.4.0
@@ -905,11 +908,11 @@ importers:
         specifier: 1.8.0
         version: 1.8.0
       vite:
-        specifier: 4.3.9
-        version: 4.3.9(@types/node@18.11.18)(sass@1.62.1)
+        specifier: 4.4.2
+        version: 4.4.2(@types/node@20.4.1)(sass@1.63.6)
       vite-plugin-compression:
         specifier: ^0.5.1
-        version: 0.5.1(vite@4.3.9)
+        version: 0.5.1(vite@4.4.2)
       vue:
         specifier: 3.3.4
         version: 3.3.4
@@ -1039,7 +1042,7 @@ importers:
         version: 2.8.8
       ts-jest:
         specifier: ^29.0.5
-        version: 29.0.5(@babel/core@7.22.5)(jest@29.4.0)(typescript@4.9.4)
+        version: 29.0.5(@babel/core@7.22.8)(jest@29.4.0)(typescript@4.9.4)
       typedoc:
         specifier: ^0.23.24
         version: 0.23.24(typescript@4.9.4)
@@ -1094,6 +1097,11 @@ packages:
     resolution: {integrity: sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==}
     engines: {node: '>=6.9.0'}
 
+  /@babel/compat-data@7.22.6:
+    resolution: {integrity: sha512-29tfsWTq2Ftu7MXmimyC0C5FDZv5DYxOZkh3XD3+QW4V/BYuv/LyEsjj3c0hqedEaDt6DBfDvexMKU8YevdqFg==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
   /@babel/core@7.22.5:
     resolution: {integrity: sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==}
     engines: {node: '>=6.9.0'}
@@ -1116,6 +1124,29 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/core@7.22.8:
+    resolution: {integrity: sha512-75+KxFB4CZqYRXjx4NlR4J7yGvKumBuZTmV4NV6v09dVXXkuYVYLT68N6HCzLvfJ+fWCxQsntNzKwwIXL4bHnw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@ampproject/remapping': 2.2.1
+      '@babel/code-frame': 7.22.5
+      '@babel/generator': 7.22.7
+      '@babel/helper-compilation-targets': 7.22.6(@babel/core@7.22.8)
+      '@babel/helper-module-transforms': 7.22.5
+      '@babel/helpers': 7.22.6
+      '@babel/parser': 7.22.7
+      '@babel/template': 7.22.5
+      '@babel/traverse': 7.22.8
+      '@babel/types': 7.22.5
+      '@nicolo-ribaudo/semver-v6': 6.3.3
+      convert-source-map: 1.9.0
+      debug: 4.3.4(supports-color@8.1.1)
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/generator@7.22.5:
     resolution: {integrity: sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==}
     engines: {node: '>=6.9.0'}
@@ -1125,6 +1156,16 @@ packages:
       '@jridgewell/trace-mapping': 0.3.18
       jsesc: 2.5.2
 
+  /@babel/generator@7.22.7:
+    resolution: {integrity: sha512-p+jPjMG+SI8yvIaxGgeW24u7q9+5+TGpZh8/CuB7RhBKd7RCy8FayNEFNNKrNK/eUcY/4ExQqLmyrvBXKsIcwQ==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.22.5
+      '@jridgewell/gen-mapping': 0.3.3
+      '@jridgewell/trace-mapping': 0.3.18
+      jsesc: 2.5.2
+    dev: true
+
   /@babel/helper-compilation-targets@7.22.5(@babel/core@7.22.5):
     resolution: {integrity: sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==}
     engines: {node: '>=6.9.0'}
@@ -1138,6 +1179,20 @@ packages:
       lru-cache: 5.1.1
       semver: 6.3.0
 
+  /@babel/helper-compilation-targets@7.22.6(@babel/core@7.22.8):
+    resolution: {integrity: sha512-534sYEqWD9VfUm3IPn2SLcH4Q3P86XL+QvqdC7ZsFrzyyPF3T4XGiVghF6PTYNdWg6pXuoqXxNQAhbYeEInTzA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/compat-data': 7.22.6
+      '@babel/core': 7.22.8
+      '@babel/helper-validator-option': 7.22.5
+      '@nicolo-ribaudo/semver-v6': 6.3.3
+      browserslist: 4.21.9
+      lru-cache: 5.1.1
+    dev: true
+
   /@babel/helper-environment-visitor@7.22.5:
     resolution: {integrity: sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==}
     engines: {node: '>=6.9.0'}
@@ -1192,6 +1247,13 @@ packages:
     dependencies:
       '@babel/types': 7.22.5
 
+  /@babel/helper-split-export-declaration@7.22.6:
+    resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.22.5
+    dev: true
+
   /@babel/helper-string-parser@7.22.5:
     resolution: {integrity: sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==}
     engines: {node: '>=6.9.0'}
@@ -1214,6 +1276,17 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/helpers@7.22.6:
+    resolution: {integrity: sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/template': 7.22.5
+      '@babel/traverse': 7.22.8
+      '@babel/types': 7.22.5
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/highlight@7.22.5:
     resolution: {integrity: sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==}
     engines: {node: '>=6.9.0'}
@@ -1229,6 +1302,14 @@ packages:
     dependencies:
       '@babel/types': 7.22.5
 
+  /@babel/parser@7.22.7:
+    resolution: {integrity: sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+    dependencies:
+      '@babel/types': 7.22.5
+    dev: true
+
   /@babel/plugin-proposal-export-namespace-from@7.18.9(@babel/core@7.22.5):
     resolution: {integrity: sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==}
     engines: {node: '>=6.9.0'}
@@ -1392,8 +1473,8 @@ packages:
       - supports-color
     dev: false
 
-  /@babel/runtime@7.20.7:
-    resolution: {integrity: sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==}
+  /@babel/runtime@7.21.0:
+    resolution: {integrity: sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==}
     engines: {node: '>=6.9.0'}
     dependencies:
       regenerator-runtime: 0.13.11
@@ -1430,6 +1511,24 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/traverse@7.22.8:
+    resolution: {integrity: sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.22.5
+      '@babel/generator': 7.22.7
+      '@babel/helper-environment-visitor': 7.22.5
+      '@babel/helper-function-name': 7.22.5
+      '@babel/helper-hoist-variables': 7.22.5
+      '@babel/helper-split-export-declaration': 7.22.6
+      '@babel/parser': 7.22.7
+      '@babel/types': 7.22.5
+      debug: 4.3.4(supports-color@8.1.1)
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/types@7.22.5:
     resolution: {integrity: sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==}
     engines: {node: '>=6.9.0'}
@@ -1451,6 +1550,15 @@ packages:
       redis-info: 3.1.0
     dev: false
 
+  /@bull-board/api@5.6.0(@bull-board/ui@5.6.0):
+    resolution: {integrity: sha512-a2O15p5oEm+/E/0I2l2nE2NKK0dkgNNTaamu+0gGyfUxWoCS3fCGX6LLEyl3jgOz0IC3GKRnwtVgbZFzk42sGQ==}
+    peerDependencies:
+      '@bull-board/ui': 5.6.0
+    dependencies:
+      '@bull-board/ui': 5.6.0
+      redis-info: 3.1.0
+    dev: false
+
   /@bull-board/koa@5.2.0(@types/koa@2.13.5)(pug@3.0.2):
     resolution: {integrity: sha512-jntDAl/POouD0PS/iiKXBNl26SuUf7Y5uL3EgpDN7isvwFcpKhvdk0VdBypjrkRHN6rPaEJJPkEtK30qv01XYw==}
     dependencies:
@@ -1525,6 +1633,12 @@ packages:
       '@bull-board/api': 5.2.0(@bull-board/ui@5.2.0)
     dev: false
 
+  /@bull-board/ui@5.6.0:
+    resolution: {integrity: sha512-mc9T+kijDX5ZJMJCzeKPk9uLfOtcuefdDLPqWi961EiiNKfkDex+Gh41DAfcyrNjYsAkBsphvgBgcvundHPGIw==}
+    dependencies:
+      '@bull-board/api': 5.6.0(@bull-board/ui@5.6.0)
+    dev: false
+
   /@colors/colors@1.5.0:
     resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
     engines: {node: '>=0.1.90'}
@@ -1707,8 +1821,8 @@ packages:
       - supports-color
     dev: false
 
-  /@esbuild/android-arm64@0.17.19:
-    resolution: {integrity: sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==}
+  /@esbuild/android-arm64@0.18.11:
+    resolution: {integrity: sha512-snieiq75Z1z5LJX9cduSAjUr7vEI1OdlzFPMw0HH5YI7qQHDd3qs+WZoMrWYDsfRJSq36lIA6mfZBkvL46KoIw==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
@@ -1716,8 +1830,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-arm@0.17.19:
-    resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==}
+  /@esbuild/android-arm@0.18.11:
+    resolution: {integrity: sha512-q4qlUf5ucwbUJZXF5tEQ8LF7y0Nk4P58hOsGk3ucY0oCwgQqAnqXVbUuahCddVHfrxmpyewRpiTHwVHIETYu7Q==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
@@ -1725,8 +1839,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-x64@0.17.19:
-    resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==}
+  /@esbuild/android-x64@0.18.11:
+    resolution: {integrity: sha512-iPuoxQEV34+hTF6FT7om+Qwziv1U519lEOvekXO9zaMMlT9+XneAhKL32DW3H7okrCOBQ44BMihE8dclbZtTuw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
@@ -1734,8 +1848,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/darwin-arm64@0.17.19:
-    resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==}
+  /@esbuild/darwin-arm64@0.18.11:
+    resolution: {integrity: sha512-Gm0QkI3k402OpfMKyQEEMG0RuW2LQsSmI6OeO4El2ojJMoF5NLYb3qMIjvbG/lbMeLOGiW6ooU8xqc+S0fgz2w==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
@@ -1743,8 +1857,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/darwin-x64@0.17.19:
-    resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==}
+  /@esbuild/darwin-x64@0.18.11:
+    resolution: {integrity: sha512-N15Vzy0YNHu6cfyDOjiyfJlRJCB/ngKOAvoBf1qybG3eOq0SL2Lutzz9N7DYUbb7Q23XtHPn6lMDF6uWbGv9Fw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
@@ -1752,8 +1866,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/freebsd-arm64@0.17.19:
-    resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==}
+  /@esbuild/freebsd-arm64@0.18.11:
+    resolution: {integrity: sha512-atEyuq6a3omEY5qAh5jIORWk8MzFnCpSTUruBgeyN9jZq1K/QI9uke0ATi3MHu4L8c59CnIi4+1jDKMuqmR71A==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
@@ -1761,8 +1875,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/freebsd-x64@0.17.19:
-    resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==}
+  /@esbuild/freebsd-x64@0.18.11:
+    resolution: {integrity: sha512-XtuPrEfBj/YYYnAAB7KcorzzpGTvOr/dTtXPGesRfmflqhA4LMF0Gh/n5+a9JBzPuJ+CGk17CA++Hmr1F/gI0Q==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
@@ -1770,8 +1884,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-arm64@0.17.19:
-    resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==}
+  /@esbuild/linux-arm64@0.18.11:
+    resolution: {integrity: sha512-c6Vh2WS9VFKxKZ2TvJdA7gdy0n6eSy+yunBvv4aqNCEhSWVor1TU43wNRp2YLO9Vng2G+W94aRz+ILDSwAiYog==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
@@ -1779,8 +1893,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-arm@0.17.19:
-    resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==}
+  /@esbuild/linux-arm@0.18.11:
+    resolution: {integrity: sha512-Idipz+Taso/toi2ETugShXjQ3S59b6m62KmLHkJlSq/cBejixmIydqrtM2XTvNCywFl3VC7SreSf6NV0i6sRyg==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
@@ -1788,8 +1902,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-ia32@0.17.19:
-    resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==}
+  /@esbuild/linux-ia32@0.18.11:
+    resolution: {integrity: sha512-S3hkIF6KUqRh9n1Q0dSyYcWmcVa9Cg+mSoZEfFuzoYXXsk6196qndrM+ZiHNwpZKi3XOXpShZZ+9dfN5ykqjjw==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
@@ -1797,8 +1911,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-loong64@0.17.19:
-    resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==}
+  /@esbuild/linux-loong64@0.18.11:
+    resolution: {integrity: sha512-MRESANOoObQINBA+RMZW+Z0TJWpibtE7cPFnahzyQHDCA9X9LOmGh68MVimZlM9J8n5Ia8lU773te6O3ILW8kw==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
@@ -1806,8 +1920,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-mips64el@0.17.19:
-    resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==}
+  /@esbuild/linux-mips64el@0.18.11:
+    resolution: {integrity: sha512-qVyPIZrXNMOLYegtD1u8EBccCrBVshxMrn5MkuFc3mEVsw7CCQHaqZ4jm9hbn4gWY95XFnb7i4SsT3eflxZsUg==}
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
@@ -1815,8 +1929,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-ppc64@0.17.19:
-    resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==}
+  /@esbuild/linux-ppc64@0.18.11:
+    resolution: {integrity: sha512-T3yd8vJXfPirZaUOoA9D2ZjxZX4Gr3QuC3GztBJA6PklLotc/7sXTOuuRkhE9W/5JvJP/K9b99ayPNAD+R+4qQ==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
@@ -1824,8 +1938,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-riscv64@0.17.19:
-    resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==}
+  /@esbuild/linux-riscv64@0.18.11:
+    resolution: {integrity: sha512-evUoRPWiwuFk++snjH9e2cAjF5VVSTj+Dnf+rkO/Q20tRqv+644279TZlPK8nUGunjPAtQRCj1jQkDAvL6rm2w==}
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
@@ -1833,8 +1947,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-s390x@0.17.19:
-    resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==}
+  /@esbuild/linux-s390x@0.18.11:
+    resolution: {integrity: sha512-/SlRJ15XR6i93gRWquRxYCfhTeC5PdqEapKoLbX63PLCmAkXZHY2uQm2l9bN0oPHBsOw2IswRZctMYS0MijFcg==}
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
@@ -1842,8 +1956,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-x64@0.17.19:
-    resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==}
+  /@esbuild/linux-x64@0.18.11:
+    resolution: {integrity: sha512-xcncej+wF16WEmIwPtCHi0qmx1FweBqgsRtEL1mSHLFR6/mb3GEZfLQnx+pUDfRDEM4DQF8dpXIW7eDOZl1IbA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
@@ -1851,8 +1965,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/netbsd-x64@0.17.19:
-    resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==}
+  /@esbuild/netbsd-x64@0.18.11:
+    resolution: {integrity: sha512-aSjMHj/F7BuS1CptSXNg6S3M4F3bLp5wfFPIJM+Km2NfIVfFKhdmfHF9frhiCLIGVzDziggqWll0B+9AUbud/Q==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
@@ -1860,8 +1974,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/openbsd-x64@0.17.19:
-    resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==}
+  /@esbuild/openbsd-x64@0.18.11:
+    resolution: {integrity: sha512-tNBq+6XIBZtht0xJGv7IBB5XaSyvYPCm1PxJ33zLQONdZoLVM0bgGqUrXnJyiEguD9LU4AHiu+GCXy/Hm9LsdQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
@@ -1869,8 +1983,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/sunos-x64@0.17.19:
-    resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==}
+  /@esbuild/sunos-x64@0.18.11:
+    resolution: {integrity: sha512-kxfbDOrH4dHuAAOhr7D7EqaYf+W45LsAOOhAet99EyuxxQmjbk8M9N4ezHcEiCYPaiW8Dj3K26Z2V17Gt6p3ng==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
@@ -1878,8 +1992,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-arm64@0.17.19:
-    resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==}
+  /@esbuild/win32-arm64@0.18.11:
+    resolution: {integrity: sha512-Sh0dDRyk1Xi348idbal7lZyfSkjhJsdFeuC13zqdipsvMetlGiFQNdO+Yfp6f6B4FbyQm7qsk16yaZk25LChzg==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
@@ -1887,8 +2001,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-ia32@0.17.19:
-    resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==}
+  /@esbuild/win32-ia32@0.18.11:
+    resolution: {integrity: sha512-o9JUIKF1j0rqJTFbIoF4bXj6rvrTZYOrfRcGyL0Vm5uJ/j5CkBD/51tpdxe9lXEDouhRgdr/BYzUrDOvrWwJpg==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
@@ -1896,8 +2010,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-x64@0.17.19:
-    resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==}
+  /@esbuild/win32-x64@0.18.11:
+    resolution: {integrity: sha512-rQI4cjLHd2hGsM1LqgDI7oOCYbQ6IBOVsX9ejuRMSze0GqXUG2ekwiKkiBU1pRGSeCqFFHxTrcEydB2Hyoz9CA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
@@ -2013,7 +2127,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.0
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       chalk: 4.1.2
       jest-message-util: 29.6.0
       jest-util: 29.6.0
@@ -2079,14 +2193,14 @@ packages:
       '@jest/test-result': 29.6.0
       '@jest/transform': 29.6.0
       '@jest/types': 29.6.0
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       ci-info: 3.8.0
       exit: 0.1.2
       graceful-fs: 4.2.11
       jest-changed-files: 29.5.0
-      jest-config: 29.6.0(@types/node@20.3.1)
+      jest-config: 29.6.0(@types/node@18.11.18)
       jest-haste-map: 29.6.0
       jest-message-util: 29.6.0
       jest-regex-util: 29.4.3
@@ -2123,7 +2237,7 @@ packages:
     dependencies:
       '@jest/fake-timers': 29.6.0
       '@jest/types': 29.6.0
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       jest-mock: 29.6.0
     dev: true
 
@@ -2162,7 +2276,7 @@ packages:
     dependencies:
       '@jest/types': 29.6.0
       '@sinonjs/fake-timers': 10.3.0
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       jest-message-util: 29.6.0
       jest-mock: 29.6.0
       jest-util: 29.6.0
@@ -2242,7 +2356,7 @@ packages:
       '@jest/transform': 29.6.0
       '@jest/types': 29.6.0
       '@jridgewell/trace-mapping': 0.3.18
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       chalk: 4.1.2
       collect-v8-coverage: 1.0.1
       exit: 0.1.2
@@ -2402,7 +2516,7 @@ packages:
       '@jest/schemas': 29.6.0
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       '@types/yargs': 17.0.24
       chalk: 4.1.2
     dev: true
@@ -2650,6 +2764,11 @@ packages:
     engines: {node: '>= 10'}
     hasBin: true
 
+  /@nicolo-ribaudo/semver-v6@6.3.3:
+    resolution: {integrity: sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg==}
+    hasBin: true
+    dev: true
+
   /@nodelib/fs.scandir@2.1.5:
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
@@ -2781,7 +2900,7 @@ packages:
     engines: {node: '>=12.0.0'}
     dependencies:
       '@redocly/ajv': 8.11.0
-      '@types/node': 14.18.52
+      '@types/node': 14.18.53
       colorette: 1.4.0
       js-levenshtein: 1.1.6
       js-yaml: 4.1.0
@@ -2794,26 +2913,26 @@ packages:
       - encoding
     dev: false
 
-  /@rollup/plugin-alias@3.1.9(rollup@3.23.1):
+  /@rollup/plugin-alias@3.1.9(rollup@3.26.2):
     resolution: {integrity: sha512-QI5fsEvm9bDzt32k39wpOwZhVzRcL5ydcffUHMyLVaVaLeC70I8TJZ17F1z1eMoLu4E/UOcH9BWVkKpIKdrfiw==}
     engines: {node: '>=8.0.0'}
     peerDependencies:
       rollup: ^1.20.0||^2.0.0
     dependencies:
-      rollup: 3.23.1
+      rollup: 3.26.2
       slash: 3.0.0
     dev: true
 
-  /@rollup/plugin-json@4.1.0(rollup@3.23.1):
+  /@rollup/plugin-json@4.1.0(rollup@3.26.2):
     resolution: {integrity: sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==}
     peerDependencies:
       rollup: ^1.20.0 || ^2.0.0
     dependencies:
-      '@rollup/pluginutils': 3.1.0(rollup@3.23.1)
-      rollup: 3.23.1
+      '@rollup/pluginutils': 3.1.0(rollup@3.26.2)
+      rollup: 3.26.2
     dev: true
 
-  /@rollup/pluginutils@3.1.0(rollup@3.23.1):
+  /@rollup/pluginutils@3.1.0(rollup@3.26.2):
     resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==}
     engines: {node: '>= 8.0.0'}
     peerDependencies:
@@ -2822,7 +2941,7 @@ packages:
       '@types/estree': 0.0.39
       estree-walker: 1.0.1
       picomatch: 2.3.1
-      rollup: 3.23.1
+      rollup: 3.26.2
     dev: true
 
   /@rollup/pluginutils@4.2.1:
@@ -3373,12 +3492,12 @@ packages:
   /@types/accepts@1.3.5:
     resolution: {integrity: sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
 
   /@types/adm-zip@0.5.0:
     resolution: {integrity: sha512-FCJBJq9ODsQZUNURo5ILAQueuA8WJhRvuihS3ke2iI25mJlfV2LK8jG2Qj2z2AWg8U0FtWWqBHVRetceLskSaw==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
     dev: true
 
   /@types/argparse@1.0.38:
@@ -3426,7 +3545,7 @@ packages:
     resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==}
     dependencies:
       '@types/connect': 3.4.35
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
 
   /@types/bull@3.15.9:
     resolution: {integrity: sha512-MPUcyPPQauAmynoO3ezHAmCOhbB0pWmYyijr/5ctaCqhbKWsjW0YCod38ZcLzUBprosfZ9dPqfYIcfdKjk7RNQ==}
@@ -3442,7 +3561,7 @@ packages:
     dependencies:
       '@types/http-cache-semantics': 4.0.1
       '@types/keyv': 3.1.4
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       '@types/responselike': 1.0.0
 
   /@types/cbor@6.0.0:
@@ -3455,14 +3574,14 @@ packages:
   /@types/co-body@6.1.0:
     resolution: {integrity: sha512-3e0q2jyDAnx/DSZi0z2H0yoZ2wt5yRDZ+P7ymcMObvq0ufWRT4tsajyO+Q1VwVWiv9PRR4W3YEjEzBjeZlhF+w==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       '@types/qs': 6.9.7
     dev: false
 
   /@types/connect@3.4.35:
     resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
 
   /@types/content-disposition@0.5.5:
     resolution: {integrity: sha512-v6LCdKfK6BwcqMo+wYW05rLS12S0ZO0Fl4w1h4aaZMD7bqT3gVUns6FvLJKGZHQmYn3SX55JWGpziwJRwVgutA==}
@@ -3473,7 +3592,7 @@ packages:
       '@types/connect': 3.4.35
       '@types/express': 4.17.17
       '@types/keygrip': 1.0.2
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
 
   /@types/core-js@2.5.0:
     resolution: {integrity: sha512-qjkHL3wF0JMHMqgm/kmL8Pf8rIiqvueEiZ0g6NVTcBX1WN46GWDr+V5z+gsHUeL0n8TfAmXnYmF7ajsxmBp4PQ==}
@@ -3523,7 +3642,7 @@ packages:
   /@types/express-serve-static-core@4.17.35:
     resolution: {integrity: sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       '@types/qs': 6.9.7
       '@types/range-parser': 1.2.4
       '@types/send': 0.17.1
@@ -3539,7 +3658,7 @@ packages:
   /@types/fluent-ffmpeg@2.1.20:
     resolution: {integrity: sha512-B+OvhCdJ3LgEq2PhvWNOiB/EfwnXLElfMCgc4Z1K5zXgSfo9I6uGKwR/lqmNPFQuebNnes7re3gqkV77SyypLg==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
     dev: true
 
   /@types/form-data@2.5.0:
@@ -3552,13 +3671,13 @@ packages:
   /@types/formidable@2.0.6:
     resolution: {integrity: sha512-L4HcrA05IgQyNYJj6kItuIkXrInJvsXTPC5B1i64FggWKKqSL+4hgt7asiSNva75AoLQjq29oPxFfU4GAQ6Z2w==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
     dev: false
 
   /@types/glob-stream@8.0.0:
     resolution: {integrity: sha512-fxTWwdQmX9LWSHD7ZLlv3BHR992mKcVcDnT/2v+l/QZZo7TfDdyasqlSYVzOnMGWhRbrWeWkbj/mgezFjKynhw==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 20.4.1
       '@types/picomatch': 2.3.0
       '@types/streamx': 2.9.1
     dev: true
@@ -3567,7 +3686,7 @@ packages:
     resolution: {integrity: sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==}
     dependencies:
       '@types/minimatch': 5.1.2
-      '@types/node': 20.3.1
+      '@types/node': 20.4.1
     dev: true
 
   /@types/graceful-fs@4.1.6:
@@ -3576,34 +3695,19 @@ packages:
       '@types/node': 20.3.1
     dev: true
 
-  /@types/gulp-rename@2.0.1:
-    resolution: {integrity: sha512-9ZjeS2RHEnmBmTcyi2+oeye3BgCsWhvi4uv3qCnAg8i6plOuRdaeNxjOves0ELysEXYLBl7bCl5fbVs7AZtgTA==}
-    dependencies:
-      '@types/node': 20.3.1
-      '@types/vinyl': 2.0.7
-    dev: true
-
   /@types/gulp-rename@2.0.2:
     resolution: {integrity: sha512-CQsXqTVtAXqrPd4IbrrlJEEzRkUR3RXsyZbrVoOVqjlchDDmnyRDatAUisjpQjjCg/wjJrSiNg8T1uAbJ/7Qqg==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 20.4.1
       '@types/vinyl': 2.0.7
     dev: true
 
-  /@types/gulp@4.0.10:
-    resolution: {integrity: sha512-spgZHJFqiEJGwqGlf7T/k4nkBpBcLgP7T0EfN6G2vvnhUfvd4uO1h8RwpXOE8x/54DVYUs1XCAtBHkX/R3axAQ==}
+  /@types/gulp@4.0.13:
+    resolution: {integrity: sha512-Ms20Q2tZ3MpThZGn4Ag6e7ifz/oQJFxsuiopqz5oHmhE6q2ohnELgafi5K/pKX/4ntlpidS61v/TXAguYsVcaA==}
     dependencies:
       '@types/undertaker': 1.2.8
       '@types/vinyl-fs': 3.0.2
-      chokidar: 3.3.1
-    dev: true
-
-  /@types/gulp@4.0.11:
-    resolution: {integrity: sha512-jy0nfcsjiGqO1prNsYMK/bHkTblIBgG04sL2nxPpnP9MyNicHp1SUblomjOla6JoW1qkR67HjFHqIibpPoShNQ==}
-    dependencies:
-      '@types/undertaker': 1.2.8
-      '@types/vinyl-fs': 3.0.2
-      chokidar: 3.3.1
+      chokidar: 3.5.3
     dev: true
 
   /@types/http-assert@1.5.3:
@@ -3661,7 +3765,7 @@ packages:
   /@types/jsdom@20.0.1:
     resolution: {integrity: sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       '@types/tough-cookie': 4.0.2
       parse5: 7.1.2
     dev: true
@@ -3692,7 +3796,7 @@ packages:
   /@types/keyv@3.1.4:
     resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
 
   /@types/koa-bodyparser@4.3.10:
     resolution: {integrity: sha512-6ae05pjhmrmGhUR8GYD5qr5p9LTEMEGfGXCsK8VaSL+totwigm8+H/7MHW7K4854CMeuwRAubT8qcc/EagaeIA==}
@@ -3808,7 +3912,7 @@ packages:
       '@types/http-errors': 2.0.1
       '@types/keygrip': 1.0.2
       '@types/koa-compose': 3.2.5
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
 
   /@types/koa__cors@3.3.0:
     resolution: {integrity: sha512-FUN8YxcBakIs+walVe3+HcNP+Bxd0SB8BJHBWkglZ5C1XQWljlKcEFDG/dPiCIqwVCUbc5X0nYDlH62uEhdHMA==}
@@ -3857,13 +3961,13 @@ packages:
   /@types/needle@3.2.0:
     resolution: {integrity: sha512-6XzvzEyJ2ozFNfPajFmqH9JOt0Hp+9TawaYpJT59iIP/zR0U37cfWCRwosyIeEBBZBi021Osq4jGAD3AOju5fg==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
     dev: true
 
   /@types/node-fetch@2.6.4:
     resolution: {integrity: sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 20.4.1
       form-data: 3.0.1
     dev: false
 
@@ -3874,19 +3978,23 @@ packages:
       node-fetch: 3.3.1
     dev: true
 
-  /@types/node@14.18.52:
-    resolution: {integrity: sha512-DGhiXKOHSFVVm+PJD+9Y0ObxXLeG6qwc0HoOn+ooQKeNNu+T2mEJCM5UBDUREKAggl9MHYjb5E71PAmx6MbzIg==}
+  /@types/node@14.18.53:
+    resolution: {integrity: sha512-soGmOpVBUq+gaBMwom1M+krC/NNbWlosh4AtGA03SyWNDiqSKtwp7OulO1M6+mg8YkHMvJ/y0AkCeO8d1hNb7A==}
 
   /@types/node@18.11.18:
     resolution: {integrity: sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==}
 
   /@types/node@20.3.1:
     resolution: {integrity: sha512-EhcH/wvidPy1WeML3TtYFGR83UzjxeWRen9V402T8aUGYsCHOmfoisV3ZSg03gAFIbLq8TnWOJ0f4cALtnSEUg==}
+    dev: true
+
+  /@types/node@20.4.1:
+    resolution: {integrity: sha512-JIzsAvJeA/5iY6Y/OxZbv1lUcc8dNSE77lb2gnBH+/PJ3lFR1Ccvgwl5JWnHAkNHcRsT0TbpVOsiMKZ1F/yyJg==}
 
   /@types/nodemailer@6.4.8:
     resolution: {integrity: sha512-oVsJSCkqViCn8/pEu2hfjwVO+Gb3e+eTWjg3PcjeFKRItfKpKwHphQqbYmPQrlMk+op7pNNWPbsJIEthpFN/OQ==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
     dev: true
 
   /@types/normalize-package-data@2.4.1:
@@ -3896,7 +4004,7 @@ packages:
   /@types/oauth@0.9.1:
     resolution: {integrity: sha512-a1iY62/a3yhZ7qH7cNUsxoI3U/0Fe9+RnuFrpTKr+0WVOzbKlSLojShCKe20aOD1Sppv+i8Zlq0pLDuTJnwS4A==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
 
   /@types/object-assign-deep@0.4.0:
     resolution: {integrity: sha512-3D0F3rHRNDc8cQSXNzwF1jBrJi28Mdrhc10ZLlqbJWDPYRWTTWB9Tc8JoKrgBvLKioXoPoHT6Uzf3s2F7akCUg==}
@@ -3926,7 +4034,7 @@ packages:
     resolution: {integrity: sha512-R5H3vw62gHNHrn+JGZbKejb+Z2D/6E5UNVlhCzIaBBLroMQMOFqy5Pap2gM+ZZHdqBtVU0/cx/M6to+mOJcoew==}
     dependencies:
       '@types/needle': 3.2.0
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
     dev: true
 
   /@types/pug@2.0.6:
@@ -3940,7 +4048,7 @@ packages:
   /@types/qrcode@1.5.0:
     resolution: {integrity: sha512-x5ilHXRxUPIMfjtM+1vf/GPTRWZ81nqscursm5gMznJeK9M0YnZ1c3bEvRLQ0zSSgedLx1J6MGL231ObQGGhaA==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
     dev: true
 
   /@types/qs@6.9.7:
@@ -3960,7 +4068,7 @@ packages:
   /@types/redis@2.8.32:
     resolution: {integrity: sha512-7jkMKxcGq9p242exlbsVzuJb57KqHRhNl4dHoQu2Y5v9bCAbtIXXH0R3HleSQW4CTOqpHIYUW3t6tpUj4BVQ+w==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
     dev: true
 
   /@types/redis@4.0.11:
@@ -3977,7 +4085,7 @@ packages:
   /@types/responselike@1.0.0:
     resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
 
   /@types/sanitize-html@2.9.0:
     resolution: {integrity: sha512-4fP/kEcKNj2u39IzrxWYuf/FnCCwwQCpif6wwY6ROUS1EPRIfWJjGkY3HIowY1EX/VbX5e86yq8AAE7UPMgATg==}
@@ -4001,19 +4109,19 @@ packages:
     resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==}
     dependencies:
       '@types/mime': 1.3.2
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
 
   /@types/serve-static@1.15.2:
     resolution: {integrity: sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==}
     dependencies:
       '@types/http-errors': 2.0.1
       '@types/mime': 3.0.1
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
 
   /@types/sharp@0.31.1:
     resolution: {integrity: sha512-5nWwamN9ZFHXaYEincMSuza8nNfOof8nmO+mcI+Agx1uMUk4/pQnNIcix+9rLPXzKrm1pS34+6WRDbDV0Jn7ag==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
     dev: true
 
   /@types/sinonjs__fake-timers@8.1.1:
@@ -4035,7 +4143,7 @@ packages:
   /@types/streamx@2.9.1:
     resolution: {integrity: sha512-9bywzhouyedmci7WCIPFwJ8zASDnxt2gaVUy52X0p0Tt085IJSAEP0L6j4SSNeDMSLzpYu6cPz0GrJZ7kPJ6Bg==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 20.4.1
     dev: true
 
   /@types/throttle-debounce@5.0.0:
@@ -4061,7 +4169,7 @@ packages:
   /@types/undertaker@1.2.8:
     resolution: {integrity: sha512-gW3PRqCHYpo45XFQHJBhch7L6hytPsIe0QeLujlnFsjHPnXLhJcPdN6a9368d7aIQgH2I/dUTPFBlGeSNA3qOg==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 20.4.1
       '@types/undertaker-registry': 1.0.1
       async-done: 1.3.2
     dev: true
@@ -4078,7 +4186,7 @@ packages:
     resolution: {integrity: sha512-ctNcmmzbMIKooXjRkyyUCOu2Z4AyqibL+RhXoF3pb7K7j+ezItnakmpm31LymkYHSIM5ey0tjIFzTvFOTSBCGw==}
     dependencies:
       '@types/glob-stream': 8.0.0
-      '@types/node': 20.3.1
+      '@types/node': 20.4.1
       '@types/vinyl': 2.0.7
     dev: true
 
@@ -4086,13 +4194,13 @@ packages:
     resolution: {integrity: sha512-4UqPv+2567NhMQuMLdKAyK4yzrfCqwaTt6bLhHEs8PFcxbHILsrxaY63n4wgE/BRLDWDQeI+WcTmkXKExh9hQg==}
     dependencies:
       '@types/expect': 1.20.4
-      '@types/node': 20.3.1
+      '@types/node': 20.4.1
     dev: true
 
   /@types/web-push@3.3.2:
     resolution: {integrity: sha512-JxWGVL/m7mWTIg4mRYO+A6s0jPmBkr4iJr39DqJpRJAc+jrPiEe1/asmkwerzRon8ZZDxaZJpsxpv0Z18Wo9gw==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
     dev: true
 
   /@types/webgl-ext@0.0.30:
@@ -4106,13 +4214,13 @@ packages:
   /@types/websocket@1.0.5:
     resolution: {integrity: sha512-NbsqiNX9CnEfC1Z0Vf4mE1SgAJ07JnRYcNex7AJ9zAVzmiGHmjKFEk7O4TJIsgv2B1sLEb6owKFZrACwdYngsQ==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
     dev: true
 
   /@types/ws@8.5.4:
     resolution: {integrity: sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
 
   /@types/yargs-parser@21.0.0:
     resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==}
@@ -4134,7 +4242,7 @@ packages:
     resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==}
     requiresBuild: true
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 20.4.1
     dev: true
     optional: true
 
@@ -4267,14 +4375,14 @@ packages:
       eslint-visitor-keys: 3.4.1
     dev: true
 
-  /@vitejs/plugin-vue@4.2.3(vite@4.3.9)(vue@3.3.4):
+  /@vitejs/plugin-vue@4.2.3(vite@4.4.2)(vue@3.3.4):
     resolution: {integrity: sha512-R6JDUfiZbJA9cMiguQ7jxALsgiprjBeHL5ikpXfJCH62pPHtI+JdJ5xWj6Ev73yXSlYl86+blXn1kZHQ7uElxw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
       vite: ^4.0.0
       vue: ^3.2.25
     dependencies:
-      vite: 4.3.9(@types/node@18.11.18)(sass@1.62.1)
+      vite: 4.4.2(@types/node@20.4.1)(sass@1.63.6)
       vue: 3.3.4
     dev: true
 
@@ -4298,7 +4406,7 @@ packages:
     resolution: {integrity: sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==}
     dependencies:
       '@babel/parser': 7.22.5
-      postcss: 8.4.24
+      postcss: 8.4.25
       source-map: 0.6.1
     dev: true
 
@@ -5465,6 +5573,11 @@ packages:
 
   /blurhash@1.1.5:
     resolution: {integrity: sha512-a+LO3A2DfxTaTztsmkbLYmUzUeApi0LZuKalwbNmqAHR6HhJGMt1qSV/R3wc+w4DL28holjqO3Bg74aUGavGjg==}
+    dev: false
+
+  /blurhash@2.0.5:
+    resolution: {integrity: sha512-cRygWd7kGBQO3VEhPiTgq4Wc43ctsM+o46urrmPOiuAe+07fzlSB9OJVdpgDL0jPqXUVQ9ht7aq7kxOeJHRK+w==}
+    dev: true
 
   /bmp-js@0.1.0:
     resolution: {integrity: sha512-vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw==}
@@ -5513,10 +5626,10 @@ packages:
     dependencies:
       fill-range: 7.0.1
 
-  /broadcast-channel@4.19.1:
-    resolution: {integrity: sha512-CroDV8L4QdMuCHtjs0AATaN2w1rA5e6ca9a3yZATmAs3lbFu3q3QkITkuMS4sQ/NjtZwkVANXLlhgyQfiukBuw==}
+  /broadcast-channel@5.1.0:
+    resolution: {integrity: sha512-wAbP+mtQ28N+iX3scX6Q97UN39ER5jRWOtM3r1BNPLWFOMt3AGmwN9kS3fqwgaUW0tbWHRSfTpsT+pAvrzQz0Q==}
     dependencies:
-      '@babel/runtime': 7.20.7
+      '@babel/runtime': 7.21.0
       oblivious-set: 1.1.1
       p-queue: 6.6.2
       rimraf: 3.0.2
@@ -5646,7 +5759,7 @@ packages:
     dependencies:
       '@npmcli/fs': 3.1.0
       fs-minipass: 3.0.2
-      glob: 10.3.1
+      glob: 10.3.3
       lru-cache: 7.18.3
       minipass: 5.0.0
       minipass-collect: 1.0.2
@@ -5927,6 +6040,21 @@ packages:
     optionalDependencies:
       fsevents: 2.1.3
 
+  /chokidar@3.5.3:
+    resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
+    engines: {node: '>= 8.10.0'}
+    dependencies:
+      anymatch: 3.1.3
+      braces: 3.0.2
+      glob-parent: 5.1.2
+      is-binary-path: 2.1.0
+      is-glob: 4.0.3
+      normalize-path: 3.0.0
+      readdirp: 3.6.0
+    optionalDependencies:
+      fsevents: 2.3.2
+    dev: true
+
   /chownr@1.1.4:
     resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
     dev: false
@@ -6299,8 +6427,8 @@ packages:
     engines: {node: '>=4.0.0'}
     dev: true
 
-  /compare-versions@5.0.3:
-    resolution: {integrity: sha512-4UZlZP8Z99MGEY+Ovg/uJxJuvoXuN4M6B3hKaiackiHrgzQFEe3diJi1mf1PNHbFujM7FvLrK2bpgIaImbtZ1A==}
+  /compare-versions@6.0.0:
+    resolution: {integrity: sha512-s2MzYxfRsE9f/ow8hjn7ysa7pod1xhHdQMsgiJtKx6XSNf4x2N1KG4fjrkUmXcP/e9Y2ZX4zB6sHIso0Lm6evQ==}
     dev: true
 
   /component-emitter@1.3.0:
@@ -6587,6 +6715,12 @@ packages:
   /core-js@3.31.0:
     resolution: {integrity: sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ==}
     requiresBuild: true
+    dev: false
+
+  /core-js@3.31.1:
+    resolution: {integrity: sha512-2sKLtfq1eFST7l7v62zaqXacPc7uG8ZAya8ogijLhTtaKNcpzpB4TMoTw2Si+8GYKRwFPMMtUT0263QFWFfqyQ==}
+    requiresBuild: true
+    dev: true
 
   /core-util-is@1.0.2:
     resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==}
@@ -6769,7 +6903,7 @@ packages:
     dependencies:
       '@cypress/request': 2.88.11
       '@cypress/xvfb': 1.2.4(supports-color@8.1.1)
-      '@types/node': 14.18.52
+      '@types/node': 14.18.53
       '@types/sinonjs__fake-timers': 8.1.1
       '@types/sizzle': 2.3.3
       arch: 2.2.0
@@ -7476,34 +7610,34 @@ packages:
       es6-symbol: 3.1.3
     dev: true
 
-  /esbuild@0.17.19:
-    resolution: {integrity: sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==}
+  /esbuild@0.18.11:
+    resolution: {integrity: sha512-i8u6mQF0JKJUlGR3OdFLKldJQMMs8OqM9Cc3UCi9XXziJ9WERM5bfkHaEAy0YAvPRMgqSW55W7xYn84XtEFTtA==}
     engines: {node: '>=12'}
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      '@esbuild/android-arm': 0.17.19
-      '@esbuild/android-arm64': 0.17.19
-      '@esbuild/android-x64': 0.17.19
-      '@esbuild/darwin-arm64': 0.17.19
-      '@esbuild/darwin-x64': 0.17.19
-      '@esbuild/freebsd-arm64': 0.17.19
-      '@esbuild/freebsd-x64': 0.17.19
-      '@esbuild/linux-arm': 0.17.19
-      '@esbuild/linux-arm64': 0.17.19
-      '@esbuild/linux-ia32': 0.17.19
-      '@esbuild/linux-loong64': 0.17.19
-      '@esbuild/linux-mips64el': 0.17.19
-      '@esbuild/linux-ppc64': 0.17.19
-      '@esbuild/linux-riscv64': 0.17.19
-      '@esbuild/linux-s390x': 0.17.19
-      '@esbuild/linux-x64': 0.17.19
-      '@esbuild/netbsd-x64': 0.17.19
-      '@esbuild/openbsd-x64': 0.17.19
-      '@esbuild/sunos-x64': 0.17.19
-      '@esbuild/win32-arm64': 0.17.19
-      '@esbuild/win32-ia32': 0.17.19
-      '@esbuild/win32-x64': 0.17.19
+      '@esbuild/android-arm': 0.18.11
+      '@esbuild/android-arm64': 0.18.11
+      '@esbuild/android-x64': 0.18.11
+      '@esbuild/darwin-arm64': 0.18.11
+      '@esbuild/darwin-x64': 0.18.11
+      '@esbuild/freebsd-arm64': 0.18.11
+      '@esbuild/freebsd-x64': 0.18.11
+      '@esbuild/linux-arm': 0.18.11
+      '@esbuild/linux-arm64': 0.18.11
+      '@esbuild/linux-ia32': 0.18.11
+      '@esbuild/linux-loong64': 0.18.11
+      '@esbuild/linux-mips64el': 0.18.11
+      '@esbuild/linux-ppc64': 0.18.11
+      '@esbuild/linux-riscv64': 0.18.11
+      '@esbuild/linux-s390x': 0.18.11
+      '@esbuild/linux-x64': 0.18.11
+      '@esbuild/netbsd-x64': 0.18.11
+      '@esbuild/openbsd-x64': 0.18.11
+      '@esbuild/sunos-x64': 0.18.11
+      '@esbuild/win32-arm64': 0.18.11
+      '@esbuild/win32-ia32': 0.18.11
+      '@esbuild/win32-x64': 0.18.11
     dev: true
 
   /escalade@3.1.1:
@@ -7889,6 +8023,10 @@ packages:
   /eventemitter3@4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
 
+  /eventemitter3@5.0.1:
+    resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==}
+    dev: true
+
   /events@1.1.1:
     resolution: {integrity: sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==}
     engines: {node: '>=0.4.x'}
@@ -8017,7 +8155,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/expect-utils': 29.6.0
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       jest-get-type: 29.4.3
       jest-matcher-utils: 29.6.0
       jest-message-util: 29.6.0
@@ -8109,6 +8247,10 @@ packages:
       time-stamp: 1.1.0
     dev: true
 
+  /fast-blurhash@1.1.2:
+    resolution: {integrity: sha512-lJVOgYSlahqkRhrKumNx/SGB2F/qS0D1z7xjGYjb5EZJRtlzySGMniZjkQ9h9Rv8sPmM/V9orEgRiMwazDNH6A==}
+    dev: true
+
   /fast-deep-equal@3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
@@ -8127,6 +8269,17 @@ packages:
       micromatch: 4.0.5
     dev: true
 
+  /fast-glob@3.3.0:
+    resolution: {integrity: sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==}
+    engines: {node: '>=8.6.0'}
+    dependencies:
+      '@nodelib/fs.stat': 2.0.5
+      '@nodelib/fs.walk': 1.2.8
+      glob-parent: 5.1.2
+      merge2: 1.4.1
+      micromatch: 4.0.5
+    dev: true
+
   /fast-json-stable-stringify@2.1.0:
     resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
 
@@ -8371,18 +8524,18 @@ packages:
       readable-stream: 2.3.8
     dev: true
 
-  /focus-trap-vue@4.0.2(focus-trap@7.4.3)(vue@3.3.4):
+  /focus-trap-vue@4.0.2(focus-trap@7.5.2)(vue@3.3.4):
     resolution: {integrity: sha512-2iQN2xKCSCzyhcD90VpueQcTIAhaCRxxo67fkz7RSqLmEd16QKjfGslCr3KxvBx0LfpVN9j0IAyKKuJKw3Intg==}
     peerDependencies:
       focus-trap: ^7.0.0
       vue: ^3.0.0
     dependencies:
-      focus-trap: 7.4.3
+      focus-trap: 7.5.2
       vue: 3.3.4
     dev: true
 
-  /focus-trap@7.4.3:
-    resolution: {integrity: sha512-BgSSbK4GPnS2VbtZ50VtOv1Sti6DIkj3+LkVjiWMNjLeAp1SH1UlLx3ULu/DCu4vq5R4/uvTm+zrvsMsuYmGLg==}
+  /focus-trap@7.5.2:
+    resolution: {integrity: sha512-p6vGNNWLDGwJCiEjkSK6oERj/hEyI9ITsSwIUICBoKLlWiTWXJRfQibCwcoi50rTZdbi87qDtUlMCmQwsGSgPw==}
     dependencies:
       tabbable: 6.2.0
     dev: true
@@ -8786,8 +8939,8 @@ packages:
       - supports-color
     dev: true
 
-  /glob@10.3.1:
-    resolution: {integrity: sha512-9BKYcEeIs7QwlCYs+Y3GBvqAMISufUS0i2ELd11zpZjxI5V9iyRj0HgzB5/cLf2NY4vcYBTYzJ7GIui7j/4DOw==}
+  /glob@10.3.3:
+    resolution: {integrity: sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==}
     engines: {node: '>=16 || 14 >=14.17'}
     hasBin: true
     dependencies:
@@ -8795,7 +8948,7 @@ packages:
       jackspeak: 2.2.1
       minimatch: 9.0.2
       minipass: 5.0.0
-      path-scurry: 1.10.0
+      path-scurry: 1.10.1
     dev: false
 
   /glob@7.2.0:
@@ -8879,7 +9032,7 @@ packages:
     dependencies:
       array-union: 2.1.0
       dir-glob: 3.0.1
-      fast-glob: 3.2.12
+      fast-glob: 3.3.0
       ignore: 5.2.4
       merge2: 1.4.1
       slash: 3.0.0
@@ -8952,8 +9105,8 @@ packages:
   /graphemer@1.4.0:
     resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
 
-  /gsap@3.11.5:
-    resolution: {integrity: sha512-Q89nKCLgoX5xUjznh9LcaIUkz54k1voNucT1Rpf9SJNFIQznBwFqt5qUUQbeVInFyN/n18OUJkpeI6CNEDt74w==}
+  /gsap@3.12.2:
+    resolution: {integrity: sha512-EkYnpG8qHgYBFAwsgsGEqvT1WUidX0tt/ijepx7z8EUJHElykg91RvW1XbkT59T0gZzzszOpjQv7SE41XuIXyQ==}
     dev: true
 
   /gulp-cli@2.3.0:
@@ -9002,7 +9155,7 @@ packages:
     resolution: {integrity: sha512-SVSF7ikuWKhpAW4l4wapAqPPSToJoiNKsbDoUnRrSgwZHH7lH8pbPeQj1aOVYQrbZKhfSVBxVW+Py7vtulRktw==}
     engines: {node: '>=10'}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 20.4.1
       '@types/vinyl': 2.0.7
       istextorbinary: 3.3.0
       replacestream: 4.0.3
@@ -10143,7 +10296,7 @@ packages:
       '@jest/expect': 29.6.0
       '@jest/test-result': 29.6.0
       '@jest/types': 29.6.0
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       chalk: 4.1.2
       co: 4.6.0
       dedent: 0.7.0
@@ -10301,45 +10454,6 @@ packages:
       - supports-color
     dev: true
 
-  /jest-config@29.6.0(@types/node@20.3.1):
-    resolution: {integrity: sha512-fKA4jM91PDqWVkMpb1FVKxIuhg3hC6hgaen57cr1rRZkR96dCatvJZsk3ik7/GNu9ERj9wgAspOmyvkFoGsZhA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      '@types/node': '*'
-      ts-node: '>=9.0.0'
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      ts-node:
-        optional: true
-    dependencies:
-      '@babel/core': 7.22.5
-      '@jest/test-sequencer': 29.6.0
-      '@jest/types': 29.6.0
-      '@types/node': 20.3.1
-      babel-jest: 29.6.0(@babel/core@7.22.5)
-      chalk: 4.1.2
-      ci-info: 3.8.0
-      deepmerge: 4.3.1
-      glob: 7.2.3
-      graceful-fs: 4.2.11
-      jest-circus: 29.6.0
-      jest-environment-node: 29.6.0
-      jest-get-type: 29.4.3
-      jest-regex-util: 29.4.3
-      jest-resolve: 29.6.0
-      jest-runner: 29.6.0
-      jest-util: 29.6.0
-      jest-validate: 29.6.0
-      micromatch: 4.0.5
-      parse-json: 5.2.0
-      pretty-format: 29.6.0
-      slash: 3.0.0
-      strip-json-comments: 3.1.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /jest-diff@27.5.1:
     resolution: {integrity: sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
@@ -10443,7 +10557,7 @@ packages:
       '@jest/environment': 29.6.0
       '@jest/fake-timers': 29.6.0
       '@jest/types': 29.6.0
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       jest-mock: 29.6.0
       jest-util: 29.6.0
     dev: true
@@ -10493,7 +10607,7 @@ packages:
     dependencies:
       '@jest/types': 29.6.0
       '@types/graceful-fs': 4.1.6
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.11
@@ -10610,7 +10724,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.0
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       jest-util: 29.6.0
     dev: true
 
@@ -10741,7 +10855,7 @@ packages:
       '@jest/test-result': 29.6.0
       '@jest/transform': 29.6.0
       '@jest/types': 29.6.0
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       chalk: 4.1.2
       emittery: 0.13.1
       graceful-fs: 4.2.11
@@ -10802,7 +10916,7 @@ packages:
       '@jest/test-result': 29.6.0
       '@jest/transform': 29.6.0
       '@jest/types': 29.6.0
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       chalk: 4.1.2
       cjs-module-lexer: 1.2.3
       collect-v8-coverage: 1.0.1
@@ -10905,7 +11019,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.0
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       chalk: 4.1.2
       ci-info: 3.8.0
       graceful-fs: 4.2.11
@@ -10955,7 +11069,7 @@ packages:
     dependencies:
       '@jest/test-result': 29.6.0
       '@jest/types': 29.6.0
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       emittery: 0.13.1
@@ -10976,7 +11090,7 @@ packages:
     resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
     engines: {node: '>= 10.13.0'}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       merge-stream: 2.0.0
       supports-color: 8.1.1
     dev: true
@@ -10985,7 +11099,7 @@ packages:
     resolution: {integrity: sha512-dICMQ+Q4W0QVMsaQzWlA1FVQhKNz7QcDCOGtbk1GCAd0Lai+wdkQvfmQwL4MjGumineh1xz+6M5oMj3rfWS02A==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       jest-util: 29.6.0
       merge-stream: 2.0.0
       supports-color: 8.1.1
@@ -10995,7 +11109,7 @@ packages:
     resolution: {integrity: sha512-oiQHH1SnKmZIwwPnpOrXTq4kHBk3lKGY/07DpnH0sAu+x7J8rXlbLDROZsU6vy9GwB0hPiZeZpu6YlJ48QoKcA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 18.11.18
       jest-util: 29.6.0
       merge-stream: 2.0.0
       supports-color: 8.1.1
@@ -11365,8 +11479,8 @@ packages:
       safe-buffer: 5.2.1
     dev: false
 
-  /katex@0.16.7:
-    resolution: {integrity: sha512-Xk9C6oGKRwJTfqfIbtr0Kes9OSv6IFsuhFGc7tW4urlpMJtuh+7YhzU6YEG9n8gmWKcMAFzkp7nr+r69kV0zrA==}
+  /katex@0.16.8:
+    resolution: {integrity: sha512-ftuDnJbcbOckGY11OO+zg3OofESlbR5DRl2cmN8HeWeeFIV7wTXvAOx8kEjZjobhA+9wh2fbKeO6cdcA9Mnovg==}
     hasBin: true
     dependencies:
       commander: 8.3.0
@@ -13238,8 +13352,8 @@ packages:
       path-root-regex: 0.1.2
     dev: true
 
-  /path-scurry@1.10.0:
-    resolution: {integrity: sha512-tZFEaRQbMLjwrsmidsGJ6wDMv0iazJWk6SfIKnY4Xru8auXgmJkOBa5DUbYFcFD2Rzk2+KDlIiF0GVXNCbgC7g==}
+  /path-scurry@1.10.1:
+    resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==}
     engines: {node: '>=16 || 14 >=14.17'}
     dependencies:
       lru-cache: 10.0.0
@@ -13345,8 +13459,8 @@ packages:
       split2: 4.2.0
     dev: false
 
-  /photoswipe@5.3.7:
-    resolution: {integrity: sha512-zsyLsTTLFrj0XR1m4/hO7qNooboFKUrDy+Zt5i2d6qjFPAtBjzaj/Xtydso4uxzcXpcqbTmyxDibb3BcSISseg==}
+  /photoswipe@5.3.8:
+    resolution: {integrity: sha512-4vTzOQt8GP4Chsm0s+8j2xDtVHAEN252PxrU12A1zXauNn0zD5HRHgjALKO2GKTyBnTnOrJUOxbV8LTrFIMrYw==}
     engines: {node: '>= 0.12.0'}
     dev: true
 
@@ -13672,6 +13786,15 @@ packages:
       picocolors: 1.0.0
       source-map-js: 1.0.2
 
+  /postcss@8.4.25:
+    resolution: {integrity: sha512-7taJ/8t2av0Z+sQEvNzCkpDynl0tX3uJMCODi6nT3PfASC7dYCWV9aQ+uiCf+KBD4SEFcu+GvJdGdwzQ6OSjCw==}
+    engines: {node: ^10 || ^12 || >=14}
+    dependencies:
+      nanoid: 3.3.6
+      picocolors: 1.0.0
+      source-map-js: 1.0.2
+    dev: true
+
   /postgres-array@2.0.0:
     resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
     engines: {node: '>=4'}
@@ -14003,11 +14126,6 @@ packages:
     resolution: {integrity: sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==}
     dev: false
 
-  /punycode@2.1.1:
-    resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==}
-    engines: {node: '>=6'}
-    dev: true
-
   /punycode@2.3.0:
     resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==}
     engines: {node: '>=6'}
@@ -14256,6 +14374,13 @@ packages:
     dependencies:
       picomatch: 2.3.1
 
+  /readdirp@3.6.0:
+    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
+    engines: {node: '>=8.10.0'}
+    dependencies:
+      picomatch: 2.3.1
+    dev: true
+
   /rechoir@0.6.2:
     resolution: {integrity: sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==}
     engines: {node: '>= 0.10'}
@@ -14616,8 +14741,8 @@ packages:
       rangestr: 0.0.1
       seedrandom: 2.4.2
 
-  /rollup@3.23.1:
-    resolution: {integrity: sha512-ybRdFVHOoljGEFILHLd2g/qateqUdjE6YS41WXq4p3C/WwD3xtWxV4FYWETA1u9TeXQc5K8L8zHE5d/scOvrOQ==}
+  /rollup@3.26.2:
+    resolution: {integrity: sha512-6umBIGVz93er97pMgQO08LuH3m6PUb3jlDUUGFsNJB6VgTCUaDFpupf5JfU30529m/UKOgmiX+uY6Sx8cOYpLA==}
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
@@ -14694,12 +14819,12 @@ packages:
       postcss: 8.4.24
     dev: false
 
-  /sass@1.62.1:
-    resolution: {integrity: sha512-NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A==}
+  /sass@1.63.6:
+    resolution: {integrity: sha512-MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw==}
     engines: {node: '>=14.0.0'}
     hasBin: true
     dependencies:
-      chokidar: 3.3.1
+      chokidar: 3.5.3
       immutable: 4.3.0
       source-map-js: 1.0.2
     dev: true
@@ -15172,10 +15297,6 @@ packages:
       safer-buffer: 2.1.2
       tweetnacl: 0.14.5
 
-  /ssr-window@4.0.2:
-    resolution: {integrity: sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==}
-    dev: true
-
   /ssri@10.0.4:
     resolution: {integrity: sha512-12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
@@ -15534,11 +15655,9 @@ packages:
       webpack: 5.85.1(@swc/core@1.3.62)(webpack-cli@5.1.3)
     dev: true
 
-  /swiper@9.3.2:
-    resolution: {integrity: sha512-Kj9Z4kXRmJR3YT/Wj+XLWj8P6IcRt+WG38uL8M3/Wny7+6sV0TlP9vnE1X+Co9c7VzNooojWGnFa+Wf/9+CUMA==}
+  /swiper@10.0.4:
+    resolution: {integrity: sha512-DlNR3KiaVkPep6RraZ2tNr7lvyuzELuR+4NZr4wO42t0UworIO3DxDlz8b5Q3uUioh7cJad99EdRJLkPF+r8Ag==}
     engines: {node: '>= 4.7.0'}
-    dependencies:
-      ssr-window: 4.0.2
     dev: true
 
   /symbol-tree@3.2.4:
@@ -15781,6 +15900,11 @@ packages:
 
   /tinycolor2@1.5.2:
     resolution: {integrity: sha512-h80m9GPFGbcLzZByXlNSEhp1gf8Dy+VX/2JCGUZsWLo7lV1mnE/XlxGYgRBoMLJh1lIDXP0EMC4RPTjlRaV+Bg==}
+    dev: false
+
+  /tinycolor2@1.6.0:
+    resolution: {integrity: sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==}
+    dev: true
 
   /tmp@0.2.1:
     resolution: {integrity: sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==}
@@ -15905,7 +16029,7 @@ packages:
       escape-string-regexp: 5.0.0
     dev: true
 
-  /ts-jest@27.1.2(@babel/core@7.22.5)(@types/jest@27.4.0)(jest@27.4.5)(typescript@5.1.3):
+  /ts-jest@27.1.2(@babel/core@7.22.8)(@types/jest@27.4.0)(jest@27.4.5)(typescript@5.1.3):
     resolution: {integrity: sha512-eSOiJOWq6Hhs6Khzk5wKC5sgWIXgXqOCiIl1+3lfnearu58Hj4QpE5tUhQcA3xtZrELbcvAGCsd6HB8OsaVaTA==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     hasBin: true
@@ -15926,7 +16050,7 @@ packages:
       esbuild:
         optional: true
     dependencies:
-      '@babel/core': 7.22.5
+      '@babel/core': 7.22.8
       '@types/jest': 27.4.0
       bs-logger: 0.2.6
       fast-json-stable-stringify: 2.1.0
@@ -15940,7 +16064,7 @@ packages:
       yargs-parser: 20.2.9
     dev: true
 
-  /ts-jest@29.0.5(@babel/core@7.22.5)(jest@29.4.0)(typescript@4.9.4):
+  /ts-jest@29.0.5(@babel/core@7.22.8)(jest@29.4.0)(typescript@4.9.4):
     resolution: {integrity: sha512-PL3UciSgIpQ7f6XjVOmbi96vmDHUqAyqDr8YxzopDqX3kfgYtX1cuNeBjP+L9sFXi6nzsGGA6R3fP3DDDJyrxA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -15961,7 +16085,7 @@ packages:
       esbuild:
         optional: true
     dependencies:
-      '@babel/core': 7.22.5
+      '@babel/core': 7.22.8
       bs-logger: 0.2.6
       fast-json-stable-stringify: 2.1.0
       jest: 29.4.0(@types/node@18.11.18)
@@ -16051,11 +16175,11 @@ packages:
       v8-compile-cache-lib: 3.0.1
       yn: 3.1.1
 
-  /tsc-alias@1.8.6:
-    resolution: {integrity: sha512-vq+i6VpE83IeMsSJVcFN03ZBofADhr8/gIJXjxpbnTRfN/MFXy0+SBaKG2o7p95QqXBGkeG98HYz3IkOOveFbg==}
+  /tsc-alias@1.8.7:
+    resolution: {integrity: sha512-59Q/zUQa3miTf99mLbSqaW0hi1jt4WoG8Uhe5hSZJHQpSoFW9eEwvW7jlKMHXWvT+zrzy3SN9PE/YBhQ+WVydA==}
     hasBin: true
     dependencies:
-      chokidar: 3.3.1
+      chokidar: 3.5.3
       commander: 9.5.0
       globby: 11.1.0
       mylas: 2.1.13
@@ -16315,6 +16439,12 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
+  /typescript@5.1.6:
+    resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+    dev: true
+
   /ulid@2.3.0:
     resolution: {integrity: sha512-keqHubrlpvT6G2wH0OEfSW4mquYRcbe/J8NMmveoQOjUqmo+hXtO+ORCpWhdbZ7k72UtY61BL7haGxW6enBnjw==}
     hasBin: true
@@ -16649,7 +16779,7 @@ packages:
       replace-ext: 1.0.1
     dev: true
 
-  /vite-plugin-compression@0.5.1(vite@4.3.9):
+  /vite-plugin-compression@0.5.1(vite@4.4.2):
     resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
     peerDependencies:
       vite: '>=2.0.0'
@@ -16657,18 +16787,19 @@ packages:
       chalk: 4.1.2
       debug: 4.3.4(supports-color@8.1.1)
       fs-extra: 10.1.0
-      vite: 4.3.9(@types/node@18.11.18)(sass@1.62.1)
+      vite: 4.4.2(@types/node@20.4.1)(sass@1.63.6)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /vite@4.3.9(@types/node@18.11.18)(sass@1.62.1):
-    resolution: {integrity: sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==}
+  /vite@4.4.2(@types/node@20.4.1)(sass@1.63.6):
+    resolution: {integrity: sha512-zUcsJN+UvdSyHhYa277UHhiJ3iq4hUBwHavOpsNUGsTgjBeoBlK8eDt+iT09pBq0h9/knhG/SPrZiM7cGmg7NA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
     peerDependencies:
       '@types/node': '>= 14'
       less: '*'
+      lightningcss: ^1.21.0
       sass: '*'
       stylus: '*'
       sugarss: '*'
@@ -16678,6 +16809,8 @@ packages:
         optional: true
       less:
         optional: true
+      lightningcss:
+        optional: true
       sass:
         optional: true
       stylus:
@@ -16687,11 +16820,11 @@ packages:
       terser:
         optional: true
     dependencies:
-      '@types/node': 18.11.18
-      esbuild: 0.17.19
-      postcss: 8.4.24
-      rollup: 3.23.1
-      sass: 1.62.1
+      '@types/node': 20.4.1
+      esbuild: 0.18.11
+      postcss: 8.4.25
+      rollup: 3.26.2
+      sass: 1.63.6
     optionalDependencies:
       fsevents: 2.3.2
     dev: true
@@ -17422,15 +17555,15 @@ packages:
     name: plyr
     version: 3.7.0
     dependencies:
-      core-js: 3.31.0
+      core-js: 3.31.1
       custom-event-polyfill: 1.0.7
       loadjs: 4.2.0
       rangetouch: 2.0.1
       url-polyfill: 1.1.12
     dev: true
 
-  github.com/thatonecalculator/emojilib/9d16541664dc8fef3201ae9b647477070676a52e:
-    resolution: {tarball: https://codeload.github.com/thatonecalculator/emojilib/tar.gz/9d16541664dc8fef3201ae9b647477070676a52e}
+  github.com/thatonecalculator/emojilib/15fd9504f943763a057ff803ee2009ec0524c96b:
+    resolution: {tarball: https://codeload.github.com/thatonecalculator/emojilib/tar.gz/15fd9504f943763a057ff803ee2009ec0524c96b}
     name: emojilib
     version: 3.0.10
     dev: true

From 99b87138dcd5c4df4584a0642904e6740ffd567a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 10 Jul 2023 21:14:22 -0700
Subject: [PATCH 25/68] dev60

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

diff --git a/package.json b/package.json
index 5927883165..0f14400cf7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-rc3",
+	"version": "14.0.0-dev60",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 54b6106be3353f78fa888bc40639c7a2a4993a7e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 10 Jul 2023 21:16:56 -0700
Subject: [PATCH 26/68] fix: :ambulance: correct import for swiper 10

---
 packages/client/src/pages/about.vue           | 2 +-
 packages/client/src/pages/admin-file.vue      | 2 +-
 packages/client/src/pages/channels.vue        | 2 +-
 packages/client/src/pages/explore.vue         | 2 +-
 packages/client/src/pages/gallery/index.vue   | 2 +-
 packages/client/src/pages/instance-info.vue   | 2 +-
 packages/client/src/pages/messaging/index.vue | 2 +-
 packages/client/src/pages/notifications.vue   | 2 +-
 packages/client/src/pages/pages.vue           | 2 +-
 packages/client/src/pages/search.vue          | 2 +-
 packages/client/src/pages/tag.vue             | 2 +-
 packages/client/src/pages/timeline.vue        | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue
index b7fe6fe7af..88ed1add21 100644
--- a/packages/client/src/pages/about.vue
+++ b/packages/client/src/pages/about.vue
@@ -163,7 +163,7 @@
 
 <script lang="ts" setup>
 import { ref, computed, onMounted, watch } from "vue";
-import { Virtual } from "swiper";
+import { Virtual } from "swiper/modules";
 import { Swiper, SwiperSlide } from "swiper/vue";
 import XEmojis from "./about.emojis.vue";
 import XFederation from "./about.federation.vue";
diff --git a/packages/client/src/pages/admin-file.vue b/packages/client/src/pages/admin-file.vue
index 4a2c87e937..87647dc1df 100644
--- a/packages/client/src/pages/admin-file.vue
+++ b/packages/client/src/pages/admin-file.vue
@@ -157,7 +157,7 @@
 
 <script lang="ts" setup>
 import { computed, watch } from "vue";
-import { Virtual } from "swiper";
+import { Virtual } from "swiper/modules";
 import { Swiper, SwiperSlide } from "swiper/vue";
 import MkButton from "@/components/MkButton.vue";
 import MkSwitch from "@/components/form/switch.vue";
diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue
index 75e9224405..65f4dbf0cb 100644
--- a/packages/client/src/pages/channels.vue
+++ b/packages/client/src/pages/channels.vue
@@ -112,7 +112,7 @@
 
 <script lang="ts" setup>
 import { computed, onMounted, defineComponent, inject, watch } from "vue";
-import { Virtual } from "swiper";
+import { Virtual } from "swiper/modules";
 import { Swiper, SwiperSlide } from "swiper/vue";
 import MkChannelPreview from "@/components/MkChannelPreview.vue";
 import MkChannelList from "@/components/MkChannelList.vue";
diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index 3e0a114ec1..c5b638ba4c 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -38,7 +38,7 @@
 
 <script lang="ts" setup>
 import { computed, watch, onMounted } from "vue";
-import { Virtual } from "swiper";
+import { Virtual } from "swiper/modules";
 import { Swiper, SwiperSlide } from "swiper/vue";
 import XFeatured from "./explore.featured.vue";
 import XUsers from "./explore.users.vue";
diff --git a/packages/client/src/pages/gallery/index.vue b/packages/client/src/pages/gallery/index.vue
index a4a09325c9..45e7bd7ae6 100644
--- a/packages/client/src/pages/gallery/index.vue
+++ b/packages/client/src/pages/gallery/index.vue
@@ -107,7 +107,7 @@
 
 <script lang="ts" setup>
 import { computed, defineComponent, watch, onMounted } from "vue";
-import { Virtual } from "swiper";
+import { Virtual } from "swiper/modules";
 import { Swiper, SwiperSlide } from "swiper/vue";
 import MkFolder from "@/components/MkFolder.vue";
 import MkPagination from "@/components/MkPagination.vue";
diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue
index cd6a390c84..20643a32f2 100644
--- a/packages/client/src/pages/instance-info.vue
+++ b/packages/client/src/pages/instance-info.vue
@@ -338,7 +338,7 @@
 
 <script lang="ts" setup>
 import { watch } from "vue";
-import { Virtual } from "swiper";
+import { Virtual } from "swiper/modules";
 import { Swiper, SwiperSlide } from "swiper/vue";
 import type * as calckey from "calckey-js";
 import MkChart from "@/components/MkChart.vue";
diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index 72d32fa21f..59ef020941 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -90,7 +90,7 @@
 <script lang="ts" setup>
 import { ref, markRaw, onMounted, onUnmounted, watch } from "vue";
 import * as Acct from "calckey-js/built/acct";
-import { Virtual } from "swiper";
+import { Virtual } from "swiper/modules";
 import { Swiper, SwiperSlide } from "swiper/vue";
 import MkButton from "@/components/MkButton.vue";
 import MkChatPreview from "@/components/MkChatPreview.vue";
diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index 47554d9ae3..f8e68a99f2 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -52,7 +52,7 @@
 
 <script lang="ts" setup>
 import { computed, ref, watch } from "vue";
-import { Virtual } from "swiper";
+import { Virtual } from "swiper/modules";
 import { Swiper, SwiperSlide } from "swiper/vue";
 import { notificationTypes } from "calckey-js";
 import XNotifications from "@/components/MkNotifications.vue";
diff --git a/packages/client/src/pages/pages.vue b/packages/client/src/pages/pages.vue
index a3a08be7cf..6b051f683f 100644
--- a/packages/client/src/pages/pages.vue
+++ b/packages/client/src/pages/pages.vue
@@ -81,7 +81,7 @@
 
 <script lang="ts" setup>
 import { computed, watch, onMounted } from "vue";
-import { Virtual } from "swiper";
+import { Virtual } from "swiper/modules";
 import { Swiper, SwiperSlide } from "swiper/vue";
 import MkPagePreview from "@/components/MkPagePreview.vue";
 import MkPagination from "@/components/MkPagination.vue";
diff --git a/packages/client/src/pages/search.vue b/packages/client/src/pages/search.vue
index 3968348a5f..fdab6636e8 100644
--- a/packages/client/src/pages/search.vue
+++ b/packages/client/src/pages/search.vue
@@ -41,7 +41,7 @@
 
 <script lang="ts" setup>
 import { computed, watch, onMounted } from "vue";
-import { Virtual } from "swiper";
+import { Virtual } from "swiper/modules";
 import { Swiper, SwiperSlide } from "swiper/vue";
 import XNotes from "@/components/MkNotes.vue";
 import XUserList from "@/components/MkUserList.vue";
diff --git a/packages/client/src/pages/tag.vue b/packages/client/src/pages/tag.vue
index d60bee652a..e9a1792a03 100644
--- a/packages/client/src/pages/tag.vue
+++ b/packages/client/src/pages/tag.vue
@@ -41,7 +41,7 @@
 
 <script lang="ts" setup>
 import { computed, watch, onMounted } from "vue";
-import { Virtual } from "swiper";
+import { Virtual } from "swiper/modules";
 import { Swiper, SwiperSlide } from "swiper/vue";
 import XNotes from "@/components/MkNotes.vue";
 import XUserList from "@/components/MkUserList.vue";
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index a28e3d9f67..930a9635af 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -65,7 +65,7 @@
 
 <script lang="ts" setup>
 import { computed, ref, onMounted } from "vue";
-import { Virtual } from "swiper";
+import { Virtual } from "swiper/modules";
 import { Swiper, SwiperSlide } from "swiper/vue";
 import XTutorial from "@/components/MkTutorialDialog.vue";
 import XTimeline from "@/components/MkTimeline.vue";

From 6d70b2402df7b9a56589ae74eb11785a3b7cfb16 Mon Sep 17 00:00:00 2001
From: freeplay <freeplay@duck.com>
Date: Tue, 11 Jul 2023 00:27:21 -0400
Subject: [PATCH 27/68] style: consistent link underline thickness

---
 packages/client/src/components/global/MkUrl.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/components/global/MkUrl.vue b/packages/client/src/components/global/MkUrl.vue
index 6e50c851eb..41bb053926 100644
--- a/packages/client/src/components/global/MkUrl.vue
+++ b/packages/client/src/components/global/MkUrl.vue
@@ -78,6 +78,7 @@ const target = self ? null : "_blank";
 	text-decoration: none !important;
 	> span {
 		text-decoration: underline var(--fgTransparent);
+		text-decoration-thickness: 1px;
 		transition: text-decoration-color 0.2s;
 	}
 

From 36ef3600c31e49424bade5df4c152d8f1a92e3d2 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 10 Jul 2023 21:29:01 -0700
Subject: [PATCH 28/68] build: :arrow_up: up backend deps

---
 packages/backend/package.json |   64 +--
 pnpm-lock.yaml                | 1004 ++++++++++++++++++++++-----------
 2 files changed, 696 insertions(+), 372 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index ec6451f61c..e249b5d3fe 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -25,16 +25,16 @@
 		"@tensorflow/tfjs-node": "3.21.1"
 	},
 	"dependencies": {
-		"@bull-board/api": "5.2.0",
-		"@bull-board/koa": "5.2.0",
-		"@bull-board/ui": "5.2.0",
+		"@bull-board/api": "5.6.0",
+		"@bull-board/koa": "5.6.0",
+		"@bull-board/ui": "5.6.0",
 		"@discordapp/twemoji": "14.1.2",
 		"@elastic/elasticsearch": "7.17.0",
 		"@koa/cors": "3.4.3",
 		"@koa/multer": "3.0.2",
 		"@koa/router": "9.0.1",
 		"@peertube/http-signature": "1.7.0",
-		"@redocly/openapi-core": "1.0.0-beta.120",
+		"@redocly/openapi-core": "1.0.0-beta.131",
 		"@sinonjs/fake-timers": "9.1.2",
 		"@syuilo/aiscript": "0.11.1",
 		"@tensorflow/tfjs": "^4.2.0",
@@ -45,17 +45,17 @@
 		"autobind-decorator": "2.4.0",
 		"autolinker": "4.0.0",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.1277.0",
+		"aws-sdk": "2.1413.0",
 		"axios": "^1.4.0",
 		"bcryptjs": "2.4.3",
-		"blurhash": "1.1.5",
+		"blurhash": "2.0.5",
 		"bull": "4.10.4",
 		"cacheable-lookup": "7.0.0",
 		"calckey-js": "workspace:*",
 		"cbor": "8.1.0",
-		"chalk": "5.2.0",
+		"chalk": "5.3.0",
 		"chalk-template": "0.4.0",
-		"chokidar": "3.5.3",
+		"chokidar": "^3.5.3",
 		"cli-highlight": "2.1.11",
 		"color-convert": "2.0.1",
 		"content-disposition": "0.5.4",
@@ -68,15 +68,15 @@
 		"got": "12.5.3",
 		"hpagent": "0.1.2",
 		"ioredis": "5.3.2",
-		"ip-cidr": "3.0.11",
+		"ip-cidr": "3.1.0",
 		"is-svg": "4.3.2",
 		"js-yaml": "4.1.0",
 		"jsdom": "20.0.3",
 		"jsonld": "8.2.0",
-		"jsrsasign": "10.6.1",
-		"koa": "2.13.4",
+		"jsrsasign": "10.8.6",
+		"koa": "2.14.2",
 		"koa-body": "^6.0.1",
-		"koa-bodyparser": "4.3.0",
+		"koa-bodyparser": "4.4.1",
 		"koa-favicon": "2.1.0",
 		"koa-json-body": "5.3.0",
 		"koa-logger": "3.2.1",
@@ -98,9 +98,9 @@
 		"nsfwjs": "2.4.2",
 		"oauth": "^0.10.0",
 		"os-utils": "0.0.14",
-		"otpauth": "^9.1.2",
+		"otpauth": "^9.1.3",
 		"parse5": "7.1.2",
-		"pg": "8.11.0",
+		"pg": "8.11.1",
 		"private-ip": "2.3.4",
 		"probe-image-size": "7.2.3",
 		"promise-limit": "2.7.0",
@@ -110,7 +110,7 @@
 		"qs": "6.11.2",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
-		"re2": "1.19.0",
+		"re2": "1.19.1",
 		"redis-lock": "0.1.4",
 		"redis-semaphore": "5.3.1",
 		"reflect-metadata": "0.1.13",
@@ -119,7 +119,7 @@
 		"rss-parser": "3.13.0",
 		"sanitize-html": "2.10.0",
 		"seedrandom": "^3.0.5",
-		"semver": "7.5.1",
+		"semver": "7.5.4",
 		"sharp": "0.32.1",
 		"sonic-channel": "^1.3.1",
 		"stringz": "2.1.0",
@@ -130,27 +130,26 @@
 		"tinycolor2": "1.5.2",
 		"tmp": "0.2.1",
 		"twemoji-parser": "14.0.0",
-		"typeorm": "0.3.11",
+		"typeorm": "0.3.17",
 		"ulid": "2.3.0",
 		"uuid": "9.0.0",
-		"web-push": "3.6.1",
+		"web-push": "3.6.3",
 		"websocket": "1.0.34",
 		"xev": "3.0.2"
 	},
 	"devDependencies": {
 		"@swc/cli": "^0.1.62",
-		"@swc/core": "^1.3.62",
+		"@swc/core": "^1.3.68",
 		"@types/adm-zip": "^0.5.0",
 		"@types/bcryptjs": "2.4.2",
-		"@types/bull": "3.15.9",
 		"@types/cbor": "6.0.0",
 		"@types/escape-regexp": "0.0.1",
-		"@types/fluent-ffmpeg": "2.1.20",
+		"@types/fluent-ffmpeg": "2.1.21",
 		"@types/js-yaml": "4.0.5",
-		"@types/jsdom": "20.0.1",
-		"@types/jsonld": "1.5.8",
-		"@types/jsrsasign": "10.5.4",
-		"@types/koa": "2.13.5",
+		"@types/jsdom": "21.1.1",
+		"@types/jsonld": "1.5.9",
+		"@types/jsrsasign": "10.5.8",
+		"@types/koa": "2.13.6",
 		"@types/koa-bodyparser": "4.3.10",
 		"@types/koa-cors": "0.0.2",
 		"@types/koa-favicon": "2.0.21",
@@ -169,7 +168,7 @@
 		"@types/probe-image-size": "^7.2.0",
 		"@types/pug": "2.0.6",
 		"@types/punycode": "2.1.0",
-		"@types/qrcode": "1.5.0",
+		"@types/qrcode": "1.5.1",
 		"@types/qs": "6.9.7",
 		"@types/random-seed": "0.3.3",
 		"@types/ratelimiter": "3.4.4",
@@ -177,17 +176,16 @@
 		"@types/rename": "1.0.4",
 		"@types/sanitize-html": "2.9.0",
 		"@types/semver": "7.5.0",
-		"@types/sharp": "0.31.1",
 		"@types/sinonjs__fake-timers": "8.1.2",
 		"@types/tinycolor2": "1.4.3",
 		"@types/tmp": "0.2.3",
-		"@types/uuid": "8.3.4",
+		"@types/uuid": "9.0.2",
 		"@types/web-push": "3.3.2",
 		"@types/websocket": "1.0.5",
-		"@types/ws": "8.5.4",
+		"@types/ws": "8.5.5",
 		"autobind-decorator": "2.4.0",
 		"cross-env": "7.0.3",
-		"eslint": "^8.42.0",
+		"eslint": "^8.44.0",
 		"execa": "6.1.0",
 		"json5": "2.2.3",
 		"json5-loader": "4.0.1",
@@ -195,11 +193,11 @@
 		"pug": "3.0.2",
 		"strict-event-emitter-types": "2.0.0",
 		"swc-loader": "^0.2.3",
-		"ts-loader": "9.4.3",
+		"ts-loader": "9.4.4",
 		"ts-node": "10.9.1",
 		"tsconfig-paths": "4.2.0",
-		"typescript": "5.1.3",
-		"webpack": "^5.85.1",
+		"typescript": "5.1.6",
+		"webpack": "^5.88.1",
 		"ws": "8.13.0"
 	}
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8285d327cc..4b4695f3f5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -82,14 +82,14 @@ importers:
   packages/backend:
     dependencies:
       '@bull-board/api':
-        specifier: 5.2.0
-        version: 5.2.0(@bull-board/ui@5.2.0)
+        specifier: 5.6.0
+        version: 5.6.0(@bull-board/ui@5.6.0)
       '@bull-board/koa':
-        specifier: 5.2.0
-        version: 5.2.0(@types/koa@2.13.5)(pug@3.0.2)
+        specifier: 5.6.0
+        version: 5.6.0(@types/koa@2.13.6)(pug@3.0.2)
       '@bull-board/ui':
-        specifier: 5.2.0
-        version: 5.2.0
+        specifier: 5.6.0
+        version: 5.6.0
       '@discordapp/twemoji':
         specifier: 14.1.2
         version: 14.1.2
@@ -109,8 +109,8 @@ importers:
         specifier: 1.7.0
         version: 1.7.0
       '@redocly/openapi-core':
-        specifier: 1.0.0-beta.120
-        version: 1.0.0-beta.120
+        specifier: 1.0.0-beta.131
+        version: 1.0.0-beta.131
       '@sinonjs/fake-timers':
         specifier: 9.1.2
         version: 9.1.2
@@ -142,8 +142,8 @@ importers:
         specifier: 0.1.0
         version: 0.1.0
       aws-sdk:
-        specifier: 2.1277.0
-        version: 2.1277.0
+        specifier: 2.1413.0
+        version: 2.1413.0
       axios:
         specifier: ^1.4.0
         version: 1.4.0
@@ -151,8 +151,8 @@ importers:
         specifier: 2.4.3
         version: 2.4.3
       blurhash:
-        specifier: 1.1.5
-        version: 1.1.5
+        specifier: 2.0.5
+        version: 2.0.5
       bull:
         specifier: 4.10.4
         version: 4.10.4
@@ -166,14 +166,14 @@ importers:
         specifier: 8.1.0
         version: 8.1.0
       chalk:
-        specifier: 5.2.0
-        version: 5.2.0
+        specifier: 5.3.0
+        version: 5.3.0
       chalk-template:
         specifier: 0.4.0
         version: 0.4.0
       chokidar:
         specifier: ^3.3.1
-        version: 3.3.1
+        version: 3.5.3
       cli-highlight:
         specifier: 2.1.11
         version: 2.1.11
@@ -211,8 +211,8 @@ importers:
         specifier: 5.3.2
         version: 5.3.2
       ip-cidr:
-        specifier: 3.0.11
-        version: 3.0.11
+        specifier: 3.1.0
+        version: 3.1.0
       is-svg:
         specifier: 4.3.2
         version: 4.3.2
@@ -226,17 +226,17 @@ importers:
         specifier: 8.2.0
         version: 8.2.0
       jsrsasign:
-        specifier: 10.6.1
-        version: 10.6.1
+        specifier: 10.8.6
+        version: 10.8.6
       koa:
-        specifier: 2.13.4
-        version: 2.13.4
+        specifier: 2.14.2
+        version: 2.14.2
       koa-body:
         specifier: ^6.0.1
         version: 6.0.1
       koa-bodyparser:
-        specifier: 4.3.0
-        version: 4.3.0
+        specifier: 4.4.1
+        version: 4.4.1
       koa-favicon:
         specifier: 2.1.0
         version: 2.1.0
@@ -260,7 +260,7 @@ importers:
         version: 2.1.0
       koa-views:
         specifier: 7.0.2
-        version: 7.0.2(@types/koa@2.13.5)(ejs@3.1.9)(pug@3.0.2)
+        version: 7.0.2(@types/koa@2.13.6)(ejs@3.1.9)(pug@3.0.2)
       megalodon:
         specifier: workspace:*
         version: link:../megalodon
@@ -301,14 +301,14 @@ importers:
         specifier: 0.0.14
         version: 0.0.14
       otpauth:
-        specifier: ^9.1.2
-        version: 9.1.2
+        specifier: ^9.1.3
+        version: 9.1.3
       parse5:
         specifier: 7.1.2
         version: 7.1.2
       pg:
-        specifier: 8.11.0
-        version: 8.11.0
+        specifier: 8.11.1
+        version: 8.11.1
       private-ip:
         specifier: 2.3.4
         version: 2.3.4
@@ -337,8 +337,8 @@ importers:
         specifier: 3.4.1
         version: 3.4.1
       re2:
-        specifier: 1.19.0
-        version: 1.19.0
+        specifier: 1.19.1
+        version: 1.19.1
       redis-lock:
         specifier: 0.1.4
         version: 0.1.4
@@ -364,8 +364,8 @@ importers:
         specifier: ^3.0.5
         version: 3.0.5
       semver:
-        specifier: 7.5.1
-        version: 7.5.1
+        specifier: 7.5.4
+        version: 7.5.4
       sharp:
         specifier: 0.32.1
         version: 0.32.1
@@ -386,7 +386,7 @@ importers:
         version: 5.17.17
       tesseract.js:
         specifier: ^3.0.3
-        version: 3.0.3(eslint@8.42.0)
+        version: 3.0.3(eslint@8.44.0)
       tinycolor2:
         specifier: 1.5.2
         version: 1.5.2
@@ -397,8 +397,8 @@ importers:
         specifier: 14.0.0
         version: 14.0.0
       typeorm:
-        specifier: 0.3.11
-        version: 0.3.11(ioredis@5.3.2)(pg@8.11.0)(ts-node@10.9.1)
+        specifier: 0.3.17
+        version: 0.3.17(ioredis@5.3.2)(pg@8.11.1)(ts-node@10.9.1)
       ulid:
         specifier: 2.3.0
         version: 2.3.0
@@ -406,8 +406,8 @@ importers:
         specifier: 9.0.0
         version: 9.0.0
       web-push:
-        specifier: 3.6.1
-        version: 3.6.1
+        specifier: 3.6.3
+        version: 3.6.3
       websocket:
         specifier: 1.0.34
         version: 1.0.34
@@ -424,19 +424,16 @@ importers:
     devDependencies:
       '@swc/cli':
         specifier: ^0.1.62
-        version: 0.1.62(@swc/core@1.3.62)(chokidar@3.3.1)
+        version: 0.1.62(@swc/core@1.3.68)(chokidar@3.5.3)
       '@swc/core':
-        specifier: ^1.3.62
-        version: 1.3.62
+        specifier: ^1.3.68
+        version: 1.3.68
       '@types/adm-zip':
         specifier: ^0.5.0
         version: 0.5.0
       '@types/bcryptjs':
         specifier: 2.4.2
         version: 2.4.2
-      '@types/bull':
-        specifier: 3.15.9
-        version: 3.15.9
       '@types/cbor':
         specifier: 6.0.0
         version: 6.0.0
@@ -444,23 +441,23 @@ importers:
         specifier: 0.0.1
         version: 0.0.1
       '@types/fluent-ffmpeg':
-        specifier: 2.1.20
-        version: 2.1.20
+        specifier: 2.1.21
+        version: 2.1.21
       '@types/js-yaml':
         specifier: 4.0.5
         version: 4.0.5
       '@types/jsdom':
-        specifier: 20.0.1
-        version: 20.0.1
+        specifier: 21.1.1
+        version: 21.1.1
       '@types/jsonld':
-        specifier: 1.5.8
-        version: 1.5.8
+        specifier: 1.5.9
+        version: 1.5.9
       '@types/jsrsasign':
-        specifier: 10.5.4
-        version: 10.5.4
+        specifier: 10.5.8
+        version: 10.5.8
       '@types/koa':
-        specifier: 2.13.5
-        version: 2.13.5
+        specifier: 2.13.6
+        version: 2.13.6
       '@types/koa-bodyparser':
         specifier: 4.3.10
         version: 4.3.10
@@ -481,7 +478,7 @@ importers:
         version: 4.1.3
       '@types/koa-views':
         specifier: 7.0.0
-        version: 7.0.0(@types/koa@2.13.5)(pug@3.0.2)
+        version: 7.0.0(@types/koa@2.13.6)(pug@3.0.2)
       '@types/koa__cors':
         specifier: 3.3.0
         version: 3.3.0
@@ -516,8 +513,8 @@ importers:
         specifier: 2.1.0
         version: 2.1.0
       '@types/qrcode':
-        specifier: 1.5.0
-        version: 1.5.0
+        specifier: 1.5.1
+        version: 1.5.1
       '@types/qs':
         specifier: 6.9.7
         version: 6.9.7
@@ -539,9 +536,6 @@ importers:
       '@types/semver':
         specifier: 7.5.0
         version: 7.5.0
-      '@types/sharp':
-        specifier: 0.31.1
-        version: 0.31.1
       '@types/sinonjs__fake-timers':
         specifier: 8.1.2
         version: 8.1.2
@@ -552,8 +546,8 @@ importers:
         specifier: 0.2.3
         version: 0.2.3
       '@types/uuid':
-        specifier: 8.3.4
-        version: 8.3.4
+        specifier: 9.0.2
+        version: 9.0.2
       '@types/web-push':
         specifier: 3.3.2
         version: 3.3.2
@@ -561,14 +555,14 @@ importers:
         specifier: 1.0.5
         version: 1.0.5
       '@types/ws':
-        specifier: 8.5.4
-        version: 8.5.4
+        specifier: 8.5.5
+        version: 8.5.5
       cross-env:
         specifier: 7.0.3
         version: 7.0.3
       eslint:
-        specifier: ^8.42.0
-        version: 8.42.0
+        specifier: ^8.44.0
+        version: 8.44.0
       execa:
         specifier: 6.1.0
         version: 6.1.0
@@ -577,7 +571,7 @@ importers:
         version: 2.2.3
       json5-loader:
         specifier: 4.0.1
-        version: 4.0.1(webpack@5.85.1)
+        version: 4.0.1(webpack@5.88.1)
       mocha:
         specifier: 10.2.0
         version: 10.2.0
@@ -589,22 +583,22 @@ importers:
         version: 2.0.0
       swc-loader:
         specifier: ^0.2.3
-        version: 0.2.3(@swc/core@1.3.62)(webpack@5.85.1)
+        version: 0.2.3(@swc/core@1.3.68)(webpack@5.88.1)
       ts-loader:
-        specifier: 9.4.3
-        version: 9.4.3(typescript@5.1.3)(webpack@5.85.1)
+        specifier: 9.4.4
+        version: 9.4.4(typescript@5.1.6)(webpack@5.88.1)
       ts-node:
         specifier: 10.9.1
-        version: 10.9.1(@swc/core@1.3.62)(@types/node@18.11.18)(typescript@5.1.3)
+        version: 10.9.1(@swc/core@1.3.68)(@types/node@18.11.18)(typescript@5.1.6)
       tsconfig-paths:
         specifier: 4.2.0
         version: 4.2.0
       typescript:
-        specifier: 5.1.3
-        version: 5.1.3
+        specifier: 5.1.6
+        version: 5.1.6
       webpack:
-        specifier: ^5.85.1
-        version: 5.85.1(@swc/core@1.3.62)(webpack-cli@5.1.3)
+        specifier: ^5.88.1
+        version: 5.88.1(@swc/core@1.3.68)
       ws:
         specifier: 8.13.0
         version: 8.13.0
@@ -642,7 +636,7 @@ importers:
         version: 7.36.0(@types/node@20.3.1)
       '@swc/cli':
         specifier: ^0.1.62
-        version: 0.1.62(@swc/core@1.3.62)(chokidar@3.3.1)
+        version: 0.1.62(@swc/core@1.3.62)
       '@swc/core':
         specifier: ^1.3.62
         version: 1.3.62
@@ -789,7 +783,7 @@ importers:
         version: 2.30.0
       emojilib:
         specifier: github:thatonecalculator/emojilib
-        version: github.com/thatonecalculator/emojilib/15fd9504f943763a057ff803ee2009ec0524c96b
+        version: github.com/thatonecalculator/emojilib/1d6adc1af8105b4937d2f0e7479acf5bd565bd9b
       escape-regexp:
         specifier: 0.0.1
         version: 0.0.1
@@ -1051,7 +1045,7 @@ importers:
     devDependencies:
       '@swc/cli':
         specifier: ^0.1.62
-        version: 0.1.62(@swc/core@1.3.62)(chokidar@3.3.1)
+        version: 0.1.62(@swc/core@1.3.62)
       '@swc/core':
         specifier: ^1.3.62
         version: 1.3.62
@@ -1076,8 +1070,8 @@ importers:
 
 packages:
 
-  /@aashutoshrathi/word-wrap@1.2.5:
-    resolution: {integrity: sha512-plhoNEfSVdHMKXQyAxvH0Zyv3/4NL8r6pwgMQdmHR2vBUXn2t74PN2pBRppqKUa6RMT0yldyvOHG5Dbjwy2mBQ==}
+  /@aashutoshrathi/word-wrap@1.2.6:
+    resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==}
     engines: {node: '>=0.10.0'}
 
   /@ampproject/remapping@2.2.1:
@@ -1120,7 +1114,7 @@ packages:
       debug: 4.3.4(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
-      semver: 6.3.0
+      semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
@@ -1177,7 +1171,7 @@ packages:
       '@babel/helper-validator-option': 7.22.5
       browserslist: 4.21.9
       lru-cache: 5.1.1
-      semver: 6.3.0
+      semver: 6.3.1
 
   /@babel/helper-compilation-targets@7.22.6(@babel/core@7.22.8):
     resolution: {integrity: sha512-534sYEqWD9VfUm3IPn2SLcH4Q3P86XL+QvqdC7ZsFrzyyPF3T4XGiVghF6PTYNdWg6pXuoqXxNQAhbYeEInTzA==}
@@ -1541,15 +1535,6 @@ packages:
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
     dev: true
 
-  /@bull-board/api@5.2.0(@bull-board/ui@5.2.0):
-    resolution: {integrity: sha512-1HGF2EF/4zI3+Cj414nQzwFprLXOJTlVdqXUf5UEBS4HtYafWv93mGIwkrD8S4Bpz4VSvM87adF6tQPJ7Ewt+w==}
-    peerDependencies:
-      '@bull-board/ui': 5.2.0
-    dependencies:
-      '@bull-board/ui': 5.2.0
-      redis-info: 3.1.0
-    dev: false
-
   /@bull-board/api@5.6.0(@bull-board/ui@5.6.0):
     resolution: {integrity: sha512-a2O15p5oEm+/E/0I2l2nE2NKK0dkgNNTaamu+0gGyfUxWoCS3fCGX6LLEyl3jgOz0IC3GKRnwtVgbZFzk42sGQ==}
     peerDependencies:
@@ -1559,17 +1544,17 @@ packages:
       redis-info: 3.1.0
     dev: false
 
-  /@bull-board/koa@5.2.0(@types/koa@2.13.5)(pug@3.0.2):
-    resolution: {integrity: sha512-jntDAl/POouD0PS/iiKXBNl26SuUf7Y5uL3EgpDN7isvwFcpKhvdk0VdBypjrkRHN6rPaEJJPkEtK30qv01XYw==}
+  /@bull-board/koa@5.6.0(@types/koa@2.13.6)(pug@3.0.2):
+    resolution: {integrity: sha512-unzvUQQwzDF4GBcBjMTKjLtZa6D1QQIQws1hEG+xZ+/cr3LqZbcsJ7A1828XcK6GLPVtbgH0dm2/gZMS4+7Maw==}
     dependencies:
-      '@bull-board/api': 5.2.0(@bull-board/ui@5.2.0)
-      '@bull-board/ui': 5.2.0
+      '@bull-board/api': 5.6.0(@bull-board/ui@5.6.0)
+      '@bull-board/ui': 5.6.0
       ejs: 3.1.9
-      koa: 2.13.4
+      koa: 2.14.2
       koa-mount: 4.0.0
       koa-router: 10.1.1
       koa-static: 5.0.0
-      koa-views: 7.0.2(@types/koa@2.13.5)(ejs@3.1.9)(pug@3.0.2)
+      koa-views: 7.0.2(@types/koa@2.13.6)(ejs@3.1.9)(pug@3.0.2)
     transitivePeerDependencies:
       - '@types/koa'
       - arc-templates
@@ -1627,12 +1612,6 @@ packages:
       - whiskers
     dev: false
 
-  /@bull-board/ui@5.2.0:
-    resolution: {integrity: sha512-f2sgs7AjOVch7tFhbmlVCkhZjJWboxwNxWEfAsIUd1WidUC+Ef5J02tpQvu7apzRtu5zcn8IiJtI5HFO6oKaCA==}
-    dependencies:
-      '@bull-board/api': 5.2.0(@bull-board/ui@5.2.0)
-    dev: false
-
   /@bull-board/ui@5.6.0:
     resolution: {integrity: sha512-mc9T+kijDX5ZJMJCzeKPk9uLfOtcuefdDLPqWi961EiiNKfkDex+Gh41DAfcyrNjYsAkBsphvgBgcvundHPGIw==}
     dependencies:
@@ -2027,6 +2006,16 @@ packages:
     dependencies:
       eslint: 8.42.0
       eslint-visitor-keys: 3.4.1
+    dev: true
+
+  /@eslint-community/eslint-utils@4.4.0(eslint@8.44.0):
+    resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+    dependencies:
+      eslint: 8.44.0
+      eslint-visitor-keys: 3.4.1
 
   /@eslint-community/regexpp@4.5.1:
     resolution: {integrity: sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==}
@@ -2047,10 +2036,32 @@ packages:
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
       - supports-color
+    dev: true
+
+  /@eslint/eslintrc@2.1.0:
+    resolution: {integrity: sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      ajv: 6.12.6
+      debug: 4.3.4(supports-color@8.1.1)
+      espree: 9.6.0
+      globals: 13.20.0
+      ignore: 5.2.4
+      import-fresh: 3.3.0
+      js-yaml: 4.1.0
+      minimatch: 3.1.2
+      strip-json-comments: 3.1.1
+    transitivePeerDependencies:
+      - supports-color
 
   /@eslint/js@8.42.0:
     resolution: {integrity: sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
+  /@eslint/js@8.44.0:
+    resolution: {integrity: sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
   /@hapi/hoek@9.3.0:
     resolution: {integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==}
@@ -2081,6 +2092,7 @@ packages:
 
   /@ioredis/commands@1.2.0:
     resolution: {integrity: sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==}
+    dev: false
 
   /@isaacs/cliui@8.0.2:
     resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
@@ -2613,7 +2625,7 @@ packages:
       nopt: 5.0.0
       npmlog: 5.0.1
       rimraf: 3.0.2
-      semver: 7.5.1
+      semver: 7.5.4
       tar: 6.1.15
     transitivePeerDependencies:
       - encoding
@@ -2631,7 +2643,7 @@ packages:
       nopt: 5.0.0
       npmlog: 5.0.1
       rimraf: 3.0.2
-      semver: 7.5.1
+      semver: 7.5.4
       tar: 6.1.15
     transitivePeerDependencies:
       - encoding
@@ -2791,7 +2803,7 @@ packages:
     resolution: {integrity: sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
     dependencies:
-      semver: 7.5.1
+      semver: 7.5.4
     dev: false
 
   /@nsfw-filter/gif-frames@1.0.2:
@@ -2895,8 +2907,8 @@ packages:
       uri-js: 4.4.1
     dev: false
 
-  /@redocly/openapi-core@1.0.0-beta.120:
-    resolution: {integrity: sha512-BvasunpVWm5O9F/mW6JmxUqat4XFU5zNnKJkMY6GJ9UYH2UxgKnGaMLWXKtbJEOBnMT12S/p9yeqrQHnk8rGhQ==}
+  /@redocly/openapi-core@1.0.0-beta.131:
+    resolution: {integrity: sha512-Dri3Oad3NwcyKgtkYz6hyJO+bAD531ppPrPxNo9Xfqza9LkUtJ6Vi2E6OSRGTWb94iTyEkhrJPbJE56/PbaKhQ==}
     engines: {node: '>=12.0.0'}
     dependencies:
       '@redocly/ajv': 8.11.0
@@ -2906,7 +2918,7 @@ packages:
       js-yaml: 4.1.0
       lodash.isequal: 4.5.0
       minimatch: 5.1.6
-      node-fetch: 2.6.11
+      node-fetch: 2.6.12
       pluralize: 8.0.0
       yaml-ast-parser: 0.0.43
     transitivePeerDependencies:
@@ -3098,7 +3110,7 @@ packages:
     resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
     dev: false
 
-  /@swc/cli@0.1.62(@swc/core@1.3.62)(chokidar@3.3.1):
+  /@swc/cli@0.1.62(@swc/core@1.3.62):
     resolution: {integrity: sha512-kOFLjKY3XH1DWLfXL1/B5MizeNorHR8wHKEi92S/Zi9Md/AK17KSqR8MgyRJ6C1fhKHvbBCl8wboyKAFXStkYw==}
     engines: {node: '>= 12.13'}
     hasBin: true
@@ -3111,10 +3123,30 @@ packages:
     dependencies:
       '@mole-inc/bin-wrapper': 8.0.1
       '@swc/core': 1.3.62
-      chokidar: 3.3.1
       commander: 7.2.0
       fast-glob: 3.2.12
-      semver: 7.5.1
+      semver: 7.5.4
+      slash: 3.0.0
+      source-map: 0.7.4
+    dev: true
+
+  /@swc/cli@0.1.62(@swc/core@1.3.68)(chokidar@3.5.3):
+    resolution: {integrity: sha512-kOFLjKY3XH1DWLfXL1/B5MizeNorHR8wHKEi92S/Zi9Md/AK17KSqR8MgyRJ6C1fhKHvbBCl8wboyKAFXStkYw==}
+    engines: {node: '>= 12.13'}
+    hasBin: true
+    peerDependencies:
+      '@swc/core': ^1.2.66
+      chokidar: ^3.5.1
+    peerDependenciesMeta:
+      chokidar:
+        optional: true
+    dependencies:
+      '@mole-inc/bin-wrapper': 8.0.1
+      '@swc/core': 1.3.68
+      chokidar: 3.5.3
+      commander: 7.2.0
+      fast-glob: 3.2.12
+      semver: 7.5.4
       slash: 3.0.0
       source-map: 0.7.4
     dev: true
@@ -3134,6 +3166,15 @@ packages:
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@swc/core-darwin-arm64@1.3.68:
+    resolution: {integrity: sha512-Z5pNxeuP2NxpOHTzDQkJs0wAPLnTlglZnR3WjObijwvdwT/kw1Y5EPDKM/BVSIeG40SPMkDLBbI0aj0qyXzrBA==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
     optional: true
 
   /@swc/core-darwin-x64@1.3.62:
@@ -3142,6 +3183,15 @@ packages:
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@swc/core-darwin-x64@1.3.68:
+    resolution: {integrity: sha512-ZHl42g6yXhfX4PzAQ0BNvBXpt/OcbAHfubWRN6eXELK3fiNnxL7QBW1if7iizlq6iA+Mj1pwHyyUit1pz0+fgA==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
     optional: true
 
   /@swc/core-linux-arm-gnueabihf@1.3.62:
@@ -3150,6 +3200,15 @@ packages:
     cpu: [arm]
     os: [linux]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@swc/core-linux-arm-gnueabihf@1.3.68:
+    resolution: {integrity: sha512-Mk8f6KCOQ2CNAR4PtWajIjS6XKSSR7ZYDOCf1GXRxhS3qEyQH7V8elWvqWYqHcT4foO60NUmxA/NOM/dQrdO1A==}
+    engines: {node: '>=10'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
     optional: true
 
   /@swc/core-linux-arm64-gnu@1.3.62:
@@ -3158,6 +3217,15 @@ packages:
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@swc/core-linux-arm64-gnu@1.3.68:
+    resolution: {integrity: sha512-RhBllggh9t9sIxaRgRcGrVaS7fDk6KsIqR6b9+dwU5OyDr4ZyHWw1ZaH/1/HAebuXYhNBjoNUiRtca6lKRIPgQ==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
     optional: true
 
   /@swc/core-linux-arm64-musl@1.3.62:
@@ -3166,6 +3234,15 @@ packages:
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@swc/core-linux-arm64-musl@1.3.68:
+    resolution: {integrity: sha512-8K3zjU+tFgn6yGDEeD343gkKaHU9dhz77NiVkI1VzwRaT/Ag5pwl5eMQ1yStm8koNFzn3zq6rGjHfI5g2yI5Wg==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
     optional: true
 
   /@swc/core-linux-x64-gnu@1.3.62:
@@ -3174,6 +3251,15 @@ packages:
     cpu: [x64]
     os: [linux]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@swc/core-linux-x64-gnu@1.3.68:
+    resolution: {integrity: sha512-4xAnvsBOyeTL0AB8GWlRKDM/hsysJ5jr5qvdKKI3rZfJgnnxl/xSX6TJKPsJ8gygfUJ3BmfCbmUmEyeDZ3YPvA==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
     optional: true
 
   /@swc/core-linux-x64-musl@1.3.62:
@@ -3182,6 +3268,15 @@ packages:
     cpu: [x64]
     os: [linux]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@swc/core-linux-x64-musl@1.3.68:
+    resolution: {integrity: sha512-RCpaBo1fcpy1EFdjF+I7N4lfzOaHXVV0iMw/ABM+0PD6tp3V/9pxsguaZyeAHyEiUlDA6PZ4TfXv5zfnXEgW4Q==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
     optional: true
 
   /@swc/core-win32-arm64-msvc@1.3.62:
@@ -3190,6 +3285,15 @@ packages:
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@swc/core-win32-arm64-msvc@1.3.68:
+    resolution: {integrity: sha512-v2WZvXrSslYEpY1nqpItyamL4DyaJinmOkXvM8Bc1LLKU5rGuvmBdjUYg/5Y+o0AUynuiWubpgHNOkBWiCvfqw==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
     optional: true
 
   /@swc/core-win32-ia32-msvc@1.3.62:
@@ -3198,6 +3302,15 @@ packages:
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@swc/core-win32-ia32-msvc@1.3.68:
+    resolution: {integrity: sha512-HH5NJrIdzkJs+1xxprie0qSCMBeL9yeEhcC1yZTzYv8bwmabOUSdtKIqS55iYP/2hLWn9CTbvKPmLOIhCopW3Q==}
+    engines: {node: '>=10'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
     optional: true
 
   /@swc/core-win32-x64-msvc@1.3.62:
@@ -3206,6 +3319,15 @@ packages:
     cpu: [x64]
     os: [win32]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@swc/core-win32-x64-msvc@1.3.68:
+    resolution: {integrity: sha512-9HZVtLQUgK8r/yXQdwe0VBexbIcrY6+fBROhs7AAPWdewpaUeLkwQEJk6TbYr9CQuHw26FFGg6SjwAiqXF+kgQ==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
     optional: true
 
   /@swc/core@1.3.62:
@@ -3228,6 +3350,28 @@ packages:
       '@swc/core-win32-arm64-msvc': 1.3.62
       '@swc/core-win32-ia32-msvc': 1.3.62
       '@swc/core-win32-x64-msvc': 1.3.62
+    dev: true
+
+  /@swc/core@1.3.68:
+    resolution: {integrity: sha512-njGQuJO+Wy06dEayt70cf0c/KI3HGjm4iW9LLViVLBuYNzJ4SSdNfzejludzufu6im+dsDJ0i3QjgWhAIcVHMQ==}
+    engines: {node: '>=10'}
+    requiresBuild: true
+    peerDependencies:
+      '@swc/helpers': ^0.5.0
+    peerDependenciesMeta:
+      '@swc/helpers':
+        optional: true
+    optionalDependencies:
+      '@swc/core-darwin-arm64': 1.3.68
+      '@swc/core-darwin-x64': 1.3.68
+      '@swc/core-linux-arm-gnueabihf': 1.3.68
+      '@swc/core-linux-arm64-gnu': 1.3.68
+      '@swc/core-linux-arm64-musl': 1.3.68
+      '@swc/core-linux-x64-gnu': 1.3.68
+      '@swc/core-linux-x64-musl': 1.3.68
+      '@swc/core-win32-arm64-msvc': 1.3.68
+      '@swc/core-win32-ia32-msvc': 1.3.68
+      '@swc/core-win32-x64-msvc': 1.3.68
 
   /@swc/wasm@1.2.130:
     resolution: {integrity: sha512-rNcJsBxS70+pv8YUWwf5fRlWX6JoY/HJc25HD/F8m6Kv7XhJdqPPMhyX6TKkUBPAG7TWlZYoxa+rHAjPy4Cj3Q==}
@@ -3332,7 +3476,7 @@ packages:
       '@types/webgl-ext': 0.0.30
       '@webgpu/types': 0.1.16
       long: 4.0.0
-      node-fetch: 2.6.11
+      node-fetch: 2.6.12
       seedrandom: 3.0.5
     transitivePeerDependencies:
       - encoding
@@ -3348,7 +3492,7 @@ packages:
       '@types/webgl-ext': 0.0.30
       '@webgpu/types': 0.1.21
       long: 4.0.0
-      node-fetch: 2.6.11
+      node-fetch: 2.6.12
       seedrandom: 3.0.5
     transitivePeerDependencies:
       - encoding
@@ -3362,7 +3506,7 @@ packages:
     dependencies:
       '@tensorflow/tfjs-core': 3.21.0
       '@types/node-fetch': 2.6.4
-      node-fetch: 2.6.11
+      node-fetch: 2.6.12
       seedrandom: 3.0.5
       string_decoder: 1.3.0
     transitivePeerDependencies:
@@ -3377,7 +3521,7 @@ packages:
     dependencies:
       '@tensorflow/tfjs-core': 4.2.0
       '@types/node-fetch': 2.6.4
-      node-fetch: 2.6.11
+      node-fetch: 2.6.12
       seedrandom: 3.0.5
       string_decoder: 1.3.0
     transitivePeerDependencies:
@@ -3547,15 +3691,6 @@ packages:
       '@types/connect': 3.4.35
       '@types/node': 18.11.18
 
-  /@types/bull@3.15.9:
-    resolution: {integrity: sha512-MPUcyPPQauAmynoO3ezHAmCOhbB0pWmYyijr/5ctaCqhbKWsjW0YCod38ZcLzUBprosfZ9dPqfYIcfdKjk7RNQ==}
-    dependencies:
-      '@types/ioredis': 5.0.0
-      '@types/redis': 2.8.32
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@types/cacheable-request@6.0.3:
     resolution: {integrity: sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==}
     dependencies:
@@ -3609,7 +3744,7 @@ packages:
   /@types/eslint-scope@3.7.4:
     resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==}
     dependencies:
-      '@types/eslint': 8.40.2
+      '@types/eslint': 8.44.0
       '@types/estree': 1.0.1
     dev: true
 
@@ -3620,8 +3755,8 @@ packages:
       '@types/json-schema': 7.0.12
     dev: true
 
-  /@types/eslint@8.40.2:
-    resolution: {integrity: sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ==}
+  /@types/eslint@8.44.0:
+    resolution: {integrity: sha512-gsF+c/0XOguWgaOgvFs+xnnRqt9GwgTvIks36WpE6ueeI4KCEHHd8K/CKHqhOqrJKsYH8m27kRzQEvWXAwXUTw==}
     dependencies:
       '@types/estree': 1.0.1
       '@types/json-schema': 7.0.12
@@ -3655,8 +3790,8 @@ packages:
       '@types/qs': 6.9.7
       '@types/serve-static': 1.15.2
 
-  /@types/fluent-ffmpeg@2.1.20:
-    resolution: {integrity: sha512-B+OvhCdJ3LgEq2PhvWNOiB/EfwnXLElfMCgc4Z1K5zXgSfo9I6uGKwR/lqmNPFQuebNnes7re3gqkV77SyypLg==}
+  /@types/fluent-ffmpeg@2.1.21:
+    resolution: {integrity: sha512-+n3dy/Tegt6n+YwGZUiGq6i8Jrnt8+MoyPiW1L6J5EWUl7GSt18a/VyReecfCsvTTNBXNMIKOMHDstiQM8nJLA==}
     dependencies:
       '@types/node': 18.11.18
     dev: true
@@ -3719,15 +3854,6 @@ packages:
   /@types/http-errors@2.0.1:
     resolution: {integrity: sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==}
 
-  /@types/ioredis@5.0.0:
-    resolution: {integrity: sha512-zJbJ3FVE17CNl5KXzdeSPtdltc4tMT3TzC6fxQS0sQngkbFZ6h+0uTafsRqu+eSLIugf6Yb0Ea0SUuRr42Nk9g==}
-    deprecated: This is a stub types definition. ioredis provides its own type definitions, so you do not need this installed.
-    dependencies:
-      ioredis: 5.3.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@types/istanbul-lib-coverage@2.0.4:
     resolution: {integrity: sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==}
     dev: true
@@ -3762,8 +3888,8 @@ packages:
     resolution: {integrity: sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==}
     dev: true
 
-  /@types/jsdom@20.0.1:
-    resolution: {integrity: sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==}
+  /@types/jsdom@21.1.1:
+    resolution: {integrity: sha512-cZFuoVLtzKP3gmq9eNosUL1R50U+USkbLtUQ1bYVgl/lKp0FZM7Cq4aIHAL8oIvQ17uSHi7jXPtfDOdjPwBE7A==}
     dependencies:
       '@types/node': 18.11.18
       '@types/tough-cookie': 4.0.2
@@ -3778,12 +3904,12 @@ packages:
     resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
     dev: true
 
-  /@types/jsonld@1.5.8:
-    resolution: {integrity: sha512-4l5t/jDnJpqZ+i7CLTTgPcT5BYXnAnwJupb07aAokPufCV0SjDHcwctUkSTuhIuSU9yHok+WOOngIGCtpL96gw==}
+  /@types/jsonld@1.5.9:
+    resolution: {integrity: sha512-K76ImkErPYL2wGPZpNFSKp6wE+h/APecZLJrU7UfDaGqt/f+D9Rrg1aR7VdRrQ6k5DUNRZ2vn9yACwmpOr9QcA==}
     dev: true
 
-  /@types/jsrsasign@10.5.4:
-    resolution: {integrity: sha512-05S2f4lGaWgCwFHsa3OEirc4VJf/sJRfhofzxUbuFbmm6NbffPXZrnJqquQAtS3g4C8Z0L9NHgW0znmtDxNoTQ==}
+  /@types/jsrsasign@10.5.8:
+    resolution: {integrity: sha512-1oZ3TbarAhKtKUpyrCIqXpbx3ZAfoSulleJs6/UzzyYty0ut+kjRX7zHLAaHwVIuw8CBjIymwW4J2LK944HoHQ==}
     dev: true
 
   /@types/katex@0.16.0:
@@ -3801,49 +3927,49 @@ packages:
   /@types/koa-bodyparser@4.3.10:
     resolution: {integrity: sha512-6ae05pjhmrmGhUR8GYD5qr5p9LTEMEGfGXCsK8VaSL+totwigm8+H/7MHW7K4854CMeuwRAubT8qcc/EagaeIA==}
     dependencies:
-      '@types/koa': 2.13.5
+      '@types/koa': 2.13.6
     dev: true
 
   /@types/koa-compose@3.2.5:
     resolution: {integrity: sha512-B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ==}
     dependencies:
-      '@types/koa': 2.13.5
+      '@types/koa': 2.13.6
 
   /@types/koa-cors@0.0.2:
     resolution: {integrity: sha512-uNaDY26HUVO+2C6arK8ZFODs9mBjYprD8mlvkVe2bYdX9wzEeKtycVXPafXpUkePhMh4sffIMkhRDyedokG/QA==}
     dependencies:
-      '@types/koa': 2.13.5
+      '@types/koa': 2.13.6
     dev: true
 
   /@types/koa-favicon@2.0.21:
     resolution: {integrity: sha512-paH1nheVhijx/VduoR/RCD/qTCiX+OI/6fHLi3mZae053Ts+gUBOrKtzl3pMTDbdEBqdLolfLje3PZbb6jW0jQ==}
     dependencies:
-      '@types/koa': 2.13.5
+      '@types/koa': 2.13.6
     dev: true
 
   /@types/koa-logger@3.1.2:
     resolution: {integrity: sha512-sioTA1xlKYiIgryANWPRHBkG3XGbWftw9slWADUPC+qvPIY/yRLSrhvX7zkJwMrntub5dPO0GuAoyGGf0yitfQ==}
     dependencies:
-      '@types/koa': 2.13.5
+      '@types/koa': 2.13.6
     dev: true
 
   /@types/koa-mount@4.0.2:
     resolution: {integrity: sha512-XnuGwV8bzw22nv2WqOs5a8wCHR2VgSnLLLuBQPzNTmhyiAvH0O6c+994rQVbMaBuwQJKefUInkvKoKuk+21uew==}
     dependencies:
-      '@types/koa': 2.13.5
+      '@types/koa': 2.13.6
     dev: true
 
   /@types/koa-send@4.1.3:
     resolution: {integrity: sha512-daaTqPZlgjIJycSTNjKpHYuKhXYP30atFc1pBcy6HHqB9+vcymDgYTguPdx9tO4HMOqNyz6bz/zqpxt5eLR+VA==}
     dependencies:
-      '@types/koa': 2.13.5
+      '@types/koa': 2.13.6
     dev: true
 
-  /@types/koa-views@7.0.0(@types/koa@2.13.5)(pug@3.0.2):
+  /@types/koa-views@7.0.0(@types/koa@2.13.6)(pug@3.0.2):
     resolution: {integrity: sha512-AB/NB+oFHcLOZJYFv3bG5Af8YbwYCD9/zK0WcKALsbjI/FRKrcXTUTC64RebDrkyOkBm3bpCgpGndhAH/3YQ2Q==}
     deprecated: This is a stub types definition. koa-views provides its own type definitions, so you do not need this installed.
     dependencies:
-      koa-views: 7.0.2(@types/koa@2.13.5)(ejs@3.1.9)(pug@3.0.2)
+      koa-views: 7.0.2(@types/koa@2.13.6)(ejs@3.1.9)(pug@3.0.2)
     transitivePeerDependencies:
       - '@types/koa'
       - arc-templates
@@ -3902,8 +4028,8 @@ packages:
       - whiskers
     dev: true
 
-  /@types/koa@2.13.5:
-    resolution: {integrity: sha512-HSUOdzKz3by4fnqagwthW/1w/yJspTgppyyalPVbgZf8jQWvdIXcVW5h2DGtw4zYntOaeRGx49r1hxoPWrD4aA==}
+  /@types/koa@2.13.6:
+    resolution: {integrity: sha512-diYUfp/GqfWBAiwxHtYJ/FQYIXhlEhlyaU7lB/bWQrx4Il9lCET5UwpFy3StOAohfsxxvEQ11qIJgT1j2tfBvw==}
     dependencies:
       '@types/accepts': 1.3.5
       '@types/content-disposition': 0.5.5
@@ -3917,19 +4043,19 @@ packages:
   /@types/koa__cors@3.3.0:
     resolution: {integrity: sha512-FUN8YxcBakIs+walVe3+HcNP+Bxd0SB8BJHBWkglZ5C1XQWljlKcEFDG/dPiCIqwVCUbc5X0nYDlH62uEhdHMA==}
     dependencies:
-      '@types/koa': 2.13.5
+      '@types/koa': 2.13.6
     dev: true
 
   /@types/koa__multer@2.0.4:
     resolution: {integrity: sha512-WRkshXhE5rpYFUbbtAjyMhdOOSdbu1XX+2AQlRNM6AZtgxd0/WXMU4lrP7e9tk5HWVTWbx8DOOsVBmfHjSGJ4w==}
     dependencies:
-      '@types/koa': 2.13.5
+      '@types/koa': 2.13.6
     dev: true
 
   /@types/koa__router@8.0.11:
     resolution: {integrity: sha512-WXgKWpBsbS14kzmzD9LeFapOIa678h7zvUHxDwXwSx4ETKXhXLVUAToX6jZ/U7EihM7qwyD9W/BZvB0MRu7MTQ==}
     dependencies:
-      '@types/koa': 2.13.5
+      '@types/koa': 2.13.6
     dev: true
 
   /@types/long@4.0.2:
@@ -3967,7 +4093,7 @@ packages:
   /@types/node-fetch@2.6.4:
     resolution: {integrity: sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==}
     dependencies:
-      '@types/node': 20.4.1
+      '@types/node': 18.11.18
       form-data: 3.0.1
     dev: false
 
@@ -3990,6 +4116,7 @@ packages:
 
   /@types/node@20.4.1:
     resolution: {integrity: sha512-JIzsAvJeA/5iY6Y/OxZbv1lUcc8dNSE77lb2gnBH+/PJ3lFR1Ccvgwl5JWnHAkNHcRsT0TbpVOsiMKZ1F/yyJg==}
+    dev: true
 
   /@types/nodemailer@6.4.8:
     resolution: {integrity: sha512-oVsJSCkqViCn8/pEu2hfjwVO+Gb3e+eTWjg3PcjeFKRItfKpKwHphQqbYmPQrlMk+op7pNNWPbsJIEthpFN/OQ==}
@@ -4045,8 +4172,8 @@ packages:
     resolution: {integrity: sha512-PG5aLpW6PJOeV2fHRslP4IOMWn+G+Uq8CfnyJ+PDS8ndCbU+soO+fB3NKCKo0p/Jh2Y4aPaiQZsrOXFdzpcA6g==}
     dev: true
 
-  /@types/qrcode@1.5.0:
-    resolution: {integrity: sha512-x5ilHXRxUPIMfjtM+1vf/GPTRWZ81nqscursm5gMznJeK9M0YnZ1c3bEvRLQ0zSSgedLx1J6MGL231ObQGGhaA==}
+  /@types/qrcode@1.5.1:
+    resolution: {integrity: sha512-HpSN675K0PmxIDRpjMI3Mc2GiKo3dNu+X/F5SoItiaDS1lVfgC6Wac1c5lQDfKWbTJUSHWiHKzpJpBZG7k9gaA==}
     dependencies:
       '@types/node': 18.11.18
     dev: true
@@ -4065,12 +4192,6 @@ packages:
     resolution: {integrity: sha512-GSMb93iSA8KKFDgVL2Wzs/kqrHMJcU8xhLdwI5omoACcj7K18SacklLtY1C4G02HC5drd6GygtsIaGbfxJSe0g==}
     dev: true
 
-  /@types/redis@2.8.32:
-    resolution: {integrity: sha512-7jkMKxcGq9p242exlbsVzuJb57KqHRhNl4dHoQu2Y5v9bCAbtIXXH0R3HleSQW4CTOqpHIYUW3t6tpUj4BVQ+w==}
-    dependencies:
-      '@types/node': 18.11.18
-    dev: true
-
   /@types/redis@4.0.11:
     resolution: {integrity: sha512-bI+gth8La8Wg/QCR1+V1fhrL9+LZUSWfcqpOj2Kc80ZQ4ffbdL173vQd5wovmoV9i071FU9oP2g6etLuEwb6Rg==}
     deprecated: This is a stub types definition. redis provides its own type definitions, so you do not need this installed.
@@ -4118,12 +4239,6 @@ packages:
       '@types/mime': 3.0.1
       '@types/node': 18.11.18
 
-  /@types/sharp@0.31.1:
-    resolution: {integrity: sha512-5nWwamN9ZFHXaYEincMSuza8nNfOof8nmO+mcI+Agx1uMUk4/pQnNIcix+9rLPXzKrm1pS34+6WRDbDV0Jn7ag==}
-    dependencies:
-      '@types/node': 18.11.18
-    dev: true
-
   /@types/sinonjs__fake-timers@8.1.1:
     resolution: {integrity: sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==}
     dev: true
@@ -4182,6 +4297,10 @@ packages:
     resolution: {integrity: sha512-kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q==}
     dev: true
 
+  /@types/uuid@9.0.2:
+    resolution: {integrity: sha512-kNnC1GFBLuhImSnV7w4njQkUiJi0ZXUycu1rUaouPqiKlXkh77JKgdRnTAp1x5eBwcIwbtI+3otwzuIDEuDoxQ==}
+    dev: true
+
   /@types/vinyl-fs@3.0.2:
     resolution: {integrity: sha512-ctNcmmzbMIKooXjRkyyUCOu2Z4AyqibL+RhXoF3pb7K7j+ezItnakmpm31LymkYHSIM5ey0tjIFzTvFOTSBCGw==}
     dependencies:
@@ -4221,6 +4340,13 @@ packages:
     resolution: {integrity: sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==}
     dependencies:
       '@types/node': 18.11.18
+    dev: false
+
+  /@types/ws@8.5.5:
+    resolution: {integrity: sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==}
+    dependencies:
+      '@types/node': 18.11.18
+    dev: true
 
   /@types/yargs-parser@21.0.0:
     resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==}
@@ -4266,7 +4392,7 @@ packages:
       ignore: 5.2.4
       natural-compare-lite: 1.4.0
       regexpp: 3.2.0
-      semver: 7.5.1
+      semver: 7.5.4
       tsutils: 3.21.0(typescript@4.9.4)
       typescript: 4.9.4
     transitivePeerDependencies:
@@ -4340,7 +4466,7 @@ packages:
       debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
-      semver: 7.5.1
+      semver: 7.5.4
       tsutils: 3.21.0(typescript@4.9.4)
       typescript: 4.9.4
     transitivePeerDependencies:
@@ -4361,7 +4487,7 @@ packages:
       eslint: 8.42.0
       eslint-scope: 5.1.1
       eslint-utils: 3.0.0(eslint@8.42.0)
-      semver: 7.5.1
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -4671,6 +4797,14 @@ packages:
       acorn-walk: 8.2.0
     dev: false
 
+  /acorn-import-assertions@1.9.0(acorn@8.10.0):
+    resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==}
+    peerDependencies:
+      acorn: ^8
+    dependencies:
+      acorn: 8.10.0
+    dev: true
+
   /acorn-import-assertions@1.9.0(acorn@8.9.0):
     resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==}
     peerDependencies:
@@ -4679,12 +4813,12 @@ packages:
       acorn: 8.9.0
     dev: true
 
-  /acorn-jsx@5.3.2(acorn@8.9.0):
+  /acorn-jsx@5.3.2(acorn@8.10.0):
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      acorn: 8.9.0
+      acorn: 8.10.0
 
   /acorn-walk@7.2.0:
     resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==}
@@ -4700,6 +4834,11 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
+  /acorn@8.10.0:
+    resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
   /acorn@8.9.0:
     resolution: {integrity: sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==}
     engines: {node: '>=0.4.0'}
@@ -4726,6 +4865,15 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /agent-base@7.1.0:
+    resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==}
+    engines: {node: '>= 14'}
+    dependencies:
+      debug: 4.3.4(supports-color@8.1.1)
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /agentkeepalive@4.3.0:
     resolution: {integrity: sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==}
     engines: {node: '>= 8.0.0'}
@@ -5227,8 +5375,8 @@ packages:
       arrify: 3.0.0
       callsites: 4.0.0
       cbor: 8.1.0
-      chalk: 5.2.0
-      chokidar: 3.3.1
+      chalk: 5.3.0
+      chokidar: 3.5.3
       chunkd: 2.0.1
       ci-info: 3.8.0
       ci-parallel-vars: 1.0.1
@@ -5273,8 +5421,8 @@ packages:
     resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}
     engines: {node: '>= 0.4'}
 
-  /aws-sdk@2.1277.0:
-    resolution: {integrity: sha512-cEZ0rg0j3STtLX6rba5tHMrV/KrhXKLtSleleF2IdTFzUjqRvxI54Pqc51w2D7tgAPUgEhMB4Q/ruKPqB8w+2Q==}
+  /aws-sdk@2.1413.0:
+    resolution: {integrity: sha512-vKpjC7iRwOhgv7P0xw90mVGO//2rqVPJKyYIs7uxLzSV0JzriVD+yqktOu/Hz6/phOmAd1cMIeFgpEC9ynrppg==}
     engines: {node: '>= 10.0.0'}
     dependencies:
       buffer: 4.9.2
@@ -5286,7 +5434,7 @@ packages:
       url: 0.10.3
       util: 0.12.5
       uuid: 8.0.0
-      xml2js: 0.4.19
+      xml2js: 0.5.0
     dev: false
 
   /aws-sign2@0.7.0:
@@ -5298,7 +5446,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
@@ -5324,14 +5472,14 @@ packages:
   /axios@1.4.0:
     resolution: {integrity: sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==}
     dependencies:
-      follow-redirects: 1.15.2(debug@4.3.4)
+      follow-redirects: 1.15.2
       form-data: 4.0.0
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
       - debug
     dev: false
 
-  /babel-eslint@10.1.0(eslint@8.42.0):
+  /babel-eslint@10.1.0(eslint@8.44.0):
     resolution: {integrity: sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==}
     engines: {node: '>=6'}
     deprecated: babel-eslint is now @babel/eslint-parser. This package will no longer receive updates.
@@ -5342,7 +5490,7 @@ packages:
       '@babel/parser': 7.22.5
       '@babel/traverse': 7.22.5
       '@babel/types': 7.22.5
-      eslint: 8.42.0
+      eslint: 8.44.0
       eslint-visitor-keys: 1.3.0
       resolve: 1.22.2
     transitivePeerDependencies:
@@ -5531,7 +5679,7 @@ packages:
     engines: {node: '>=12'}
     dependencies:
       bin-version: 6.0.0
-      semver: 7.5.3
+      semver: 7.5.4
       semver-truncate: 3.0.0
     dev: true
 
@@ -5571,13 +5719,8 @@ packages:
     resolution: {integrity: sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==}
     dev: true
 
-  /blurhash@1.1.5:
-    resolution: {integrity: sha512-a+LO3A2DfxTaTztsmkbLYmUzUeApi0LZuKalwbNmqAHR6HhJGMt1qSV/R3wc+w4DL28holjqO3Bg74aUGavGjg==}
-    dev: false
-
   /blurhash@2.0.5:
     resolution: {integrity: sha512-cRygWd7kGBQO3VEhPiTgq4Wc43ctsM+o46urrmPOiuAe+07fzlSB9OJVdpgDL0jPqXUVQ9ht7aq7kxOeJHRK+w==}
-    dev: true
 
   /bmp-js@0.1.0:
     resolution: {integrity: sha512-vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw==}
@@ -5658,9 +5801,9 @@ packages:
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
     dependencies:
-      caniuse-lite: 1.0.30001509
-      electron-to-chromium: 1.4.442
-      node-releases: 2.0.12
+      caniuse-lite: 1.0.30001514
+      electron-to-chromium: 1.4.455
+      node-releases: 2.0.13
       update-browserslist-db: 1.0.11(browserslist@4.21.9)
 
   /bs-logger@0.2.6:
@@ -5735,7 +5878,7 @@ packages:
       ioredis: 5.3.2
       lodash: 4.17.21
       msgpackr: 1.9.5
-      semver: 7.5.1
+      semver: 7.5.4
       uuid: 8.3.2
     transitivePeerDependencies:
       - supports-color
@@ -5884,8 +6027,8 @@ packages:
     resolution: {integrity: sha512-Gf3pFp97loixG5w83NVb09DMI+WzkVXLn4H2abxv7DXxHUyKYbZc5qpEqAQy/mDFO6bAnNQh4hZ8lLeGlPTZQg==}
     dev: true
 
-  /caniuse-lite@1.0.30001509:
-    resolution: {integrity: sha512-2uDDk+TRiTX5hMcUYT/7CSyzMZxjfGu0vAUjS2g0LSD8UoXOv0LtpH4LxGMemsiPq6LCVIUjNwVM0erkOkGCDA==}
+  /caniuse-lite@1.0.30001514:
+    resolution: {integrity: sha512-ENcIpYBmwAAOm/V2cXgM7rZUrKKaqisZl4ZAI520FIkqGXUxJjmaIssbRW5HVVR5tyV6ygTLIm15aU8LUmQSaQ==}
 
   /canonicalize@1.0.8:
     resolution: {integrity: sha512-0CNTVCLZggSh7bc5VkX5WWPWO+cyZbNd07IHIsSXLia/eAq+r836hgk+8BKoEh7949Mda87VUOitx5OddVj64A==}
@@ -5940,8 +6083,8 @@ packages:
       ansi-styles: 4.3.0
       supports-color: 7.2.0
 
-  /chalk@5.2.0:
-    resolution: {integrity: sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==}
+  /chalk@5.3.0:
+    resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==}
     engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
 
   /char-regex@1.0.2:
@@ -6026,20 +6169,6 @@ packages:
       lodash.some: 4.6.0
     dev: false
 
-  /chokidar@3.3.1:
-    resolution: {integrity: sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==}
-    engines: {node: '>= 8.10.0'}
-    dependencies:
-      anymatch: 3.1.3
-      braces: 3.0.2
-      glob-parent: 5.1.2
-      is-binary-path: 2.1.0
-      is-glob: 4.0.3
-      normalize-path: 3.0.0
-      readdirp: 3.3.0
-    optionalDependencies:
-      fsevents: 2.1.3
-
   /chokidar@3.5.3:
     resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
     engines: {node: '>= 8.10.0'}
@@ -6053,7 +6182,6 @@ packages:
       readdirp: 3.6.0
     optionalDependencies:
       fsevents: 2.3.2
-    dev: true
 
   /chownr@1.1.4:
     resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
@@ -6467,7 +6595,7 @@ packages:
       js-string-escape: 1.0.1
       lodash: 4.17.21
       md5-hex: 3.0.1
-      semver: 7.5.1
+      semver: 7.5.4
       well-known-symbols: 2.0.0
     dev: true
 
@@ -6938,7 +7066,7 @@ packages:
       pretty-bytes: 5.6.0
       proxy-from-env: 1.0.0
       request-progress: 3.0.0
-      semver: 7.5.1
+      semver: 7.5.4
       supports-color: 8.1.1
       tmp: 0.2.1
       untildify: 4.0.0
@@ -7009,6 +7137,17 @@ packages:
     dependencies:
       ms: 2.0.0
 
+  /debug@3.2.7:
+    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+    dependencies:
+      ms: 2.1.3
+    dev: false
+
   /debug@3.2.7(supports-color@8.1.1):
     resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
     peerDependencies:
@@ -7019,6 +7158,7 @@ packages:
     dependencies:
       ms: 2.1.3
       supports-color: 8.1.1
+    dev: true
 
   /debug@4.3.3:
     resolution: {integrity: sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==}
@@ -7185,6 +7325,7 @@ packages:
   /denque@2.1.0:
     resolution: {integrity: sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==}
     engines: {node: '>=0.10'}
+    dev: false
 
   /depd@1.1.2:
     resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==}
@@ -7386,7 +7527,7 @@ packages:
     dependencies:
       commander: 2.20.3
       lru-cache: 4.1.5
-      semver: 5.7.1
+      semver: 5.7.2
       sigmund: 1.0.1
 
   /ee-first@1.1.1:
@@ -7402,6 +7543,10 @@ packages:
 
   /electron-to-chromium@1.4.442:
     resolution: {integrity: sha512-RkrZF//Ya+0aJq2NM3OdisNh5ZodZq1rdXOS96G8DdDgpDKqKE81yTbbQ3F/4CKm1JBPsGu1Lp/akkna2xO06Q==}
+    dev: true
+
+  /electron-to-chromium@1.4.455:
+    resolution: {integrity: sha512-8tgdX0Odl24LtmLwxotpJCVjIndN559AvaOtd67u+2mo+IDsgsTF580NB+uuDCqsHw8yFg53l5+imFV9Fw3cbA==}
 
   /emittery@0.13.1:
     resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
@@ -7793,7 +7938,7 @@ packages:
       minimatch: 3.1.2
       object.values: 1.1.6
       resolve: 1.22.2
-      semver: 6.3.0
+      semver: 6.3.1
       tsconfig-paths: 3.14.2
     transitivePeerDependencies:
       - eslint-import-resolver-typescript
@@ -7813,7 +7958,7 @@ packages:
       ignore: 5.2.4
       minimatch: 3.1.2
       resolve: 1.22.2
-      semver: 6.3.0
+      semver: 6.3.1
     dev: true
 
   /eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.6.0)(eslint@8.42.0)(prettier@2.8.8):
@@ -7946,13 +8091,70 @@ packages:
       text-table: 0.2.0
     transitivePeerDependencies:
       - supports-color
+    dev: true
+
+  /eslint@8.44.0:
+    resolution: {integrity: sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    hasBin: true
+    dependencies:
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.44.0)
+      '@eslint-community/regexpp': 4.5.1
+      '@eslint/eslintrc': 2.1.0
+      '@eslint/js': 8.44.0
+      '@humanwhocodes/config-array': 0.11.10
+      '@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(supports-color@8.1.1)
+      doctrine: 3.0.0
+      escape-string-regexp: 4.0.0
+      eslint-scope: 7.2.0
+      eslint-visitor-keys: 3.4.1
+      espree: 9.6.0
+      esquery: 1.5.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.20.0
+      graphemer: 1.4.0
+      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-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.3
+      strip-ansi: 6.0.1
+      strip-json-comments: 3.1.1
+      text-table: 0.2.0
+    transitivePeerDependencies:
+      - supports-color
 
   /espree@9.5.2:
     resolution: {integrity: sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      acorn: 8.9.0
-      acorn-jsx: 5.3.2(acorn@8.9.0)
+      acorn: 8.10.0
+      acorn-jsx: 5.3.2(acorn@8.10.0)
+      eslint-visitor-keys: 3.4.1
+    dev: true
+
+  /espree@9.6.0:
+    resolution: {integrity: sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      acorn: 8.10.0
+      acorn-jsx: 5.3.2(acorn@8.10.0)
       eslint-visitor-keys: 3.4.1
 
   /esprima@2.7.3:
@@ -8540,6 +8742,16 @@ packages:
       tabbable: 6.2.0
     dev: true
 
+  /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'}
@@ -8711,20 +8923,11 @@ packages:
   /fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
-  /fsevents@2.1.3:
-    resolution: {integrity: sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==}
-    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
-    os: [darwin]
-    deprecated: '"Please update to latest v2.3 or v2.2"'
-    requiresBuild: true
-    optional: true
-
   /fsevents@2.3.2:
     resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
     requiresBuild: true
-    dev: true
     optional: true
 
   /fulcon@1.0.2:
@@ -8930,7 +9133,7 @@ packages:
     dependencies:
       anymatch: 2.0.0
       async-done: 1.3.2
-      chokidar: 3.3.1
+      chokidar: 3.5.3
       is-negated-glob: 1.0.0
       just-debounce: 1.1.0
       normalize-path: 3.0.0
@@ -8946,7 +9149,7 @@ packages:
     dependencies:
       foreground-child: 3.1.1
       jackspeak: 2.2.1
-      minimatch: 9.0.2
+      minimatch: 9.0.3
       minipass: 5.0.0
       path-scurry: 1.10.1
     dev: false
@@ -9490,7 +9693,7 @@ packages:
     engines: {node: '>= 4.5.0'}
     dependencies:
       agent-base: 4.3.0
-      debug: 3.2.7(supports-color@8.1.1)
+      debug: 3.2.7
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -9505,6 +9708,16 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /https-proxy-agent@7.0.1:
+    resolution: {integrity: sha512-Eun8zV0kcYS1g19r78osiQLEFIRspRUDd9tIfBCTBPBeMieF/EsJNL8VI3xOIdYRDEkjQnqOYPsZ2DsWsVsFwQ==}
+    engines: {node: '>= 14'}
+    dependencies:
+      agent-base: 7.1.0
+      debug: 4.3.4(supports-color@8.1.1)
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /human-signals@1.1.1:
     resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==}
     engines: {node: '>=8.12.0'}
@@ -9689,6 +9902,7 @@ packages:
       standard-as-callback: 2.1.0
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /iota-array@1.0.0:
     resolution: {integrity: sha512-pZ2xT+LOHckCatGQ3DcG/a+QuEqvoxqkiL7tvE8nn3uuu+f6i1TtpB5/FtWFbxUuVr5PZCx8KskuGatbJDXOWA==}
@@ -9702,8 +9916,8 @@ packages:
       sprintf-js: 1.1.2
     dev: false
 
-  /ip-cidr@3.0.11:
-    resolution: {integrity: sha512-6pf3APV0cRWy7vk0ealQt7UeWPqpT4RQM0bR0miVY/XRiBV8hIkPSkEHctv1+GAUPIwT9qpUL57deYlYca9UEA==}
+  /ip-cidr@3.1.0:
+    resolution: {integrity: sha512-HUCn4snshEX1P8cja/IyU3qk8FVDW8T5zZcegDFbu4w7NojmAhk5NcOgj3M8+0fmumo1afJTPDtJlzsxLdOjtg==}
     engines: {node: '>=10.0.0'}
     dependencies:
       ip-address: 7.1.0
@@ -10184,7 +10398,7 @@ packages:
       '@babel/parser': 7.22.5
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.0
-      semver: 6.3.0
+      semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -10997,7 +11211,7 @@ packages:
       jest-util: 29.6.0
       natural-compare: 1.4.0
       pretty-format: 29.6.0
-      semver: 7.5.3
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -11090,7 +11304,7 @@ packages:
     resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
     engines: {node: '>= 10.13.0'}
     dependencies:
-      '@types/node': 18.11.18
+      '@types/node': 20.3.1
       merge-stream: 2.0.0
       supports-color: 8.1.1
     dev: true
@@ -11265,7 +11479,7 @@ packages:
         optional: true
     dependencies:
       abab: 2.0.6
-      acorn: 8.9.0
+      acorn: 8.10.0
       acorn-globals: 6.0.0
       cssom: 0.4.4
       cssstyle: 2.3.0
@@ -11366,7 +11580,7 @@ packages:
   /json-stringify-safe@5.0.1:
     resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
 
-  /json5-loader@4.0.1(webpack@5.85.1):
+  /json5-loader@4.0.1(webpack@5.88.1):
     resolution: {integrity: sha512-c9viNZlZTz0MTIcf/4qvek5Dz1/PU3DNCB4PwUhlEZIV3qb1bSD6vQQymlV17/Wm6ncra1aCvmIPsuRj+KfEEg==}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
@@ -11375,7 +11589,7 @@ packages:
       json5: 2.2.3
       loader-utils: 2.0.4
       schema-utils: 3.3.0
-      webpack: 5.85.1(@swc/core@1.3.62)(webpack-cli@5.1.3)
+      webpack: 5.88.1(@swc/core@1.3.68)
     dev: true
 
   /json5@1.0.2:
@@ -11446,8 +11660,8 @@ packages:
       verror: 1.10.0
     dev: true
 
-  /jsrsasign@10.6.1:
-    resolution: {integrity: sha512-emiQ05haY9CRj1Ho/LiuCqr/+8RgJuWdiHYNglIg2Qjfz0n+pnUq9I2QHplXuOMO2EnAW1oCGC1++aU5VoWSlw==}
+  /jsrsasign@10.8.6:
+    resolution: {integrity: sha512-bQmbVtsfbgaKBTWCKiDCPlUPbdlRIK/FzSwT3BzIgZl/cU6TqXu6pZJsCI/dJVrZ9Gir5GC4woqw9shH/v7MBw==}
     dev: false
 
   /jssha@3.3.0:
@@ -11531,18 +11745,19 @@ packages:
     dependencies:
       '@types/co-body': 6.1.0
       '@types/formidable': 2.0.6
-      '@types/koa': 2.13.5
+      '@types/koa': 2.13.6
       co-body: 6.1.0
       formidable: 2.1.2
       zod: 3.21.4
     dev: false
 
-  /koa-bodyparser@4.3.0:
-    resolution: {integrity: sha512-uyV8G29KAGwZc4q/0WUAjH+Tsmuv9ImfBUF2oZVyZtaeo0husInagyn/JH85xMSxM0hEk/mbCII5ubLDuqW/Rw==}
+  /koa-bodyparser@4.4.1:
+    resolution: {integrity: sha512-kBH3IYPMb+iAXnrxIhXnW+gXV8OTzCu8VPDqvcDHW9SQrbkHmqPQtiZwrltNmSq6/lpipHnT7k7PsjlVD7kK0w==}
     engines: {node: '>=8.0.0'}
     dependencies:
       co-body: 6.1.0
       copy-to: 2.0.1
+      type-is: 1.6.18
     dev: false
 
   /koa-compose@4.1.0:
@@ -11629,13 +11844,13 @@ packages:
     resolution: {integrity: sha512-UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ==}
     engines: {node: '>= 7.6.0'}
     dependencies:
-      debug: 3.2.7(supports-color@8.1.1)
+      debug: 3.2.7
       koa-send: 5.0.1
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /koa-views@7.0.2(@types/koa@2.13.5)(ejs@3.1.9)(pug@3.0.2):
+  /koa-views@7.0.2(@types/koa@2.13.6)(ejs@3.1.9)(pug@3.0.2):
     resolution: {integrity: sha512-dvx3mdVeSVuIPEaKAoGbxLcenudvhl821xxyuRbcoA+bOJ2dvN8wlGjkLu0ZFMlkCscXZV6lzxy28rafeazI/w==}
     deprecated: This package is deprecated, please use the new fork @ladjs/koa-views. Maintenance is supported by Forward Email at https://forwardemail.net ; follow/watch https://github.com/ladjs/koa-views for updates and release changelog
     peerDependencies:
@@ -11644,7 +11859,7 @@ packages:
       '@types/koa':
         optional: true
     dependencies:
-      '@types/koa': 2.13.5
+      '@types/koa': 2.13.6
       consolidate: 0.16.0(ejs@3.1.9)(pug@3.0.2)
       debug: 4.3.4(supports-color@8.1.1)
       get-paths: 0.0.7
@@ -11711,6 +11926,37 @@ packages:
   /koa@2.13.4:
     resolution: {integrity: sha512-43zkIKubNbnrULWlHdN5h1g3SEKXOEzoAlRsHOTFpnlDu8JlAOZSMJBLULusuXRequboiwJcj5vtYXKB3k7+2g==}
     engines: {node: ^4.8.4 || ^6.10.1 || ^7.10.1 || >= 8.1.4}
+    dependencies:
+      accepts: 1.3.8
+      cache-content-type: 1.0.1
+      content-disposition: 0.5.4
+      content-type: 1.0.5
+      cookies: 0.8.0
+      debug: 4.3.3
+      delegates: 1.0.0
+      depd: 2.0.0
+      destroy: 1.2.0
+      encodeurl: 1.0.2
+      escape-html: 1.0.3
+      fresh: 0.5.2
+      http-assert: 1.5.0
+      http-errors: 1.8.1
+      is-generator-function: 1.0.10
+      koa-compose: 4.1.0
+      koa-convert: 2.0.0
+      on-finished: 2.4.1
+      only: 0.0.2
+      parseurl: 1.3.3
+      statuses: 1.5.0
+      type-is: 1.6.18
+      vary: 1.1.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
+  /koa@2.14.2:
+    resolution: {integrity: sha512-VFI2bpJaodz6P7x2uyLiX6RLYpZmOJqNmoCst/Yyd7hQlszyPwG/I9CQJ63nOtKSxpt5M7NH67V6nJL2BwCl7g==}
+    engines: {node: ^4.8.4 || ^6.10.1 || ^7.10.1 || >= 8.1.4}
     dependencies:
       accepts: 1.3.8
       cache-content-type: 1.0.1
@@ -11914,6 +12160,7 @@ packages:
 
   /lodash.defaults@4.2.0:
     resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==}
+    dev: false
 
   /lodash.difference@4.5.0:
     resolution: {integrity: sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==}
@@ -11937,6 +12184,7 @@ packages:
 
   /lodash.isarguments@3.1.0:
     resolution: {integrity: sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==}
+    dev: false
 
   /lodash.isequal@4.5.0:
     resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
@@ -12073,7 +12321,7 @@ packages:
     resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
     engines: {node: '>=8'}
     dependencies:
-      semver: 6.3.0
+      semver: 6.3.1
 
   /make-error@1.3.6:
     resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
@@ -12334,8 +12582,8 @@ packages:
     dependencies:
       brace-expansion: 2.0.1
 
-  /minimatch@9.0.2:
-    resolution: {integrity: sha512-PZOT9g5v2ojiTL7r1xF6plNHLtOeTpSlDI007As2NlA2aYBMfVom17yqa6QzhmDP8QOhn7LjHTg7DFCVSSa6yg==}
+  /minimatch@9.0.3:
+    resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==}
     engines: {node: '>=16 || 14 >=14.17'}
     dependencies:
       brace-expansion: 2.0.1
@@ -12458,6 +12706,12 @@ packages:
     hasBin: true
     dev: false
 
+  /mkdirp@2.1.6:
+    resolution: {integrity: sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dev: false
+
   /mocha@10.2.0:
     resolution: {integrity: sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==}
     engines: {node: '>= 14.0.0'}
@@ -12465,7 +12719,7 @@ packages:
     dependencies:
       ansi-colors: 4.1.1
       browser-stdout: 1.3.1
-      chokidar: 3.3.1
+      chokidar: 3.5.3
       debug: 4.3.4(supports-color@8.1.1)
       diff: 5.0.0
       escape-string-regexp: 4.0.0
@@ -12637,7 +12891,7 @@ packages:
     engines: {node: '>= 4.4.x'}
     hasBin: true
     dependencies:
-      debug: 3.2.7(supports-color@8.1.1)
+      debug: 3.2.7
       iconv-lite: 0.4.24
       sax: 1.2.4
     transitivePeerDependencies:
@@ -12669,7 +12923,7 @@ packages:
     resolution: {integrity: sha512-iwXuFrMAcFVi/ZoZiqq8BzAdsLw9kxDfTC0HMyjXfSL/6CSDAGD5UmR7azrAgWV1zKYq7dUUMj4owusBWKLsiQ==}
     engines: {node: '>=10'}
     dependencies:
-      semver: 7.5.1
+      semver: 7.5.4
     dev: false
 
   /node-addon-api@5.1.0:
@@ -12700,6 +12954,18 @@ packages:
     dependencies:
       whatwg-url: 5.0.0
 
+  /node-fetch@2.6.12:
+    resolution: {integrity: sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==}
+    engines: {node: 4.x || >=6.0.0}
+    peerDependencies:
+      encoding: ^0.1.0
+    peerDependenciesMeta:
+      encoding:
+        optional: true
+    dependencies:
+      whatwg-url: 5.0.0
+    dev: false
+
   /node-fetch@3.3.1:
     resolution: {integrity: sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
@@ -12732,7 +12998,7 @@ packages:
       nopt: 6.0.0
       npmlog: 6.0.2
       rimraf: 3.0.2
-      semver: 7.5.1
+      semver: 7.5.4
       tar: 6.1.15
       which: 2.0.2
     transitivePeerDependencies:
@@ -12743,8 +13009,8 @@ packages:
     resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
     dev: true
 
-  /node-releases@2.0.12:
-    resolution: {integrity: sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==}
+  /node-releases@2.0.13:
+    resolution: {integrity: sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==}
 
   /nodemailer@6.9.3:
     resolution: {integrity: sha512-fy9v3NgTzBngrMFkDsKEj0r02U7jm6XfC3b52eoNV+GCrGj+s8pt5OqhiJdWKuw51zCTdiNR/IUD1z33LIIGpg==}
@@ -12775,7 +13041,7 @@ packages:
     dependencies:
       hosted-git-info: 2.8.9
       resolve: 1.22.2
-      semver: 5.7.1
+      semver: 5.7.2
       validate-npm-package-license: 3.0.4
     dev: true
 
@@ -13058,7 +13324,7 @@ packages:
     resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
     engines: {node: '>= 0.8.0'}
     dependencies:
-      '@aashutoshrathi/word-wrap': 1.2.5
+      '@aashutoshrathi/word-wrap': 1.2.6
       deep-is: 0.1.4
       fast-levenshtein: 2.0.6
       levn: 0.4.1
@@ -13093,8 +13359,8 @@ packages:
     resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==}
     dev: true
 
-  /otpauth@9.1.2:
-    resolution: {integrity: sha512-iI5nlVvMFP3aTPdjG/fnC4mhVJ/KZOSnBrvo/VnYHUwlTp9jVLjAe2B3i3pyCH+3/E5jYQRSvuHk/8oas3870g==}
+  /otpauth@9.1.3:
+    resolution: {integrity: sha512-lWy9GE2ASTgOwhH1dQsZwOIcVl2HopXNnTTtBXuhO4VZJ9AXT8Zx1ifTGaFUiXVFOzbHD/W4hDqMd/ZRDLkJEw==}
     dependencies:
       jssha: 3.3.0
     dev: false
@@ -13410,12 +13676,12 @@ packages:
     engines: {node: '>=4.0.0'}
     dev: false
 
-  /pg-pool@3.6.1(pg@8.11.0):
+  /pg-pool@3.6.1(pg@8.11.1):
     resolution: {integrity: sha512-jizsIzhkIitxCGfPRzJn1ZdcosIt3pz9Sh3V01fm1vZnbnCMgmGl5wvGGdNN2EL9Rmb0EcFoCkixH4Pu+sP9Og==}
     peerDependencies:
       pg: '>=8.0'
     dependencies:
-      pg: 8.11.0
+      pg: 8.11.1
     dev: false
 
   /pg-protocol@1.6.0:
@@ -13433,8 +13699,8 @@ packages:
       postgres-interval: 1.2.0
     dev: false
 
-  /pg@8.11.0:
-    resolution: {integrity: sha512-meLUVPn2TWgJyLmy7el3fQQVwft4gU5NGyvV0XbD41iU9Jbg8lCH4zexhIkihDzVHJStlt6r088G6/fWeNjhXA==}
+  /pg@8.11.1:
+    resolution: {integrity: sha512-utdq2obft07MxaDg0zBJI+l/M3mBRfIpEN3iSemsz0G5F2/VXx+XzqF4oxrbIZXQxt2AZzIUzyVg/YM6xOP/WQ==}
     engines: {node: '>= 8.0.0'}
     peerDependencies:
       pg-native: '>=3.0.1'
@@ -13445,7 +13711,7 @@ packages:
       buffer-writer: 2.0.0
       packet-reader: 1.0.0
       pg-connection-string: 2.6.1
-      pg-pool: 3.6.1(pg@8.11.0)
+      pg-pool: 3.6.1(pg@8.11.1)
       pg-protocol: 1.6.0
       pg-types: 2.2.0
       pgpass: 1.0.5
@@ -14273,8 +14539,8 @@ packages:
       setimmediate: 1.0.5
     dev: false
 
-  /re2@1.19.0:
-    resolution: {integrity: sha512-y0LcLZgBF3L7mDtNfbghb7dCmChYQO2QsUGklNueAJUH+HAZO8UZUubgNsf6OxRTAQpeE4KMPR7vcpK3+Q+GiA==}
+  /re2@1.19.1:
+    resolution: {integrity: sha512-pML2LZvGdjESWAsufwlFwF+TBauIx7ItgcPIL0KiiZ9GrJ5OU3aJEc/EZvygB32nhjrRxe6QQFbie79QhT7gVA==}
     requiresBuild: true
     dependencies:
       install-artifact-from-github: 1.3.3
@@ -14368,18 +14634,11 @@ packages:
       minimatch: 5.1.6
     dev: false
 
-  /readdirp@3.3.0:
-    resolution: {integrity: sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==}
-    engines: {node: '>=8.10.0'}
-    dependencies:
-      picomatch: 2.3.1
-
   /readdirp@3.6.0:
     resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
     engines: {node: '>=8.10.0'}
     dependencies:
       picomatch: 2.3.1
-    dev: true
 
   /rechoir@0.6.2:
     resolution: {integrity: sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==}
@@ -14410,6 +14669,7 @@ packages:
   /redis-errors@1.2.0:
     resolution: {integrity: sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==}
     engines: {node: '>=4'}
+    dev: false
 
   /redis-info@3.1.0:
     resolution: {integrity: sha512-ER4L9Sh/vm63DkIE0bkSjxluQlioBiBgf5w1UuldaW/3vPcecdljVDisZhmnCMvsxHNiARTTDDHGg9cGwTfrKg==}
@@ -14427,6 +14687,7 @@ packages:
     engines: {node: '>=4'}
     dependencies:
       redis-errors: 1.2.0
+    dev: false
 
   /redis-semaphore@5.3.1(ioredis@5.3.2):
     resolution: {integrity: sha512-oUpxxfxSbh5eT0mvVpz2d4Qlg2CsaoQkeo80/v6CU2l97zO0u6NPgc9/zQZa9KGR3/93b0igtSct3hEFh8Ei8w==}
@@ -14885,15 +15146,15 @@ packages:
     resolution: {integrity: sha512-LJWA9kSvMolR51oDE6PN3kALBNaUdkxzAGcexw8gjMA8xr5zUqK0JiR3CgARSqanYF3Z1YHvsErb1KDgh+v7Rg==}
     engines: {node: '>=12'}
     dependencies:
-      semver: 7.5.1
+      semver: 7.5.4
     dev: true
 
-  /semver@5.7.1:
-    resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==}
+  /semver@5.7.2:
+    resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==}
     hasBin: true
 
-  /semver@6.3.0:
-    resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}
+  /semver@6.3.1:
+    resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
     hasBin: true
 
   /semver@7.3.8:
@@ -14911,13 +15172,12 @@ packages:
     dependencies:
       lru-cache: 6.0.0
 
-  /semver@7.5.3:
-    resolution: {integrity: sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==}
+  /semver@7.5.4:
+    resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==}
     engines: {node: '>=10'}
     hasBin: true
     dependencies:
       lru-cache: 6.0.0
-    dev: true
 
   /serialize-error@7.0.1:
     resolution: {integrity: sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==}
@@ -14992,7 +15252,7 @@ packages:
       detect-libc: 2.0.1
       node-addon-api: 6.1.0
       prebuild-install: 7.1.1
-      semver: 7.5.1
+      semver: 7.5.4
       simple-get: 4.0.1
       tar-fs: 2.1.1
       tunnel-agent: 0.6.0
@@ -15317,6 +15577,7 @@ packages:
 
   /standard-as-callback@2.1.0:
     resolution: {integrity: sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==}
+    dev: false
 
   /start-server-and-test@1.15.2:
     resolution: {integrity: sha512-t5xJX04Hg7hqxiKHMJBz/n4zIMsE6G7hpAcerFAH+4Vh9le/LeyFcJERJM7WLiPygWF9TOg33oroJF1XOzJtYQ==}
@@ -15655,6 +15916,16 @@ packages:
       webpack: 5.85.1(@swc/core@1.3.62)(webpack-cli@5.1.3)
     dev: true
 
+  /swc-loader@0.2.3(@swc/core@1.3.68)(webpack@5.88.1):
+    resolution: {integrity: sha512-D1p6XXURfSPleZZA/Lipb3A8pZ17fP4NObZvFCDjK/OKljroqDpPmsBdTraWhVBqUNpcWBQY1imWdoPScRlQ7A==}
+    peerDependencies:
+      '@swc/core': ^1.2.147
+      webpack: '>=2'
+    dependencies:
+      '@swc/core': 1.3.68
+      webpack: 5.88.1(@swc/core@1.3.68)
+    dev: true
+
   /swiper@10.0.4:
     resolution: {integrity: sha512-DlNR3KiaVkPep6RraZ2tNr7lvyuzELuR+4NZr4wO42t0UworIO3DxDlz8b5Q3uUioh7cJad99EdRJLkPF+r8Ag==}
     engines: {node: '>= 4.7.0'}
@@ -15774,6 +16045,31 @@ packages:
       webpack: 5.85.1(@swc/core@1.3.62)(webpack-cli@5.1.3)
     dev: true
 
+  /terser-webpack-plugin@5.3.9(@swc/core@1.3.68)(webpack@5.88.1):
+    resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==}
+    engines: {node: '>= 10.13.0'}
+    peerDependencies:
+      '@swc/core': '*'
+      esbuild: '*'
+      uglify-js: '*'
+      webpack: ^5.1.0
+    peerDependenciesMeta:
+      '@swc/core':
+        optional: true
+      esbuild:
+        optional: true
+      uglify-js:
+        optional: true
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.18
+      '@swc/core': 1.3.68
+      jest-worker: 27.5.1
+      schema-utils: 3.3.0
+      serialize-javascript: 6.0.1
+      terser: 5.18.2
+      webpack: 5.88.1(@swc/core@1.3.68)
+    dev: true
+
   /terser@5.18.2:
     resolution: {integrity: sha512-Ah19JS86ypbJzTzvUCX7KOsEIhDaRONungA4aYBjEP3JZRf4ocuDzTg4QWZnPn9DEMiMYGJPiSOy7aykoCc70w==}
     engines: {node: '>=10'}
@@ -15789,11 +16085,11 @@ packages:
     resolution: {integrity: sha512-2fD76ka9nO/C616R0fq+M9Zu91DA3vEfyozp0jlxaJOBmpfeprtgRP3cqVweZh2darE1kK/DazoxZ65g7WU99Q==}
     dev: false
 
-  /tesseract.js@3.0.3(eslint@8.42.0):
+  /tesseract.js@3.0.3(eslint@8.44.0):
     resolution: {integrity: sha512-eZ1+OGWvF5IMExAzIwnDf3S3kf2FeC+i4qrMTRvBSlZeHc3ONy0vCmaKmBQz6scjB6C1W2w2x0r4lCEh95qBnw==}
     requiresBuild: true
     dependencies:
-      babel-eslint: 10.1.0(eslint@8.42.0)
+      babel-eslint: 10.1.0(eslint@8.44.0)
       bmp-js: 0.1.0
       file-type: 12.4.2
       idb-keyval: 3.2.0
@@ -16093,13 +16389,13 @@ packages:
       json5: 2.2.3
       lodash.memoize: 4.1.2
       make-error: 1.3.6
-      semver: 7.5.1
+      semver: 7.5.4
       typescript: 4.9.4
       yargs-parser: 21.1.1
     dev: true
 
-  /ts-loader@9.4.3(typescript@5.1.3)(webpack@5.85.1):
-    resolution: {integrity: sha512-n3hBnm6ozJYzwiwt5YRiJZkzktftRpMiBApHaJPoWLA+qetQBAXkHqCLM6nwSdRDimqVtA5ocIkcTRLMTt7yzA==}
+  /ts-loader@9.4.4(typescript@5.1.6)(webpack@5.88.1):
+    resolution: {integrity: sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
       typescript: '*'
@@ -16108,9 +16404,9 @@ packages:
       chalk: 4.1.2
       enhanced-resolve: 5.15.0
       micromatch: 4.0.5
-      semver: 7.5.1
-      typescript: 5.1.3
-      webpack: 5.85.1(@swc/core@1.3.62)(webpack-cli@5.1.3)
+      semver: 7.5.4
+      typescript: 5.1.6
+      webpack: 5.88.1(@swc/core@1.3.68)
     dev: true
 
   /ts-node@10.4.0(@swc/core@1.3.62)(@types/node@20.3.1)(typescript@5.1.3):
@@ -16144,7 +16440,7 @@ packages:
       yn: 3.1.1
     dev: true
 
-  /ts-node@10.9.1(@swc/core@1.3.62)(@types/node@18.11.18)(typescript@5.1.3):
+  /ts-node@10.9.1(@swc/core@1.3.68)(@types/node@18.11.18)(typescript@5.1.6):
     resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
     hasBin: true
     peerDependencies:
@@ -16159,7 +16455,7 @@ packages:
         optional: true
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
-      '@swc/core': 1.3.62
+      '@swc/core': 1.3.68
       '@tsconfig/node10': 1.0.9
       '@tsconfig/node12': 1.0.11
       '@tsconfig/node14': 1.0.3
@@ -16171,7 +16467,7 @@ packages:
       create-require: 1.1.1
       diff: 4.0.2
       make-error: 1.3.6
-      typescript: 5.1.3
+      typescript: 5.1.6
       v8-compile-cache-lib: 3.0.1
       yn: 3.1.1
 
@@ -16341,8 +16637,8 @@ packages:
       typescript: 4.9.4
     dev: true
 
-  /typeorm@0.3.11(ioredis@5.3.2)(pg@8.11.0)(ts-node@10.9.1):
-    resolution: {integrity: sha512-pzdOyWbVuz/z8Ww6gqvBW4nylsM0KLdUCDExr2gR20/x1khGSVxQkjNV/3YqliG90jrWzrknYbYscpk8yxFJVg==}
+  /typeorm@0.3.17(ioredis@5.3.2)(pg@8.11.1)(ts-node@10.9.1):
+    resolution: {integrity: sha512-UDjUEwIQalO9tWw9O2A4GU+sT3oyoUXheHJy4ft+RFdnRdQctdQ34L9SqE2p7LdwzafHx1maxT+bqXON+Qnmig==}
     engines: {node: '>= 12.9.0'}
     hasBin: true
     peerDependencies:
@@ -16351,9 +16647,9 @@ packages:
       better-sqlite3: ^7.1.2 || ^8.0.0
       hdb-pool: ^0.1.6
       ioredis: ^5.0.4
-      mongodb: ^3.6.0
-      mssql: ^7.3.0
-      mysql2: ^2.2.5
+      mongodb: ^5.2.0
+      mssql: ^9.1.1
+      mysql2: ^2.2.5 || ^3.0.1
       oracledb: ^5.1.0
       pg: ^8.5.1
       pg-native: ^3.0.0
@@ -16407,17 +16703,15 @@ packages:
       date-fns: 2.30.0
       debug: 4.3.4(supports-color@8.1.1)
       dotenv: 16.3.1
-      glob: 7.2.3
+      glob: 8.1.0
       ioredis: 5.3.2
-      js-yaml: 4.1.0
-      mkdirp: 1.0.4
-      pg: 8.11.0
+      mkdirp: 2.1.6
+      pg: 8.11.1
       reflect-metadata: 0.1.13
       sha.js: 2.4.11
-      ts-node: 10.9.1(@swc/core@1.3.62)(@types/node@18.11.18)(typescript@5.1.3)
+      ts-node: 10.9.1(@swc/core@1.3.68)(@types/node@18.11.18)(typescript@5.1.6)
       tslib: 2.6.0
-      uuid: 8.3.2
-      xml2js: 0.4.23
+      uuid: 9.0.0
       yargs: 17.7.2
     transitivePeerDependencies:
       - supports-color
@@ -16438,12 +16732,12 @@ packages:
     resolution: {integrity: sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==}
     engines: {node: '>=14.17'}
     hasBin: true
+    dev: true
 
   /typescript@5.1.6:
     resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==}
     engines: {node: '>=14.17'}
     hasBin: true
-    dev: true
 
   /ulid@2.3.0:
     resolution: {integrity: sha512-keqHubrlpvT6G2wH0OEfSW4mquYRcbe/J8NMmveoQOjUqmo+hXtO+ORCpWhdbZ7k72UtY61BL7haGxW6enBnjw==}
@@ -16633,7 +16927,7 @@ packages:
       is-arguments: 1.1.1
       is-generator-function: 1.0.10
       is-typed-array: 1.1.10
-      which-typed-array: 1.1.9
+      which-typed-array: 1.1.10
     dev: false
 
   /uuid@3.4.0:
@@ -16942,17 +17236,16 @@ packages:
       graceful-fs: 4.2.11
     dev: true
 
-  /web-push@3.6.1:
-    resolution: {integrity: sha512-+eN2/4Ybu+nkRgXqlPXUzqeA5BgQ7J4StYJM/e2uJpsSIGhkZJFrTlCx+ow9sD0mn+4jgbo2FkFoMBKftl49ZQ==}
-    engines: {node: '>= 6'}
+  /web-push@3.6.3:
+    resolution: {integrity: sha512-3RlA0lRmLcwlHCRR94Tz+Fw6wPtm0lFm8oyukQunlEIarANxE84Ox9XBgF4+jNlXgO40DIwblOiC43oR46helA==}
+    engines: {node: '>= 16'}
     hasBin: true
     dependencies:
       asn1.js: 5.4.1
       http_ece: 1.1.0
-      https-proxy-agent: 5.0.1
+      https-proxy-agent: 7.0.1
       jws: 4.0.0
       minimist: 1.2.8
-      urlsafe-base64: 1.0.0
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -17066,6 +17359,46 @@ packages:
       - uglify-js
     dev: true
 
+  /webpack@5.88.1(@swc/core@1.3.68):
+    resolution: {integrity: sha512-FROX3TxQnC/ox4N+3xQoWZzvGXSuscxR32rbzjpXgEzWudJFEJBpdlkkob2ylrv5yzzufD1zph1OoFsLtm6stQ==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+    peerDependencies:
+      webpack-cli: '*'
+    peerDependenciesMeta:
+      webpack-cli:
+        optional: true
+    dependencies:
+      '@types/eslint-scope': 3.7.4
+      '@types/estree': 1.0.1
+      '@webassemblyjs/ast': 1.11.6
+      '@webassemblyjs/wasm-edit': 1.11.6
+      '@webassemblyjs/wasm-parser': 1.11.6
+      acorn: 8.10.0
+      acorn-import-assertions: 1.9.0(acorn@8.10.0)
+      browserslist: 4.21.9
+      chrome-trace-event: 1.0.3
+      enhanced-resolve: 5.15.0
+      es-module-lexer: 1.3.0
+      eslint-scope: 5.1.1
+      events: 3.3.0
+      glob-to-regexp: 0.4.1
+      graceful-fs: 4.2.11
+      json-parse-even-better-errors: 2.3.1
+      loader-runner: 4.3.0
+      mime-types: 2.1.35
+      neo-async: 2.6.2
+      schema-utils: 3.3.0
+      tapable: 2.2.1
+      terser-webpack-plugin: 5.3.9(@swc/core@1.3.68)(webpack@5.88.1)
+      watchpack: 2.4.0
+      webpack-sources: 3.2.3
+    transitivePeerDependencies:
+      - '@swc/core'
+      - esbuild
+      - uglify-js
+    dev: true
+
   /websocket@1.0.34:
     resolution: {integrity: sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ==}
     engines: {node: '>=4.0.0'}
@@ -17153,6 +17486,18 @@ packages:
     resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==}
     dev: false
 
+  /which-typed-array@1.1.10:
+    resolution: {integrity: sha512-uxoA5vLUfRPdjCuJ1h5LlYdmTLbYfums398v3WLkM+i/Wltl2/XyZpQWKbN++ck5L64SR/grOHqtXCUKmlZPNA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      available-typed-arrays: 1.0.5
+      call-bind: 1.0.2
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-tostringtag: 1.0.0
+      is-typed-array: 1.1.10
+    dev: false
+
   /which-typed-array@1.1.9:
     resolution: {integrity: sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==}
     engines: {node: '>= 0.4'}
@@ -17163,6 +17508,7 @@ packages:
       gopd: 1.0.1
       has-tostringtag: 1.0.0
       is-typed-array: 1.1.10
+    dev: true
 
   /which@1.3.1:
     resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
@@ -17323,21 +17669,6 @@ packages:
     engines: {node: '>=12'}
     dev: false
 
-  /xml2js@0.4.19:
-    resolution: {integrity: sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==}
-    dependencies:
-      sax: 1.2.1
-      xmlbuilder: 9.0.7
-    dev: false
-
-  /xml2js@0.4.23:
-    resolution: {integrity: sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==}
-    engines: {node: '>=4.0.0'}
-    dependencies:
-      sax: 1.2.4
-      xmlbuilder: 11.0.1
-    dev: false
-
   /xml2js@0.5.0:
     resolution: {integrity: sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==}
     engines: {node: '>=4.0.0'}
@@ -17351,11 +17682,6 @@ packages:
     engines: {node: '>=4.0'}
     dev: false
 
-  /xmlbuilder@9.0.7:
-    resolution: {integrity: sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ==}
-    engines: {node: '>=4.0'}
-    dev: false
-
   /xmlchars@2.2.0:
     resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
 
@@ -17562,8 +17888,8 @@ packages:
       url-polyfill: 1.1.12
     dev: true
 
-  github.com/thatonecalculator/emojilib/15fd9504f943763a057ff803ee2009ec0524c96b:
-    resolution: {tarball: https://codeload.github.com/thatonecalculator/emojilib/tar.gz/15fd9504f943763a057ff803ee2009ec0524c96b}
+  github.com/thatonecalculator/emojilib/1d6adc1af8105b4937d2f0e7479acf5bd565bd9b:
+    resolution: {tarball: https://codeload.github.com/thatonecalculator/emojilib/tar.gz/1d6adc1af8105b4937d2f0e7479acf5bd565bd9b}
     name: emojilib
     version: 3.0.10
     dev: true

From cd66f859abd0723375d685a058ddc05b1fd70848 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 10 Jul 2023 21:35:20 -0700
Subject: [PATCH 29/68] docs: :memo: join server

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

diff --git a/README.md b/README.md
index 2e6907e306..18b37ae02b 100644
--- a/README.md
+++ b/README.md
@@ -72,6 +72,14 @@
 
 # 🌠 Getting started
 
+Want to just join a Calckey server? View the list here, pick one, and join:
+
+### https://calckey.org/join
+
+---
+
+Want to make your own? Keep reading!
+
 This guide will work for both **starting from scratch** and **migrating from Misskey**.
 
 ## 🔰 Easy installers

From afb89029b8374b75a75d3b91bea8a1d144fb978a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 10 Jul 2023 22:34:04 -0700
Subject: [PATCH 30/68] chore: vite conf changes

---
 packages/client/vite.config.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/client/vite.config.ts b/packages/client/vite.config.ts
index 6c644660e6..592628e837 100644
--- a/packages/client/vite.config.ts
+++ b/packages/client/vite.config.ts
@@ -23,9 +23,9 @@ const extensions = [
 ];
 
 export default defineConfig(({ command, mode }) => {
-	fs.mkdirSync(__dirname + "/../../built", { recursive: true });
+	fs.mkdirSync(`${__dirname}/../../built`, { recursive: true });
 	fs.writeFileSync(
-		__dirname + "/../../built/meta.json",
+		`${__dirname}/../../built/meta.json`,
 		JSON.stringify({ version: meta.version }),
 		"utf-8",
 	);
@@ -40,15 +40,16 @@ export default defineConfig(({ command, mode }) => {
 			pluginJson5(),
 			viteCompression({
 				algorithm: "brotliCompress",
+				verbose: false,
 			}),
 		],
 
 		resolve: {
 			extensions,
 			alias: {
-				"@/": __dirname + "/src/",
-				"/client-assets/": __dirname + "/assets/",
-				"/static-assets/": __dirname + "/../backend/assets/",
+				"@/": `${__dirname}/src/`,
+				"/client-assets/": `${__dirname}/assets/`,
+				"/static-assets/": `${__dirname}/../backend/assets/`,
 			},
 		},
 
@@ -82,7 +83,7 @@ export default defineConfig(({ command, mode }) => {
 			},
 			cssCodeSplit: true,
 			assetsInlineLimit: 0,
-			outDir: __dirname + "/../../built/_client_dist_",
+			outDir: `${__dirname}/../../built/_client_dist_`,
 			assetsDir: ".",
 			emptyOutDir: false,
 			sourcemap: process.env.NODE_ENV === "development",
@@ -94,5 +95,7 @@ export default defineConfig(({ command, mode }) => {
 		optimizeDeps: {
 			auto: true,
 		},
+
+		logLevel: 'warn',
 	};
 });

From 4bcfcfe7f1c65bf411c9182a0e6c5b030aa2d491 Mon Sep 17 00:00:00 2001
From: DVD <zjdavid.2003@gmail.com>
Date: Tue, 11 Jul 2023 21:27:10 +0800
Subject: [PATCH 31/68] Fixes image cropper ui

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

diff --git a/packages/client/src/components/MkCropperDialog.vue b/packages/client/src/components/MkCropperDialog.vue
index b7d25bd35d..3d8ea46e87 100644
--- a/packages/client/src/components/MkCropperDialog.vue
+++ b/packages/client/src/components/MkCropperDialog.vue
@@ -13,7 +13,7 @@
 		<template #default="{ width, height }">
 			<div
 				class="mk-cropper-dialog"
-				:style="`--vw: ${width}px; --vh: ${height}px;`"
+				:style="`--vw: ${width ? `${width}px` : '100%'}; --vh: ${height ? `${height}px` : '100%'};`"
 			>
 				<Transition name="fade">
 					<div v-if="loading" class="loading">

From 13bf9839d1424a0088895fc383d11690d09dad1d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 15:05:43 -0700
Subject: [PATCH 32/68] docs: :memo: FoundKey migration docs

Co-authored-by: Jeder <jeder@noreply.codeberg.org>
Superscedes #10471
---
 CALCKEY.md      |  2 +-
 CHANGELOG.md    |  2 +-
 README.md       |  4 ++--
 docs/migrate.md | 16 +++++++++-------
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index 5a8bbd8ff7..619155238c 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -137,7 +137,7 @@
   - 👍 also triggers generic like/favorite
 - [Add additional background for acrylic popups if backdrop-filter is unsupported](https://github.com/misskey-dev/misskey/pull/8671)
 - [Add parameters to MFM rotate](https://github.com/misskey-dev/misskey/pull/8549)
-- Many changes from [Foundkey](https://akkoma.dev/FoundKeyGang/Foundkey)
+- Many changes from [FoundKey](https://akkoma.dev/FoundKeyGang/FoundKey)
 	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/0ece67b04c3f0365057624c1068808276ccab981: refactor pages/auth.form.vue to composition API
 	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/4bc9610d8bf5af736b5e89e4782395705de45d7d: remove unnecessary joins
 	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/9ee609d70082f7a6dc119a5d83c0e7c5e1208676: enhance privacy of notes
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 988156a72d..b9a998f627 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2704,7 +2704,7 @@ Co-committed-by: naskya <naskya@noreply.codeberg.org>
 
 Passwords will be automatically re-hashed on sign-in. All new password hashes will be argon2 by default.  This uses argon2id and is not configurable. In the very unlikely case someone has more specific needs, a fork is recommended.  ChangeLog: Added  Co-authored-by: Chloe Kudryavtsev <code@toast.bunkerlabs.net>
 
-Breaks Calckey -> Misskey migration, but fixes Foundkey -> Calckey migration
+Breaks Calckey -> Misskey migration, but fixes FoundKey -> Calckey migration
 
 - Add argon
 
diff --git a/README.md b/README.md
index 18b37ae02b..a2465cc092 100644
--- a/README.md
+++ b/README.md
@@ -216,9 +216,9 @@ Please don't use ElasticSearch unless you already have an ElasticSearch setup an
 - Edit `.config/default.yml`, making sure to fill out required fields.
 - Also copy and edit `.config/docker_example.env` to `.config/docker.env` if you're using Docker.
 
-## 🚚 Migrating from Misskey to Calckey
+## 🚚 Migrating from Misskey/FoundKey to Calckey
 
-For migrating from Misskey v13, Misskey v12, and Foundkey, read [this document](https://codeberg.org/calckey/calckey/src/branch/develop/docs/migrate.md).
+For migrating from Misskey v13, Misskey v12, and FoundKey, read [this document](https://codeberg.org/calckey/calckey/src/branch/develop/docs/migrate.md).
 
 ## 🌐 Web proxy
 
diff --git a/docs/migrate.md b/docs/migrate.md
index ae7df286ad..7d5c5639f6 100644
--- a/docs/migrate.md
+++ b/docs/migrate.md
@@ -1,10 +1,11 @@
-# 🚚 Migrating from Misskey to Calckey
+# 🚚 Migrating from Misskey/FoundKey to Calckey
 
-The following procedure may not work depending on your environment and version of Misskey.
+All the guides below assume you're starting in the root of the repo directory.
 
-**Make sure you**
-- **stopped all master and worker processes of Misskey.**
-- **have backups of the database before performing any commands.**
+### Before proceeding
+
+- **Ensure you have stopped all master and worker processes of Misskey.**
+- **Ensure you have backups of the database before performing any commands.**
 
 ## Misskey v13 and above
 
@@ -77,10 +78,11 @@ NODE_ENV=production pnpm run migrate
 # build using prefered method
 ```
 
-## Foundkey
+## FoundKey
 
 ```sh
 cd packages/backend
+sed -i '12s/^/\/\//' ./migration/1663399074403-resize-comments-drive-file.js
 
 LINE_NUM="$(npx typeorm migration:show -d ormconfig.js | grep -n uniformThemecolor1652859567549 | cut -d ':' -f 1)"
 NUM_MIGRATIONS="$(npx typeorm migration:show -d ormconfig.js | tail -n+"$LINE_NUM" | grep '\[X\]' | wc -l)"
@@ -100,4 +102,4 @@ NODE_ENV=production pnpm run migrate
 
 ## Reverse
 
-You ***cannot*** migrate back to Misskey from Calckey due to re-hashing passwords on signin with argon2. You can migrate from Calckey to Foundkey, though.
+You ***cannot*** migrate back to Misskey from Calckey due to re-hashing passwords on signin with argon2. You can migrate from Calckey to FoundKey, though.

From b5c01e9f61ebdea93640c60762d6be2057b23ad0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 15:45:28 -0700
Subject: [PATCH 33/68] chore: :page_facing_up: LICENSE for configuration
 directories

Closes #10470
---
 COPYING               | 27 ++++++++++++++++++++-------
 custom/assets/LICENSE | 13 +++++++++++++
 2 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 custom/assets/LICENSE

diff --git a/COPYING b/COPYING
index fb483b5235..387515b061 100644
--- a/COPYING
+++ b/COPYING
@@ -1,15 +1,24 @@
-Unless otherwise stated this repository is
-Copyright © 2014-2022 syuilo and contributers
-Copyright © 2022 thatonecalculator and contributers
+Unless specified otherwise, the entirety of this repository is subject to the following:
+Copyright © 2014-2023 syuilo and contributors
+Copyright © 2022-2023 Kainoa Kanter and contributors
 
 And is distributed under The GNU Affero General Public License Version 3, you should have received a copy of the license file as LICENSE.
 
+---
 
-Calckey includes several third-party Open-Source softwares.
+These specific configuration directories:
 
-Emoji keywords for Unicode 11 and below by Mu-An Chiou
-License: MIT
-https://github.com/muan/emojilib/blob/master/LICENSE
+- .config/
+- custom/assets/
+
+and their contents are
+Copyright © 2022-2023 Kainoa Kanter and contributors
+
+And are distributed under The Apache License, Version 2.0, you should have received a copy of the license file as LICENSE in each specified directory.
+
+---
+
+Calckey includes several third-party open-source softwares and software libraries.
 
 RsaSignature2017 implementation by Transmute Industries Inc
 License: MIT
@@ -18,3 +27,7 @@ https://github.com/transmute-industries/RsaSignature2017/blob/master/LICENSE
 Machine learning model for sensitive images by Infinite Red, Inc.
 License: MIT
 https://github.com/infinitered/nsfwjs/blob/master/LICENSE
+
+Licenses for all softwares and software libraries installed via the Node Package Manager ("npm") can be found by running the following shell command in the root directory of this repository:
+
+pnpm licenses list
diff --git a/custom/assets/LICENSE b/custom/assets/LICENSE
new file mode 100644
index 0000000000..342509dec1
--- /dev/null
+++ b/custom/assets/LICENSE
@@ -0,0 +1,13 @@
+Copyright 2023 Calckey
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

From b4c69ad6748df07d1eb1f56e5e0d4666ab75d747 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 15:46:41 -0700
Subject: [PATCH 34/68] fix: :page_facing_up: don't gitignore .config license

Follow-up #10470
---
 .config/LICENSE | 13 +++++++++++++
 .gitignore      |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 .config/LICENSE

diff --git a/.config/LICENSE b/.config/LICENSE
new file mode 100644
index 0000000000..342509dec1
--- /dev/null
+++ b/.config/LICENSE
@@ -0,0 +1,13 @@
+Copyright 2023 Calckey
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/.gitignore b/.gitignore
index 29377540d8..6bf2ea1b14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ coverage
 !/.config/devenv.yml
 !/.config/docker_example.env
 !/.config/helm_values_example.yml
+!/.config/LICENSE
 
 #docker dev config
 /dev/docker-compose.yml

From 17320b960bae4c11cc3f5304a5309b8256c3ee8b Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@waah.day>
Date: Tue, 11 Jul 2023 20:48:38 -0400
Subject: [PATCH 35/68] chore: change account

---
 packages/client/src/pages/about-calckey.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/pages/about-calckey.vue b/packages/client/src/pages/about-calckey.vue
index 6899c4de0f..fb508239bb 100644
--- a/packages/client/src/pages/about-calckey.vue
+++ b/packages/client/src/pages/about-calckey.vue
@@ -101,8 +101,9 @@
 								><Mfm
 									:text="'@freeplay@calckey.social (UI/UX)'"
 							/></FormLink>
-							<FormLink to="/@nmkj@calckey.jp"
-								><Mfm :text="'@nmkj@calckey.jp (Backend)'"
+							<FormLink to="/@namekuji@calckey.social"
+								><Mfm
+									:text="'@namekuji@calckey.social (Backend)'"
 							/></FormLink>
 							<FormLink to="/@dev@post.naskya.net"
 								><Mfm :text="'@dev@post.naskya.net (Backend)'"

From cacee0228b1d638ee345373d408913ccd3be9df8 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 18:26:53 -0700
Subject: [PATCH 36/68] fix: :bug: fix draggable

Use vue-draggable-plus instead of vuedraggable: https://github.com/SortableJS/vue.draggable.next/issues/216

Closes #10467
---
 packages/client/package.json                  |  4 +-
 .../client/src/components/MkCropperDialog.vue |  4 +-
 .../src/components/MkPostFormAttaches.vue     |  9 ++-
 packages/client/src/components/MkWidgets.vue  |  7 +--
 .../pages/page-editor/page-editor.blocks.vue  |  9 ++-
 .../src/pages/page-editor/page-editor.vue     |  9 +--
 .../client/src/pages/settings/reaction.vue    |  6 +-
 packages/client/vite.config.ts                |  2 +-
 pnpm-lock.yaml                                | 60 ++++++-------------
 9 files changed, 40 insertions(+), 70 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 81c252d664..95fb9f9b2a 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -87,9 +87,9 @@
 		"vite": "4.4.2",
 		"vite-plugin-compression": "^0.5.1",
 		"vue": "3.3.4",
+		"vue-draggable-plus": "^0.2.2",
 		"vue-isyourpasswordsafe": "^2.0.0",
 		"vue-plyr": "^7.0.0",
-		"vue-prism-editor": "2.0.0-alpha.2",
-		"vuedraggable": "4.1.0"
+		"vue-prism-editor": "2.0.0-alpha.2"
 	}
 }
diff --git a/packages/client/src/components/MkCropperDialog.vue b/packages/client/src/components/MkCropperDialog.vue
index 3d8ea46e87..748132fbca 100644
--- a/packages/client/src/components/MkCropperDialog.vue
+++ b/packages/client/src/components/MkCropperDialog.vue
@@ -13,7 +13,9 @@
 		<template #default="{ width, height }">
 			<div
 				class="mk-cropper-dialog"
-				:style="`--vw: ${width ? `${width}px` : '100%'}; --vh: ${height ? `${height}px` : '100%'};`"
+				:style="`--vw: ${width ? `${width}px` : '100%'}; --vh: ${
+					height ? `${height}px` : '100%'
+				};`"
 			>
 				<Transition name="fade">
 					<div v-if="loading" class="loading">
diff --git a/packages/client/src/components/MkPostFormAttaches.vue b/packages/client/src/components/MkPostFormAttaches.vue
index 41997b0f71..8517d6969e 100644
--- a/packages/client/src/components/MkPostFormAttaches.vue
+++ b/packages/client/src/components/MkPostFormAttaches.vue
@@ -1,6 +1,6 @@
 <template>
 	<div v-show="files.length != 0" class="skeikyzd">
-		<XDraggable
+		<VueDraggable
 			v-model="_files"
 			class="files"
 			item-key="id"
@@ -25,22 +25,21 @@
 					</div>
 				</div>
 			</template>
-		</XDraggable>
+		</VueDraggable>
 		<p class="remain">{{ 16 - files.length }}/16</p>
 	</div>
 </template>
 
 <script lang="ts">
 import { defineComponent, defineAsyncComponent } from "vue";
+import { VueDraggable } from "vue-draggable-plus";
 import MkDriveFileThumbnail from "@/components/MkDriveFileThumbnail.vue";
 import * as os from "@/os";
 import { i18n } from "@/i18n";
 
 export default defineComponent({
 	components: {
-		XDraggable: defineAsyncComponent(() =>
-			import("vuedraggable").then((x) => x.default),
-		),
+		VueDraggable,
 		MkDriveFileThumbnail,
 	},
 
diff --git a/packages/client/src/components/MkWidgets.vue b/packages/client/src/components/MkWidgets.vue
index a5e56c0750..4e40aeec36 100644
--- a/packages/client/src/components/MkWidgets.vue
+++ b/packages/client/src/components/MkWidgets.vue
@@ -28,7 +28,7 @@
 					i18n.ts.close
 				}}</MkButton>
 			</header>
-			<XDraggable
+			<VueDraggable
 				v-model="widgets_"
 				item-key="id"
 				handle=".handle"
@@ -59,7 +59,7 @@
 						</div>
 					</div>
 				</template>
-			</XDraggable>
+			</VueDraggable>
 		</template>
 		<component
 			:is="`mkw-${widget.name}`"
@@ -78,14 +78,13 @@
 <script lang="ts" setup>
 import { defineAsyncComponent, reactive, ref, computed } from "vue";
 import { v4 as uuid } from "uuid";
+import { VueDraggable } from "vue-draggable-plus";
 import MkSelect from "@/components/form/select.vue";
 import MkButton from "@/components/MkButton.vue";
 import { widgets as widgetDefs } from "@/widgets";
 import * as os from "@/os";
 import { i18n } from "@/i18n";
 
-const XDraggable = defineAsyncComponent(() => import("vuedraggable"));
-
 type Widget = {
 	name: string;
 	id: string;
diff --git a/packages/client/src/pages/page-editor/page-editor.blocks.vue b/packages/client/src/pages/page-editor/page-editor.blocks.vue
index 72594ae1ab..a2ef65b153 100644
--- a/packages/client/src/pages/page-editor/page-editor.blocks.vue
+++ b/packages/client/src/pages/page-editor/page-editor.blocks.vue
@@ -1,5 +1,5 @@
 <template>
-	<XDraggable
+	<VueDraggable
 		v-model="blocks"
 		tag="div"
 		item-key="id"
@@ -17,11 +17,12 @@
 				@remove="() => removeItem(element)"
 			/>
 		</template>
-	</XDraggable>
+	</VueDraggable>
 </template>
 
 <script lang="ts">
 import { defineComponent, defineAsyncComponent } from "vue";
+import { VueDraggable } from "vue-draggable-plus";
 import XSection from "./els/page-editor.el.section.vue";
 import XText from "./els/page-editor.el.text.vue";
 import XTextarea from "./els/page-editor.el.textarea.vue";
@@ -41,9 +42,7 @@ import * as os from "@/os";
 
 export default defineComponent({
 	components: {
-		XDraggable: defineAsyncComponent(() =>
-			import("vuedraggable").then((x) => x.default),
-		),
+		VueDraggable,
 		XSection,
 		XText,
 		XImage,
diff --git a/packages/client/src/pages/page-editor/page-editor.vue b/packages/client/src/pages/page-editor/page-editor.vue
index c679e5efa1..c8b2f47bd5 100644
--- a/packages/client/src/pages/page-editor/page-editor.vue
+++ b/packages/client/src/pages/page-editor/page-editor.vue
@@ -118,7 +118,7 @@
 
 			<div v-else-if="tab === 'variables'">
 				<div class="qmuvgica">
-					<XDraggable
+					<VueDraggable
 						v-show="variables.length > 0"
 						v-model="variables"
 						tag="div"
@@ -140,7 +140,7 @@
 								@remove="() => removeVariable(element)"
 							/>
 						</template>
-					</XDraggable>
+					</VueDraggable>
 
 					<MkButton
 						v-if="!readonly"
@@ -174,6 +174,7 @@ import { blockDefs } from "@/scripts/hpml/index";
 import { HpmlTypeChecker } from "@/scripts/hpml/type-checker";
 import { url } from "@/config";
 import { collectPageVars } from "@/scripts/collect-page-vars";
+import { VueDraggable } from "vue-draggable-plus";
 import * as os from "@/os";
 import { selectFile } from "@/scripts/select-file";
 import { mainRouter } from "@/router";
@@ -181,10 +182,6 @@ import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
 import { $i } from "@/account";
 
-const XDraggable = defineAsyncComponent(() =>
-	import("vuedraggable").then((x) => x.default),
-);
-
 const props = defineProps<{
 	initPageId?: string;
 	initPageName?: string;
diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue
index 9929004866..b748b0ce0b 100644
--- a/packages/client/src/pages/settings/reaction.vue
+++ b/packages/client/src/pages/settings/reaction.vue
@@ -10,7 +10,7 @@
 					i18n.ts.reactionSettingDescription
 				}}</template>
 				<div v-panel style="border-radius: 6px">
-					<XDraggable
+					<VueDraggable
 						v-model="reactions"
 						class="zoaiodol"
 						:item-key="(item) => item"
@@ -35,7 +35,7 @@
 								<i class="ph-plus ph-bold ph-lg"></i>
 							</button>
 						</template>
-					</XDraggable>
+					</VueDraggable>
 				</div>
 				<template #caption
 					>{{ i18n.ts.reactionSettingDescription2 }}
@@ -124,7 +124,7 @@
 
 <script lang="ts" setup>
 import { defineAsyncComponent, watch } from "vue";
-import XDraggable from "vuedraggable";
+import { VueDraggable } from "vue-draggable-plus";
 import FormInput from "@/components/form/input.vue";
 import FormRadios from "@/components/form/radios.vue";
 import FromSlot from "@/components/form/slot.vue";
diff --git a/packages/client/vite.config.ts b/packages/client/vite.config.ts
index 592628e837..1b6bdfe594 100644
--- a/packages/client/vite.config.ts
+++ b/packages/client/vite.config.ts
@@ -96,6 +96,6 @@ export default defineConfig(({ command, mode }) => {
 			auto: true,
 		},
 
-		logLevel: 'warn',
+		logLevel: "warn",
 	};
 });
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4b4695f3f5..1189c23434 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -910,6 +910,9 @@ importers:
       vue:
         specifier: 3.3.4
         version: 3.3.4
+      vue-draggable-plus:
+        specifier: ^0.2.2
+        version: 0.2.2
       vue-isyourpasswordsafe:
         specifier: ^2.0.0
         version: 2.0.0
@@ -919,9 +922,6 @@ importers:
       vue-prism-editor:
         specifier: 2.0.0-alpha.2
         version: 2.0.0-alpha.2(vue@3.3.4)
-      vuedraggable:
-        specifier: 4.1.0
-        version: 4.1.0(vue@3.3.4)
 
   packages/megalodon:
     dependencies:
@@ -5446,7 +5446,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
@@ -5472,7 +5472,7 @@ packages:
   /axios@1.4.0:
     resolution: {integrity: sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==}
     dependencies:
-      follow-redirects: 1.15.2
+      follow-redirects: 1.15.2(debug@4.3.4)
       form-data: 4.0.0
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
@@ -7137,17 +7137,6 @@ packages:
     dependencies:
       ms: 2.0.0
 
-  /debug@3.2.7:
-    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.1.3
-    dev: false
-
   /debug@3.2.7(supports-color@8.1.1):
     resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
     peerDependencies:
@@ -7158,7 +7147,6 @@ packages:
     dependencies:
       ms: 2.1.3
       supports-color: 8.1.1
-    dev: true
 
   /debug@4.3.3:
     resolution: {integrity: sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==}
@@ -8742,16 +8730,6 @@ packages:
       tabbable: 6.2.0
     dev: true
 
-  /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'}
@@ -9693,7 +9671,7 @@ packages:
     engines: {node: '>= 4.5.0'}
     dependencies:
       agent-base: 4.3.0
-      debug: 3.2.7
+      debug: 3.2.7(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -11844,7 +11822,7 @@ packages:
     resolution: {integrity: sha512-UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ==}
     engines: {node: '>= 7.6.0'}
     dependencies:
-      debug: 3.2.7
+      debug: 3.2.7(supports-color@8.1.1)
       koa-send: 5.0.1
     transitivePeerDependencies:
       - supports-color
@@ -12891,7 +12869,7 @@ packages:
     engines: {node: '>= 4.4.x'}
     hasBin: true
     dependencies:
-      debug: 3.2.7
+      debug: 3.2.7(supports-color@8.1.1)
       iconv-lite: 0.4.24
       sax: 1.2.4
     transitivePeerDependencies:
@@ -15438,10 +15416,6 @@ packages:
       is-plain-obj: 1.1.0
     dev: true
 
-  /sortablejs@1.14.0:
-    resolution: {integrity: sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==}
-    dev: true
-
   /source-map-js@1.0.2:
     resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
     engines: {node: '>=0.10.0'}
@@ -17135,6 +17109,15 @@ packages:
     resolution: {integrity: sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==}
     dev: true
 
+  /vue-draggable-plus@0.2.2:
+    resolution: {integrity: sha512-Mp9T7FK/N8anWr1Bi3RKQ3GETRu/pCHz+upvd0CTHY9Rq4sITfVtpoKsMUkasg55svx5sw8B+yeQob3WfaqqzQ==}
+    peerDependencies:
+      '@vue/composition-api': '*'
+    peerDependenciesMeta:
+      '@vue/composition-api':
+        optional: true
+    dev: true
+
   /vue-isyourpasswordsafe@2.0.0:
     resolution: {integrity: sha512-j3ORj18R9AgFiP2UOM35KuZbSeJAUiwCSyeRBFN3CGFYTJSKsxqU9qGqOHOz6OhLAYKMTin8JOmqugAbF9O+Bg==}
     dependencies:
@@ -17174,15 +17157,6 @@ packages:
       '@vue/shared': 3.3.4
     dev: true
 
-  /vuedraggable@4.1.0(vue@3.3.4):
-    resolution: {integrity: sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==}
-    peerDependencies:
-      vue: ^3.0.1
-    dependencies:
-      sortablejs: 1.14.0
-      vue: 3.3.4
-    dev: true
-
   /w3c-hr-time@1.0.2:
     resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==}
     deprecated: Use your platform's native performance.now() and performance.timeOrigin.

From 8a790800489e368736e92b70c6e7d20e3f4107ab Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 18:28:23 -0700
Subject: [PATCH 37/68] dev63

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

diff --git a/package.json b/package.json
index 0f14400cf7..8e54bcd50c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev60",
+	"version": "14.0.0-dev63",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From adb5a39b9650afedd346dad7e944c0d495a7f314 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 18:55:24 -0700
Subject: [PATCH 38/68] fix?

---
 packages/client/src/pages/settings/reaction.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue
index b748b0ce0b..a76745d5f1 100644
--- a/packages/client/src/pages/settings/reaction.vue
+++ b/packages/client/src/pages/settings/reaction.vue
@@ -11,6 +11,7 @@
 				}}</template>
 				<div v-panel style="border-radius: 6px">
 					<VueDraggable
+						ref="el"
 						v-model="reactions"
 						class="zoaiodol"
 						:item-key="(item) => item"

From bd5bf012d4162c66a37f21aef95d3fa6ca23f33a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 19:08:47 -0700
Subject: [PATCH 39/68] fix

---
 .../client/src/pages/settings/reaction.vue    | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue
index a76745d5f1..c407e6f942 100644
--- a/packages/client/src/pages/settings/reaction.vue
+++ b/packages/client/src/pages/settings/reaction.vue
@@ -11,26 +11,25 @@
 				}}</template>
 				<div v-panel style="border-radius: 6px">
 					<VueDraggable
-						ref="el"
 						v-model="reactions"
 						class="zoaiodol"
-						:item-key="(item) => item"
 						animation="150"
 						delay="100"
+						@end="save"
 						delay-on-touch-only="true"
 					>
-						<template #item="{ element }">
 							<button
+								v-for="item in reactions"
+								:key="item"
 								class="_button item"
-								@click="remove(element, $event)"
+								@click="remove(item, $event)"
 							>
 								<MkEmoji
-									:emoji="element"
+									:emoji="item"
 									style="height: 1.7em"
 									class="emoji"
 								/>
 							</button>
-						</template>
 						<template #footer>
 							<button class="_button add" @click="chooseEmoji">
 								<i class="ph-plus ph-bold ph-lg"></i>
@@ -226,16 +225,6 @@ function chooseEmoji(ev: MouseEvent) {
 	});
 }
 
-watch(
-	$$(reactions),
-	() => {
-		save();
-	},
-	{
-		deep: true,
-	},
-);
-
 watch(enableEmojiReactions, async () => {
 	await reloadAsk();
 });

From d9113cc62cbf6ba7203d474bf9923db041fce21b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 19:20:58 -0700
Subject: [PATCH 40/68] fix

---
 .../src/components/MkPostFormAttaches.vue     | 33 +++++++++----------
 packages/client/src/components/MkWidgets.vue  |  8 +++--
 .../pages/page-editor/page-editor.blocks.vue  |  5 ++-
 .../src/pages/page-editor/page-editor.vue     |  5 ++-
 .../client/src/pages/settings/reaction.vue    |  4 +--
 5 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/packages/client/src/components/MkPostFormAttaches.vue b/packages/client/src/components/MkPostFormAttaches.vue
index 8517d6969e..cb3a9901b8 100644
--- a/packages/client/src/components/MkPostFormAttaches.vue
+++ b/packages/client/src/components/MkPostFormAttaches.vue
@@ -3,28 +3,27 @@
 		<VueDraggable
 			v-model="_files"
 			class="files"
-			item-key="id"
 			animation="150"
 			delay="100"
 			delay-on-touch-only="true"
 		>
-			<template #item="{ element }">
-				<div
-					class="file"
-					@click="showFileMenu(element, $event)"
-					@contextmenu.prevent="showFileMenu(element, $event)"
-				>
-					<MkDriveFileThumbnail
-						:data-id="element.id"
-						class="thumbnail"
-						:file="element"
-						fit="cover"
-					/>
-					<div v-if="element.isSensitive" class="sensitive">
-						<i class="ph-warning ph-bold ph-lg icon"></i>
-					</div>
+			<div
+				class="file"
+				v-for="element in _files"
+				:key="element.id"
+				@click="showFileMenu(element, $event)"
+				@contextmenu.prevent="showFileMenu(element, $event)"
+			>
+				<MkDriveFileThumbnail
+					:data-id="element.id"
+					class="thumbnail"
+					:file="element"
+					fit="cover"
+				/>
+				<div v-if="element.isSensitive" class="sensitive">
+					<i class="ph-warning ph-bold ph-lg icon"></i>
 				</div>
-			</template>
+			</div>
 		</VueDraggable>
 		<p class="remain">{{ 16 - files.length }}/16</p>
 	</div>
diff --git a/packages/client/src/components/MkWidgets.vue b/packages/client/src/components/MkWidgets.vue
index 4e40aeec36..4274b255d5 100644
--- a/packages/client/src/components/MkWidgets.vue
+++ b/packages/client/src/components/MkWidgets.vue
@@ -30,11 +30,13 @@
 			</header>
 			<VueDraggable
 				v-model="widgets_"
-				item-key="id"
 				handle=".handle"
 				animation="150"
 			>
-				<template #item="{ element }">
+				<div
+					v-for="element in widgets_"
+					:key="element.id"
+				>
 					<div class="customize-container">
 						<button
 							class="config _button"
@@ -58,7 +60,7 @@
 							/>
 						</div>
 					</div>
-				</template>
+				</div>
 			</VueDraggable>
 		</template>
 		<component
diff --git a/packages/client/src/pages/page-editor/page-editor.blocks.vue b/packages/client/src/pages/page-editor/page-editor.blocks.vue
index a2ef65b153..c7a7b8152e 100644
--- a/packages/client/src/pages/page-editor/page-editor.blocks.vue
+++ b/packages/client/src/pages/page-editor/page-editor.blocks.vue
@@ -2,21 +2,20 @@
 	<VueDraggable
 		v-model="blocks"
 		tag="div"
-		item-key="id"
 		handle=".drag-handle"
 		:group="{ name: 'blocks' }"
 		animation="150"
 		swap-threshold="0.5"
 	>
-		<template #item="{ element }">
 			<component
+				v-for="element in blocks"
+				:key="element"
 				:is="'x-' + element.type"
 				:value="element"
 				:hpml="hpml"
 				@update:value="updateItem"
 				@remove="() => removeItem(element)"
 			/>
-		</template>
 	</VueDraggable>
 </template>
 
diff --git a/packages/client/src/pages/page-editor/page-editor.vue b/packages/client/src/pages/page-editor/page-editor.vue
index c8b2f47bd5..772bc9ca5d 100644
--- a/packages/client/src/pages/page-editor/page-editor.vue
+++ b/packages/client/src/pages/page-editor/page-editor.vue
@@ -123,14 +123,14 @@
 						v-model="variables"
 						tag="div"
 						class="variables"
-						item-key="name"
 						handle=".drag-handle"
 						:group="{ name: 'variables' }"
 						animation="150"
 						swap-threshold="0.5"
 					>
-						<template #item="{ element }">
 							<XVariable
+								v-for="element in variables"
+								:key="element.name"
 								:model-value="element"
 								:removable="true"
 								:hpml="hpml"
@@ -139,7 +139,6 @@
 								:draggable="true"
 								@remove="() => removeVariable(element)"
 							/>
-						</template>
 					</VueDraggable>
 
 					<MkButton
diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue
index c407e6f942..2ce7fffb6d 100644
--- a/packages/client/src/pages/settings/reaction.vue
+++ b/packages/client/src/pages/settings/reaction.vue
@@ -18,7 +18,7 @@
 						@end="save"
 						delay-on-touch-only="true"
 					>
-							<button
+							<div
 								v-for="item in reactions"
 								:key="item"
 								class="_button item"
@@ -29,7 +29,7 @@
 									style="height: 1.7em"
 									class="emoji"
 								/>
-							</button>
+							</div>
 						<template #footer>
 							<button class="_button add" @click="chooseEmoji">
 								<i class="ph-plus ph-bold ph-lg"></i>

From 648cc8782334d96813c6dd4b6c116fee116c01c0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 19:21:52 -0700
Subject: [PATCH 41/68] chore: :art: format

---
 packages/client/src/components/MkWidgets.vue  | 11 ++-------
 .../pages/page-editor/page-editor.blocks.vue  | 18 +++++++-------
 .../src/pages/page-editor/page-editor.vue     | 22 ++++++++---------
 .../client/src/pages/settings/reaction.vue    | 24 +++++++++----------
 4 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/packages/client/src/components/MkWidgets.vue b/packages/client/src/components/MkWidgets.vue
index 4274b255d5..272ba1404e 100644
--- a/packages/client/src/components/MkWidgets.vue
+++ b/packages/client/src/components/MkWidgets.vue
@@ -28,15 +28,8 @@
 					i18n.ts.close
 				}}</MkButton>
 			</header>
-			<VueDraggable
-				v-model="widgets_"
-				handle=".handle"
-				animation="150"
-			>
-				<div
-					v-for="element in widgets_"
-					:key="element.id"
-				>
+			<VueDraggable v-model="widgets_" handle=".handle" animation="150">
+				<div v-for="element in widgets_" :key="element.id">
 					<div class="customize-container">
 						<button
 							class="config _button"
diff --git a/packages/client/src/pages/page-editor/page-editor.blocks.vue b/packages/client/src/pages/page-editor/page-editor.blocks.vue
index c7a7b8152e..25e35a4877 100644
--- a/packages/client/src/pages/page-editor/page-editor.blocks.vue
+++ b/packages/client/src/pages/page-editor/page-editor.blocks.vue
@@ -7,15 +7,15 @@
 		animation="150"
 		swap-threshold="0.5"
 	>
-			<component
-				v-for="element in blocks"
-				:key="element"
-				:is="'x-' + element.type"
-				:value="element"
-				:hpml="hpml"
-				@update:value="updateItem"
-				@remove="() => removeItem(element)"
-			/>
+		<component
+			v-for="element in blocks"
+			:key="element"
+			:is="'x-' + element.type"
+			:value="element"
+			:hpml="hpml"
+			@update:value="updateItem"
+			@remove="() => removeItem(element)"
+		/>
 	</VueDraggable>
 </template>
 
diff --git a/packages/client/src/pages/page-editor/page-editor.vue b/packages/client/src/pages/page-editor/page-editor.vue
index 772bc9ca5d..7fda393039 100644
--- a/packages/client/src/pages/page-editor/page-editor.vue
+++ b/packages/client/src/pages/page-editor/page-editor.vue
@@ -128,17 +128,17 @@
 						animation="150"
 						swap-threshold="0.5"
 					>
-							<XVariable
-								v-for="element in variables"
-								:key="element.name"
-								:model-value="element"
-								:removable="true"
-								:hpml="hpml"
-								:name="element.name"
-								:title="element.name"
-								:draggable="true"
-								@remove="() => removeVariable(element)"
-							/>
+						<XVariable
+							v-for="element in variables"
+							:key="element.name"
+							:model-value="element"
+							:removable="true"
+							:hpml="hpml"
+							:name="element.name"
+							:title="element.name"
+							:draggable="true"
+							@remove="() => removeVariable(element)"
+						/>
 					</VueDraggable>
 
 					<MkButton
diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue
index 2ce7fffb6d..2b2e699737 100644
--- a/packages/client/src/pages/settings/reaction.vue
+++ b/packages/client/src/pages/settings/reaction.vue
@@ -18,18 +18,18 @@
 						@end="save"
 						delay-on-touch-only="true"
 					>
-							<div
-								v-for="item in reactions"
-								:key="item"
-								class="_button item"
-								@click="remove(item, $event)"
-							>
-								<MkEmoji
-									:emoji="item"
-									style="height: 1.7em"
-									class="emoji"
-								/>
-							</div>
+						<div
+							v-for="item in reactions"
+							:key="item"
+							class="_button item"
+							@click="remove(item, $event)"
+						>
+							<MkEmoji
+								:emoji="item"
+								style="height: 1.7em"
+								class="emoji"
+							/>
+						</div>
 						<template #footer>
 							<button class="_button add" @click="chooseEmoji">
 								<i class="ph-plus ph-bold ph-lg"></i>

From d6dd1bc43c37d3f45f0375b770e75e25708d3497 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 19:24:24 -0700
Subject: [PATCH 42/68] save on delete

---
 packages/client/src/pages/settings/reaction.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue
index 2b2e699737..a7ceb96122 100644
--- a/packages/client/src/pages/settings/reaction.vue
+++ b/packages/client/src/pages/settings/reaction.vue
@@ -184,6 +184,7 @@ function remove(reaction, ev: MouseEvent) {
 				text: i18n.ts.remove,
 				action: () => {
 					reactions = reactions.filter((x) => x !== reaction);
+					save();
 				},
 			},
 		],

From e57a9a075c53cce45402c1efeba417a6dbf854cd Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 19:38:49 -0700
Subject: [PATCH 43/68] refactor: :recycle: MkPostFormAttachees setup syntax

---
 .../src/components/MkPostFormAttaches.vue     | 271 ++++++++----------
 1 file changed, 127 insertions(+), 144 deletions(-)

diff --git a/packages/client/src/components/MkPostFormAttaches.vue b/packages/client/src/components/MkPostFormAttaches.vue
index cb3a9901b8..7224122a0b 100644
--- a/packages/client/src/components/MkPostFormAttaches.vue
+++ b/packages/client/src/components/MkPostFormAttaches.vue
@@ -29,156 +29,139 @@
 	</div>
 </template>
 
-<script lang="ts">
-import { defineComponent, defineAsyncComponent } from "vue";
+<script lang="ts" setup>
+import { defineAsyncComponent, ref, computed } from "vue";
 import { VueDraggable } from "vue-draggable-plus";
 import MkDriveFileThumbnail from "@/components/MkDriveFileThumbnail.vue";
 import * as os from "@/os";
 import { i18n } from "@/i18n";
 
-export default defineComponent({
-	components: {
-		VueDraggable,
-		MkDriveFileThumbnail,
+const props = defineProps({
+	files: {
+		type: Array,
+		required: true,
 	},
-
-	props: {
-		files: {
-			type: Array,
-			required: true,
-		},
-		detachMediaFn: {
-			type: Function,
-			required: false,
-		},
-	},
-
-	emits: ["updated", "detach", "changeSensitive", "changeName"],
-
-	data() {
-		return {
-			menu: null as Promise<null> | null,
-			i18n,
-		};
-	},
-
-	computed: {
-		_files: {
-			get() {
-				return this.files;
-			},
-			set(value) {
-				this.$emit("updated", value);
-			},
-		},
-	},
-
-	methods: {
-		detachMedia(id) {
-			if (this.detachMediaFn) {
-				this.detachMediaFn(id);
-			} else {
-				this.$emit("detach", id);
-			}
-		},
-		toggleSensitive(file) {
-			os.api("drive/files/update", {
-				fileId: file.id,
-				isSensitive: !file.isSensitive,
-			}).then(() => {
-				this.$emit("changeSensitive", file, !file.isSensitive);
-			});
-		},
-		async rename(file) {
-			const { canceled, result } = await os.inputText({
-				title: i18n.ts.enterFileName,
-				default: file.name,
-				allowEmpty: false,
-			});
-			if (canceled) return;
-			os.api("drive/files/update", {
-				fileId: file.id,
-				name: result,
-			}).then(() => {
-				this.$emit("changeName", file, result);
-				file.name = result;
-			});
-		},
-
-		async describe(file) {
-			os.popup(
-				defineAsyncComponent(
-					() => import("@/components/MkMediaCaption.vue"),
-				),
-				{
-					title: i18n.ts.describeFile,
-					input: {
-						placeholder: i18n.ts.inputNewDescription,
-						default: file.comment !== null ? file.comment : "",
-					},
-					image: file,
-				},
-				{
-					done: (result) => {
-						if (!result || result.canceled) return;
-						let comment =
-							result.result.length === 0 ? null : result.result;
-						os.api("drive/files/update", {
-							fileId: file.id,
-							comment: comment,
-						}).then(() => {
-							file.comment = comment;
-						});
-					},
-				},
-				"closed",
-			);
-		},
-
-		showFileMenu(file, ev: MouseEvent) {
-			if (this.menu) return;
-			this.menu = os
-				.popupMenu(
-					[
-						{
-							text: i18n.ts.renameFile,
-							icon: "ph-cursor-text ph-bold ph-lg",
-							action: () => {
-								this.rename(file);
-							},
-						},
-						{
-							text: file.isSensitive
-								? i18n.ts.unmarkAsSensitive
-								: i18n.ts.markAsSensitive,
-							icon: file.isSensitive
-								? "ph-eye ph-bold ph-lg"
-								: "ph-eye-slash ph-bold ph-lg",
-							action: () => {
-								this.toggleSensitive(file);
-							},
-						},
-						{
-							text: i18n.ts.describeFile,
-							icon: "ph-subtitles ph-bold ph-lg",
-							action: () => {
-								this.describe(file);
-							},
-						},
-						{
-							text: i18n.ts.attachCancel,
-							icon: "ph-x ph-bold ph-lg",
-							action: () => {
-								this.detachMedia(file.id);
-							},
-						},
-					],
-					ev.currentTarget ?? ev.target,
-				)
-				.then(() => (this.menu = null));
-		},
+	detachMediaFn: {
+		type: Function,
+		required: false,
 	},
 });
+
+const emits = defineEmits([
+	"updated",
+	"detach",
+	"changeSensitive",
+	"changeName",
+]);
+
+let menu = ref<Promise<any> | null>(null);
+
+const _files = computed({
+	get: () => props.files,
+	set: (value) => emits("updated", value),
+});
+
+const detachMedia = (id) => {
+	if (props.detachMediaFn) {
+		props.detachMediaFn(id);
+	} else {
+		emits("detach", id);
+	}
+};
+
+function toggleSensitive(file) {
+	os.api("drive/files/update", {
+		fileId: file.id,
+		isSensitive: !file.isSensitive,
+	}).then(() => {
+		emits("changeSensitive", file, !file.isSensitive);
+	});
+}
+
+async function rename(file) {
+	const { canceled, result } = await os.inputText({
+		title: i18n.ts.enterFileName,
+		default: file.name,
+	});
+	if (canceled) return;
+	os.api("drive/files/update", {
+		fileId: file.id,
+		name: result,
+	}).then(() => {
+		emits("changeName", file, result);
+		file.name = result;
+	});
+}
+
+async function describe(file) {
+	os.popup(
+		defineAsyncComponent(() => import("@/components/MkMediaCaption.vue")),
+		{
+			title: i18n.ts.describeFile,
+			input: {
+				placeholder: i18n.ts.inputNewDescription,
+				default: file.comment !== null ? file.comment : "",
+			},
+			image: file,
+		},
+		{
+			done: (result) => {
+				if (!result || result.canceled) return;
+				let comment = result.result.length === 0 ? null : result.result;
+				os.api("drive/files/update", {
+					fileId: file.id,
+					comment: comment,
+				}).then(() => {
+					file.comment = comment;
+				});
+			},
+		},
+		"closed",
+	);
+}
+
+function showFileMenu(file, ev: MouseEvent) {
+	if (menu) return;
+	menu = os
+		.popupMenu(
+			[
+				{
+					text: i18n.ts.renameFile,
+					icon: "ph-cursor-text ph-bold ph-lg",
+					action: () => {
+						rename(file);
+					},
+				},
+				{
+					text: file.isSensitive
+						? i18n.ts.unmarkAsSensitive
+						: i18n.ts.markAsSensitive,
+					icon: file.isSensitive
+						? "ph-eye ph-bold ph-lg"
+						: "ph-eye-slash ph-bold ph-lg",
+					action: () => {
+						toggleSensitive(file);
+					},
+				},
+				{
+					text: i18n.ts.describeFile,
+					icon: "ph-subtitles ph-bold ph-lg",
+					action: () => {
+						describe(file);
+					},
+				},
+				{
+					text: i18n.ts.attachCancel,
+					icon: "ph-x ph-bold ph-lg",
+					action: () => {
+						detachMedia(file.id);
+					},
+				},
+			],
+			ev.currentTarget ?? ev.target,
+		)
+		.then(() => (menu = null));
+}
 </script>
 
 <style lang="scss" scoped>
@@ -217,8 +200,8 @@ export default defineComponent({
 				top: 0;
 				left: 0;
 				z-index: 2;
-				background: rgba(17, 17, 17, 0.7);
-				color: #fff;
+				background: var(--header);
+				color: var(--fg);
 
 				> .icon {
 					margin: auto;

From cfb46f2775e029e011ccc9364b932db313db0933 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 19:44:00 -0700
Subject: [PATCH 44/68] fix popup menu

---
 .../src/components/MkPostFormAttaches.vue     | 73 +++++++++----------
 1 file changed, 35 insertions(+), 38 deletions(-)

diff --git a/packages/client/src/components/MkPostFormAttaches.vue b/packages/client/src/components/MkPostFormAttaches.vue
index 7224122a0b..6da744ccfd 100644
--- a/packages/client/src/components/MkPostFormAttaches.vue
+++ b/packages/client/src/components/MkPostFormAttaches.vue
@@ -54,8 +54,6 @@ const emits = defineEmits([
 	"changeName",
 ]);
 
-let menu = ref<Promise<any> | null>(null);
-
 const _files = computed({
 	get: () => props.files,
 	set: (value) => emits("updated", value),
@@ -121,46 +119,45 @@ async function describe(file) {
 }
 
 function showFileMenu(file, ev: MouseEvent) {
-	if (menu) return;
-	menu = os
-		.popupMenu(
-			[
-				{
-					text: i18n.ts.renameFile,
-					icon: "ph-cursor-text ph-bold ph-lg",
-					action: () => {
-						rename(file);
-					},
+	os.popupMenu(
+		[
+			{
+				text: i18n.ts.renameFile,
+				icon: "ph-cursor-text ph-bold ph-lg",
+				action: () => {
+					rename(file);
 				},
-				{
-					text: file.isSensitive
-						? i18n.ts.unmarkAsSensitive
-						: i18n.ts.markAsSensitive,
-					icon: file.isSensitive
-						? "ph-eye ph-bold ph-lg"
-						: "ph-eye-slash ph-bold ph-lg",
-					action: () => {
-						toggleSensitive(file);
-					},
+			},
+			{
+				text: file.isSensitive
+					? i18n.ts.unmarkAsSensitive
+					: i18n.ts.markAsSensitive,
+				icon: file.isSensitive
+					? "ph-eye ph-bold ph-lg"
+					: "ph-eye-slash ph-bold ph-lg",
+				action: () => {
+					toggleSensitive(file);
 				},
-				{
-					text: i18n.ts.describeFile,
-					icon: "ph-subtitles ph-bold ph-lg",
-					action: () => {
-						describe(file);
-					},
+			},
+			{
+				text: i18n.ts.describeFile,
+				icon: "ph-subtitles ph-bold ph-lg",
+				action: () => {
+					describe(file);
 				},
-				{
-					text: i18n.ts.attachCancel,
-					icon: "ph-x ph-bold ph-lg",
-					action: () => {
-						detachMedia(file.id);
-					},
+			},
+			{
+				text: i18n.ts.attachCancel,
+				icon: "ph-x ph-bold ph-lg",
+				action: () => {
+					detachMedia(file.id);
 				},
-			],
-			ev.currentTarget ?? ev.target,
-		)
-		.then(() => (menu = null));
+			},
+		],
+		(ev.currentTarget ?? ev.target ?? undefined) as
+			| HTMLElement
+			| undefined,
+	);
 }
 </script>
 

From d45c028af4aad20ad664caec9b0f2f934f56397b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 20:30:31 -0700
Subject: [PATCH 45/68] fix: :bug: plus button for reactions

---
 .../src/components/MkPostFormAttaches.vue      |  4 +---
 .../client/src/pages/settings/reaction.vue     | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/client/src/components/MkPostFormAttaches.vue b/packages/client/src/components/MkPostFormAttaches.vue
index 6da744ccfd..a1cb191de7 100644
--- a/packages/client/src/components/MkPostFormAttaches.vue
+++ b/packages/client/src/components/MkPostFormAttaches.vue
@@ -154,9 +154,7 @@ function showFileMenu(file, ev: MouseEvent) {
 				},
 			},
 		],
-		(ev.currentTarget ?? ev.target ?? undefined) as
-			| HTMLElement
-			| undefined,
+		(ev.currentTarget ?? ev.target ?? undefined) as HTMLElement | undefined,
 	);
 }
 </script>
diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue
index a7ceb96122..57f8a0d4e4 100644
--- a/packages/client/src/pages/settings/reaction.vue
+++ b/packages/client/src/pages/settings/reaction.vue
@@ -12,7 +12,7 @@
 				<div v-panel style="border-radius: 6px">
 					<VueDraggable
 						v-model="reactions"
-						class="zoaiodol"
+						:class="$style.root"
 						animation="150"
 						delay="100"
 						@end="save"
@@ -30,11 +30,13 @@
 								class="emoji"
 							/>
 						</div>
-						<template #footer>
-							<button class="_button add" @click="chooseEmoji">
-								<i class="ph-plus ph-bold ph-lg"></i>
-							</button>
-						</template>
+						<button
+							:draggable="false"
+							class="_button add"
+							@click="chooseEmoji"
+						>
+							<i class="ph-plus ph-bold ph-lg"></i>
+						</button>
 					</VueDraggable>
 				</div>
 				<template #caption
@@ -251,8 +253,8 @@ definePageMetadata({
 });
 </script>
 
-<style lang="scss" scoped>
-.zoaiodol {
+<style lang="scss" module>
+.root {
 	padding: 12px;
 	font-size: 1.1em;
 

From c84572c58b6157a42f7ba37ad591d41ac03e7cb1 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 20:31:26 -0700
Subject: [PATCH 46/68] dev67

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

diff --git a/package.json b/package.json
index 8e54bcd50c..7e853fb45c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev63",
+	"version": "14.0.0-dev67",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 2a86a8ad755c9406292e8eaf51a305d84d4ed9a8 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 20:36:15 -0700
Subject: [PATCH 47/68] fix: :bug: plus button in reaction settings

---
 package.json                                  |  2 +-
 .../src/components/MkPostFormAttaches.vue     |  4 +---
 .../client/src/pages/settings/reaction.vue    | 22 ++++++++-----------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 8e54bcd50c..7d79fc7096 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev63",
+	"version": "14.0.0-dev68",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/MkPostFormAttaches.vue b/packages/client/src/components/MkPostFormAttaches.vue
index 6da744ccfd..a1cb191de7 100644
--- a/packages/client/src/components/MkPostFormAttaches.vue
+++ b/packages/client/src/components/MkPostFormAttaches.vue
@@ -154,9 +154,7 @@ function showFileMenu(file, ev: MouseEvent) {
 				},
 			},
 		],
-		(ev.currentTarget ?? ev.target ?? undefined) as
-			| HTMLElement
-			| undefined,
+		(ev.currentTarget ?? ev.target ?? undefined) as HTMLElement | undefined,
 	);
 }
 </script>
diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue
index a7ceb96122..953c39c5ff 100644
--- a/packages/client/src/pages/settings/reaction.vue
+++ b/packages/client/src/pages/settings/reaction.vue
@@ -30,12 +30,10 @@
 								class="emoji"
 							/>
 						</div>
-						<template #footer>
-							<button class="_button add" @click="chooseEmoji">
-								<i class="ph-plus ph-bold ph-lg"></i>
-							</button>
-						</template>
 					</VueDraggable>
+					<button class="_button add" @click="chooseEmoji">
+						<i class="ph-plus ph-bold ph-lg"></i>
+					</button>
 				</div>
 				<template #caption
 					>{{ i18n.ts.reactionSettingDescription2 }}
@@ -244,10 +242,6 @@ const headerTabs = $computed(() => []);
 definePageMetadata({
 	title: i18n.ts.reaction,
 	icon: "ph-smiley ph-bold ph-lg",
-	action: {
-		icon: "ph-eye ph-bold ph-lg",
-		handler: preview,
-	},
 });
 </script>
 
@@ -261,10 +255,12 @@ definePageMetadata({
 		padding: 8px;
 		cursor: move;
 	}
+}
 
-	> .add {
-		display: inline-block;
-		padding: 8px;
-	}
+.add {
+	display: inline-block;
+	padding: 8px;
+	margin-left: 12px;
+	margin-bottom: 12px;
 }
 </style>

From 7d41179b83f6a3b423b0dbf3fdf20cfd2de1b302 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 20:56:40 -0700
Subject: [PATCH 48/68] feat: :sparkles: don't close emoji picker if shift is
 held down, like Discord

https://snug.moe/notes/9h1p04dqytz2qfsz
---
 .../src/components/MkEmojiPickerDialog.vue    | 39 ++++++++++++++++---
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/components/MkEmojiPickerDialog.vue b/packages/client/src/components/MkEmojiPickerDialog.vue
index fcd2f26a3c..95000b353a 100644
--- a/packages/client/src/components/MkEmojiPickerDialog.vue
+++ b/packages/client/src/components/MkEmojiPickerDialog.vue
@@ -12,7 +12,7 @@
 		:transparent-bg="true"
 		:manual-showing="manualShowing"
 		:src="src"
-		@click="modal?.close()"
+		@click="checkForShift"
 		@opening="opening"
 		@close="emit('close')"
 		@closed="emit('closed')"
@@ -31,7 +31,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from "vue";
+import { ref, onMounted, onBeforeUnmount } from "vue";
 import MkModal from "@/components/MkModal.vue";
 import MkEmojiPicker from "@/components/MkEmojiPicker.vue";
 import { defaultStore } from "@/store";
@@ -58,20 +58,49 @@ const emit = defineEmits<{
 
 const modal = ref<InstanceType<typeof MkModal>>();
 const picker = ref<InstanceType<typeof MkEmojiPicker>>();
+const isShiftKeyPressed = ref(false);
 
-function chosen(emoji: any) {
+const keydownHandler = (e) => {
+	if (e.key === "Shift") {
+		isShiftKeyPressed.value = true;
+	}
+};
+
+const keyupHandler = (e) => {
+	if (e.key === "Shift") {
+		isShiftKeyPressed.value = false;
+	}
+};
+
+function checkForShift(ev?: MouseEvent) {
+	if (!isShiftKeyPressed.value) {
+		modal.value?.close(ev);
+	}
+}
+
+function chosen(emoji: any, ev: MouseEvent) {
 	emit("done", emoji);
-	modal.value?.close();
+	checkForShift(ev);
 }
 
 function opening() {
 	try {
 		picker.value?.reset();
 	} catch (e) {
-		console.error(`Something's wrong with restting the emoji picker: ${e}`);
+		console.error("Something's wrong with resetting the emoji picker", e);
 	}
 	picker.value?.focus();
 }
+
+onMounted(() => {
+	window.addEventListener("keydown", keydownHandler);
+	window.addEventListener("keyup", keyupHandler);
+});
+
+onBeforeUnmount(() => {
+	window.removeEventListener("keydown", keydownHandler);
+	window.removeEventListener("keyup", keyupHandler);
+});
 </script>
 
 <style lang="scss" scoped>

From b0b0fda42c801792258350088a7ea0b8064ea5c0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 20:57:28 -0700
Subject: [PATCH 49/68] fix

---
 packages/client/src/components/MkEmojiPickerDialog.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkEmojiPickerDialog.vue b/packages/client/src/components/MkEmojiPickerDialog.vue
index 95000b353a..28cc1d2151 100644
--- a/packages/client/src/components/MkEmojiPickerDialog.vue
+++ b/packages/client/src/components/MkEmojiPickerDialog.vue
@@ -78,9 +78,9 @@ function checkForShift(ev?: MouseEvent) {
 	}
 }
 
-function chosen(emoji: any, ev: MouseEvent) {
+function chosen(emoji: any) {
 	emit("done", emoji);
-	checkForShift(ev);
+	checkForShift();
 }
 
 function opening() {

From d8a46370c071bbfd4591ad099627ee6c8fdf0a19 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 20:58:33 -0700
Subject: [PATCH 50/68] dev69

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

diff --git a/package.json b/package.json
index 7d79fc7096..ef2cd9e70c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev68",
+	"version": "14.0.0-dev69",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From ba7dbe986163f82d2b02f4dcf73be87711310401 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 21:01:31 -0700
Subject: [PATCH 51/68] fix: :bug: save reactions if added

---
 locales/en-US.yml                               | 1 +
 packages/client/src/pages/settings/reaction.vue | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index b7248e033f..219ff42a1e 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -644,6 +644,7 @@ useBlurEffectForModal: "Use blur effect for modals"
 useFullReactionPicker: "Use full-size reaction picker"
 width: "Width"
 height: "Height"
+xl: "XL"
 large: "Big"
 medium: "Medium"
 small: "Small"
diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue
index 953c39c5ff..29f14fd48a 100644
--- a/packages/client/src/pages/settings/reaction.vue
+++ b/packages/client/src/pages/settings/reaction.vue
@@ -83,7 +83,7 @@
 				<option :value="1">{{ i18n.ts.small }}</option>
 				<option :value="2">{{ i18n.ts.medium }}</option>
 				<option :value="3">{{ i18n.ts.large }}</option>
-				<option :value="4">{{ i18n.ts.large }}+</option>
+				<option :value="4">{{ i18n.ts.xl }}</option>
 			</FormRadios>
 
 			<FormSwitch
@@ -123,7 +123,6 @@
 <script lang="ts" setup>
 import { defineAsyncComponent, watch } from "vue";
 import { VueDraggable } from "vue-draggable-plus";
-import FormInput from "@/components/form/input.vue";
 import FormRadios from "@/components/form/radios.vue";
 import FromSlot from "@/components/form/slot.vue";
 import FormButton from "@/components/MkButton.vue";
@@ -220,6 +219,7 @@ function chooseEmoji(ev: MouseEvent) {
 	}).then((emoji) => {
 		if (!reactions.includes(emoji)) {
 			reactions.push(emoji);
+			save();
 		}
 	});
 }

From a8382fd007ed136248b1c90ca86fa7c73a09685d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 21:07:32 -0700
Subject: [PATCH 52/68] docs: :memo: FoundKey EOL disclaimer

---
 docs/migrate.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/migrate.md b/docs/migrate.md
index 7d5c5639f6..3c43af8095 100644
--- a/docs/migrate.md
+++ b/docs/migrate.md
@@ -102,4 +102,4 @@ NODE_ENV=production pnpm run migrate
 
 ## Reverse
 
-You ***cannot*** migrate back to Misskey from Calckey due to re-hashing passwords on signin with argon2. You can migrate from Calckey to FoundKey, though.
+You ***cannot*** migrate back to Misskey from Calckey due to re-hashing passwords on signin with argon2. You can migrate from Calckey to FoundKey, although this is not recommended due to FoundKey being end-of-life.

From 04224bfc66fa926fa10110f30aa281e891cb1580 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 23:23:44 -0700
Subject: [PATCH 53/68] feat: :sparkles: Donation pop-up with optional admin
 link

Co-authored-by: Syuilo <syuilotan@yahoo.co.jp>
---
 locales/en-US.yml                             |   5 +
 .../migration/1689136347561-donation-link.js  |  15 ++
 packages/backend/src/models/entities/meta.ts  |   6 +
 .../src/server/api/endpoints/admin/meta.ts    |   6 +
 packages/client/src/components/MkDonation.vue | 131 ++++++++++++++++++
 packages/client/src/init.ts                   |  23 +++
 packages/client/src/pages/admin/settings.vue  |  17 +++
 packages/client/src/pages/settings/2fa.vue    |   2 +-
 8 files changed, 204 insertions(+), 1 deletion(-)
 create mode 100644 packages/backend/migration/1689136347561-donation-link.js
 create mode 100644 packages/client/src/components/MkDonation.vue

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 219ff42a1e..08eb2a62fe 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1118,6 +1118,7 @@ enableIdenticonGeneration: "Enable Identicon generation"
 showPopup: "Notify users with popup"
 showWithSparkles: "Show with sparkles"
 youHaveUnreadAnnouncements: "You have unread announcements"
+donationLink: "Link to donation page"
 
 _sensitiveMediaDetection:
   description: "Reduces the effort of server moderation through automatically recognizing
@@ -1216,6 +1217,10 @@ _aboutMisskey:
   source: "Source code"
   translation: "Translate Calckey"
   donate: "Donate to Calckey"
+  donateTitle: "Enjoying Calckey?"
+  pleaseDonateToCalckey: "Please consider donating to Calckey to support its development."
+  pleaseDonateToHost: "Please also consider donating to your honme server, {host}, to help support its operation costs."
+  donateHost: "Donate to {host}"
   morePatrons: "We also appreciate the support of many other helpers not listed here.
     Thank you! 🥰"
   patrons: "Calckey patrons"
diff --git a/packages/backend/migration/1689136347561-donation-link.js b/packages/backend/migration/1689136347561-donation-link.js
new file mode 100644
index 0000000000..dbe0ed7c8e
--- /dev/null
+++ b/packages/backend/migration/1689136347561-donation-link.js
@@ -0,0 +1,15 @@
+export class DonationLink1689136347561 {
+	name = "DonationLink1689136347561";
+
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "donationLink" character varying(256)`,
+		);
+	}
+
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "DonationLink1689136347561"`,
+		);
+	}
+}
diff --git a/packages/backend/src/models/entities/meta.ts b/packages/backend/src/models/entities/meta.ts
index 200ef50552..d3de7ba53b 100644
--- a/packages/backend/src/models/entities/meta.ts
+++ b/packages/backend/src/models/entities/meta.ts
@@ -556,4 +556,10 @@ export class Meta {
 		default: true,
 	})
 	public enableIdenticonGeneration: boolean;
+
+	@Column("varchar", {
+		length: 256,
+		nullable: true,
+	})
+	public donationLink: string | null;
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts
index 50317d4a81..6c3bb5041d 100644
--- a/packages/backend/src/server/api/endpoints/admin/meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -491,6 +491,11 @@ export const meta = {
 				optional: false,
 				nullable: false,
 			},
+			donationLink: {
+				type: "string",
+				optional: true,
+				nullable: true,
+			}
 		},
 	},
 } as const;
@@ -604,5 +609,6 @@ export default define(meta, paramDef, async (ps, me) => {
 		experimentalFeatures: instance.experimentalFeatures,
 		enableServerMachineStats: instance.enableServerMachineStats,
 		enableIdenticonGeneration: instance.enableIdenticonGeneration,
+		donationLink: instance.donationLink,
 	};
 });
diff --git a/packages/client/src/components/MkDonation.vue b/packages/client/src/components/MkDonation.vue
new file mode 100644
index 0000000000..beaeef2d22
--- /dev/null
+++ b/packages/client/src/components/MkDonation.vue
@@ -0,0 +1,131 @@
+<template>
+	<div class="_panel _shadow" :class="$style.root">
+		<div :class="$style.icon">
+			<i class="ph-hand-heart ph-bold ph-6x" />
+		</div>
+		<div :class="$style.main">
+			<div :class="$style.title">
+				{{ i18n.ts._aboutMisskey.donateTitle }}
+			</div>
+			<div :class="$style.text">
+				{{ i18n.ts._aboutMisskey.pleaseDonateToCalckey }}
+				<p v-if="instance.donationLink">
+					{{
+						i18n.t("_aboutMisskey.pleaseDonateToHost", {
+							host: hostname,
+						})
+					}}
+				</p>
+			</div>
+			<div class="_flexList">
+				<MkButton primary @click="openCalckeyDonation">{{
+					i18n.ts._aboutMisskey.donate
+				}}</MkButton>
+				<MkButton v-if="instance.donationLink" primary @click="openExternalDonation">{{
+					i18n.t("_aboutMisskey.donateHost", {
+						host: hostname,
+					})
+				}}</MkButton>
+			</div>
+			<div class="_flexList">
+				<MkButton @click="close">{{ i18n.ts.remindMeLater }}</MkButton>
+				<MkButton @click="neverShow">{{ i18n.ts.neverShow }}</MkButton>
+			</div>
+		</div>
+		<button class="_button" :class="$style.close" @click="close">
+			<i class="ph-x ph-bold ph-lg"></i>
+		</button>
+	</div>
+</template>
+
+<script lang="ts" setup>
+import MkButton from "@/components/MkButton.vue";
+import { host } from "@/config";
+import { i18n } from "@/i18n";
+import * as os from "@/os";
+import { instance } from "@/instance";
+
+const emit = defineEmits<{
+	(ev: "closed"): void;
+}>();
+
+const hostname = instance.name?.length <= 20 ? instance.name : host;
+
+const zIndex = os.claimZIndex("low");
+
+function close() {
+	localStorage.setItem("latestDonationInfoShownAt", Date.now().toString());
+	emit("closed");
+}
+
+function neverShow() {
+	localStorage.setItem("neverShowDonationInfo", "true");
+	close();
+}
+
+function openCalckeyDonation() {
+	window.open("https://opencollective.com/calckey", "_blank");
+}
+
+function openExternalDonation() {
+	let link = instance.donationLink;
+	if (!/^https?:\/\//i.test(link)) {
+    link = `http://${link}`;
+	}
+	window.open(link, "_blank");
+}
+</script>
+
+<style lang="scss" module>
+.root {
+	position: fixed;
+	z-index: v-bind(zIndex);
+	bottom: var(--margin);
+	left: 0;
+	right: 0;
+	margin: auto;
+	box-sizing: border-box;
+	width: calc(100% - (var(--margin) * 2));
+	max-width: 500px;
+	display: flex;
+}
+
+.icon {
+	text-align: center;
+	padding-top: 25px;
+	width: 100px;
+	color: var(--accent);
+}
+
+@media (max-width: 500px) {
+	.icon {
+		width: 80px;
+	}
+}
+
+@media (max-width: 450px) {
+	.icon {
+		width: 70px;
+	}
+}
+
+.main {
+	padding: 25px 25px 25px 0;
+	flex: 1;
+}
+
+.close {
+	position: absolute;
+	top: 8px;
+	right: 8px;
+	padding: 8px;
+}
+
+.title {
+	font-weight: bold;
+}
+
+.text {
+	margin: 0.7em 0 1em 0;
+}
+</style>
diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index 11b9a2edac..66be0430dc 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -450,6 +450,29 @@ function checkForSplash() {
 		}
 		localStorage.setItem("lastUsed", Date.now().toString());
 
+		const latestDonationInfoShownAt = localStorage.getItem(
+			"latestDonationInfoShownAt",
+		);
+		const neverShowDonationInfo = localStorage.getItem("neverShowDonationInfo");
+		if (
+			neverShowDonationInfo !== "true" &&
+			new Date($i.createdAt).getTime() < Date.now() - 1000 * 60 * 60 * 24 * 3 &&
+			!location.pathname.startsWith("/miauth")
+		) {
+			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") {
diff --git a/packages/client/src/pages/admin/settings.vue b/packages/client/src/pages/admin/settings.vue
index b03a98ae54..4920a82fae 100644
--- a/packages/client/src/pages/admin/settings.vue
+++ b/packages/client/src/pages/admin/settings.vue
@@ -53,6 +53,20 @@
 									i18n.ts.maintainerEmail
 								}}</template>
 							</FormInput>
+
+							<FormInput
+								v-model="donationLink"
+								class="_formBlock"
+							>
+								<template #prefix
+									><i
+										class="ph-hand-heart ph-bold ph-lg"
+									></i
+								></template>
+								<template #label>{{
+									i18n.ts.donationLink
+								}}</template>
+							</FormInput>
 						</FormSplit>
 
 						<FormTextarea v-model="pinnedUsers" class="_formBlock">
@@ -435,6 +449,7 @@ let description: string | null = $ref(null);
 let tosUrl: string | null = $ref(null);
 let maintainerName: string | null = $ref(null);
 let maintainerEmail: string | null = $ref(null);
+let donationLink: string | null = $ref(null);
 let iconUrl: string | null = $ref(null);
 let bannerUrl: string | null = $ref(null);
 let logoImageUrl: string | null = $ref(null);
@@ -481,6 +496,7 @@ async function init() {
 	defaultDarkTheme = meta.defaultDarkTheme;
 	maintainerName = meta.maintainerName;
 	maintainerEmail = meta.maintainerEmail;
+	donationLink = meta.donationLink;
 	enableLocalTimeline = !meta.disableLocalTimeline;
 	enableGlobalTimeline = !meta.disableGlobalTimeline;
 	enableRecommendedTimeline = !meta.disableRecommendedTimeline;
@@ -527,6 +543,7 @@ function save() {
 		defaultDarkTheme: defaultDarkTheme === "" ? null : defaultDarkTheme,
 		maintainerName,
 		maintainerEmail,
+		donationLink,
 		disableLocalTimeline: !enableLocalTimeline,
 		disableGlobalTimeline: !enableGlobalTimeline,
 		disableRecommendedTimeline: !enableRecommendedTimeline,
diff --git a/packages/client/src/pages/settings/2fa.vue b/packages/client/src/pages/settings/2fa.vue
index e8c616493a..4a1598e168 100644
--- a/packages/client/src/pages/settings/2fa.vue
+++ b/packages/client/src/pages/settings/2fa.vue
@@ -82,7 +82,7 @@
 							<p>
 								{{ `${i18n.ts.lastUsedDate}: ${key.lastUsed}` }}
 							</p>
-							<div class="_buttons _flexList">
+							<div class="_flexList">
 								<MkButton @click="renameKey(key)"
 									><i
 										class="ph-pencil-line ph-bold ph-lg"

From acb6edef3cfb0529b744b5f505b01739584a2007 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Jul 2023 23:42:59 -0700
Subject: [PATCH 54/68] refactor: :recycle: donation link logic, add link to
 /about, fix typo

---
 locales/en-US.yml                              |  2 +-
 .../server/api/endpoints/admin/update-meta.ts  | 18 ++++++++++++++++++
 packages/client/src/components/MkDonation.vue  | 14 +++-----------
 packages/client/src/pages/about.vue            | 15 +++++++++++++++
 4 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 08eb2a62fe..d8a26b1f25 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1219,7 +1219,7 @@ _aboutMisskey:
   donate: "Donate to Calckey"
   donateTitle: "Enjoying Calckey?"
   pleaseDonateToCalckey: "Please consider donating to Calckey to support its development."
-  pleaseDonateToHost: "Please also consider donating to your honme server, {host}, to help support its operation costs."
+  pleaseDonateToHost: "Please also consider donating to your home server, {host}, to help support its operation costs."
   donateHost: "Donate to {host}"
   morePatrons: "We also appreciate the support of many other helpers not listed here.
     Thank you! 🥰"
diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
index cf22c6c489..16e49a85a8 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -177,6 +177,9 @@ export const paramDef = {
 				postImports: { type: "boolean" },
 			},
 		},
+		enableServerMachineStats: { type: "boolean" },
+		enableIdenticonGeneration: { type: "boolean" },
+		donationLink: { type: "string", nullable: true },
 	},
 	required: [],
 } as const;
@@ -568,6 +571,21 @@ export default define(meta, paramDef, async (ps, me) => {
 		set.experimentalFeatures = ps.experimentalFeatures || undefined;
 	}
 
+	if (ps.enableServerMachineStats !== undefined) {
+		set.enableServerMachineStats = ps.enableServerMachineStats;
+	}
+
+	if (ps.enableIdenticonGeneration !== undefined) {
+		set.enableIdenticonGeneration = ps.enableIdenticonGeneration;
+	}
+
+	if (ps.donationLink !== undefined) {
+		set.donationLink = ps.donationLink;
+		if (set.donationLink && !/^https?:\/\//i.test(set.donationLink)) {
+			set.donationLink = `https://${set.donationLink}`;
+		}
+	}
+
 	await db.transaction(async (transactionalEntityManager) => {
 		const metas = await transactionalEntityManager.find(Meta, {
 			order: {
diff --git a/packages/client/src/components/MkDonation.vue b/packages/client/src/components/MkDonation.vue
index beaeef2d22..367ec7b58a 100644
--- a/packages/client/src/components/MkDonation.vue
+++ b/packages/client/src/components/MkDonation.vue
@@ -18,10 +18,10 @@
 				</p>
 			</div>
 			<div class="_flexList">
-				<MkButton primary @click="openCalckeyDonation">{{
+				<MkButton primary @click="openExternal('https://opencollective.com/calckey')">{{
 					i18n.ts._aboutMisskey.donate
 				}}</MkButton>
-				<MkButton v-if="instance.donationLink" primary @click="openExternalDonation">{{
+				<MkButton v-if="instance.donationLink" primary @click="openExternal(instance.donationLink)">{{
 					i18n.t("_aboutMisskey.donateHost", {
 						host: hostname,
 					})
@@ -63,15 +63,7 @@ function neverShow() {
 	close();
 }
 
-function openCalckeyDonation() {
-	window.open("https://opencollective.com/calckey", "_blank");
-}
-
-function openExternalDonation() {
-	let link = instance.donationLink;
-	if (!/^https?:\/\//i.test(link)) {
-    link = `http://${link}`;
-	}
+function openExternal(link) {
 	window.open(link, "_blank");
 }
 </script>
diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue
index 88ed1add21..bbc340fe23 100644
--- a/packages/client/src/pages/about.vue
+++ b/packages/client/src/pages/about.vue
@@ -93,6 +93,21 @@
 								external
 								>{{ i18n.ts.tos }}</FormLink
 							>
+							<FormLink
+								v-if="$instance.donationLink"
+								:to="$instance.donationLink"
+								external
+							>
+								<template #icon
+									><i class="ph-money ph-bold ph-lg"></i
+								></template>
+								{{
+									i18n.t("_aboutMisskey.donateHost", {
+										host: $instance.name || host,
+									})
+								}}
+								<template #suffix>Donate</template>
+							</FormLink>
 						</FormSection>
 
 						<FormSuspense :p="initStats">

From c1ebe11ee9885f69cfdde87b005461210036a37d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 12 Jul 2023 00:13:39 -0700
Subject: [PATCH 55/68] dev70

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

diff --git a/package.json b/package.json
index ef2cd9e70c..15d7b2ab03 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev69",
+	"version": "14.0.0-dev70",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From d9fd0ea7141056a7a0255c9e8e7b8fbac9e95667 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 12 Jul 2023 00:23:54 -0700
Subject: [PATCH 56/68] fix: :lipstick: locales, transition for MkDonation

---
 locales/en-US.yml                             |   2 +
 locales/ja-JP.yml                             |   2 +
 packages/client/src/components/MkDonation.vue | 107 ++++++++++++------
 3 files changed, 74 insertions(+), 37 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index d8a26b1f25..c61b573bab 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1119,6 +1119,8 @@ showPopup: "Notify users with popup"
 showWithSparkles: "Show with sparkles"
 youHaveUnreadAnnouncements: "You have unread announcements"
 donationLink: "Link to donation page"
+neverShow: "Don't show again"
+remindMeLater: "Maybe later"
 
 _sensitiveMediaDetection:
   description: "Reduces the effort of server moderation through automatically recognizing
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 95fb7bcf88..fe03d1f415 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -983,6 +983,8 @@ enableIdenticonGeneration: "ユーザーごとのIdenticon生成を有効にす
 showPopup: "ポップアップを表示してユーザーに知らせる"
 showWithSparkles: "タイトルをキラキラさせる"
 youHaveUnreadAnnouncements: "未読のお知らせがあります"
+neverShow: "今後表示しない"
+remindMeLater: "また後で"
 
 _sensitiveMediaDetection:
   description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てられます。サーバーの負荷が少し増えます。"
diff --git a/packages/client/src/components/MkDonation.vue b/packages/client/src/components/MkDonation.vue
index 367ec7b58a..9ec99a6ec5 100644
--- a/packages/client/src/components/MkDonation.vue
+++ b/packages/client/src/components/MkDonation.vue
@@ -1,50 +1,68 @@
 <template>
-	<div class="_panel _shadow" :class="$style.root">
-		<div :class="$style.icon">
-			<i class="ph-hand-heart ph-bold ph-6x" />
+	<transition name="slide-fade">
+		<div v-if="show" class="_panel _shadow" :class="$style.root">
+			<div :class="$style.icon">
+				<i class="ph-hand-heart ph-bold ph-5x" />
+			</div>
+			<div :class="$style.main">
+				<div :class="$style.title">
+					{{ i18n.ts._aboutMisskey.donateTitle }}
+				</div>
+				<div :class="$style.text">
+					{{ i18n.ts._aboutMisskey.pleaseDonateToCalckey }}
+					<p v-if="instance.donationLink">
+						{{
+							i18n.t("_aboutMisskey.pleaseDonateToHost", {
+								host: hostname,
+							})
+						}}
+					</p>
+				</div>
+				<div class="_flexList">
+					<MkButton
+						primary
+						@click="
+							openExternal('https://opencollective.com/calckey')
+						"
+						>{{ i18n.ts._aboutMisskey.donate }}</MkButton
+					>
+					<MkButton
+						v-if="instance.donationLink"
+						primary
+						@click="openExternal(instance.donationLink)"
+						>{{
+							i18n.t("_aboutMisskey.donateHost", {
+								host: hostname,
+							})
+						}}</MkButton
+					>
+				</div>
+				<div class="_flexList" style="margin-top: 0.6rem">
+					<MkButton @click="close">{{
+						i18n.ts.remindMeLater
+					}}</MkButton>
+					<MkButton @click="neverShow">{{
+						i18n.ts.neverShow
+					}}</MkButton>
+				</div>
+			</div>
+			<button class="_button" :class="$style.close" @click="close">
+				<i class="ph-x ph-bold ph-lg"></i>
+			</button>
 		</div>
-		<div :class="$style.main">
-			<div :class="$style.title">
-				{{ i18n.ts._aboutMisskey.donateTitle }}
-			</div>
-			<div :class="$style.text">
-				{{ i18n.ts._aboutMisskey.pleaseDonateToCalckey }}
-				<p v-if="instance.donationLink">
-					{{
-						i18n.t("_aboutMisskey.pleaseDonateToHost", {
-							host: hostname,
-						})
-					}}
-				</p>
-			</div>
-			<div class="_flexList">
-				<MkButton primary @click="openExternal('https://opencollective.com/calckey')">{{
-					i18n.ts._aboutMisskey.donate
-				}}</MkButton>
-				<MkButton v-if="instance.donationLink" primary @click="openExternal(instance.donationLink)">{{
-					i18n.t("_aboutMisskey.donateHost", {
-						host: hostname,
-					})
-				}}</MkButton>
-			</div>
-			<div class="_flexList">
-				<MkButton @click="close">{{ i18n.ts.remindMeLater }}</MkButton>
-				<MkButton @click="neverShow">{{ i18n.ts.neverShow }}</MkButton>
-			</div>
-		</div>
-		<button class="_button" :class="$style.close" @click="close">
-			<i class="ph-x ph-bold ph-lg"></i>
-		</button>
-	</div>
+	</transition>
 </template>
 
 <script lang="ts" setup>
+import { ref } from "vue";
 import MkButton from "@/components/MkButton.vue";
 import { host } from "@/config";
 import { i18n } from "@/i18n";
 import * as os from "@/os";
 import { instance } from "@/instance";
 
+let show = ref(true);
+
 const emit = defineEmits<{
 	(ev: "closed"): void;
 }>();
@@ -56,6 +74,7 @@ const zIndex = os.claimZIndex("low");
 function close() {
 	localStorage.setItem("latestDonationInfoShownAt", Date.now().toString());
 	emit("closed");
+	show.value = false;
 }
 
 function neverShow() {
@@ -116,8 +135,22 @@ function openExternal(link) {
 .title {
 	font-weight: bold;
 }
-
 .text {
 	margin: 0.7em 0 1em 0;
 }
+
+.slide-fade-enter {
+    opacity: 1;
+    transform: translateY(0);
+}
+.slide-fade-enter-active {
+    transition: opacity 0.5s, transform 0.5s;
+}
+.slide-fade-leave-to {
+    opacity: 0;
+    transform: translateY(100%);
+}
+.slide-fade-leave-active {
+    transition: opacity 0.5s, transform 0.5s;
+}
 </style>

From d2c7e7cde5a7ab47d4601276905a6bb7fe90fc5d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 12 Jul 2023 00:24:04 -0700
Subject: [PATCH 57/68] dev71

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

diff --git a/package.json b/package.json
index 15d7b2ab03..a0bb72c8f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev70",
+	"version": "14.0.0-dev71",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From c7ca8aed746b20986851af4bdc30d64ad2f8bba1 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 12 Jul 2023 00:36:24 -0700
Subject: [PATCH 58/68] fix: :lipstick: scope transition style

---
 packages/client/src/components/MkDonation.vue | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/packages/client/src/components/MkDonation.vue b/packages/client/src/components/MkDonation.vue
index 9ec99a6ec5..5d39607990 100644
--- a/packages/client/src/components/MkDonation.vue
+++ b/packages/client/src/components/MkDonation.vue
@@ -1,6 +1,6 @@
 <template>
 	<transition name="slide-fade">
-		<div v-if="show" class="_panel _shadow" :class="$style.root">
+		<div v-if="show" class="_panel _shadow _acrylic" :class="$style.root">
 			<div :class="$style.icon">
 				<i class="ph-hand-heart ph-bold ph-5x" />
 			</div>
@@ -87,13 +87,30 @@ function openExternal(link) {
 }
 </script>
 
+<style lang="scss" scoped>
+.slide-fade-enter {
+    opacity: 1;
+    transform: translateY(0);
+}
+.slide-fade-enter-active {
+    transition: opacity 0.5s, transform 0.5s;
+}
+.slide-fade-leave-to {
+    opacity: 0;
+    transform: translateY(100%);
+}
+.slide-fade-leave-active {
+    transition: opacity 0.5s, transform 0.5s;
+}
+</style>
+
 <style lang="scss" module>
 .root {
 	position: fixed;
 	z-index: v-bind(zIndex);
 	bottom: var(--margin);
-	left: 0;
-	right: 0;
+	left: 2%;
+	bottom: 2%;
 	margin: auto;
 	box-sizing: border-box;
 	width: calc(100% - (var(--margin) * 2));
@@ -138,19 +155,4 @@ function openExternal(link) {
 .text {
 	margin: 0.7em 0 1em 0;
 }
-
-.slide-fade-enter {
-    opacity: 1;
-    transform: translateY(0);
-}
-.slide-fade-enter-active {
-    transition: opacity 0.5s, transform 0.5s;
-}
-.slide-fade-leave-to {
-    opacity: 0;
-    transform: translateY(100%);
-}
-.slide-fade-leave-active {
-    transition: opacity 0.5s, transform 0.5s;
-}
 </style>

From 66d7884b72ea2153bdf3c13e75fd39ec7033c822 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 12 Jul 2023 00:45:53 -0700
Subject: [PATCH 59/68] feat: :lipstick: fly in as well

---
 packages/client/src/components/MkDonation.vue | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/packages/client/src/components/MkDonation.vue b/packages/client/src/components/MkDonation.vue
index 5d39607990..b368b3e4ea 100644
--- a/packages/client/src/components/MkDonation.vue
+++ b/packages/client/src/components/MkDonation.vue
@@ -88,20 +88,33 @@ function openExternal(link) {
 </script>
 
 <style lang="scss" scoped>
-.slide-fade-enter {
-    opacity: 1;
-    transform: translateY(0);
-}
-.slide-fade-enter-active {
-    transition: opacity 0.5s, transform 0.5s;
-}
-.slide-fade-leave-to {
+.slide-fade-enter-from {
     opacity: 0;
     transform: translateY(100%);
 }
+
+.slide-fade-enter-active {
+    transition: opacity 0.5s, transform 0.5s;
+}
+
+.slide-fade-enter-to {
+    opacity: 1;
+    transform: translateY(0);
+}
+
+.slide-fade-leave-from {
+    opacity: 1;
+    transform: translateY(0);
+}
+
 .slide-fade-leave-active {
     transition: opacity 0.5s, transform 0.5s;
 }
+
+.slide-fade-leave-to {
+    opacity: 0;
+    transform: translateY(100%);
+}
 </style>
 
 <style lang="scss" module>

From badd040df673fa3a5efe0b2e8ceb821a6497109c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 12 Jul 2023 00:48:07 -0700
Subject: [PATCH 60/68] fix: :bug: properly show instance's link

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

diff --git a/packages/client/src/components/MkDonation.vue b/packages/client/src/components/MkDonation.vue
index b368b3e4ea..a67e5b9d4a 100644
--- a/packages/client/src/components/MkDonation.vue
+++ b/packages/client/src/components/MkDonation.vue
@@ -10,7 +10,7 @@
 				</div>
 				<div :class="$style.text">
 					{{ i18n.ts._aboutMisskey.pleaseDonateToCalckey }}
-					<p v-if="instance.donationLink">
+					<p v-if="$instance.donationLink">
 						{{
 							i18n.t("_aboutMisskey.pleaseDonateToHost", {
 								host: hostname,
@@ -27,9 +27,9 @@
 						>{{ i18n.ts._aboutMisskey.donate }}</MkButton
 					>
 					<MkButton
-						v-if="instance.donationLink"
+						v-if="$instance.donationLink"
 						primary
-						@click="openExternal(instance.donationLink)"
+						@click="openExternal($instance.donationLink)"
 						>{{
 							i18n.t("_aboutMisskey.donateHost", {
 								host: hostname,

From 6b5d9f7454b99a57a0e9e28dcca0938251b15c95 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 12 Jul 2023 00:54:28 -0700
Subject: [PATCH 61/68] fix: :bug: give donation link in non-admin meta

---
 packages/backend/src/server/api/endpoints/meta.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index 673a0266c8..dfb589a431 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -389,6 +389,11 @@ export const meta = {
 				nullable: false,
 				default: "⭐",
 			},
+			donationLink: {
+				type: "string",
+				optional: "true",
+				nullable: true,
+			}
 		},
 	},
 } as const;
@@ -491,6 +496,7 @@ export default define(meta, paramDef, async (ps, me) => {
 		translatorAvailable:
 			instance.deeplAuthKey != null || instance.libreTranslateApiUrl != null,
 		defaultReaction: instance.defaultReaction,
+		donationLink: instance.donationLink,
 
 		...(ps.detail
 			? {

From 8d88ac30e198d75fdc8b1df436a62373bc3e9207 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 12 Jul 2023 00:56:40 -0700
Subject: [PATCH 62/68] fix: :lipstick: properly slide in

---
 packages/client/src/components/MkDonation.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkDonation.vue b/packages/client/src/components/MkDonation.vue
index a67e5b9d4a..6d9e3d8479 100644
--- a/packages/client/src/components/MkDonation.vue
+++ b/packages/client/src/components/MkDonation.vue
@@ -54,14 +54,14 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from "vue";
+import { ref, nextTick } from "vue";
 import MkButton from "@/components/MkButton.vue";
 import { host } from "@/config";
 import { i18n } from "@/i18n";
 import * as os from "@/os";
 import { instance } from "@/instance";
 
-let show = ref(true);
+let show = ref(false);
 
 const emit = defineEmits<{
 	(ev: "closed"): void;
@@ -71,6 +71,15 @@ const hostname = instance.name?.length <= 20 ? instance.name : host;
 
 const zIndex = os.claimZIndex("low");
 
+function slideIn() {
+    show.value = false;
+    nextTick(() => {
+        show.value = true;
+    });
+}
+
+slideIn();
+
 function close() {
 	localStorage.setItem("latestDonationInfoShownAt", Date.now().toString());
 	emit("closed");

From 17e578010a97c2048314132466ffb4691c179fa4 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 12 Jul 2023 00:58:09 -0700
Subject: [PATCH 63/68] fix: :lipstick: ease-out transitions

---
 packages/client/src/components/MkDonation.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkDonation.vue b/packages/client/src/components/MkDonation.vue
index 6d9e3d8479..371b2e2a98 100644
--- a/packages/client/src/components/MkDonation.vue
+++ b/packages/client/src/components/MkDonation.vue
@@ -103,7 +103,7 @@ function openExternal(link) {
 }
 
 .slide-fade-enter-active {
-    transition: opacity 0.5s, transform 0.5s;
+    transition: opacity 0.5s, transform 0.5s ease-out;
 }
 
 .slide-fade-enter-to {
@@ -117,7 +117,7 @@ function openExternal(link) {
 }
 
 .slide-fade-leave-active {
-    transition: opacity 0.5s, transform 0.5s;
+    transition: opacity 0.5s, transform 0.5s ease-out;
 }
 
 .slide-fade-leave-to {

From c75c9f4b75ef0c9d122955a1605bb6739ccd1a07 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 12 Jul 2023 01:01:05 -0700
Subject: [PATCH 64/68] gap

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

diff --git a/packages/client/src/components/MkDonation.vue b/packages/client/src/components/MkDonation.vue
index 371b2e2a98..a2352a4e43 100644
--- a/packages/client/src/components/MkDonation.vue
+++ b/packages/client/src/components/MkDonation.vue
@@ -18,7 +18,7 @@
 						}}
 					</p>
 				</div>
-				<div class="_flexList">
+				<div class="_flexList" style="gap: 0.6rem;">
 					<MkButton
 						primary
 						@click="

From 1c2fa18f3447872498857a4c10a85119be79abf7 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 12 Jul 2023 01:05:16 -0700
Subject: [PATCH 65/68] refactor: :lipstick: max instance name length 37,
 gradate specific server dono button

---
 packages/client/src/components/MkDonation.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkDonation.vue b/packages/client/src/components/MkDonation.vue
index a2352a4e43..6b575f30b1 100644
--- a/packages/client/src/components/MkDonation.vue
+++ b/packages/client/src/components/MkDonation.vue
@@ -28,7 +28,7 @@
 					>
 					<MkButton
 						v-if="$instance.donationLink"
-						primary
+						gradate
 						@click="openExternal($instance.donationLink)"
 						>{{
 							i18n.t("_aboutMisskey.donateHost", {
@@ -67,7 +67,7 @@ const emit = defineEmits<{
 	(ev: "closed"): void;
 }>();
 
-const hostname = instance.name?.length <= 20 ? instance.name : host;
+const hostname = instance.name?.length < 38 ? instance.name : host;
 
 const zIndex = os.claimZIndex("low");
 

From b3776a5e69f81c479d4a75f278ba30ee7ad7be08 Mon Sep 17 00:00:00 2001
From: freeplay <freeplay@duck.com>
Date: Wed, 12 Jul 2023 13:26:36 -0400
Subject: [PATCH 66/68] fix: match custom emoji size to Misskey's

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

diff --git a/packages/client/src/components/global/MkEmoji.vue b/packages/client/src/components/global/MkEmoji.vue
index 3e899823ae..5da567a0f3 100644
--- a/packages/client/src/components/global/MkEmoji.vue
+++ b/packages/client/src/components/global/MkEmoji.vue
@@ -69,7 +69,7 @@ const alt = computed(() =>
 	vertical-align: -0.25em;
 
 	&.custom {
-		height: 2.5em;
+		height: 2em;
 		vertical-align: middle;
 		transition: transform 0.2s ease;
 

From 6129d6eddb9cb3360b412938f9605c939b004b44 Mon Sep 17 00:00:00 2001
From: naskya <naskya@noreply.codeberg.org>
Date: Thu, 13 Jul 2023 00:45:26 +0000
Subject: [PATCH 67/68] chore: forgot to remove a debug print stmt?

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

diff --git a/packages/backend/src/server/api/stream/index.ts b/packages/backend/src/server/api/stream/index.ts
index e778c49467..72dce19511 100644
--- a/packages/backend/src/server/api/stream/index.ts
+++ b/packages/backend/src/server/api/stream/index.ts
@@ -247,7 +247,7 @@ export default class Connection {
 
 		for (const obj of objs) {
 			const { type, body } = obj;
-			console.log(type, body);
+			// console.log(type, body);
 			switch (type) {
 				case "readNotification":
 					this.onReadNotification(body);

From c5eeb5e583f49ce9cb692f7ec1a46592ddd51a6b Mon Sep 17 00:00:00 2001
From: DVD <zjdavid.2003@gmail.com>
Date: Thu, 13 Jul 2023 09:05:38 +0800
Subject: [PATCH 68/68] Fix CW Import

---
 packages/backend/src/queue/processors/db/import-masto-post.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/queue/processors/db/import-masto-post.ts b/packages/backend/src/queue/processors/db/import-masto-post.ts
index 317ba7b1bd..efa4adf3f3 100644
--- a/packages/backend/src/queue/processors/db/import-masto-post.ts
+++ b/packages/backend/src/queue/processors/db/import-masto-post.ts
@@ -50,7 +50,7 @@ export async function importMastoPost(
 		text: text || undefined,
 		reply,
 		renote: null,
-		cw: post.sensitive,
+		cw: post.object.sensitive ? post.object.summary : undefined,
 		localOnly: false,
 		visibility: "hidden",
 		visibleUsers: [],