From 3badf5546a4b941f10dd165029b30d0106496469 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 15 Aug 2022 15:41:25 -0700
Subject: [PATCH 001/245] Hide timetravel for now

---
 CALCKEY.md                             | 1 +
 package.json                           | 2 +-
 packages/client/src/pages/timeline.vue | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index bcc90df2b..fe7d76a26 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -23,6 +23,7 @@
 
 - OCR image captioning
 - Admin custom CSS
+- Add back time machine (jump to date)
 - Improve accesibility score
 <details><summary>Current Misskey score is 57/100</summary>
 
diff --git a/package.json b/package.json
index ecf791ae3..f09a892a2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-"version": "12.118.1-calc.1",
+"version": "12.118.1-calc.2",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 5acfa922e..f4786600d 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -121,12 +121,12 @@ const headerActions = $computed(() => [{
 	title: i18n.ts.antennas,
 	iconOnly: true,
 	handler: chooseAntenna,
-}, {
+}, /* **TODO: fix timetravel** {
 	icon: 'fas fa-calendar-alt',
 	title: i18n.ts.jumpToSpecifiedDate,
 	iconOnly: true,
 	handler: timetravel,
-}]);
+}*/]);
 
 const headerTabs = $computed(() => [{
 	key: 'home',

From f101791d020483844e9afd846836a12856360316 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 15 Aug 2022 15:55:30 -0700
Subject: [PATCH 002/245] Fix overlap betwen favicon and splash icon

---
 packages/backend/src/server/web/index.ts       | 7 ++++---
 packages/backend/src/server/web/views/base.pug | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts
index 0d3f012c4..4a6dfaff1 100644
--- a/packages/backend/src/server/web/index.ts
+++ b/packages/backend/src/server/web/index.ts
@@ -530,16 +530,17 @@ router.get('(.*)', async ctx => {
 	if (meta.customMOTD.length > 0) {
 		motd = meta.customMOTD;
 	}
-	let iconUrl = meta.iconUrl;
+	let splashIconUrl = meta.iconUrl;
 	if (meta.customSplashIcons.length > 0) {
-		iconUrl = meta.customSplashIcons[Math.floor(Math.random() * meta.customSplashIcons.length)];
+		splashIconUrl = meta.customSplashIcons[Math.floor(Math.random() * meta.customSplashIcons.length)];
 	}
 	await ctx.render('base', {
 		img: meta.bannerUrl,
 		title: meta.name || 'Calckey',
 		instanceName: meta.name || 'Calckey',
 		desc: meta.description,
-		icon: iconUrl,
+		icon: meta.iconUrl,
+		splashIcon: splashIconUrl,
 		themeColor: meta.themeColor,
 		privateMode: meta.privateMode,
 		randomMOTD: motd[Math.floor(Math.random() * motd.length)],
diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug
index 925bd6ba9..d019d2f64 100644
--- a/packages/backend/src/server/web/views/base.pug
+++ b/packages/backend/src/server/web/views/base.pug
@@ -77,7 +77,7 @@ html
 			br
 			| Please turn on your JavaScript
 		div#splash
-			img#splashIcon(src= icon || '/static-assets/splash.png')
+			img#splashIcon(src= splashIcon || '/static-assets/splash.png')
 			span#splashText
 				block randomMOTD
 					= randomMOTD

From 6490f4cf764a8a201b887f4bb91f1433762049f7 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Mon, 15 Aug 2022 22:28:13 +0200
Subject: [PATCH 003/245] enhance: add re-collapsing to quoted notes

---
 .../src/components/sub-note-content.vue       | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/components/sub-note-content.vue b/packages/client/src/components/sub-note-content.vue
index 9ee180345..6a8d9b78d 100644
--- a/packages/client/src/components/sub-note-content.vue
+++ b/packages/client/src/components/sub-note-content.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="wrmlmaau" :class="{ collapsed }">
+<div class="wrmlmaau" :class="{ collapsed, isLong }">
 	<div class="body">
 		<span v-if="note.deletedAt" style="opacity: 0.5">({{ i18n.ts.deleted }})</span>
 		<MkA v-if="note.replyId" class="reply" :to="`/notes/${note.replyId}`"><i class="fas fa-reply"></i></MkA>
@@ -14,9 +14,12 @@
 		<summary>{{ i18n.ts.poll }}</summary>
 		<XPoll :note="note"/>
 	</details>
-	<button v-if="collapsed" class="fade _button" @click="collapsed = false">
+	<button v-if="isLong && collapsed" class="fade _button" @click="collapsed = false">
 		<span>{{ i18n.ts.showMore }}</span>
 	</button>
+	<button v-if="isLong && !collapsed" class="showLess _button" @click="collapsed = true">
+		<span>{{ i18n.ts.showLess }}</span>
+	</button>
 </div>
 </template>
 
@@ -31,11 +34,14 @@ const props = defineProps<{
 	note: misskey.entities.Note;
 }>();
 
-const collapsed = $ref(
+
+const isLong = (
 	props.note.cw == null && props.note.text != null && (
 		(props.note.text.split('\n').length > 9) ||
 		(props.note.text.length > 500)
-	));
+	)
+);
+const collapsed = $ref(props.note.cw == null && isLong);
 </script>
 
 <style lang="scss" scoped>
@@ -85,5 +91,23 @@ const collapsed = $ref(
 			}
 		}
 	}
+
+	&.isLong {
+		> .showLess {
+			width: 100%;
+			margin-top: 1em;
+			position: sticky;
+			bottom: 1em;
+
+			> span {
+				display: inline-block;
+				background: var(--panel);
+				padding: 6px 10px;
+				font-size: 0.8em;
+				border-radius: 999px;
+				box-shadow: 0 0 7px 7px var(--bg);
+			}
+		}
+	}
 }
 </style>

From 8068d9ed925e38ad9c055e29c2164634f15dcb2e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 15 Aug 2022 16:05:26 -0700
Subject: [PATCH 004/245] feat: :sparkles: foundkey: add recollapsing quote
 notes

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

diff --git a/CALCKEY.md b/CALCKEY.md
index fe7d76a26..7b8c8d72b 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -90,3 +90,4 @@
 	- 585e4f5c42cfafb6cdf7eb601ab435d6a4d85a96: fix textarea not updating properly
 	- 30d8bc9259cb6b72ed76d67b21dbb4cdceca8327: refactor: welcome.setup.vue to composition api
 	- 751921e24f37ed707fe44a40d88eebb1299efa35: make emoji picker case insensitive
+	- 298febeb9c9501e3e3df16982c08657d1da474e0: enhance: add re-collapsing to quoted notes

From c383c30e80d35150c7a4ec3296e2f87d763e42e3 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 15 Aug 2022 18:43:17 -0700
Subject: [PATCH 005/245] feat: :sparkles: Swipe through timelines on mobile

---
 package.json                           |  5 +++--
 packages/client/src/pages/timeline.vue | 31 ++++++++++++++++++++++++--
 packages/client/src/ui/universal.vue   | 13 +++++------
 yarn.lock                              | 12 ++++++++--
 4 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index f09a892a2..5a435b8d8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-"version": "12.118.1-calc.2",
+	"version": "12.118.1-calc.2",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
@@ -51,7 +51,8 @@
 		"gulp-terser": "2.1.0",
 		"js-yaml": "4.1.0",
 		"long": "^5.2.0",
-		"seedrandom": "^3.0.5"
+		"seedrandom": "^3.0.5",
+		"tocada": "^1.0.0-beta.6"
 	},
 	"devDependencies": {
 		"@types/gulp": "4.0.9",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index f4786600d..fb371b004 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, computed, watch } from 'vue';
+import { defineAsyncComponent, computed, watch, ref } from 'vue';
 import XTimeline from '@/components/timeline.vue';
 import XPostForm from '@/components/post-form.vue';
 import { scroll } from '@/scripts/scroll';
@@ -32,6 +32,9 @@ import { i18n } from '@/i18n';
 import { instance } from '@/instance';
 import { $i } from '@/account';
 import { definePageMetadata } from '@/scripts/page-metadata';
+import { deviceKind } from '@/scripts/device-kind';
+
+import 'tocada';
 
 const XTutorial = defineAsyncComponent(() => import('./timeline.tutorial.vue'));
 
@@ -43,6 +46,16 @@ const keymap = {
 	't': focus,
 };
 
+const DESKTOP_THRESHOLD = 1100;
+const MOBILE_THRESHOLD = 500;
+
+// デスクトップでウィンドウを狭くしたときモバイルUIが表示されて欲しいことはあるので deviceKind === 'desktop' の判定は行わない
+const isDesktop = ref(window.innerWidth >= DESKTOP_THRESHOLD);
+const isMobile = ref(deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD);
+window.addEventListener('resize', () => {
+	isMobile.value = deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD;
+});
+
 const tlComponent = $ref<InstanceType<typeof XTimeline>>();
 const rootEl = $ref<HTMLElement>();
 
@@ -91,7 +104,7 @@ async function chooseChannel(ev: MouseEvent): Promise<void> {
 	os.popupMenu(items, ev.currentTarget ?? ev.target);
 }
 
-function saveSrc(newSrc: 'home' | 'local' | 'social' | 'global'): void {
+function saveSrc(newSrc: 'home' | 'local' | 'recommended' | 'social' | 'global'): void {
 	defaultStore.set('tl', {
 		...defaultStore.state.tl,
 		src: newSrc,
@@ -162,6 +175,20 @@ definePageMetadata(computed(() => ({
 	title: i18n.ts.timeline,
 	icon: src === 'local' ? 'fas fa-user-group' : src === 'social' ? 'fas fa-handshake-simple' : src === 'recommended' ? 'fas fa-signs-post' : src === 'global' ? 'fas fa-globe' : 'fas fa-home',
 })));
+
+if (isMobile.value) {
+	window.addEventListener('swipeleft', () => {
+		const current = headerTabs.value.find(x => x.key === src.value);
+		const next = headerTabs.value[(headerTabs.value.indexOf(current) - 1) % headerTabs.value.length];
+		saveSrc(next.key);
+	});
+	window.addEventListener('swiperight', () => {
+		const current = headerTabs.value.find(x => x.key === src.value);
+		const next = headerTabs.value[(headerTabs.value.indexOf(current) + 1) % headerTabs.value.length];
+		saveSrc(next.key);
+	});
+}
+
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 0ef0da70b..e2ec016ba 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -4,7 +4,7 @@
 
 	<MkStickyContainer class="contents">
 		<template #header><XStatusBars :class="$style.statusbars"/></template>
-		<main style="min-width: 0;" :style="{ background: pageMetadata?.value?.bg }" @contextmenu.stop="onContextmenu">
+		<main id="maincontent" style="min-width: 0;" :style="{ background: pageMetadata?.value?.bg }" @contextmenu.stop="onContextmenu">
 			<div :class="$style.content">
 				<RouterView/>
 			</div>
@@ -71,6 +71,7 @@ import { Router } from '@/nirax';
 import { mainRouter } from '@/router';
 import { PageMetadata, provideMetadataReceiver, setPageMetadata } from '@/scripts/page-metadata';
 import { deviceKind } from '@/scripts/device-kind';
+
 const XWidgets = defineAsyncComponent(() => import('./universal.widgets.vue'));
 const XSidebar = defineAsyncComponent(() => import('@/ui/_common_/navbar.vue'));
 const XStatusBars = defineAsyncComponent(() => import('@/ui/_common_/statusbars.vue'));
@@ -170,6 +171,7 @@ function top() {
 }
 
 const wallpaper = localStorage.getItem('wallpaper') != null;
+
 </script>
 
 <style lang="scss" scoped>
@@ -288,14 +290,11 @@ const wallpaper = localStorage.getItem('wallpaper') != null;
 		z-index: 1000;
 		bottom: 0;
 		left: 0;
-		padding: 16px 16px calc(env(safe-area-inset-bottom, 0px) + 16px) 16px;
+		padding: 12px 12px calc(env(safe-area-inset-bottom, 0px) + 12px) 12px;
 		display: flex;
 		width: 100%;
 		box-sizing: border-box;
-		-webkit-backdrop-filter: var(--blur, blur(32px));
-		backdrop-filter: var(--blur, blur(32px));
-		background-color: var(--header);
-		border-top: solid 0.5px var(--divider);
+		background-color: var(--bg);
 
 		> .button {
 			position: relative;
@@ -341,7 +340,7 @@ const wallpaper = localStorage.getItem('wallpaper') != null;
 			}
 
 			> * {
-				font-size: 20px;
+				font-size: 16px;
 			}
 
 			&:disabled {
diff --git a/yarn.lock b/yarn.lock
index 8634d10e8..5155de695 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3236,7 +3236,7 @@ __metadata:
 "browser-image-resizer@git+https://github.com/misskey-dev/browser-image-resizer#v2.2.1-misskey.2":
   version: 2.2.1-misskey.2
   resolution: "browser-image-resizer@https://github.com/misskey-dev/browser-image-resizer.git#commit=a58834f5fe2af9f9f31ff115121aef3de6f9d416"
-  checksum: eb5ddfe7f6a2de96340ef420df9be03a75f2bfd8f568a60be22cc8f2ccdcb754105b7799cf706c09add3f9d82b7ce1c6f963842f80a85f234b26ef6bf1b8da09
+  checksum: 8ea30705704cc3f81eca23ff6cd0d5bf0d5404cd82612a52de11c0b851be511613022758babf5c202cc92b019483cfb97d7ef48cc18368a8913803fd654ac5d1
   languageName: node
   linkType: hard
 
@@ -10101,6 +10101,7 @@ __metadata:
     long: ^5.2.0
     seedrandom: ^3.0.5
     start-server-and-test: 1.14.0
+    tocada: ^1.0.0-beta.6
     typescript: 4.7.4
     vue-eslint-parser: ^9.0.2
   languageName: unknown
@@ -14374,6 +14375,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tocada@npm:^1.0.0-beta.6":
+  version: 1.0.0-beta.6
+  resolution: "tocada@npm:1.0.0-beta.6"
+  checksum: 62637d2a5ca96b592cb0aa95d1e474386b95ac52111da90a0a9348b73f5f27633fef95222b0c8ff2f6c2767dabea0a3182ea1d4d6454ef02e03efe3a364d18c7
+  languageName: node
+  linkType: hard
+
 "toidentifier@npm:1.0.1":
   version: 1.0.1
   resolution: "toidentifier@npm:1.0.1"
@@ -14783,7 +14791,7 @@ __metadata:
 
 "typescript@patch:typescript@4.7.4#~builtin<compat/typescript>":
   version: 4.7.4
-  resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin<compat/typescript>::version=4.7.4&hash=7ad353"
+  resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin<compat/typescript>::version=4.7.4&hash=f456af"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver

From 4f9ea8f354d7211f485934ace83e7782bfad56b0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 15 Aug 2022 18:43:40 -0700
Subject: [PATCH 006/245] docs: :memo: Add swipe to WIP

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

diff --git a/CALCKEY.md b/CALCKEY.md
index 7b8c8d72b..13a38cfe9 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -22,6 +22,7 @@
 ## Work in progress
 
 - OCR image captioning
+- Swipe through timelines on mobile
 - Admin custom CSS
 - Add back time machine (jump to date)
 - Improve accesibility score

From 84e7c644a728339d345597a11194a8b1b31430e3 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 15 Aug 2022 19:07:24 -0700
Subject: [PATCH 007/245] fix: :alembic: Try swiped-events

---
 package.json                           |  5 ++---
 packages/client/package.json           |  1 +
 packages/client/src/pages/timeline.vue | 12 ++++++------
 yarn.lock                              | 25 +++++++++++++++++--------
 4 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 5a435b8d8..f933f6d94 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.2",
+	"version": "12.118.1-calc.5",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
@@ -51,8 +51,7 @@
 		"gulp-terser": "2.1.0",
 		"js-yaml": "4.1.0",
 		"long": "^5.2.0",
-		"seedrandom": "^3.0.5",
-		"tocada": "^1.0.0-beta.6"
+		"seedrandom": "^3.0.5"
 	},
 	"devDependencies": {
 		"@types/gulp": "4.0.9",
diff --git a/packages/client/package.json b/packages/client/package.json
index b43b3c03d..d5c02d8ae 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -46,6 +46,7 @@
 		"seedrandom": "3.0.5",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
+		"swiped-events": "^1.1.6",
 		"syuilo-password-strength": "0.0.1",
 		"tesseract.js": "^2.1.5",
 		"textarea-caret": "3.1.0",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index fb371b004..f02e55121 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -177,14 +177,14 @@ definePageMetadata(computed(() => ({
 })));
 
 if (isMobile.value) {
-	window.addEventListener('swipeleft', () => {
-		const current = headerTabs.value.find(x => x.key === src.value);
-		const next = headerTabs.value[(headerTabs.value.indexOf(current) - 1) % headerTabs.value.length];
+	document.addEventListener('swipeleft', () => {
+		const current = headerTabs.values.find(x => x.key === src.value);
+		const next = headerTabs.values[(headerTabs.values.indexOf(current) - 1) % headerTabs.values.length];
 		saveSrc(next.key);
 	});
-	window.addEventListener('swiperight', () => {
-		const current = headerTabs.value.find(x => x.key === src.value);
-		const next = headerTabs.value[(headerTabs.value.indexOf(current) + 1) % headerTabs.value.length];
+	document.addEventListener('swiperight', () => {
+		const current = headerTabs.values.find(x => x.key === src.value);
+		const next = headerTabs.values[(headerTabs.values.indexOf(current) + 1) % headerTabs.values.length];
 		saveSrc(next.key);
 	});
 }
diff --git a/yarn.lock b/yarn.lock
index 5155de695..999297cab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3900,6 +3900,7 @@ __metadata:
     start-server-and-test: 1.14.0
     strict-event-emitter-types: 2.0.0
     stringz: 2.1.0
+    swiped-events: ^1.1.6
     syuilo-password-strength: 0.0.1
     tesseract.js: ^2.1.5
     textarea-caret: 3.1.0
@@ -10101,7 +10102,6 @@ __metadata:
     long: ^5.2.0
     seedrandom: ^3.0.5
     start-server-and-test: 1.14.0
-    tocada: ^1.0.0-beta.6
     typescript: 4.7.4
     vue-eslint-parser: ^9.0.2
   languageName: unknown
@@ -10360,6 +10360,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"natives@npm:^1.1.6":
+  version: 1.1.6
+  resolution: "natives@npm:1.1.6"
+  checksum: f9823dddba1eb71dc34f7e684d6d2bb39e709bdc54c42e89f27ec4a87966564644d88d2ea332ddfb91d00129a03d8e73abc35b09a0d985a80d6eaad95f3c1887
+  languageName: node
+  linkType: hard
+
 "natural-compare@npm:^1.4.0":
   version: 1.4.0
   resolution: "natural-compare@npm:1.4.0"
@@ -14047,6 +14054,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"swiped-events@npm:^1.1.6":
+  version: 1.1.6
+  resolution: "swiped-events@npm:1.1.6"
+  dependencies:
+    natives: ^1.1.6
+  checksum: c2c88d0390c667938213fe661c693522d32d0432acbd02ccb8f1883b67b503ffdfa22cbec89d2102d1f9f61023aa477b704920fd1ec883ae813d8756aacd5506
+  languageName: node
+  linkType: hard
+
 "symbol-tree@npm:^3.2.4":
   version: 3.2.4
   resolution: "symbol-tree@npm:3.2.4"
@@ -14375,13 +14391,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tocada@npm:^1.0.0-beta.6":
-  version: 1.0.0-beta.6
-  resolution: "tocada@npm:1.0.0-beta.6"
-  checksum: 62637d2a5ca96b592cb0aa95d1e474386b95ac52111da90a0a9348b73f5f27633fef95222b0c8ff2f6c2767dabea0a3182ea1d4d6454ef02e03efe3a364d18c7
-  languageName: node
-  linkType: hard
-
 "toidentifier@npm:1.0.1":
   version: 1.0.1
   resolution: "toidentifier@npm:1.0.1"

From fc24c0639f97330b2e388e7c3d4cbe77b97c8b51 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 15 Aug 2022 19:08:47 -0700
Subject: [PATCH 008/245] fix: :package: fix import

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

diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index f02e55121..01c5327d4 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -34,7 +34,7 @@ import { $i } from '@/account';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { deviceKind } from '@/scripts/device-kind';
 
-import 'tocada';
+import 'swiped-events';
 
 const XTutorial = defineAsyncComponent(() => import('./timeline.tutorial.vue'));
 

From 866b1e94284af9a6a2fd54e293fae2f6e81f9f8d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 15 Aug 2022 19:18:54 -0700
Subject: [PATCH 009/245] refactor: :package: fuck them libs

---
 packages/client/package.json           |   1 -
 packages/client/src/pages/timeline.vue | 287 +++++++++++++++++--------
 yarn.lock                              |  17 --
 3 files changed, 198 insertions(+), 107 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index d5c02d8ae..b43b3c03d 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -46,7 +46,6 @@
 		"seedrandom": "3.0.5",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
-		"swiped-events": "^1.1.6",
 		"syuilo-password-strength": "0.0.1",
 		"tesseract.js": "^2.1.5",
 		"textarea-caret": "3.1.0",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 01c5327d4..1967fc1a3 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -1,24 +1,42 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="src" :actions="headerActions" :tabs="headerTabs" :display-my-avatar="true"/></template>
-	<MkSpacer :content-max="800">
-		<div ref="rootEl" v-hotkey.global="keymap" class="cmuxhskf">
-			<XTutorial v-if="$store.reactiveState.tutorial.value != -1" class="tutorial _block"/>
-			<XPostForm v-if="$store.reactiveState.showFixedPostForm.value" class="post-form _block" fixed/>
-
-			<div v-if="queue > 0" class="new"><button class="_buttonPrimary" @click="top()">{{ i18n.ts.newNoteRecived }}</button></div>
-			<div class="tl _block">
-				<XTimeline
-					ref="tl" :key="src"
-					class="tl"
-					:src="src"
-					:sound="true"
-					@queue="queueUpdated"
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				v-model:tab="src"
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-my-avatar="true"
+		/></template>
+		<MkSpacer :content-max="800">
+			<div ref="rootEl" v-hotkey.global="keymap" class="cmuxhskf">
+				<XTutorial
+					v-if="$store.reactiveState.tutorial.value != -1"
+					class="tutorial _block"
 				/>
+				<XPostForm
+					v-if="$store.reactiveState.showFixedPostForm.value"
+					class="post-form _block"
+					fixed
+				/>
+
+				<div v-if="queue > 0" class="new">
+					<button class="_buttonPrimary" @click="top()">
+						{{ i18n.ts.newNoteRecived }}
+					</button>
+				</div>
+				<div class="tl _block">
+					<XTimeline
+						ref="tl"
+						:key="src"
+						class="tl"
+						:src="src"
+						:sound="true"
+						@queue="queueUpdated"
+					/>
+				</div>
 			</div>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
@@ -34,16 +52,20 @@ import { $i } from '@/account';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { deviceKind } from '@/scripts/device-kind';
 
-import 'swiped-events';
-
 const XTutorial = defineAsyncComponent(() => import('./timeline.tutorial.vue'));
 
-const isLocalTimelineAvailable = !instance.disableLocalTimeline || ($i != null && ($i.isModerator || $i.isAdmin));
-const isRecommendedTimelineAvailable = !instance.disableRecommendedTimeline || ($i != null && ($i.isModerator || $i.isAdmin));
-const isGlobalTimelineAvailable = !instance.disableGlobalTimeline || ($i != null && ($i.isModerator || $i.isAdmin));
+const isLocalTimelineAvailable =
+	!instance.disableLocalTimeline ||
+	($i != null && ($i.isModerator || $i.isAdmin));
+const isRecommendedTimelineAvailable =
+	!instance.disableRecommendedTimeline ||
+	($i != null && ($i.isModerator || $i.isAdmin));
+const isGlobalTimelineAvailable =
+	!instance.disableGlobalTimeline ||
+	($i != null && ($i.isModerator || $i.isAdmin));
 const enableGuestTimeline = instance.enableGuestTimeline;
 const keymap = {
-	't': focus,
+	t: focus,
 };
 
 const DESKTOP_THRESHOLD = 1100;
@@ -51,18 +73,24 @@ const MOBILE_THRESHOLD = 500;
 
 // デスクトップでウィンドウを狭くしたときモバイルUIが表示されて欲しいことはあるので deviceKind === 'desktop' の判定は行わない
 const isDesktop = ref(window.innerWidth >= DESKTOP_THRESHOLD);
-const isMobile = ref(deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD);
+const isMobile = ref(
+	deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD
+);
 window.addEventListener('resize', () => {
-	isMobile.value = deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD;
+	isMobile.value =
+		deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD;
 });
 
 const tlComponent = $ref<InstanceType<typeof XTimeline>>();
 const rootEl = $ref<HTMLElement>();
 
 let queue = $ref(0);
-const src = $computed({ get: () => defaultStore.reactiveState.tl.value.src, set: (x) => saveSrc(x) });
+const src = $computed({
+	get: () => defaultStore.reactiveState.tl.value.src,
+	set: (x) => saveSrc(x),
+});
 
-watch ($$(src), () => queue = 0);
+watch($$(src), () => (queue = 0));
 
 function queueUpdated(q: number): void {
 	queue = q;
@@ -74,7 +102,7 @@ function top(): void {
 
 async function chooseList(ev: MouseEvent): Promise<void> {
 	const lists = await os.api('users/lists/list');
-	const items = lists.map(list => ({
+	const items = lists.map((list) => ({
 		type: 'link' as const,
 		text: list.name,
 		to: `/timeline/list/${list.id}`,
@@ -84,7 +112,7 @@ async function chooseList(ev: MouseEvent): Promise<void> {
 
 async function chooseAntenna(ev: MouseEvent): Promise<void> {
 	const antennas = await os.api('antennas/list');
-	const items = antennas.map(antenna => ({
+	const items = antennas.map((antenna) => ({
 		type: 'link' as const,
 		text: antenna.name,
 		indicate: antenna.hasUnreadNote,
@@ -95,7 +123,7 @@ async function chooseAntenna(ev: MouseEvent): Promise<void> {
 
 async function chooseChannel(ev: MouseEvent): Promise<void> {
 	const channels = await os.api('channels/followed');
-	const items = channels.map(channel => ({
+	const items = channels.map((channel) => ({
 		type: 'link' as const,
 		text: channel.name,
 		indicate: channel.hasUnreadNote,
@@ -104,7 +132,9 @@ async function chooseChannel(ev: MouseEvent): Promise<void> {
 	os.popupMenu(items, ev.currentTarget ?? ev.target);
 }
 
-function saveSrc(newSrc: 'home' | 'local' | 'recommended' | 'social' | 'global'): void {
+function saveSrc(
+	newSrc: 'home' | 'local' | 'recommended' | 'social' | 'global'
+): void {
 	defaultStore.set('tl', {
 		...defaultStore.state.tl,
 		src: newSrc,
@@ -124,75 +154,154 @@ function focus(): void {
 	tlComponent.focus();
 }
 
-const headerActions = $computed(() => [{
-	icon: 'fas fa-list-ul',
-	title: i18n.ts.lists,
-	iconOnly: true,
-	handler: chooseList,
-}, {
-	icon: 'fas fa-satellite',
-	title: i18n.ts.antennas,
-	iconOnly: true,
-	handler: chooseAntenna,
-}, /* **TODO: fix timetravel** {
+const headerActions = $computed(() => [
+	{
+		icon: 'fas fa-list-ul',
+		title: i18n.ts.lists,
+		iconOnly: true,
+		handler: chooseList,
+	},
+	{
+		icon: 'fas fa-satellite',
+		title: i18n.ts.antennas,
+		iconOnly: true,
+		handler: chooseAntenna,
+	} /* **TODO: fix timetravel** {
 	icon: 'fas fa-calendar-alt',
 	title: i18n.ts.jumpToSpecifiedDate,
 	iconOnly: true,
 	handler: timetravel,
-}*/]);
+}*/,
+]);
 
-const headerTabs = $computed(() => [{
-	key: 'home',
-	title: i18n.ts._timelines.home,
-	icon: 'fas fa-home',
-	iconOnly: true,
-}, ...(isLocalTimelineAvailable ? [{
-	key: 'local',
-	title: i18n.ts._timelines.local,
-	icon: 'fas fa-user-group',
-	iconOnly: true,
-}] : []),
-...(isRecommendedTimelineAvailable ? [{
-	key: 'recommended',
-	title: i18n.ts._timelines.recommended,
-	icon: 'fas fa-signs-post',
-	iconOnly: true,
-}] : []),
-...(isLocalTimelineAvailable ? [{
-	key: 'social',
-	title: i18n.ts._timelines.social,
-	icon: 'fas fa-handshake-simple',
-	iconOnly: true,
-}] : []),
-...(isGlobalTimelineAvailable ? [{
-	key: 'global',
-	title: i18n.ts._timelines.global,
-	icon: 'fas fa-globe',
-	iconOnly: true,
-}] : [])]);
+const headerTabs = $computed(() => [
+	{
+		key: 'home',
+		title: i18n.ts._timelines.home,
+		icon: 'fas fa-home',
+		iconOnly: true,
+	},
+	...(isLocalTimelineAvailable
+		? [
+			{
+				key: 'local',
+				title: i18n.ts._timelines.local,
+				icon: 'fas fa-user-group',
+				iconOnly: true,
+			},
+		]
+		: []),
+	...(isRecommendedTimelineAvailable
+		? [
+			{
+				key: 'recommended',
+				title: i18n.ts._timelines.recommended,
+				icon: 'fas fa-signs-post',
+				iconOnly: true,
+			},
+		]
+		: []),
+	...(isLocalTimelineAvailable
+		? [
+			{
+				key: 'social',
+				title: i18n.ts._timelines.social,
+				icon: 'fas fa-handshake-simple',
+				iconOnly: true,
+			},
+		]
+		: []),
+	...(isGlobalTimelineAvailable
+		? [
+			{
+				key: 'global',
+				title: i18n.ts._timelines.global,
+				icon: 'fas fa-globe',
+				iconOnly: true,
+			},
+		]
+		: []),
+]);
 
-definePageMetadata(computed(() => ({
-	title: i18n.ts.timeline,
-	icon: src === 'local' ? 'fas fa-user-group' : src === 'social' ? 'fas fa-handshake-simple' : src === 'recommended' ? 'fas fa-signs-post' : src === 'global' ? 'fas fa-globe' : 'fas fa-home',
-})));
+definePageMetadata(
+	computed(() => ({
+		title: i18n.ts.timeline,
+		icon:
+			src === 'local'
+				? 'fas fa-user-group'
+				: src === 'social'
+					? 'fas fa-handshake-simple'
+					: src === 'recommended'
+						? 'fas fa-signs-post'
+						: src === 'global'
+							? 'fas fa-globe'
+							: 'fas fa-home',
+	}))
+);
 
 if (isMobile.value) {
-	document.addEventListener('swipeleft', () => {
-		const current = headerTabs.values.find(x => x.key === src.value);
-		const next = headerTabs.values[(headerTabs.values.indexOf(current) - 1) % headerTabs.values.length];
-		saveSrc(next.key);
-	});
-	document.addEventListener('swiperight', () => {
-		const current = headerTabs.values.find(x => x.key === src.value);
-		const next = headerTabs.values[(headerTabs.values.indexOf(current) + 1) % headerTabs.values.length];
-		saveSrc(next.key);
-	});
-}
+	document.addEventListener('touchstart', handleTouchStart, false);
+	document.addEventListener('touchmove', handleTouchMove, false);
 
+	let xDown = null;
+	let yDown = null;
+
+	function getTouches(evt) {
+		return (
+			evt.touches || evt.originalEvent.touches
+		);
+	}
+
+	function handleTouchStart(evt) {
+		const firstTouch = getTouches(evt)[0];
+		xDown = firstTouch.clientX;
+		yDown = firstTouch.clientY;
+	}
+
+	function handleTouchMove(evt) {
+		if (!xDown || !yDown) {
+			return;
+		}
+
+		let xUp = evt.touches[0].clientX;
+		let yUp = evt.touches[0].clientY;
+
+		let xDiff = xDown - xUp;
+		let yDiff = yDown - yUp;
+
+		if (Math.abs(xDiff) > Math.abs(yDiff)) {
+			if (xDiff > 0) {
+				console.log('right swipe');
+				const current = headerTabs.values.find((x) => x.key === src.value);
+				const next =
+					headerTabs.values[
+						(headerTabs.values.indexOf(current) + 1) % headerTabs.values.length
+					];
+				saveSrc(next.key);
+			} else {
+				console.log('left swipe');
+				const current = headerTabs.values.find((x) => x.key === src.value);
+				const next =
+					headerTabs.values[
+						(headerTabs.values.indexOf(current) - 1) % headerTabs.values.length
+					];
+				saveSrc(next.key);
+			}
+		} /* else {
+			if (yDiff > 0) {
+				// down swipe
+			} else {
+				// up swipe
+			}
+		} */
+		/* reset values */
+		xDown = null;
+		yDown = null;
+	}
+}
 </script>
 
 <style lang="scss" scoped>
-
 .cmuxhskf {
 	> .new {
 		position: sticky;
diff --git a/yarn.lock b/yarn.lock
index 999297cab..0615f1cb0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3900,7 +3900,6 @@ __metadata:
     start-server-and-test: 1.14.0
     strict-event-emitter-types: 2.0.0
     stringz: 2.1.0
-    swiped-events: ^1.1.6
     syuilo-password-strength: 0.0.1
     tesseract.js: ^2.1.5
     textarea-caret: 3.1.0
@@ -10360,13 +10359,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"natives@npm:^1.1.6":
-  version: 1.1.6
-  resolution: "natives@npm:1.1.6"
-  checksum: f9823dddba1eb71dc34f7e684d6d2bb39e709bdc54c42e89f27ec4a87966564644d88d2ea332ddfb91d00129a03d8e73abc35b09a0d985a80d6eaad95f3c1887
-  languageName: node
-  linkType: hard
-
 "natural-compare@npm:^1.4.0":
   version: 1.4.0
   resolution: "natural-compare@npm:1.4.0"
@@ -14054,15 +14046,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"swiped-events@npm:^1.1.6":
-  version: 1.1.6
-  resolution: "swiped-events@npm:1.1.6"
-  dependencies:
-    natives: ^1.1.6
-  checksum: c2c88d0390c667938213fe661c693522d32d0432acbd02ccb8f1883b67b503ffdfa22cbec89d2102d1f9f61023aa477b704920fd1ec883ae813d8756aacd5506
-  languageName: node
-  linkType: hard
-
 "symbol-tree@npm:^3.2.4":
   version: 3.2.4
   resolution: "symbol-tree@npm:3.2.4"

From 42df0515120d4279f048348795bcb30a940f6b5d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 15 Aug 2022 19:19:31 -0700
Subject: [PATCH 010/245] (by libs i meant libraries, lol)

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

diff --git a/package.json b/package.json
index f933f6d94..c8ed1e1f0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.5",
+	"version": "12.118.1-calc.6",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 053f1c0ac47377933f98c6fdb8b91e15ed2043ba Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 00:00:36 -0700
Subject: [PATCH 011/245] feat: :alembic: ripple effect

---
 packages/client/src/pages/timeline.vue | 75 +++++++++++++-------------
 packages/client/src/ui/universal.vue   | 12 +++++
 2 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 1967fc1a3..2a6f2740b 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -1,42 +1,43 @@
 <template>
-	<MkStickyContainer>
-		<template #header
-			><MkPageHeader
-				v-model:tab="src"
-				:actions="headerActions"
-				:tabs="headerTabs"
-				:display-my-avatar="true"
-		/></template>
-		<MkSpacer :content-max="800">
-			<div ref="rootEl" v-hotkey.global="keymap" class="cmuxhskf">
-				<XTutorial
-					v-if="$store.reactiveState.tutorial.value != -1"
-					class="tutorial _block"
-				/>
-				<XPostForm
-					v-if="$store.reactiveState.showFixedPostForm.value"
-					class="post-form _block"
-					fixed
-				/>
+<MkStickyContainer>
+	<template #header>
+		<MkPageHeader
+			v-model:tab="src"
+			:actions="headerActions"
+			:tabs="headerTabs"
+			:display-my-avatar="true"
+		/>
+	</template>
+	<MkSpacer :content-max="800">
+		<div ref="rootEl" v-hotkey.global="keymap" class="cmuxhskf">
+			<XTutorial
+				v-if="$store.reactiveState.tutorial.value != -1"
+				class="tutorial _block"
+			/>
+			<XPostForm
+				v-if="$store.reactiveState.showFixedPostForm.value"
+				class="post-form _block"
+				fixed
+			/>
 
-				<div v-if="queue > 0" class="new">
-					<button class="_buttonPrimary" @click="top()">
-						{{ i18n.ts.newNoteRecived }}
-					</button>
-				</div>
-				<div class="tl _block">
-					<XTimeline
-						ref="tl"
-						:key="src"
-						class="tl"
-						:src="src"
-						:sound="true"
-						@queue="queueUpdated"
-					/>
-				</div>
+			<div v-if="queue > 0" class="new">
+				<button class="_buttonPrimary" @click="top()">
+					{{ i18n.ts.newNoteRecived }}
+				</button>
 			</div>
-		</MkSpacer>
-	</MkStickyContainer>
+			<div class="tl _block">
+				<XTimeline
+					ref="tl"
+					:key="src"
+					class="tl"
+					:src="src"
+					:sound="true"
+					@queue="queueUpdated"
+				/>
+			</div>
+		</div>
+	</MkSpacer>
+</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
@@ -72,7 +73,6 @@ const DESKTOP_THRESHOLD = 1100;
 const MOBILE_THRESHOLD = 500;
 
 // デスクトップでウィンドウを狭くしたときモバイルUIが表示されて欲しいことはあるので deviceKind === 'desktop' の判定は行わない
-const isDesktop = ref(window.innerWidth >= DESKTOP_THRESHOLD);
 const isMobile = ref(
 	deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD
 );
@@ -297,6 +297,7 @@ if (isMobile.value) {
 		/* reset values */
 		xDown = null;
 		yDown = null;
+		return;
 	}
 }
 </script>
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index e2ec016ba..42af110bb 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -304,8 +304,20 @@ const wallpaper = localStorage.getItem('wallpaper') != null;
 			height: 64px;
 			border-radius: 8px;
 			background: var(--panel);
+			background-position: center;
+			transition: background 0.6s;
 			color: var(--fg);
 
+			&:hover {
+				background: var(--panelHover) radial-gradient(circle, transparent 1%, var(--panelHover) 1%) center/15000%;
+			}
+
+			&:active {
+				background-color: var(--accentedBg);
+				background-size: 100%;
+				transition: background 0s;
+			}
+
 			&:not(:last-child) {
 				margin-right: 12px;
 			}

From 0b99897410c0620c888ed92b88af06ea73f1a0ec Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 00:00:46 -0700
Subject: [PATCH 012/245] feat: :bookmark: .7

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

diff --git a/package.json b/package.json
index c8ed1e1f0..4a8731696 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.6",
+	"version": "12.118.1-calc.7",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From a0787d837a8a2b1b8a29be461378053e7dab8555 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 00:02:04 -0700
Subject: [PATCH 013/245] mark all as ready upon loading notifs

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

diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index acf338c2c..26ea07eaa 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -27,6 +27,7 @@ import { definePageMetadata } from '@/scripts/page-metadata';
 let tab = $ref('all');
 let includeTypes = $ref<string[] | null>(null);
 let unreadOnly = $computed(() => tab === 'unread');
+os.apiWithDialog('notifications/mark-all-as-read');
 
 const mentionsPagination = {
 	endpoint: 'notes/mentions' as const,

From 5b3d55c84f722f4e381d54940f71c89e2f278616 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 00:08:37 -0700
Subject: [PATCH 014/245] fix: :iphone: Fix for mobile

---
 package.json                         | 2 +-
 packages/client/src/ui/universal.vue | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 4a8731696..5fc979f1c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.7",
+	"version": "12.118.1-calc.8",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 42af110bb..a77dcfcc9 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -308,14 +308,10 @@ const wallpaper = localStorage.getItem('wallpaper') != null;
 			transition: background 0.6s;
 			color: var(--fg);
 
-			&:hover {
-				background: var(--panelHover) radial-gradient(circle, transparent 1%, var(--panelHover) 1%) center/15000%;
-			}
-
 			&:active {
 				background-color: var(--accentedBg);
 				background-size: 100%;
-				transition: background 0s;
+				transition: background 0.1s;
 			}
 
 			&:not(:last-child) {

From bc6abeca6df5267b8b7fcef885eba92cca64dbe8 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 00:10:47 -0700
Subject: [PATCH 015/245] fix: :ambulance: No with dialog on load

---
 package.json                                | 2 +-
 packages/client/src/pages/notifications.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 5fc979f1c..f925ce25f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.8",
+	"version": "12.118.1-calc.9",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index 26ea07eaa..a3539ac7e 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -27,7 +27,7 @@ import { definePageMetadata } from '@/scripts/page-metadata';
 let tab = $ref('all');
 let includeTypes = $ref<string[] | null>(null);
 let unreadOnly = $computed(() => tab === 'unread');
-os.apiWithDialog('notifications/mark-all-as-read');
+os.api('notifications/mark-all-as-read');
 
 const mentionsPagination = {
 	endpoint: 'notes/mentions' as const,

From a68ff96dc5df584c74cc67943d83f30a7ad4b441 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 00:11:59 -0700
Subject: [PATCH 016/245] fix: :bug: more mobile stuff

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

diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index a77dcfcc9..e1b46ecae 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -326,9 +326,9 @@ const wallpaper = localStorage.getItem('wallpaper') != null;
 				}
 			}
 
-			&:hover {
+			/* &:hover {
 				background: var(--X2);
-			}
+			} */
 
 			> .indicator {
 				position: absolute;

From d5ab9d05bcd50c0d69d9e4b89c09d1cf0869f414 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 00:12:11 -0700
Subject: [PATCH 017/245] .10

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

diff --git a/package.json b/package.json
index f925ce25f..3aa704aa6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.9",
+	"version": "12.118.1-calc.10",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 011574799798ad6b3c1f6a7f3301fa681c2b2b52 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 00:22:37 -0700
Subject: [PATCH 018/245] feat: :sparkles: Make mobile account avatar clickable

---
 package.json                                         |  2 +-
 .../client/src/components/global/page-header.vue     | 12 ++++++++++--
 packages/client/src/ui/universal.vue                 |  5 -----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 3aa704aa6..70c24b56f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.10",
+	"version": "12.118.1-calc.11",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/global/page-header.vue b/packages/client/src/components/global/page-header.vue
index c5aff22db..14aaf45e5 100644
--- a/packages/client/src/components/global/page-header.vue
+++ b/packages/client/src/components/global/page-header.vue
@@ -1,7 +1,9 @@
 <template>
 <div v-if="show" ref="el" class="fdidabkb" :class="{ slim: narrow, thin: thin_ }" :style="{ background: bg }" @click="onClick">
 	<div v-if="narrow" class="buttons left">
-		<MkAvatar v-if="props.displayMyAvatar && $i" class="avatar" :user="$i" :disable-preview="true"/>
+		<button v-click-anime v-tooltip.noDelay.right="`${i18n.ts.account}: @${$i.username}`" class="item _button account" @click="openAccountMenu">
+			<MkAvatar v-if="props.displayMyAvatar && $i" class="avatar" :user="$i" :disable-preview="true"/>
+		</button>
 	</div>
 	<template v-if="metadata">
 		<div v-if="!hideTitle" class="titleContainer" @click="showTabsPopup">
@@ -44,7 +46,7 @@ import { scrollToTop } from '@/scripts/scroll';
 import { i18n } from '@/i18n';
 import { globalEvents } from '@/events';
 import { injectPageMetadata } from '@/scripts/page-metadata';
-import { $i } from '@/account';
+import { $i, openAccountMenu as openAccountMenu_ } from '@/account';
 
 type Tab = {
 	key?: string | null;
@@ -87,6 +89,12 @@ const show = $computed(() => {
 	return !hideTitle || hasTabs || hasActions;
 });
 
+const openAccountMenu = (ev: MouseEvent) => {
+	openAccountMenu_({
+		withExtraOperation: true,
+	}, ev);
+};
+
 const showTabsPopup = (ev: MouseEvent) => {
 	if (!hasTabs) return;
 	if (!narrow) return;
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index e1b46ecae..2d80907c4 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -325,11 +325,6 @@ const wallpaper = localStorage.getItem('wallpaper') != null;
 					margin-right: 8px;
 				}
 			}
-
-			/* &:hover {
-				background: var(--X2);
-			} */
-
 			> .indicator {
 				position: absolute;
 				top: 0;

From f8a410a843e6b14efb016f2eca23b370a5a76e3c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 00:25:47 -0700
Subject: [PATCH 019/245] fix: :bug: fix avatar not showing up

---
 package.json                                          | 2 +-
 packages/client/src/components/global/page-header.vue | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 70c24b56f..5295936e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.11",
+	"version": "12.118.1-calc.12",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/global/page-header.vue b/packages/client/src/components/global/page-header.vue
index 14aaf45e5..394950515 100644
--- a/packages/client/src/components/global/page-header.vue
+++ b/packages/client/src/components/global/page-header.vue
@@ -1,9 +1,7 @@
 <template>
 <div v-if="show" ref="el" class="fdidabkb" :class="{ slim: narrow, thin: thin_ }" :style="{ background: bg }" @click="onClick">
 	<div v-if="narrow" class="buttons left">
-		<button v-click-anime v-tooltip.noDelay.right="`${i18n.ts.account}: @${$i.username}`" class="item _button account" @click="openAccountMenu">
-			<MkAvatar v-if="props.displayMyAvatar && $i" class="avatar" :user="$i" :disable-preview="true"/>
-		</button>
+		<MkAvatar v-if="props.displayMyAvatar && $i" class="avatar" :user="$i" :disable-preview="true" @click="openAccountMenu"/>
 	</div>
 	<template v-if="metadata">
 		<div v-if="!hideTitle" class="titleContainer" @click="showTabsPopup">

From b6dcfede43888e451fdae7fd17b5910c3cccfce6 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 00:28:33 -0700
Subject: [PATCH 020/245] fix: :alembic:

---
 package.json                                          | 2 +-
 packages/client/src/components/global/page-header.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 5295936e4..6572d3489 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.12",
+	"version": "12.118.1-calc.3",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/global/page-header.vue b/packages/client/src/components/global/page-header.vue
index 394950515..5f17e61cf 100644
--- a/packages/client/src/components/global/page-header.vue
+++ b/packages/client/src/components/global/page-header.vue
@@ -1,7 +1,7 @@
 <template>
 <div v-if="show" ref="el" class="fdidabkb" :class="{ slim: narrow, thin: thin_ }" :style="{ background: bg }" @click="onClick">
-	<div v-if="narrow" class="buttons left">
-		<MkAvatar v-if="props.displayMyAvatar && $i" class="avatar" :user="$i" :disable-preview="true" @click="openAccountMenu"/>
+	<div v-if="narrow" class="buttons left" @click="openAccountMenu">
+		<MkAvatar v-if="props.displayMyAvatar && $i" class="avatar" :user="$i" :disable-preview="true"/>
 	</div>
 	<template v-if="metadata">
 		<div v-if="!hideTitle" class="titleContainer" @click="showTabsPopup">

From 70a4b5bf1f5571da086a9326ac60b748531c04db Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 16:32:44 -0700
Subject: [PATCH 021/245] feat: :alembic: vue-plyr

---
 package.json                                  |  2 +-
 packages/client/package.json                  |  1 +
 .../client/src/components/media-video.vue     | 29 ++++---
 yarn.lock                                     | 86 ++++++++++++++++++-
 4 files changed, 102 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 6572d3489..506e48689 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.3",
+	"version": "12.118.1-calc.4",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/package.json b/packages/client/package.json
index b43b3c03d..5757f9407 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -60,6 +60,7 @@
 		"vanilla-tilt": "1.7.2",
 		"vite": "3.0.7",
 		"vue": "3.2.37",
+		"vue-plyr": "^7.0.0",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vuedraggable": "4.0.1"
 	},
diff --git a/packages/client/src/components/media-video.vue b/packages/client/src/components/media-video.vue
index 5c38691e6..855062dd8 100644
--- a/packages/client/src/components/media-video.vue
+++ b/packages/client/src/components/media-video.vue
@@ -6,19 +6,21 @@
 	</div>
 </div>
 <div v-else class="kkjnbbplepmiyuadieoenjgutgcmtsvu">
-	<video
-		:poster="video.thumbnailUrl"
-		:title="video.comment"
-		:alt="video.comment"
-		preload="none"
-		controls
-		@contextmenu.stop
-	>
-		<source 
-			:src="video.url" 
-			:type="video.type"
+	<vue-plyr>
+		<video
+			:poster="video.thumbnailUrl"
+			:title="video.comment"
+			:alt="video.comment"
+			preload="none"
+			controls
+			@contextmenu.stop
 		>
-	</video>
+			<source
+				:src="video.url"
+				:type="video.type"
+			>
+		</video>
+	</vue-plyr>
 	<i class="fas fa-eye-slash" @click="hide = true"></i>
 </div>
 </template>
@@ -26,7 +28,9 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import * as misskey from 'misskey-js';
+import VuePlyr from 'vue-plyr';
 import { defaultStore } from '@/store';
+import 'vue-plyr/dist/vue-plyr.css';
 
 const props = defineProps<{
 	video: misskey.entities.DriveFile;
@@ -38,6 +42,7 @@ const hide = ref((defaultStore.state.nsfw === 'force') ? true : props.video.isSe
 <style lang="scss" scoped>
 .kkjnbbplepmiyuadieoenjgutgcmtsvu {
 	position: relative;
+	--plyr-color-main: var(--accent);
 
 	> i {
 		display: block;
diff --git a/yarn.lock b/yarn.lock
index 0615f1cb0..b79834ddc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -33,7 +33,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.16.4, @babel/parser@npm:^7.6.0, @babel/parser@npm:^7.9.6":
+"@babel/parser@npm:^7.16.4, @babel/parser@npm:^7.18.4, @babel/parser@npm:^7.6.0, @babel/parser@npm:^7.9.6":
   version: 7.18.11
   resolution: "@babel/parser@npm:7.18.11"
   bin:
@@ -1974,6 +1974,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vue/compiler-sfc@npm:2.7.8":
+  version: 2.7.8
+  resolution: "@vue/compiler-sfc@npm:2.7.8"
+  dependencies:
+    "@babel/parser": ^7.18.4
+    postcss: ^8.4.14
+    source-map: ^0.6.1
+  checksum: da0b4b0866224fe2aee376a88c25914da4e73ba9e11e7aa2ed240b99897735b4a988e951dcae9c8f0843216c5a97050bf16e1bb04bf65541444a8bdfedc35b38
+  languageName: node
+  linkType: hard
+
 "@vue/compiler-sfc@npm:3.2.37":
   version: 3.2.37
   resolution: "@vue/compiler-sfc@npm:3.2.37"
@@ -3914,6 +3925,7 @@ __metadata:
     vanilla-tilt: 1.7.2
     vite: 3.0.7
     vue: 3.2.37
+    vue-plyr: ^7.0.0
     vue-prism-editor: 2.0.0-alpha.2
     vuedraggable: 4.0.1
   languageName: unknown
@@ -4400,7 +4412,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-js@npm:3":
+"core-js@npm:3, core-js@npm:^3.22.0":
   version: 3.24.1
   resolution: "core-js@npm:3.24.1"
   checksum: 6fb5bf0fd9e9f3e69d95616dd03332fea6758a715d2628c108b5faf17b48b0f580e90c4febb0a523c4665b0991a810de16289f86187fe79d70cc722dbd3edf0e
@@ -4599,6 +4611,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"csstype@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "csstype@npm:3.1.0"
+  checksum: 644e986cefab86525f0b674a06889cfdbb1f117e5b7d1ce0fc55b0423ecc58807a1ea42ecc75c4f18999d14fc42d1d255f84662a45003a52bb5840e977eb2ffd
+  languageName: node
+  linkType: hard
+
+"custom-event-polyfill@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "custom-event-polyfill@npm:1.0.7"
+  checksum: f9ff2cf13e482a75b3cf83dce9e2c6e3063c5ac1b9c23ac440e4f27e875b0873445b11811237f3f30aeb1216e9ad20f9f9d30ccf5b1b658a4e50dd0b3e67b629
+  languageName: node
+  linkType: hard
+
 "cwise-compiler@npm:^1.0.0, cwise-compiler@npm:^1.1.2":
   version: 1.1.3
   resolution: "cwise-compiler@npm:1.1.3"
@@ -9410,6 +9436,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"loadjs@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "loadjs@npm:4.2.0"
+  checksum: 2144723f55c75260ce6781b36009c40d098d96fe06e3ec5c85ba250cf96c3a0aa37169b829e818c40bcba7c5141a8e52736fec193333bb6260ab95f9a493a2ef
+  languageName: node
+  linkType: hard
+
 "locate-path@npm:^5.0.0":
   version: 5.0.0
   resolution: "locate-path@npm:5.0.0"
@@ -11514,6 +11547,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"plyr@github:sampotts/plyr#develop":
+  version: 3.7.0
+  resolution: "plyr@https://github.com/sampotts/plyr.git#commit=d434c9af16e641400aaee93188594208d88f2658"
+  dependencies:
+    core-js: ^3.22.0
+    custom-event-polyfill: ^1.0.7
+    loadjs: ^4.2.0
+    rangetouch: ^2.0.1
+    url-polyfill: ^1.1.12
+  checksum: ee85815c1c992141af030d71f70e79532814b142b0057c1bedbf7c74000a79f647147bb1f03f3a9f725341afa43e848e7b54168361d95285dfed30d53be63607
+  languageName: node
+  linkType: hard
+
 "pngjs-nozlib@npm:1.0.0":
   version: 1.0.0
   resolution: "pngjs-nozlib@npm:1.0.0"
@@ -11849,7 +11895,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.1.10, postcss@npm:^8.3.11, postcss@npm:^8.4.16":
+"postcss@npm:^8.1.10, postcss@npm:^8.3.11, postcss@npm:^8.4.14, postcss@npm:^8.4.16":
   version: 8.4.16
   resolution: "postcss@npm:8.4.16"
   dependencies:
@@ -12390,6 +12436,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rangetouch@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "rangetouch@npm:2.0.1"
+  checksum: 2aa7c0901d28356ef0c02021656ed7d11fc6652f01ffe92806862fc4593e75f7a5d52d4455fa1b0ab2123d438e03dc091315949dbfad9562a680440ac0dfeb7d
+  languageName: node
+  linkType: hard
+
 "ratelimiter@npm:3.4.1":
   version: 3.4.1
   resolution: "ratelimiter@npm:3.4.1"
@@ -14986,6 +15039,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"url-polyfill@npm:^1.1.12":
+  version: 1.1.12
+  resolution: "url-polyfill@npm:1.1.12"
+  checksum: 3214cc82424c215e921dacadac56b4b099f995d24e14078369bea9ff8aa74d1a4c803ab03021e61e0a275bee7979d212d046092dba3aab73cf232ee6739ddee4
+  languageName: node
+  linkType: hard
+
 "url@npm:0.10.3":
   version: 0.10.3
   resolution: "url@npm:0.10.3"
@@ -15268,6 +15328,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vue-plyr@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "vue-plyr@npm:7.0.0"
+  dependencies:
+    plyr: "github:sampotts/plyr#develop"
+    vue: ^2.6.12
+  checksum: 004d830cfc9dbe0563cafafab6240379b7224362d3e60d8d441126f0eaafd2487c7416cb434482165b52e961b83f020dfbc2645536aa8ba991f101477d984206
+  languageName: node
+  linkType: hard
+
 "vue-prism-editor@npm:2.0.0-alpha.2":
   version: 2.0.0-alpha.2
   resolution: "vue-prism-editor@npm:2.0.0-alpha.2"
@@ -15290,6 +15360,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vue@npm:^2.6.12":
+  version: 2.7.8
+  resolution: "vue@npm:2.7.8"
+  dependencies:
+    "@vue/compiler-sfc": 2.7.8
+    csstype: ^3.1.0
+  checksum: 45fc85a13fc027798ad859fe4a5509b54217ae2f129240fc349a799bd4dbc6848ef8fa9968ab7ef7afcb954735882dbfdeb746673aa3f051e4d7ae555c213a1b
+  languageName: node
+  linkType: hard
+
 "vuedraggable@npm:4.0.1":
   version: 4.0.1
   resolution: "vuedraggable@npm:4.0.1"

From 00296f4eb01be2c6b9e10fbcf5982d042b090084 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 16:33:10 -0700
Subject: [PATCH 022/245] cl

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

diff --git a/CALCKEY.md b/CALCKEY.md
index 13a38cfe9..8ce5b4274 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -23,6 +23,7 @@
 
 - OCR image captioning
 - Swipe through timelines on mobile
+- vue-plyr as video/audio player
 - Admin custom CSS
 - Add back time machine (jump to date)
 - Improve accesibility score

From db61c366e8ad1453fb9396ff94e0255caa61efac Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 16:40:04 -0700
Subject: [PATCH 023/245] fix: :art: mount plyr with app

---
 packages/client/src/components/media-video.vue | 2 --
 packages/client/src/init.ts                    | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/media-video.vue b/packages/client/src/components/media-video.vue
index 855062dd8..061e9f1c1 100644
--- a/packages/client/src/components/media-video.vue
+++ b/packages/client/src/components/media-video.vue
@@ -28,9 +28,7 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import * as misskey from 'misskey-js';
-import VuePlyr from 'vue-plyr';
 import { defaultStore } from '@/store';
-import 'vue-plyr/dist/vue-plyr.css';
 
 const props = defineProps<{
 	video: misskey.entities.DriveFile;
diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index 8b490bbab..9cb921bfb 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -21,6 +21,8 @@ import widgets from '@/widgets';
 import directives from '@/directives';
 import components from '@/components';
 import { version, ui, lang, host } from '@/config';
+import VuePlyr from 'vue-plyr';
+import 'vue-plyr/dist/vue-plyr.css';
 import { applyTheme } from '@/scripts/theme';
 import { isDeviceDarkmode } from '@/scripts/is-device-darkmode';
 import { i18n } from '@/i18n';
@@ -39,6 +41,7 @@ import { reactionPicker } from '@/scripts/reaction-picker';
 import { getUrlWithoutLoginId } from '@/scripts/login-id';
 import { getAccountFromId } from '@/scripts/get-account-from-id';
 
+
 (async () => {
 	console.info(`Calckey v${version}`);
 
@@ -176,6 +179,8 @@ import { getAccountFromId } from '@/scripts/get-account-from-id';
 		defineAsyncComponent(() => import('@/ui/universal.vue')),
 	);
 
+	app.use(VuePlyr, { plyr: {} });
+
 	if (_DEV_) {
 		app.config.performance = true;
 	}

From da46c55db7144ff7577de45ca8d17f38c7d5f7a8 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 17:43:33 -0700
Subject: [PATCH 024/245] fix: :zap: Better import for plyr

---
 package.json                                  |  2 +-
 .../client/src/components/media-banner.vue    | 19 ++++++++++++-------
 .../client/src/components/media-video.vue     |  6 ++++--
 packages/client/src/init.ts                   |  4 ----
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 506e48689..e3c6eb6b1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.4",
+	"version": "12.118.1-calc.4.1",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/media-banner.vue b/packages/client/src/components/media-banner.vue
index 5093f11e9..7382e953a 100644
--- a/packages/client/src/components/media-banner.vue
+++ b/packages/client/src/components/media-banner.vue
@@ -6,13 +6,15 @@
 		<span>{{ $ts.clickToShow }}</span>
 	</div>
 	<div v-else-if="media.type.startsWith('audio') && media.type !== 'audio/midi'" class="audio">
-		<audio ref="audioEl"
-			class="audio"
-			:src="media.url"
-			:title="media.name"
-			controls
-			preload="metadata"
-			@volumechange="volumechange" />
+		<VuePlyr>
+			<audio ref="audioEl"
+				class="audio"
+				:src="media.url"
+				:title="media.name"
+				controls
+				preload="metadata"
+				@volumechange="volumechange" />
+		</VuePlyr>
 	</div>
 	<a v-else class="download"
 		:href="media.url"
@@ -28,7 +30,9 @@
 <script lang="ts" setup>
 import { onMounted } from 'vue';
 import * as misskey from 'misskey-js';
+import VuePlyr from 'vue-plyr';
 import { ColdDeviceStorage } from '@/store';
+import 'vue-plyr/dist/vue-plyr.css';
 
 const props = withDefaults(defineProps<{
 	media: misskey.entities.DriveFile;
@@ -53,6 +57,7 @@ onMounted(() => {
 	border-radius: 4px;
 	margin-top: 4px;
 	overflow: hidden;
+	--plyr-color-main: var(--accent);
 
 	> .download,
 	> .sensitive {
diff --git a/packages/client/src/components/media-video.vue b/packages/client/src/components/media-video.vue
index 061e9f1c1..0dfd304aa 100644
--- a/packages/client/src/components/media-video.vue
+++ b/packages/client/src/components/media-video.vue
@@ -6,7 +6,7 @@
 	</div>
 </div>
 <div v-else class="kkjnbbplepmiyuadieoenjgutgcmtsvu">
-	<vue-plyr>
+	<VuePlyr>
 		<video
 			:poster="video.thumbnailUrl"
 			:title="video.comment"
@@ -20,7 +20,7 @@
 				:type="video.type"
 			>
 		</video>
-	</vue-plyr>
+	</VuePlyr>
 	<i class="fas fa-eye-slash" @click="hide = true"></i>
 </div>
 </template>
@@ -28,7 +28,9 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import * as misskey from 'misskey-js';
+import VuePlyr from 'vue-plyr';
 import { defaultStore } from '@/store';
+import 'vue-plyr/dist/vue-plyr.css';
 
 const props = defineProps<{
 	video: misskey.entities.DriveFile;
diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index 9cb921bfb..e977b4de5 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -21,8 +21,6 @@ import widgets from '@/widgets';
 import directives from '@/directives';
 import components from '@/components';
 import { version, ui, lang, host } from '@/config';
-import VuePlyr from 'vue-plyr';
-import 'vue-plyr/dist/vue-plyr.css';
 import { applyTheme } from '@/scripts/theme';
 import { isDeviceDarkmode } from '@/scripts/is-device-darkmode';
 import { i18n } from '@/i18n';
@@ -179,8 +177,6 @@ import { getAccountFromId } from '@/scripts/get-account-from-id';
 		defineAsyncComponent(() => import('@/ui/universal.vue')),
 	);
 
-	app.use(VuePlyr, { plyr: {} });
-
 	if (_DEV_) {
 		app.config.performance = true;
 	}

From 4ef944037f73750ff869471276bb0a7ea95484cb Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 18:29:18 -0700
Subject: [PATCH 025/245] feat: :bookmark: .5

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

diff --git a/package.json b/package.json
index e3c6eb6b1..f933f6d94 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.4.1",
+	"version": "12.118.1-calc.5",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From d35f234fb503d6c026af2a32609fc6c24f2244d6 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 22:42:03 -0700
Subject: [PATCH 026/245] feat: :lipstick: New note style

---
 CALCKEY.md                              |  5 +++--
 package.json                            |  2 +-
 packages/client/src/components/note.vue | 23 ++++++++++++++++++++++-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index 8ce5b4274..edc0e3f99 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -23,7 +23,6 @@
 
 - OCR image captioning
 - Swipe through timelines on mobile
-- vue-plyr as video/audio player
 - Admin custom CSS
 - Add back time machine (jump to date)
 - Improve accesibility score
@@ -47,7 +46,6 @@
 - Self hosted, newly designed error images
   - Illustrated by [Henki](https://www.youtube.com/c/Henkiwashere)!
   - Licensed under the CC-BY-SA 4.0.
-- [Profile background as banner](https://codeberg.org/Freeplay/Misskey-Tweaks/src/branch/main/snippets/profile-background.styl)
 - Better timeline top bar
 - Mark as read from notifications widget
 - Less cluttered notification summary
@@ -62,6 +60,7 @@
 - Reply limit bug fixed
 - Make showing the update popup optional
 - Obliteration of Ai-chan
+- vue-plyr as video/audio player
 - [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996)
 - [OAuth bearer token authentication](https://github.com/misskey-dev/misskey/pull/9021)
 - [Styled Repair Tools](https://github.com/misskey-dev/misskey/pull/8956)
@@ -93,3 +92,5 @@
 	- 30d8bc9259cb6b72ed76d67b21dbb4cdceca8327: refactor: welcome.setup.vue to composition api
 	- 751921e24f37ed707fe44a40d88eebb1299efa35: make emoji picker case insensitive
 	- 298febeb9c9501e3e3df16982c08657d1da474e0: enhance: add re-collapsing to quoted notes
+- A few changed from [Misskey-Tweaks](https://codeberg.org/Freeplay/Misskey-Tweaks)
+  - [Profile background as banner](https://codeberg.org/Freeplay/Misskey-Tweaks/src/branch/main/snippets/profile-background.styl)
diff --git a/package.json b/package.json
index f933f6d94..c8ed1e1f0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.5",
+	"version": "12.118.1-calc.6",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/note.vue b/packages/client/src/components/note.vue
index f6f763231..31f79f981 100644
--- a/packages/client/src/components/note.vue
+++ b/packages/client/src/components/note.vue
@@ -340,7 +340,7 @@ function readPromo() {
 		line-height: 24px;
 		font-size: 90%;
 		white-space: pre;
-		color: #d28a3f;
+		color: #f6c177;
 
 		> i {
 			margin-right: 4px;
@@ -401,6 +401,14 @@ function readPromo() {
 				flex-shrink: 0;
 				color: inherit;
 
+				&::after {
+					content: "";
+					position: absolute;
+					inset: 0;
+					z-index: -1;
+					cursor: default;
+				}
+
 				> .dropdownIcon {
 					margin-right: 4px;
 				}
@@ -415,6 +423,12 @@ function readPromo() {
 	> .article {
 		display: flex;
 		padding: 28px 32px 18px;
+		pointer-events: all;
+		transition: background-color 0.25s ease-in-out;
+
+		&:hover {
+			background-color: var(--panelHighlight);
+		}
 
 		> .avatar {
 			flex-shrink: 0;
@@ -438,6 +452,11 @@ function readPromo() {
 					margin: 0;
 					padding: 0;
 					overflow-wrap: break-word;
+					background: var(--X3);
+					padding: 6px 10px;
+					width: 90%;
+					border-radius: 10px;
+					margin-top: 10px;
 
 					> .text {
 						margin-right: 8px;
@@ -445,6 +464,8 @@ function readPromo() {
 				}
 
 				> .content {
+					position: relative;
+
 					&.isLong {
 						> .showLess {
 							width: 100%;

From fe7a273aeeb03b309362d20e65526cd08263d91b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 22:47:18 -0700
Subject: [PATCH 027/245] fix: :lipstick: style

---
 CALCKEY.md                                   |  1 +
 package.json                                 |  2 +-
 packages/client/src/components/cw-button.vue |  1 +
 packages/client/src/components/note.vue      | 23 +++++++++++---------
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index edc0e3f99..efa7e8ad4 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -21,6 +21,7 @@
 
 ## Work in progress
 
+- New note style
 - OCR image captioning
 - Swipe through timelines on mobile
 - Admin custom CSS
diff --git a/package.json b/package.json
index c8ed1e1f0..fe766e919 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.6",
+	"version": "12.118.1-calc.6.1",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/cw-button.vue b/packages/client/src/components/cw-button.vue
index dd906f9bf..8cec6c1a9 100644
--- a/packages/client/src/components/cw-button.vue
+++ b/packages/client/src/components/cw-button.vue
@@ -42,6 +42,7 @@ const toggle = () => {
 	color: var(--cwFg);
 	background: var(--cwBg);
 	border-radius: 2px;
+	transition: background-color 0.25s ease-in-out;
 
 	&:hover {
 		background: var(--cwHoverBg);
diff --git a/packages/client/src/components/note.vue b/packages/client/src/components/note.vue
index 31f79f981..746b5b23c 100644
--- a/packages/client/src/components/note.vue
+++ b/packages/client/src/components/note.vue
@@ -298,6 +298,11 @@ function readPromo() {
 	font-size: 1.05em;
 	overflow: clip;
 	contain: content;
+	transition: background-color 0.25s ease-in-out;
+
+	&:hover {
+		background-color: var(--panelHighlight);
+	}
 
 	// これらの指定はパフォーマンス向上には有効だが、ノートの高さは一定でないため、
 	// 下の方までスクロールすると上のノートの高さがここで決め打ちされたものに変化し、表示しているノートの位置が変わってしまう
@@ -424,11 +429,6 @@ function readPromo() {
 		display: flex;
 		padding: 28px 32px 18px;
 		pointer-events: all;
-		transition: background-color 0.25s ease-in-out;
-
-		&:hover {
-			background-color: var(--panelHighlight);
-		}
 
 		> .avatar {
 			flex-shrink: 0;
@@ -452,11 +452,14 @@ function readPromo() {
 					margin: 0;
 					padding: 0;
 					overflow-wrap: break-word;
-					background: var(--X3);
-					padding: 6px 10px;
-					width: 90%;
-					border-radius: 10px;
-					margin-top: 10px;
+
+					> .button {
+						background: var(--X3);
+						padding: 6px 10px;
+						width: 90%;
+						border-radius: 10px;
+						margin-top: 10px;
+					}
 
 					> .text {
 						margin-right: 8px;

From 387d388da9d80294fc581cf2eec76f4afebc9911 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 22:53:17 -0700
Subject: [PATCH 028/245] I quickly became homophobic

---
 package.json                            |  2 +-
 packages/client/src/components/note.vue | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index fe766e919..127236682 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.6.1",
+	"version": "12.118.1-calc.6.2",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/note.vue b/packages/client/src/components/note.vue
index 746b5b23c..f6a250449 100644
--- a/packages/client/src/components/note.vue
+++ b/packages/client/src/components/note.vue
@@ -298,11 +298,6 @@ function readPromo() {
 	font-size: 1.05em;
 	overflow: clip;
 	contain: content;
-	transition: background-color 0.25s ease-in-out;
-
-	&:hover {
-		background-color: var(--panelHighlight);
-	}
 
 	// これらの指定はパフォーマンス向上には有効だが、ノートの高さは一定でないため、
 	// 下の方までスクロールすると上のノートの高さがここで決め打ちされたものに変化し、表示しているノートの位置が変わってしまう
@@ -331,6 +326,11 @@ function readPromo() {
 			border: solid 1px var(--focus);
 			border-radius: var(--radius);
 			box-sizing: border-box;
+			transition: background-color 0.25s ease-in-out;
+
+			&:hover {
+				background-color: var(--panelHighlight);
+			}
 		}
 	}
 

From ec60046469e6b978bcc12f4e5545062c50056720 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 22:59:29 -0700
Subject: [PATCH 029/245] fix: :lipstick: style

---
 package.json                                 |  2 +-
 packages/client/src/components/cw-button.vue |  9 ++++++---
 packages/client/src/components/note.vue      | 15 ---------------
 packages/client/src/components/notes.vue     |  5 +++++
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index 127236682..e200aedfd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.6.2",
+	"version": "12.118.1-calc.6.3",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/cw-button.vue b/packages/client/src/components/cw-button.vue
index 8cec6c1a9..d37bd5e13 100644
--- a/packages/client/src/components/cw-button.vue
+++ b/packages/client/src/components/cw-button.vue
@@ -38,14 +38,17 @@ const toggle = () => {
 .nrvgflfu {
 	display: inline-block;
 	padding: 4px 8px;
-	font-size: 0.7em;
+	font-size: 0.8em;
 	color: var(--cwFg);
 	background: var(--cwBg);
-	border-radius: 2px;
+	padding: 6px 10px;
+	width: 90%;
+	border-radius: 10px;
+	margin-top: 10px;
 	transition: background-color 0.25s ease-in-out;
 
 	&:hover {
-		background: var(--cwHoverBg);
+		background: var(--X3);
 	}
 
 	> span {
diff --git a/packages/client/src/components/note.vue b/packages/client/src/components/note.vue
index f6a250449..a3c51c03d 100644
--- a/packages/client/src/components/note.vue
+++ b/packages/client/src/components/note.vue
@@ -326,11 +326,6 @@ function readPromo() {
 			border: solid 1px var(--focus);
 			border-radius: var(--radius);
 			box-sizing: border-box;
-			transition: background-color 0.25s ease-in-out;
-
-			&:hover {
-				background-color: var(--panelHighlight);
-			}
 		}
 	}
 
@@ -428,7 +423,6 @@ function readPromo() {
 	> .article {
 		display: flex;
 		padding: 28px 32px 18px;
-		pointer-events: all;
 
 		> .avatar {
 			flex-shrink: 0;
@@ -452,15 +446,6 @@ function readPromo() {
 					margin: 0;
 					padding: 0;
 					overflow-wrap: break-word;
-
-					> .button {
-						background: var(--X3);
-						padding: 6px 10px;
-						width: 90%;
-						border-radius: 10px;
-						margin-top: 10px;
-					}
-
 					> .text {
 						margin-right: 8px;
 					}
diff --git a/packages/client/src/components/notes.vue b/packages/client/src/components/notes.vue
index cf4edbc83..22f4f4296 100644
--- a/packages/client/src/components/notes.vue
+++ b/packages/client/src/components/notes.vue
@@ -51,6 +51,11 @@ defineExpose({
 			.qtqtichx {
 				background: var(--panel);
 				border-radius: var(--radius);
+				transition: background-color 0.25s ease-in-out;
+
+				&:hover {
+					background-color: var(--panelHighlight);
+				}
 			}
 		}
 	}

From 38ebf778918f1ab2fa920ce0807de6295c0e4173 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 23:11:46 -0700
Subject: [PATCH 030/245] fix: :bug: fix clicking on note content

---
 CALCKEY.md                              | 5 +++--
 package.json                            | 2 +-
 packages/client/src/components/note.vue | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index efa7e8ad4..4d574c0c9 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -21,7 +21,7 @@
 
 ## Work in progress
 
-- New note style
+- Improved note style
 - OCR image captioning
 - Swipe through timelines on mobile
 - Admin custom CSS
@@ -67,6 +67,7 @@
 - [Styled Repair Tools](https://github.com/misskey-dev/misskey/pull/8956)
 - [Option to make enter send message](https://github.com/misskey-dev/misskey/pull/8954)
 - [Autocomplete in messaging](https://github.com/misskey-dev/misskey/pull/8955)
+- [Profile background as banner](https://codeberg.org/Freeplay/Misskey-Tweaks/src/branch/main/snippets/profile-background.styl)
 - [Star is generic like/favorite](https://github.com/JakeMBauer/Misskey-Extras/blob/master/patches/star-is-like.patch)
   - 👍 also triggers generic like/favorite
 - [Add additional background for acrylic popups if backdrop-filter is unsupported](https://github.com/misskey-dev/misskey/pull/8671)
@@ -94,4 +95,4 @@
 	- 751921e24f37ed707fe44a40d88eebb1299efa35: make emoji picker case insensitive
 	- 298febeb9c9501e3e3df16982c08657d1da474e0: enhance: add re-collapsing to quoted notes
 - A few changed from [Misskey-Tweaks](https://codeberg.org/Freeplay/Misskey-Tweaks)
-  - [Profile background as banner](https://codeberg.org/Freeplay/Misskey-Tweaks/src/branch/main/snippets/profile-background.styl)
+  - 
diff --git a/package.json b/package.json
index e200aedfd..ed8a6219f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.6.3",
+	"version": "12.118.1-calc.6.4",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/note.vue b/packages/client/src/components/note.vue
index a3c51c03d..f9eb8ad18 100644
--- a/packages/client/src/components/note.vue
+++ b/packages/client/src/components/note.vue
@@ -438,6 +438,7 @@ function readPromo() {
 		> .main {
 			flex: 1;
 			min-width: 0;
+			pointer-events: all;
 
 			> .body {
 				> .cw {

From bd24de7ab7b02b4612b49292c80ee8a1d0dfa31b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 23:22:17 -0700
Subject: [PATCH 031/245] fix: :alembic:

---
 package.json                            | 2 +-
 packages/client/src/components/note.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index ed8a6219f..02d2785d1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.6.4",
+	"version": "12.118.1-calc.6.5",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/note.vue b/packages/client/src/components/note.vue
index f9eb8ad18..0010011c9 100644
--- a/packages/client/src/components/note.vue
+++ b/packages/client/src/components/note.vue
@@ -401,7 +401,7 @@ function readPromo() {
 				flex-shrink: 0;
 				color: inherit;
 
-				&::after {
+				&:after {
 					content: "";
 					position: absolute;
 					inset: 0;
@@ -453,7 +453,7 @@ function readPromo() {
 				}
 
 				> .content {
-					position: relative;
+					/* position: relative; */
 
 					&.isLong {
 						> .showLess {

From d6e92616be2e9101d52d39dd509427df5219d453 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 23:33:06 -0700
Subject: [PATCH 032/245] fix: :bug: do it right

---
 package.json                                     |  2 +-
 packages/client/src/components/note-detailed.vue |  4 ++--
 packages/client/src/components/note.vue          | 12 +-----------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 02d2785d1..1db29d111 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.6.5",
+	"version": "12.118.1-calc.6.6",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/note-detailed.vue b/packages/client/src/components/note-detailed.vue
index e8dd44e27..c4ee663c7 100644
--- a/packages/client/src/components/note-detailed.vue
+++ b/packages/client/src/components/note-detailed.vue
@@ -47,7 +47,7 @@
 			</div>
 		</header>
 		<div class="main">
-			<div class="body">
+			<div class="body" :to="notePage(appearNote)">
 				<p v-if="appearNote.cw != null" class="cw">
 					<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
 					<XCwButton v-model="showContent" :note="appearNote"/>
@@ -76,7 +76,7 @@
 			</div>
 			<footer class="footer">
 				<div class="info">
-					<MkA class="created-at" :to="notePage(appearNote)">
+					<MkA class="created-at">
 						<MkTime :time="appearNote.createdAt" mode="detail"/>
 					</MkA>
 				</div>
diff --git a/packages/client/src/components/note.vue b/packages/client/src/components/note.vue
index 0010011c9..f6692ded3 100644
--- a/packages/client/src/components/note.vue
+++ b/packages/client/src/components/note.vue
@@ -401,14 +401,6 @@ function readPromo() {
 				flex-shrink: 0;
 				color: inherit;
 
-				&:after {
-					content: "";
-					position: absolute;
-					inset: 0;
-					z-index: -1;
-					cursor: default;
-				}
-
 				> .dropdownIcon {
 					margin-right: 4px;
 				}
@@ -438,7 +430,6 @@ function readPromo() {
 		> .main {
 			flex: 1;
 			min-width: 0;
-			pointer-events: all;
 
 			> .body {
 				> .cw {
@@ -447,14 +438,13 @@ function readPromo() {
 					margin: 0;
 					padding: 0;
 					overflow-wrap: break-word;
+
 					> .text {
 						margin-right: 8px;
 					}
 				}
 
 				> .content {
-					/* position: relative; */
-
 					&.isLong {
 						> .showLess {
 							width: 100%;

From 5d8f695206bb1ca932334f69dff389c22aa7d162 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 23:43:24 -0700
Subject: [PATCH 033/245] fix: :bug: need MkA

---
 package.json                                  |  2 +-
 packages/client/src/components/cw-button.vue  |  1 +
 .../client/src/components/note-detailed.vue   | 96 ++++++++++---------
 3 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/package.json b/package.json
index 1db29d111..304efac6b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.6.6",
+	"version": "12.118.1-calc.6.7",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/cw-button.vue b/packages/client/src/components/cw-button.vue
index d37bd5e13..ec0ebac7c 100644
--- a/packages/client/src/components/cw-button.vue
+++ b/packages/client/src/components/cw-button.vue
@@ -45,6 +45,7 @@ const toggle = () => {
 	width: 90%;
 	border-radius: 10px;
 	margin-top: 10px;
+	margin-bottom: 10px;
 	transition: background-color 0.25s ease-in-out;
 
 	&:hover {
diff --git a/packages/client/src/components/note-detailed.vue b/packages/client/src/components/note-detailed.vue
index c4ee663c7..e44e9993d 100644
--- a/packages/client/src/components/note-detailed.vue
+++ b/packages/client/src/components/note-detailed.vue
@@ -46,58 +46,60 @@
 				<MkInstanceTicker v-if="showTicker" class="ticker" :instance="appearNote.user.instance"/>
 			</div>
 		</header>
-		<div class="main">
-			<div class="body" :to="notePage(appearNote)">
-				<p v-if="appearNote.cw != null" class="cw">
-					<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
-					<XCwButton v-model="showContent" :note="appearNote"/>
-				</p>
-				<div v-show="appearNote.cw == null || showContent" class="content">
-					<div class="text">
-						<MkA v-if="appearNote.replyId" class="reply" :to="`/notes/${appearNote.replyId}`"><i class="fas fa-reply"></i></MkA>
-						<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
-						<a v-if="appearNote.renote != null" class="rp">RN:</a>
-						<div v-if="translating || translation" class="translation">
-							<MkLoading v-if="translating" mini/>
-							<div v-else class="translated">
-								<b>{{ $t('translatedFrom', { x: translation.sourceLang }) }}: </b>
-								<Mfm :text="translation.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
+		<MkA class="created-at" :to="notePage(appearNote)">
+			<div class="main">
+				<div class="body">
+					<p v-if="appearNote.cw != null" class="cw">
+						<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
+						<XCwButton v-model="showContent" :note="appearNote"/>
+					</p>
+					<div v-show="appearNote.cw == null || showContent" class="content">
+						<div class="text">
+							<MkA v-if="appearNote.replyId" class="reply" :to="`/notes/${appearNote.replyId}`"><i class="fas fa-reply"></i></MkA>
+							<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
+							<a v-if="appearNote.renote != null" class="rp">RN:</a>
+							<div v-if="translating || translation" class="translation">
+								<MkLoading v-if="translating" mini/>
+								<div v-else class="translated">
+									<b>{{ $t('translatedFrom', { x: translation.sourceLang }) }}: </b>
+									<Mfm :text="translation.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
+								</div>
 							</div>
 						</div>
+						<div v-if="appearNote.files.length > 0" class="files">
+							<XMediaList :media-list="appearNote.files"/>
+						</div>
+						<XPoll v-if="appearNote.poll" ref="pollViewer" :note="appearNote" class="poll"/>
+						<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="true" class="url-preview"/>
+						<div v-if="appearNote.renote" class="renote"><XNoteSimple :note="appearNote.renote"/></div>
 					</div>
-					<div v-if="appearNote.files.length > 0" class="files">
-						<XMediaList :media-list="appearNote.files"/>
-					</div>
-					<XPoll v-if="appearNote.poll" ref="pollViewer" :note="appearNote" class="poll"/>
-					<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="true" class="url-preview"/>
-					<div v-if="appearNote.renote" class="renote"><XNoteSimple :note="appearNote.renote"/></div>
+					<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="fas fa-satellite-dish"></i> {{ appearNote.channel.name }}</MkA>
 				</div>
-				<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="fas fa-satellite-dish"></i> {{ appearNote.channel.name }}</MkA>
+				<footer class="footer">
+					<div class="info">
+						<MkA class="created-at" :to="notePage(appearNote)">
+							<MkTime :time="appearNote.createdAt" mode="detail"/>
+						</MkA>
+					</div>
+					<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
+					<button class="button _button" @click="reply()">
+						<template v-if="appearNote.reply"><i class="fas fa-reply-all"></i></template>
+						<template v-else><i class="fas fa-reply"></i></template>
+						<p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p>
+					</button>
+					<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
+					<button v-if="appearNote.myReaction == null" ref="reactButton" class="button _button" @click="react()">
+						<i class="fas fa-plus"></i>
+					</button>
+					<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
+						<i class="fas fa-minus"></i>
+					</button>
+					<button ref="menuButton" class="button _button" @click="menu()">
+						<i class="fas fa-ellipsis-h"></i>
+					</button>
+				</footer>
 			</div>
-			<footer class="footer">
-				<div class="info">
-					<MkA class="created-at">
-						<MkTime :time="appearNote.createdAt" mode="detail"/>
-					</MkA>
-				</div>
-				<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
-				<button class="button _button" @click="reply()">
-					<template v-if="appearNote.reply"><i class="fas fa-reply-all"></i></template>
-					<template v-else><i class="fas fa-reply"></i></template>
-					<p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p>
-				</button>
-				<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
-				<button v-if="appearNote.myReaction == null" ref="reactButton" class="button _button" @click="react()">
-					<i class="fas fa-plus"></i>
-				</button>
-				<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
-					<i class="fas fa-minus"></i>
-				</button>
-				<button ref="menuButton" class="button _button" @click="menu()">
-					<i class="fas fa-ellipsis-h"></i>
-				</button>
-			</footer>
-		</div>
+		</MkA>
 	</article>
 	<MkNoteSub v-for="note in directReplies" :key="note.id" :note="note" class="reply" :conversation="replies"/>
 </div>

From 2781a0aca4aa9dacb1a7a51466ba70a8609d7e65 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 23:50:35 -0700
Subject: [PATCH 034/245] fix: :bug: use router

---
 package.json                                  |  2 +-
 .../client/src/components/note-detailed.vue   | 98 +++++++++----------
 packages/client/src/components/note.vue       |  1 +
 3 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/package.json b/package.json
index 304efac6b..2ec7cf9be 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.6.7",
+	"version": "12.118.1-calc.6.8",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/note-detailed.vue b/packages/client/src/components/note-detailed.vue
index e44e9993d..61d5f5a8d 100644
--- a/packages/client/src/components/note-detailed.vue
+++ b/packages/client/src/components/note-detailed.vue
@@ -46,60 +46,58 @@
 				<MkInstanceTicker v-if="showTicker" class="ticker" :instance="appearNote.user.instance"/>
 			</div>
 		</header>
-		<MkA class="created-at" :to="notePage(appearNote)">
-			<div class="main">
-				<div class="body">
-					<p v-if="appearNote.cw != null" class="cw">
-						<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
-						<XCwButton v-model="showContent" :note="appearNote"/>
-					</p>
-					<div v-show="appearNote.cw == null || showContent" class="content">
-						<div class="text">
-							<MkA v-if="appearNote.replyId" class="reply" :to="`/notes/${appearNote.replyId}`"><i class="fas fa-reply"></i></MkA>
-							<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
-							<a v-if="appearNote.renote != null" class="rp">RN:</a>
-							<div v-if="translating || translation" class="translation">
-								<MkLoading v-if="translating" mini/>
-								<div v-else class="translated">
-									<b>{{ $t('translatedFrom', { x: translation.sourceLang }) }}: </b>
-									<Mfm :text="translation.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
-								</div>
+		<div class="main" @click="router.push(notePage(appearNote))">
+			<div class="body">
+				<p v-if="appearNote.cw != null" class="cw">
+					<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
+					<XCwButton v-model="showContent" :note="appearNote"/>
+				</p>
+				<div v-show="appearNote.cw == null || showContent" class="content">
+					<div class="text">
+						<MkA v-if="appearNote.replyId" class="reply" :to="`/notes/${appearNote.replyId}`"><i class="fas fa-reply"></i></MkA>
+						<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
+						<a v-if="appearNote.renote != null" class="rp">RN:</a>
+						<div v-if="translating || translation" class="translation">
+							<MkLoading v-if="translating" mini/>
+							<div v-else class="translated">
+								<b>{{ $t('translatedFrom', { x: translation.sourceLang }) }}: </b>
+								<Mfm :text="translation.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
 							</div>
 						</div>
-						<div v-if="appearNote.files.length > 0" class="files">
-							<XMediaList :media-list="appearNote.files"/>
-						</div>
-						<XPoll v-if="appearNote.poll" ref="pollViewer" :note="appearNote" class="poll"/>
-						<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="true" class="url-preview"/>
-						<div v-if="appearNote.renote" class="renote"><XNoteSimple :note="appearNote.renote"/></div>
 					</div>
-					<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="fas fa-satellite-dish"></i> {{ appearNote.channel.name }}</MkA>
+					<div v-if="appearNote.files.length > 0" class="files">
+						<XMediaList :media-list="appearNote.files"/>
+					</div>
+					<XPoll v-if="appearNote.poll" ref="pollViewer" :note="appearNote" class="poll"/>
+					<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="true" class="url-preview"/>
+					<div v-if="appearNote.renote" class="renote"><XNoteSimple :note="appearNote.renote"/></div>
 				</div>
-				<footer class="footer">
-					<div class="info">
-						<MkA class="created-at" :to="notePage(appearNote)">
-							<MkTime :time="appearNote.createdAt" mode="detail"/>
-						</MkA>
-					</div>
-					<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
-					<button class="button _button" @click="reply()">
-						<template v-if="appearNote.reply"><i class="fas fa-reply-all"></i></template>
-						<template v-else><i class="fas fa-reply"></i></template>
-						<p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p>
-					</button>
-					<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
-					<button v-if="appearNote.myReaction == null" ref="reactButton" class="button _button" @click="react()">
-						<i class="fas fa-plus"></i>
-					</button>
-					<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
-						<i class="fas fa-minus"></i>
-					</button>
-					<button ref="menuButton" class="button _button" @click="menu()">
-						<i class="fas fa-ellipsis-h"></i>
-					</button>
-				</footer>
+				<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="fas fa-satellite-dish"></i> {{ appearNote.channel.name }}</MkA>
 			</div>
-		</MkA>
+			<footer class="footer">
+				<div class="info">
+					<MkA class="created-at" :to="notePage(appearNote)">
+						<MkTime :time="appearNote.createdAt" mode="detail"/>
+					</MkA>
+				</div>
+				<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
+				<button class="button _button" @click="reply()">
+					<template v-if="appearNote.reply"><i class="fas fa-reply-all"></i></template>
+					<template v-else><i class="fas fa-reply"></i></template>
+					<p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p>
+				</button>
+				<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
+				<button v-if="appearNote.myReaction == null" ref="reactButton" class="button _button" @click="react()">
+					<i class="fas fa-plus"></i>
+				</button>
+				<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
+					<i class="fas fa-minus"></i>
+				</button>
+				<button ref="menuButton" class="button _button" @click="menu()">
+					<i class="fas fa-ellipsis-h"></i>
+				</button>
+			</footer>
+		</div>
 	</article>
 	<MkNoteSub v-for="note in directReplies" :key="note.id" :note="note" class="reply" :conversation="replies"/>
 </div>
@@ -141,6 +139,8 @@ import { i18n } from '@/i18n';
 import { getNoteMenu } from '@/scripts/get-note-menu';
 import { useNoteCapture } from '@/scripts/use-note-capture';
 
+const router = useRouter();
+
 const props = defineProps<{
 	note: misskey.entities.Note;
 	pinned?: boolean;
diff --git a/packages/client/src/components/note.vue b/packages/client/src/components/note.vue
index f6692ded3..a55589fe4 100644
--- a/packages/client/src/components/note.vue
+++ b/packages/client/src/components/note.vue
@@ -119,6 +119,7 @@ import MkVisibility from '@/components/visibility.vue';
 import { pleaseLogin } from '@/scripts/please-login';
 import { focusPrev, focusNext } from '@/scripts/focus';
 import { checkWordMute } from '@/scripts/check-word-mute';
+import { useRouter } from '@/router';
 import { userPage } from '@/filters/user';
 import * as os from '@/os';
 import { defaultStore, noteViewInterruptors } from '@/store';

From 473291fe70ebb2db5237537c9942f7d2aec20785 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 23:53:47 -0700
Subject: [PATCH 035/245] nice

---
 package.json                                     | 2 +-
 packages/client/src/components/note-detailed.vue | 4 +---
 packages/client/src/components/note.vue          | 5 ++++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2ec7cf9be..65453c23c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.6.8",
+	"version": "12.118.1-calc.6.9",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/note-detailed.vue b/packages/client/src/components/note-detailed.vue
index 61d5f5a8d..e8dd44e27 100644
--- a/packages/client/src/components/note-detailed.vue
+++ b/packages/client/src/components/note-detailed.vue
@@ -46,7 +46,7 @@
 				<MkInstanceTicker v-if="showTicker" class="ticker" :instance="appearNote.user.instance"/>
 			</div>
 		</header>
-		<div class="main" @click="router.push(notePage(appearNote))">
+		<div class="main">
 			<div class="body">
 				<p v-if="appearNote.cw != null" class="cw">
 					<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
@@ -139,8 +139,6 @@ import { i18n } from '@/i18n';
 import { getNoteMenu } from '@/scripts/get-note-menu';
 import { useNoteCapture } from '@/scripts/use-note-capture';
 
-const router = useRouter();
-
 const props = defineProps<{
 	note: misskey.entities.Note;
 	pinned?: boolean;
diff --git a/packages/client/src/components/note.vue b/packages/client/src/components/note.vue
index a55589fe4..1a7b38ec7 100644
--- a/packages/client/src/components/note.vue
+++ b/packages/client/src/components/note.vue
@@ -33,7 +33,7 @@
 	</div>
 	<article class="article" @contextmenu.stop="onContextmenu">
 		<MkAvatar class="avatar" :user="appearNote.user"/>
-		<div class="main">
+		<div class="main" @click="router.push(notePage(appearNote))">
 			<XNoteHeader class="header" :note="appearNote" :mini="true"/>
 			<MkInstanceTicker v-if="showTicker" class="ticker" :instance="appearNote.user.instance"/>
 			<div class="body">
@@ -129,6 +129,9 @@ import { $i } from '@/account';
 import { i18n } from '@/i18n';
 import { getNoteMenu } from '@/scripts/get-note-menu';
 import { useNoteCapture } from '@/scripts/use-note-capture';
+import { notePage } from '@/filters/note';
+
+const router = useRouter();
 
 const props = defineProps<{
 	note: misskey.entities.Note;

From 74d5c3c162d7eba4dfe0c570a7d213395ac9aff6 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 16 Aug 2022 23:58:21 -0700
Subject: [PATCH 036/245] feat: :bookmark: .7

---
 CALCKEY.md                              | 4 ++--
 package.json                            | 2 +-
 packages/client/src/components/note.vue | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index 4d574c0c9..f3bec69e2 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -3,7 +3,6 @@
 ## Planned
 
 - MFM button
-- Make more of the post clickable like every other SNS
 - Better Messaging UI
 - Classic mode make instance icon bring up new context menu
 - Like/star button
@@ -21,7 +20,6 @@
 
 ## Work in progress
 
-- Improved note style
 - OCR image captioning
 - Swipe through timelines on mobile
 - Admin custom CSS
@@ -48,6 +46,8 @@
   - Illustrated by [Henki](https://www.youtube.com/c/Henkiwashere)!
   - Licensed under the CC-BY-SA 4.0.
 - Better timeline top bar
+- Improved note style
+  - Make more of the post clickable like every other SNS
 - Mark as read from notifications widget
 - Less cluttered notification summary
 - Better welcome screen (not logged in)
diff --git a/package.json b/package.json
index 65453c23c..4a8731696 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.6.9",
+	"version": "12.118.1-calc.7",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/note.vue b/packages/client/src/components/note.vue
index 1a7b38ec7..192b9a29c 100644
--- a/packages/client/src/components/note.vue
+++ b/packages/client/src/components/note.vue
@@ -31,9 +31,9 @@
 			<MkVisibility :note="note"/>
 		</div>
 	</div>
-	<article class="article" @contextmenu.stop="onContextmenu">
+	<article class="article" @contextmenu.stop="onContextmenu" @click="router.push(notePage(appearNote))">
 		<MkAvatar class="avatar" :user="appearNote.user"/>
-		<div class="main" @click="router.push(notePage(appearNote))">
+		<div class="main">
 			<XNoteHeader class="header" :note="appearNote" :mini="true"/>
 			<MkInstanceTicker v-if="showTicker" class="ticker" :instance="appearNote.user.instance"/>
 			<div class="body">

From 078ab39bdfa1ef209122466bf949f7104ce7a512 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 17 Aug 2022 00:07:42 -0700
Subject: [PATCH 037/245] feat: :sparkles: Replies can be clicked too

---
 package.json                                     | 2 +-
 packages/client/src/components/note-detailed.vue | 5 ++++-
 packages/client/src/components/note.vue          | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 4a8731696..96eb24b5c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.7",
+	"version": "12.118.1-calc.7.1",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/note-detailed.vue b/packages/client/src/components/note-detailed.vue
index e8dd44e27..63bbf5b5f 100644
--- a/packages/client/src/components/note-detailed.vue
+++ b/packages/client/src/components/note-detailed.vue
@@ -99,7 +99,7 @@
 			</footer>
 		</div>
 	</article>
-	<MkNoteSub v-for="note in directReplies" :key="note.id" :note="note" class="reply" :conversation="replies"/>
+	<MkNoteSub v-for="note in directReplies" :key="note.id" :note="note" class="reply" :conversation="replies" @click="router.push(notePage(note))"/>
 </div>
 <div v-else class="_panel muted" @click="muted = false">
 	<I18n :src="i18n.ts.userSaysSomething" tag="small">
@@ -130,6 +130,7 @@ import { pleaseLogin } from '@/scripts/please-login';
 import { checkWordMute } from '@/scripts/check-word-mute';
 import { userPage } from '@/filters/user';
 import { notePage } from '@/filters/note';
+import { useRouter } from '@/router';
 import * as os from '@/os';
 import { defaultStore, noteViewInterruptors } from '@/store';
 import { reactionPicker } from '@/scripts/reaction-picker';
@@ -139,6 +140,8 @@ import { i18n } from '@/i18n';
 import { getNoteMenu } from '@/scripts/get-note-menu';
 import { useNoteCapture } from '@/scripts/use-note-capture';
 
+const router = useRouter();
+
 const props = defineProps<{
 	note: misskey.entities.Note;
 	pinned?: boolean;
diff --git a/packages/client/src/components/note.vue b/packages/client/src/components/note.vue
index 192b9a29c..45f1102d6 100644
--- a/packages/client/src/components/note.vue
+++ b/packages/client/src/components/note.vue
@@ -9,7 +9,7 @@
 	:tabindex="!isDeleted ? '-1' : null"
 	:class="{ renote: isRenote }"
 >
-	<MkNoteSub v-if="appearNote.reply" :note="appearNote.reply" class="reply-to"/>
+	<MkNoteSub v-if="appearNote.reply" :note="appearNote.reply" class="reply-to" @click="router.push(notePage(appearNote.reply))"/>
 	<div v-if="pinned" class="info"><i class="fas fa-thumbtack"></i> {{ i18n.ts.pinnedNote }}</div>
 	<div v-if="appearNote._prId_" class="info"><i class="fas fa-bullhorn"></i> {{ i18n.ts.promotion }}<button class="_textButton hide" @click="readPromo()">{{ i18n.ts.hideThisNote }} <i class="fas fa-times"></i></button></div>
 	<div v-if="appearNote._featuredId_" class="info"><i class="fas fa-bolt"></i> {{ i18n.ts.featured }}</div>

From be7625cca6de516445a378acf406f8bf3c677507 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 17 Aug 2022 00:13:57 -0700
Subject: [PATCH 038/245] fix: :bug: Prevent clicking on child elements of
 timeline posts

---
 package.json                                     | 2 +-
 packages/client/src/components/note-detailed.vue | 2 +-
 packages/client/src/components/note.vue          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 96eb24b5c..ea58f3741 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.7.1",
+	"version": "12.118.1-calc.7.2",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/note-detailed.vue b/packages/client/src/components/note-detailed.vue
index 63bbf5b5f..98a72602c 100644
--- a/packages/client/src/components/note-detailed.vue
+++ b/packages/client/src/components/note-detailed.vue
@@ -99,7 +99,7 @@
 			</footer>
 		</div>
 	</article>
-	<MkNoteSub v-for="note in directReplies" :key="note.id" :note="note" class="reply" :conversation="replies" @click="router.push(notePage(note))"/>
+	<MkNoteSub v-for="note in directReplies" :key="note.id" :note="note" class="reply" :conversation="replies" @click.self="router.push(notePage(note))"/>
 </div>
 <div v-else class="_panel muted" @click="muted = false">
 	<I18n :src="i18n.ts.userSaysSomething" tag="small">
diff --git a/packages/client/src/components/note.vue b/packages/client/src/components/note.vue
index 45f1102d6..8823a4d26 100644
--- a/packages/client/src/components/note.vue
+++ b/packages/client/src/components/note.vue
@@ -31,9 +31,9 @@
 			<MkVisibility :note="note"/>
 		</div>
 	</div>
-	<article class="article" @contextmenu.stop="onContextmenu" @click="router.push(notePage(appearNote))">
+	<article class="article" @contextmenu.stop="onContextmenu" @click.self="router.push(notePage(appearNote))">
 		<MkAvatar class="avatar" :user="appearNote.user"/>
-		<div class="main">
+		<div class="main" @click.self="router.push(notePage(appearNote))">
 			<XNoteHeader class="header" :note="appearNote" :mini="true"/>
 			<MkInstanceTicker v-if="showTicker" class="ticker" :instance="appearNote.user.instance"/>
 			<div class="body">

From 53b6030395f3815d93b056257bf6d56fc8aa8e6b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 17 Aug 2022 00:19:10 -0700
Subject: [PATCH 039/245] feat: :lipstick: highlight hover replies

---
 package.json                                     | 2 +-
 packages/client/src/components/note-detailed.vue | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ea58f3741..15fe58ccc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.7.2",
+	"version": "12.118.1-calc.7.3",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/note-detailed.vue b/packages/client/src/components/note-detailed.vue
index 98a72602c..04b157564 100644
--- a/packages/client/src/components/note-detailed.vue
+++ b/packages/client/src/components/note-detailed.vue
@@ -537,6 +537,11 @@ if (appearNote.replyId) {
 
 	> .reply {
 		border-top: solid 0.5px var(--divider);
+		transition: background-color 0.25s ease-in-out;
+
+		&:hover {
+			background-color: var(--panelHighlight);
+		}
 	}
 
 	&.max-width_500px {

From d7d91757a7660561574cb0da40217375ae950278 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 17 Aug 2022 00:29:41 -0700
Subject: [PATCH 040/245] fix: :children_crossing: No more stupid details for
 replies

---
 package.json                                        | 2 +-
 packages/client/src/components/sub-note-content.vue | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 15fe58ccc..e74513583 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.7.3",
+	"version": "12.118.1-calc.7.4",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/sub-note-content.vue b/packages/client/src/components/sub-note-content.vue
index 6a8d9b78d..75591d388 100644
--- a/packages/client/src/components/sub-note-content.vue
+++ b/packages/client/src/components/sub-note-content.vue
@@ -6,14 +6,14 @@
 		<Mfm v-if="note.text" :text="note.text" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
 		<MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">RN: ...</MkA>
 	</div>
-	<details v-if="note.files.length > 0">
+	<div v-if="note.files.length > 0">
 		<summary>({{ $t('withNFiles', { n: note.files.length }) }})</summary>
 		<XMediaList :media-list="note.files"/>
-	</details>
-	<details v-if="note.poll">
+	</div>
+	<div v-if="note.poll">
 		<summary>{{ i18n.ts.poll }}</summary>
 		<XPoll :note="note"/>
-	</details>
+	</div>
 	<button v-if="isLong && collapsed" class="fade _button" @click="collapsed = false">
 		<span>{{ i18n.ts.showMore }}</span>
 	</button>

From e55cd0531626ac39d830af06beba8bb9f0cd116a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 17 Aug 2022 00:31:20 -0700
Subject: [PATCH 041/245] docs: :memo:

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

diff --git a/CALCKEY.md b/CALCKEY.md
index f3bec69e2..370a4a678 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -48,6 +48,8 @@
 - Better timeline top bar
 - Improved note style
   - Make more of the post clickable like every other SNS
+  - No more details tag for reply attachments
+  - Better CW button
 - Mark as read from notifications widget
 - Less cluttered notification summary
 - Better welcome screen (not logged in)

From 268def0163eeedd185dafdf7b218ec598c649584 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 17 Aug 2022 00:36:29 -0700
Subject: [PATCH 042/245] feat: :sparkles: More hover events!\

---
 package.json                                     | 2 +-
 packages/client/src/components/note-detailed.vue | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index e74513583..61aee1f65 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.7.4",
+	"version": "12.118.1-calc.7.5",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/note-detailed.vue b/packages/client/src/components/note-detailed.vue
index 04b157564..162e6f116 100644
--- a/packages/client/src/components/note-detailed.vue
+++ b/packages/client/src/components/note-detailed.vue
@@ -9,8 +9,8 @@
 	:tabindex="!isDeleted ? '-1' : null"
 	:class="{ renote: isRenote }"
 >
-	<MkNoteSub v-for="note in conversation" :key="note.id" class="reply-to-more" :note="note"/>
-	<MkNoteSub v-if="appearNote.reply" :note="appearNote.reply" class="reply-to"/>
+	<MkNoteSub v-for="note in conversation" :key="note.id" class="reply-to-more" :note="note" @click.self="router.push(notePage(note))"/>
+	<MkNoteSub v-if="appearNote.reply" :note="appearNote.reply" class="reply-to" @click.self="router.push(notePage(appearNote))"/>
 	<div v-if="isRenote" class="renote">
 		<MkAvatar class="avatar" :user="note.user"/>
 		<i class="fas fa-retweet"></i>
@@ -537,6 +537,9 @@ if (appearNote.replyId) {
 
 	> .reply {
 		border-top: solid 0.5px var(--divider);
+	}
+
+	> .reply, .reply-to, .reply-to-more {
 		transition: background-color 0.25s ease-in-out;
 
 		&:hover {

From 0ad139d5ce86f792148d202b4a6725a0f4d07271 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Wed, 17 Aug 2022 10:17:32 +0200
Subject: [PATCH 043/245] docs: :memo: cl

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

diff --git a/CALCKEY.md b/CALCKEY.md
index 370a4a678..aa1bcad21 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -46,6 +46,7 @@
   - Illustrated by [Henki](https://www.youtube.com/c/Henkiwashere)!
   - Licensed under the CC-BY-SA 4.0.
 - Better timeline top bar
+- Redesigned mobile bottom nav bar
 - Improved note style
   - Make more of the post clickable like every other SNS
   - No more details tag for reply attachments

From eb3f52e8e331b31d70a78f7965fc83ca1a8861f0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 17 Aug 2022 09:41:50 -0700
Subject: [PATCH 044/245] docs: :memo: cl

---
 CALCKEY.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index aa1bcad21..241b19cbe 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -66,6 +66,7 @@
 - Obliteration of Ai-chan
 - vue-plyr as video/audio player
 - [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996)
+- [Tapping avatar in mobile opens account modal](https://github.com/misskey-dev/misskey/pull/9056)
 - [OAuth bearer token authentication](https://github.com/misskey-dev/misskey/pull/9021)
 - [Styled Repair Tools](https://github.com/misskey-dev/misskey/pull/8956)
 - [Option to make enter send message](https://github.com/misskey-dev/misskey/pull/8954)
@@ -97,5 +98,3 @@
 	- 30d8bc9259cb6b72ed76d67b21dbb4cdceca8327: refactor: welcome.setup.vue to composition api
 	- 751921e24f37ed707fe44a40d88eebb1299efa35: make emoji picker case insensitive
 	- 298febeb9c9501e3e3df16982c08657d1da474e0: enhance: add re-collapsing to quoted notes
-- A few changed from [Misskey-Tweaks](https://codeberg.org/Freeplay/Misskey-Tweaks)
-  - 

From be31b9bed38f16472e590205051789cdd2ed1b33 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 17 Aug 2022 15:51:52 -0700
Subject: [PATCH 045/245] refactor: :package: Use updated fork of vue-plyr

---
 CALCKEY.md                   |  2 +-
 package.json                 |  2 +-
 packages/client/package.json |  2 +-
 yarn.lock                    | 66 +++++++++++-------------------------
 4 files changed, 22 insertions(+), 50 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index 241b19cbe..bac5d0c93 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -64,7 +64,7 @@
 - Reply limit bug fixed
 - Make showing the update popup optional
 - Obliteration of Ai-chan
-- vue-plyr as video/audio player
+- [@skjnldsv/vue-plyr](https://www.npmjs.com/package/@skjnldsv/vue-plyr) as video/audio player
 - [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996)
 - [Tapping avatar in mobile opens account modal](https://github.com/misskey-dev/misskey/pull/9056)
 - [OAuth bearer token authentication](https://github.com/misskey-dev/misskey/pull/9021)
diff --git a/package.json b/package.json
index 61aee1f65..c4afb6732 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.7.5",
+	"version": "12.118.1-calc.7.6",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/package.json b/packages/client/package.json
index 5757f9407..f38e3467f 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -12,6 +12,7 @@
 		"@rollup/plugin-alias": "3.1.9",
 		"@rollup/plugin-json": "4.1.0",
 		"@rollup/pluginutils": "^4.2.1",
+		"@skjnldsv/vue-plyr": "^7.2.0",
 		"@syuilo/aiscript": "0.11.1",
 		"@vitejs/plugin-vue": "3.0.3",
 		"@vue/compiler-sfc": "3.2.37",
@@ -60,7 +61,6 @@
 		"vanilla-tilt": "1.7.2",
 		"vite": "3.0.7",
 		"vue": "3.2.37",
-		"vue-plyr": "^7.0.0",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vuedraggable": "4.0.1"
 	},
diff --git a/yarn.lock b/yarn.lock
index b79834ddc..1a30293b4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -33,7 +33,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.16.4, @babel/parser@npm:^7.18.4, @babel/parser@npm:^7.6.0, @babel/parser@npm:^7.9.6":
+"@babel/parser@npm:^7.16.4, @babel/parser@npm:^7.6.0, @babel/parser@npm:^7.9.6":
   version: 7.18.11
   resolution: "@babel/parser@npm:7.18.11"
   bin:
@@ -798,6 +798,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@skjnldsv/vue-plyr@npm:^7.2.0":
+  version: 7.2.0
+  resolution: "@skjnldsv/vue-plyr@npm:7.2.0"
+  dependencies:
+    plyr: ^3.6.8
+    vue: ^3.2.37
+  checksum: fc39a9159b9539b12e1ea9e7404c98766418eb19146a14ea6bd540cfa69619b38ba03766e905ee063ffdf69dd6725976759d420b7945cce99e283a33668ac515
+  languageName: node
+  linkType: hard
+
 "@sqltools/formatter@npm:^1.2.2":
   version: 1.2.3
   resolution: "@sqltools/formatter@npm:1.2.3"
@@ -1974,17 +1984,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vue/compiler-sfc@npm:2.7.8":
-  version: 2.7.8
-  resolution: "@vue/compiler-sfc@npm:2.7.8"
-  dependencies:
-    "@babel/parser": ^7.18.4
-    postcss: ^8.4.14
-    source-map: ^0.6.1
-  checksum: da0b4b0866224fe2aee376a88c25914da4e73ba9e11e7aa2ed240b99897735b4a988e951dcae9c8f0843216c5a97050bf16e1bb04bf65541444a8bdfedc35b38
-  languageName: node
-  linkType: hard
-
 "@vue/compiler-sfc@npm:3.2.37":
   version: 3.2.37
   resolution: "@vue/compiler-sfc@npm:3.2.37"
@@ -3247,7 +3246,7 @@ __metadata:
 "browser-image-resizer@git+https://github.com/misskey-dev/browser-image-resizer#v2.2.1-misskey.2":
   version: 2.2.1-misskey.2
   resolution: "browser-image-resizer@https://github.com/misskey-dev/browser-image-resizer.git#commit=a58834f5fe2af9f9f31ff115121aef3de6f9d416"
-  checksum: 8ea30705704cc3f81eca23ff6cd0d5bf0d5404cd82612a52de11c0b851be511613022758babf5c202cc92b019483cfb97d7ef48cc18368a8913803fd654ac5d1
+  checksum: 5a29181ee34a407b43069dcd5e3364c3066eb4af3ffdd262ba669ea37273ac232aadebff8204a6ae9ff8d74305429191feedb5d420449acf01e1bbf9759c4847
   languageName: node
   linkType: hard
 
@@ -3857,6 +3856,7 @@ __metadata:
     "@rollup/plugin-alias": 3.1.9
     "@rollup/plugin-json": 4.1.0
     "@rollup/pluginutils": ^4.2.1
+    "@skjnldsv/vue-plyr": ^7.2.0
     "@syuilo/aiscript": 0.11.1
     "@types/escape-regexp": 0.0.1
     "@types/glob": 7.2.0
@@ -3925,7 +3925,6 @@ __metadata:
     vanilla-tilt: 1.7.2
     vite: 3.0.7
     vue: 3.2.37
-    vue-plyr: ^7.0.0
     vue-prism-editor: 2.0.0-alpha.2
     vuedraggable: 4.0.1
   languageName: unknown
@@ -4611,13 +4610,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"csstype@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "csstype@npm:3.1.0"
-  checksum: 644e986cefab86525f0b674a06889cfdbb1f117e5b7d1ce0fc55b0423ecc58807a1ea42ecc75c4f18999d14fc42d1d255f84662a45003a52bb5840e977eb2ffd
-  languageName: node
-  linkType: hard
-
 "custom-event-polyfill@npm:^1.0.7":
   version: 1.0.7
   resolution: "custom-event-polyfill@npm:1.0.7"
@@ -11547,16 +11539,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"plyr@github:sampotts/plyr#develop":
-  version: 3.7.0
-  resolution: "plyr@https://github.com/sampotts/plyr.git#commit=d434c9af16e641400aaee93188594208d88f2658"
+"plyr@npm:^3.6.8":
+  version: 3.7.2
+  resolution: "plyr@npm:3.7.2"
   dependencies:
     core-js: ^3.22.0
     custom-event-polyfill: ^1.0.7
     loadjs: ^4.2.0
     rangetouch: ^2.0.1
     url-polyfill: ^1.1.12
-  checksum: ee85815c1c992141af030d71f70e79532814b142b0057c1bedbf7c74000a79f647147bb1f03f3a9f725341afa43e848e7b54168361d95285dfed30d53be63607
+  checksum: 140b2e43272023737dd7f95b7bc745490131da866a4ef154f6b2c7992f94d6d951b859614ca851c3ec4a134b6b8fd1244a2642d2739dfad3aae5402b8f311455
   languageName: node
   linkType: hard
 
@@ -11895,7 +11887,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.1.10, postcss@npm:^8.3.11, postcss@npm:^8.4.14, postcss@npm:^8.4.16":
+"postcss@npm:^8.1.10, postcss@npm:^8.3.11, postcss@npm:^8.4.16":
   version: 8.4.16
   resolution: "postcss@npm:8.4.16"
   dependencies:
@@ -15328,16 +15320,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vue-plyr@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "vue-plyr@npm:7.0.0"
-  dependencies:
-    plyr: "github:sampotts/plyr#develop"
-    vue: ^2.6.12
-  checksum: 004d830cfc9dbe0563cafafab6240379b7224362d3e60d8d441126f0eaafd2487c7416cb434482165b52e961b83f020dfbc2645536aa8ba991f101477d984206
-  languageName: node
-  linkType: hard
-
 "vue-prism-editor@npm:2.0.0-alpha.2":
   version: 2.0.0-alpha.2
   resolution: "vue-prism-editor@npm:2.0.0-alpha.2"
@@ -15347,7 +15329,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vue@npm:3.2.37":
+"vue@npm:3.2.37, vue@npm:^3.2.37":
   version: 3.2.37
   resolution: "vue@npm:3.2.37"
   dependencies:
@@ -15360,16 +15342,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vue@npm:^2.6.12":
-  version: 2.7.8
-  resolution: "vue@npm:2.7.8"
-  dependencies:
-    "@vue/compiler-sfc": 2.7.8
-    csstype: ^3.1.0
-  checksum: 45fc85a13fc027798ad859fe4a5509b54217ae2f129240fc349a799bd4dbc6848ef8fa9968ab7ef7afcb954735882dbfdeb746673aa3f051e4d7ae555c213a1b
-  languageName: node
-  linkType: hard
-
 "vuedraggable@npm:4.0.1":
   version: 4.0.1
   resolution: "vuedraggable@npm:4.0.1"

From ea3c2441be8ab01ee92993a4de1699a08643e42b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 17 Aug 2022 15:57:16 -0700
Subject: [PATCH 046/245] fix: :lock: Up multer to LTS as to avoid
 CVE-2022-24434

---
 packages/backend/package.json |  2 +-
 yarn.lock                     | 68 +++++++++++++++--------------------
 2 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 1236dfd88..8e9f42dac 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -72,7 +72,7 @@
 		"mime-types": "2.1.35",
 		"misskey-js": "0.0.14",
 		"mocha": "10.0.0",
-		"multer": "1.4.4",
+		"multer": "1.4.4-lts.1",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.2.10",
 		"nodemailer": "6.7.8",
diff --git a/yarn.lock b/yarn.lock
index 1a30293b4..625fadaf4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2962,7 +2962,7 @@ __metadata:
     mime-types: 2.1.35
     misskey-js: 0.0.14
     mocha: 10.0.0
-    multer: 1.4.4
+    multer: 1.4.4-lts.1
     nested-property: 4.0.0
     node-fetch: 3.2.10
     nodemailer: 6.7.8
@@ -3246,7 +3246,7 @@ __metadata:
 "browser-image-resizer@git+https://github.com/misskey-dev/browser-image-resizer#v2.2.1-misskey.2":
   version: 2.2.1-misskey.2
   resolution: "browser-image-resizer@https://github.com/misskey-dev/browser-image-resizer.git#commit=a58834f5fe2af9f9f31ff115121aef3de6f9d416"
-  checksum: 5a29181ee34a407b43069dcd5e3364c3066eb4af3ffdd262ba669ea37273ac232aadebff8204a6ae9ff8d74305429191feedb5d420449acf01e1bbf9759c4847
+  checksum: 8ea30705704cc3f81eca23ff6cd0d5bf0d5404cd82612a52de11c0b851be511613022758babf5c202cc92b019483cfb97d7ef48cc18368a8913803fd654ac5d1
   languageName: node
   linkType: hard
 
@@ -3383,13 +3383,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"busboy@npm:^0.2.11":
-  version: 0.2.14
-  resolution: "busboy@npm:0.2.14"
+"busboy@npm:^1.0.0":
+  version: 1.6.0
+  resolution: "busboy@npm:1.6.0"
   dependencies:
-    dicer: 0.2.5
-    readable-stream: 1.1.x
-  checksum: 9df9fca6d96dab9edd03f568bde31f215794e6fabd73c75d2b39a4be2e8b73a45121d987dea5db881f3fb499737c261b372106fe72d08b8db92afaed8d751165
+    streamsearch: ^1.1.0
+  checksum: 32801e2c0164e12106bf236291a00795c3c4e4b709ae02132883fe8478ba2ae23743b11c5735a0aae8afe65ac4b6ca4568b91f0d9fed1fdbc32ede824a73746e
   languageName: node
   linkType: hard
 
@@ -5014,16 +5013,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dicer@npm:0.2.5":
-  version: 0.2.5
-  resolution: "dicer@npm:0.2.5"
-  dependencies:
-    readable-stream: 1.1.x
-    streamsearch: 0.1.2
-  checksum: a6f0ce9ac5099c7ffeaec7398d711eea1dd803eb99036d0f05342e9ed46a4235a5ed0ea01ad5d6c785fdb0aae6d61d2722e6e64f9fabdfe39885f7f52eb635ee
-  languageName: node
-  linkType: hard
-
 "diff@npm:5.0.0":
   version: 5.0.0
   resolution: "diff@npm:5.0.0"
@@ -10283,19 +10272,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"multer@npm:1.4.4":
-  version: 1.4.4
-  resolution: "multer@npm:1.4.4"
+"multer@npm:1.4.4-lts.1":
+  version: 1.4.4-lts.1
+  resolution: "multer@npm:1.4.4-lts.1"
   dependencies:
     append-field: ^1.0.0
-    busboy: ^0.2.11
+    busboy: ^1.0.0
     concat-stream: ^1.5.2
     mkdirp: ^0.5.4
     object-assign: ^4.1.1
-    on-finished: ^2.3.0
     type-is: ^1.6.4
     xtend: ^4.0.0
-  checksum: b5550d250aeee9c4d630eaecd133af0899239f6b10cec4b448ddd0a808025b383520b8227198a8612f60c2cd2094bcb60de93d973084f889d4e40efe6dbd641e
+  checksum: da04b06efdbff9bd42d9f71297eeb2c0566231a4b9c895f49479c09b163c5e404aa6e58bd1c19f006f82e2114362545e39cbf7e0163ffd8d73d0f88adf4489e2
   languageName: node
   linkType: hard
 
@@ -12509,18 +12497,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readable-stream@npm:1.1.x, readable-stream@npm:~1.1.9":
-  version: 1.1.14
-  resolution: "readable-stream@npm:1.1.14"
-  dependencies:
-    core-util-is: ~1.0.0
-    inherits: ~2.0.1
-    isarray: 0.0.1
-    string_decoder: ~0.10.x
-  checksum: 17dfeae3e909945a4a1abc5613ea92d03269ef54c49288599507fc98ff4615988a1c39a999dcf9aacba70233d9b7040bc11a5f2bfc947e262dedcc0a8b32b5a0
-  languageName: node
-  linkType: hard
-
 "readable-stream@npm:3, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0":
   version: 3.6.0
   resolution: "readable-stream@npm:3.6.0"
@@ -12547,6 +12523,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"readable-stream@npm:~1.1.9":
+  version: 1.1.14
+  resolution: "readable-stream@npm:1.1.14"
+  dependencies:
+    core-util-is: ~1.0.0
+    inherits: ~2.0.1
+    isarray: 0.0.1
+    string_decoder: ~0.10.x
+  checksum: 17dfeae3e909945a4a1abc5613ea92d03269ef54c49288599507fc98ff4615988a1c39a999dcf9aacba70233d9b7040bc11a5f2bfc947e262dedcc0a8b32b5a0
+  languageName: node
+  linkType: hard
+
 "readable-web-to-node-stream@npm:^3.0.2":
   version: 3.0.2
   resolution: "readable-web-to-node-stream@npm:3.0.2"
@@ -13786,10 +13774,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"streamsearch@npm:0.1.2":
-  version: 0.1.2
-  resolution: "streamsearch@npm:0.1.2"
-  checksum: d2db57cbfbf7947ab9c75a7b4c80a8ef8d24850cf0a1a24258bb6956c97317ce1eab7dbcbf9c5aba3e6198611af1053b02411057bbedb99bf9c64b8275248997
+"streamsearch@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "streamsearch@npm:1.1.0"
+  checksum: 1cce16cea8405d7a233d32ca5e00a00169cc0e19fbc02aa839959985f267335d435c07f96e5e0edd0eadc6d39c98d5435fb5bbbdefc62c41834eadc5622ad942
   languageName: node
   linkType: hard
 

From 720015dc9ba9a65a629e77b993a20a00a76c7841 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 17 Aug 2022 15:57:44 -0700
Subject: [PATCH 047/245] docs: :memo: cl

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

diff --git a/CALCKEY.md b/CALCKEY.md
index bac5d0c93..13977ea50 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -35,6 +35,7 @@
 
 - Yarn 3
   - Fix Dockerfile @hanna
+  - Upgrade packages with security vunrabilities
 - Saner defaults
 - Recommended instances timeline
 - Star as default reaction

From 3b85a9bb7d4704695524614ff15c53d2ca4617c0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 17 Aug 2022 15:59:58 -0700
Subject: [PATCH 048/245] chore: :package: Use proper misskey browser image
 resizer package

---
 packages/client/package.json |  2 +-
 yarn.lock                    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index f38e3467f..a71c3327d 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -20,7 +20,7 @@
 		"autosize": "5.0.1",
 		"blurhash": "1.1.5",
 		"broadcast-channel": "4.14.0",
-		"browser-image-resizer": "git+https://github.com/misskey-dev/browser-image-resizer#v2.2.1-misskey.2",
+		"browser-image-resizer": "https://github.com/misskey-dev/browser-image-resizer",
 		"chart.js": "3.9.1",
 		"chartjs-adapter-date-fns": "2.0.0",
 		"chartjs-plugin-gradient": "0.5.0",
diff --git a/yarn.lock b/yarn.lock
index 625fadaf4..5765c010f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3243,10 +3243,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browser-image-resizer@git+https://github.com/misskey-dev/browser-image-resizer#v2.2.1-misskey.2":
-  version: 2.2.1-misskey.2
-  resolution: "browser-image-resizer@https://github.com/misskey-dev/browser-image-resizer.git#commit=a58834f5fe2af9f9f31ff115121aef3de6f9d416"
-  checksum: 8ea30705704cc3f81eca23ff6cd0d5bf0d5404cd82612a52de11c0b851be511613022758babf5c202cc92b019483cfb97d7ef48cc18368a8913803fd654ac5d1
+"browser-image-resizer@https://github.com/misskey-dev/browser-image-resizer":
+  version: 2.2.1-misskey.3
+  resolution: "browser-image-resizer@https://github.com/misskey-dev/browser-image-resizer.git#commit=0227e860621e55cbed0aabe6dc601096a7748c4a"
+  checksum: 9c2466fab32624b1f24fe52279f5437d2254431cab9f8a68f82807bdd2dcb5e6fa75fe61704b2e9751a8bd1ca4b99db3c9fafd2d791dfbc7bd3bc7702f222ca1
   languageName: node
   linkType: hard
 
@@ -3876,7 +3876,7 @@ __metadata:
     autosize: 5.0.1
     blurhash: 1.1.5
     broadcast-channel: 4.14.0
-    browser-image-resizer: "git+https://github.com/misskey-dev/browser-image-resizer#v2.2.1-misskey.2"
+    browser-image-resizer: "https://github.com/misskey-dev/browser-image-resizer"
     chart.js: 3.9.1
     chartjs-adapter-date-fns: 2.0.0
     chartjs-plugin-gradient: 0.5.0

From 9c80dab7f475f97150fcff98f0ed55b545e91d5e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 17 Aug 2022 16:03:20 -0700
Subject: [PATCH 049/245] fix: :ambulance: Fix vue-plyr import

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

diff --git a/packages/client/src/components/media-banner.vue b/packages/client/src/components/media-banner.vue
index 7382e953a..74686c605 100644
--- a/packages/client/src/components/media-banner.vue
+++ b/packages/client/src/components/media-banner.vue
@@ -30,7 +30,7 @@
 <script lang="ts" setup>
 import { onMounted } from 'vue';
 import * as misskey from 'misskey-js';
-import VuePlyr from 'vue-plyr';
+import VuePlyr from '@skjnldsv/vue-plyr';
 import { ColdDeviceStorage } from '@/store';
 import 'vue-plyr/dist/vue-plyr.css';
 

From cf0409a7a1173347e0088929550bdbac4b61a82a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 17 Aug 2022 16:03:27 -0700
Subject: [PATCH 050/245] ^

---
 package.json                                   | 2 +-
 packages/client/src/components/media-video.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index c4afb6732..5fc979f1c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.7.6",
+	"version": "12.118.1-calc.8",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/media-video.vue b/packages/client/src/components/media-video.vue
index 0dfd304aa..0b055d6ed 100644
--- a/packages/client/src/components/media-video.vue
+++ b/packages/client/src/components/media-video.vue
@@ -28,7 +28,7 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import * as misskey from 'misskey-js';
-import VuePlyr from 'vue-plyr';
+import VuePlyr from '@skjnldsv/vue-plyr';
 import { defaultStore } from '@/store';
 import 'vue-plyr/dist/vue-plyr.css';
 

From 25d7e6bcd6d38af65fd7e373f1bc610168b97c41 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 17 Aug 2022 16:05:09 -0700
Subject: [PATCH 051/245] fix again

---
 packages/client/src/components/media-banner.vue | 2 +-
 packages/client/src/components/media-video.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/media-banner.vue b/packages/client/src/components/media-banner.vue
index 74686c605..c020be75b 100644
--- a/packages/client/src/components/media-banner.vue
+++ b/packages/client/src/components/media-banner.vue
@@ -32,7 +32,7 @@ import { onMounted } from 'vue';
 import * as misskey from 'misskey-js';
 import VuePlyr from '@skjnldsv/vue-plyr';
 import { ColdDeviceStorage } from '@/store';
-import 'vue-plyr/dist/vue-plyr.css';
+import '@skjnldsv/vue-plyr/dist/vue-plyr.css';
 
 const props = withDefaults(defineProps<{
 	media: misskey.entities.DriveFile;
diff --git a/packages/client/src/components/media-video.vue b/packages/client/src/components/media-video.vue
index 0b055d6ed..260835a76 100644
--- a/packages/client/src/components/media-video.vue
+++ b/packages/client/src/components/media-video.vue
@@ -30,7 +30,7 @@ import { ref } from 'vue';
 import * as misskey from 'misskey-js';
 import VuePlyr from '@skjnldsv/vue-plyr';
 import { defaultStore } from '@/store';
-import 'vue-plyr/dist/vue-plyr.css';
+import '@skjnldsv/vue-plyr/dist/vue-plyr.css';
 
 const props = defineProps<{
 	video: misskey.entities.DriveFile;

From de207c03f17462fb684d49d67b7812e96ec6a50a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 17 Aug 2022 16:20:39 -0700
Subject: [PATCH 052/245] fix: :lipstick: fix buttons on entrance screen being
 squished on mobile

---
 package.json                                     | 2 +-
 packages/client/src/pages/welcome.entrance.a.vue | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 5fc979f1c..dcdd9aeda 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.8",
+	"version": "12.118.1-calc.8.1",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/welcome.entrance.a.vue b/packages/client/src/pages/welcome.entrance.a.vue
index ba7c54f9a..b63ded9f0 100644
--- a/packages/client/src/pages/welcome.entrance.a.vue
+++ b/packages/client/src/pages/welcome.entrance.a.vue
@@ -35,7 +35,7 @@
 				<div class="action">
 					<MkButton inline rounded gradate data-cy-signup style="margin-right: 12px;" @click="signup()">{{ i18n.ts.signup }}</MkButton>
 					<MkButton inline rounded data-cy-signin @click="signin()">{{ i18n.ts.login }}</MkButton>
-					<MkButton inline rounded style="margin-left: 12px;" onclick="window.location.href='/explore'">Explore</MkButton>
+					<MkButton inline rounded style="margin-left: 12px; margin-top: 12px;" onclick="window.location.href='/explore'">Explore</MkButton>
 				</div>
 			</div>
 		</div>
@@ -266,6 +266,7 @@ function showMenu(ev) {
 
 				> .action {
 					padding: 32px;
+					padding-top: 22px;
 
 					> * {
 						line-height: 28px;

From bfd01747d1dadd5dde0f7401d9d43acb739f1e7a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 17 Aug 2022 16:38:17 -0700
Subject: [PATCH 053/245] revert: :arrow_down: Go back to vue-plyr

Fork had problems with vertical videos
---
 CALCKEY.md                                    |  2 +-
 package.json                                  |  2 +-
 packages/client/package.json                  |  2 +-
 .../client/src/components/media-banner.vue    |  4 +-
 .../client/src/components/media-video.vue     |  4 +-
 yarn.lock                                     | 64 +++++++++++++------
 6 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index 13977ea50..21675f291 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -55,6 +55,7 @@
 - Mark as read from notifications widget
 - Less cluttered notification summary
 - Better welcome screen (not logged in)
+- vue-plyr as video/audio player
 - Ability to turn off "Connection lost" message
 - Raw instance info only for moderators
 - New spinner animation
@@ -65,7 +66,6 @@
 - Reply limit bug fixed
 - Make showing the update popup optional
 - Obliteration of Ai-chan
-- [@skjnldsv/vue-plyr](https://www.npmjs.com/package/@skjnldsv/vue-plyr) as video/audio player
 - [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996)
 - [Tapping avatar in mobile opens account modal](https://github.com/misskey-dev/misskey/pull/9056)
 - [OAuth bearer token authentication](https://github.com/misskey-dev/misskey/pull/9021)
diff --git a/package.json b/package.json
index dcdd9aeda..6e6417912 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.8.1",
+	"version": "12.118.1-calc.8.2",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/package.json b/packages/client/package.json
index a71c3327d..0c6e76d83 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -12,7 +12,6 @@
 		"@rollup/plugin-alias": "3.1.9",
 		"@rollup/plugin-json": "4.1.0",
 		"@rollup/pluginutils": "^4.2.1",
-		"@skjnldsv/vue-plyr": "^7.2.0",
 		"@syuilo/aiscript": "0.11.1",
 		"@vitejs/plugin-vue": "3.0.3",
 		"@vue/compiler-sfc": "3.2.37",
@@ -61,6 +60,7 @@
 		"vanilla-tilt": "1.7.2",
 		"vite": "3.0.7",
 		"vue": "3.2.37",
+		"vue-plyr": "^7.0.0",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vuedraggable": "4.0.1"
 	},
diff --git a/packages/client/src/components/media-banner.vue b/packages/client/src/components/media-banner.vue
index c020be75b..7382e953a 100644
--- a/packages/client/src/components/media-banner.vue
+++ b/packages/client/src/components/media-banner.vue
@@ -30,9 +30,9 @@
 <script lang="ts" setup>
 import { onMounted } from 'vue';
 import * as misskey from 'misskey-js';
-import VuePlyr from '@skjnldsv/vue-plyr';
+import VuePlyr from 'vue-plyr';
 import { ColdDeviceStorage } from '@/store';
-import '@skjnldsv/vue-plyr/dist/vue-plyr.css';
+import 'vue-plyr/dist/vue-plyr.css';
 
 const props = withDefaults(defineProps<{
 	media: misskey.entities.DriveFile;
diff --git a/packages/client/src/components/media-video.vue b/packages/client/src/components/media-video.vue
index 260835a76..0dfd304aa 100644
--- a/packages/client/src/components/media-video.vue
+++ b/packages/client/src/components/media-video.vue
@@ -28,9 +28,9 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import * as misskey from 'misskey-js';
-import VuePlyr from '@skjnldsv/vue-plyr';
+import VuePlyr from 'vue-plyr';
 import { defaultStore } from '@/store';
-import '@skjnldsv/vue-plyr/dist/vue-plyr.css';
+import 'vue-plyr/dist/vue-plyr.css';
 
 const props = defineProps<{
 	video: misskey.entities.DriveFile;
diff --git a/yarn.lock b/yarn.lock
index 5765c010f..0a741e8e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -33,7 +33,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.16.4, @babel/parser@npm:^7.6.0, @babel/parser@npm:^7.9.6":
+"@babel/parser@npm:^7.16.4, @babel/parser@npm:^7.18.4, @babel/parser@npm:^7.6.0, @babel/parser@npm:^7.9.6":
   version: 7.18.11
   resolution: "@babel/parser@npm:7.18.11"
   bin:
@@ -798,16 +798,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@skjnldsv/vue-plyr@npm:^7.2.0":
-  version: 7.2.0
-  resolution: "@skjnldsv/vue-plyr@npm:7.2.0"
-  dependencies:
-    plyr: ^3.6.8
-    vue: ^3.2.37
-  checksum: fc39a9159b9539b12e1ea9e7404c98766418eb19146a14ea6bd540cfa69619b38ba03766e905ee063ffdf69dd6725976759d420b7945cce99e283a33668ac515
-  languageName: node
-  linkType: hard
-
 "@sqltools/formatter@npm:^1.2.2":
   version: 1.2.3
   resolution: "@sqltools/formatter@npm:1.2.3"
@@ -1984,6 +1974,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vue/compiler-sfc@npm:2.7.8":
+  version: 2.7.8
+  resolution: "@vue/compiler-sfc@npm:2.7.8"
+  dependencies:
+    "@babel/parser": ^7.18.4
+    postcss: ^8.4.14
+    source-map: ^0.6.1
+  checksum: da0b4b0866224fe2aee376a88c25914da4e73ba9e11e7aa2ed240b99897735b4a988e951dcae9c8f0843216c5a97050bf16e1bb04bf65541444a8bdfedc35b38
+  languageName: node
+  linkType: hard
+
 "@vue/compiler-sfc@npm:3.2.37":
   version: 3.2.37
   resolution: "@vue/compiler-sfc@npm:3.2.37"
@@ -3855,7 +3856,6 @@ __metadata:
     "@rollup/plugin-alias": 3.1.9
     "@rollup/plugin-json": 4.1.0
     "@rollup/pluginutils": ^4.2.1
-    "@skjnldsv/vue-plyr": ^7.2.0
     "@syuilo/aiscript": 0.11.1
     "@types/escape-regexp": 0.0.1
     "@types/glob": 7.2.0
@@ -3924,6 +3924,7 @@ __metadata:
     vanilla-tilt: 1.7.2
     vite: 3.0.7
     vue: 3.2.37
+    vue-plyr: ^7.0.0
     vue-prism-editor: 2.0.0-alpha.2
     vuedraggable: 4.0.1
   languageName: unknown
@@ -4609,6 +4610,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"csstype@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "csstype@npm:3.1.0"
+  checksum: 644e986cefab86525f0b674a06889cfdbb1f117e5b7d1ce0fc55b0423ecc58807a1ea42ecc75c4f18999d14fc42d1d255f84662a45003a52bb5840e977eb2ffd
+  languageName: node
+  linkType: hard
+
 "custom-event-polyfill@npm:^1.0.7":
   version: 1.0.7
   resolution: "custom-event-polyfill@npm:1.0.7"
@@ -11527,16 +11535,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"plyr@npm:^3.6.8":
-  version: 3.7.2
-  resolution: "plyr@npm:3.7.2"
+"plyr@github:sampotts/plyr#develop":
+  version: 3.7.0
+  resolution: "plyr@https://github.com/sampotts/plyr.git#commit=d434c9af16e641400aaee93188594208d88f2658"
   dependencies:
     core-js: ^3.22.0
     custom-event-polyfill: ^1.0.7
     loadjs: ^4.2.0
     rangetouch: ^2.0.1
     url-polyfill: ^1.1.12
-  checksum: 140b2e43272023737dd7f95b7bc745490131da866a4ef154f6b2c7992f94d6d951b859614ca851c3ec4a134b6b8fd1244a2642d2739dfad3aae5402b8f311455
+  checksum: ee85815c1c992141af030d71f70e79532814b142b0057c1bedbf7c74000a79f647147bb1f03f3a9f725341afa43e848e7b54168361d95285dfed30d53be63607
   languageName: node
   linkType: hard
 
@@ -11875,7 +11883,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.1.10, postcss@npm:^8.3.11, postcss@npm:^8.4.16":
+"postcss@npm:^8.1.10, postcss@npm:^8.3.11, postcss@npm:^8.4.14, postcss@npm:^8.4.16":
   version: 8.4.16
   resolution: "postcss@npm:8.4.16"
   dependencies:
@@ -15308,6 +15316,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vue-plyr@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "vue-plyr@npm:7.0.0"
+  dependencies:
+    plyr: "github:sampotts/plyr#develop"
+    vue: ^2.6.12
+  checksum: 004d830cfc9dbe0563cafafab6240379b7224362d3e60d8d441126f0eaafd2487c7416cb434482165b52e961b83f020dfbc2645536aa8ba991f101477d984206
+  languageName: node
+  linkType: hard
+
 "vue-prism-editor@npm:2.0.0-alpha.2":
   version: 2.0.0-alpha.2
   resolution: "vue-prism-editor@npm:2.0.0-alpha.2"
@@ -15317,7 +15335,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vue@npm:3.2.37, vue@npm:^3.2.37":
+"vue@npm:3.2.37":
   version: 3.2.37
   resolution: "vue@npm:3.2.37"
   dependencies:
@@ -15330,6 +15348,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vue@npm:^2.6.12":
+  version: 2.7.8
+  resolution: "vue@npm:2.7.8"
+  dependencies:
+    "@vue/compiler-sfc": 2.7.8
+    csstype: ^3.1.0
+  checksum: 45fc85a13fc027798ad859fe4a5509b54217ae2f129240fc349a799bd4dbc6848ef8fa9968ab7ef7afcb954735882dbfdeb746673aa3f051e4d7ae555c213a1b
+  languageName: node
+  linkType: hard
+
 "vuedraggable@npm:4.0.1":
   version: 4.0.1
   resolution: "vuedraggable@npm:4.0.1"

From edb60d096165abd84d381b560ffd2ab3c3c82d03 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 18 Aug 2022 09:42:21 -0700
Subject: [PATCH 054/245] chore: :package: Add vue3-lottie

---
 packages/client/package.json |  1 +
 yarn.lock                    | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/packages/client/package.json b/packages/client/package.json
index 0c6e76d83..62d0ed25b 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -62,6 +62,7 @@
 		"vue": "3.2.37",
 		"vue-plyr": "^7.0.0",
 		"vue-prism-editor": "2.0.0-alpha.2",
+		"vue3-lottie": "^2.2.5",
 		"vuedraggable": "4.0.1"
 	},
 	"devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 0a741e8e4..07896f4f0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3926,6 +3926,7 @@ __metadata:
     vue: 3.2.37
     vue-plyr: ^7.0.0
     vue-prism-editor: 2.0.0-alpha.2
+    vue3-lottie: ^2.2.5
     vuedraggable: 4.0.1
   languageName: unknown
   linkType: soft
@@ -9640,6 +9641,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lottie-web@npm:^5.8.1":
+  version: 5.9.6
+  resolution: "lottie-web@npm:5.9.6"
+  checksum: aed6a1d0c24eefb6c42a42aae18f29737746551cfdc86319f1b9675f5bc276ba26971e8d2b0e1498df880571fe4bfe2fc87885a1d4f8a318d5e4e5b939b7a474
+  languageName: node
+  linkType: hard
+
 "lowercase-keys@npm:^2.0.0":
   version: 2.0.0
   resolution: "lowercase-keys@npm:2.0.0"
@@ -15335,6 +15343,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vue3-lottie@npm:^2.2.5":
+  version: 2.2.5
+  resolution: "vue3-lottie@npm:2.2.5"
+  dependencies:
+    lottie-web: ^5.8.1
+  peerDependencies:
+    vue: ^3.2
+  checksum: a044f2c9e9ec3940cd3c7f241d708d7c7a4dd401e4e49996f7350c70ac19c6459a5334a0bc3aa96c4d58cabaa309908a3fec43cbdf9a5c1954a0023b190cb96b
+  languageName: node
+  linkType: hard
+
 "vue@npm:3.2.37":
   version: 3.2.37
   resolution: "vue@npm:3.2.37"

From 3aa8a5ca6008c2e4d6918c1ca97702740092c2ff Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 18 Aug 2022 16:48:22 -0700
Subject: [PATCH 055/245] feat: :alembic: New post button on mobile

---
 package.json                         |  2 +-
 packages/client/src/ui/universal.vue | 50 +++++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 6e6417912..f925ce25f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.8.2",
+	"version": "12.118.1-calc.9",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 2d80907c4..c65875266 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -23,9 +23,10 @@
 		<button class="button home _button" @click="mainRouter.currentRoute.value.name === 'index' ? top() : mainRouter.push('/')"><i class="fas fa-home"></i></button>
 		<button class="button notifications _button" @click="mainRouter.push('/my/notifications')"><i class="fas fa-bell"></i><span v-if="$i?.hasUnreadNotification" class="indicator"><i class="fas fa-circle"></i></span></button>
 		<button class="button widget _button" @click="widgetsShowing = true"><i class="fas fa-layer-group"></i></button>
-		<button class="button post _button" @click="os.post()"><i class="fas fa-pencil-alt"></i></button>
 	</div>
 
+	<button id="postButton" class="button post _button" @click="os.post()"><i class="fas fa-pencil-alt"></i></button>
+
 	<transition :name="$store.state.animation ? 'menuDrawer-back' : ''">
 		<div
 			v-if="drawerMenuShowing"
@@ -115,6 +116,22 @@ mainRouter.on('change', () => {
 
 document.documentElement.style.overflowY = 'scroll';
 
+let timer = -1;
+const postButton = document.getElementById('postButton');
+window.addEventListener('scroll', () => {
+	if (timer !== -1) {
+		if (postButton != null) {
+			postButton.style.animation = 'shrink 0.5s linear 1';
+		}
+		clearTimeout(timer);
+	}
+	timer = setTimeout(() => {
+		if (postButton != null) {
+			postButton.style.animation = 'grow 0.5s linear 1';
+		}
+	}, 150);
+}, false);
+
 if (defaultStore.state.widgets.length === 0) {
 	defaultStore.set('widgets', [{
 		name: 'calendar',
@@ -175,6 +192,24 @@ const wallpaper = localStorage.getItem('wallpaper') != null;
 </script>
 
 <style lang="scss" scoped>
+@keyframes shrink {
+	from {
+			transform: scale(1);
+	}
+	to {
+			transform: scale(0);
+	}
+}
+
+@keyframes grow {
+	from {
+			transform: scale(0);
+	}
+	to {
+			transform: scale(1);
+	}
+}
+
 .widgetsDrawer-enter-active,
 .widgetsDrawer-leave-active {
 	opacity: 1;
@@ -285,6 +320,19 @@ const wallpaper = localStorage.getItem('wallpaper') != null;
 		background: var(--bg);
 	}
 
+	> #postButton {
+		bottom: 6rem;
+		right: 1.5rem;
+		height: 4.5rem;
+		width: 4.5rem;
+		background: var(--panelHighlight);
+		position: fixed !important;
+		z-index: 1000;
+		font-size: 16px;
+		border-radius: 10px;
+		box-shadow: var(--shadow) 0px 0px 25px;
+	}
+
 	> .buttons {
 		position: fixed;
 		z-index: 1000;

From 2e686fc96601ebe38871b7d744c57a25bc968bca Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 18 Aug 2022 17:05:30 -0700
Subject: [PATCH 056/245] fix: :bug: only show on mobile, fix animation

---
 packages/client/src/ui/universal.vue | 34 +++++++++++-----------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index c65875266..e187f3fdb 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -25,7 +25,7 @@
 		<button class="button widget _button" @click="widgetsShowing = true"><i class="fas fa-layer-group"></i></button>
 	</div>
 
-	<button id="postButton" class="button post _button" @click="os.post()"><i class="fas fa-pencil-alt"></i></button>
+	<button v-if="isMobile" id="postButton" class="button post _button" @click="os.post()"><i class="fas fa-pencil-alt"></i></button>
 
 	<transition :name="$store.state.animation ? 'menuDrawer-back' : ''">
 		<div
@@ -121,13 +121,13 @@ const postButton = document.getElementById('postButton');
 window.addEventListener('scroll', () => {
 	if (timer !== -1) {
 		if (postButton != null) {
-			postButton.style.animation = 'shrink 0.5s linear 1';
+			postButton.style.transform = 'scale(0)';
 		}
 		clearTimeout(timer);
 	}
 	timer = setTimeout(() => {
 		if (postButton != null) {
-			postButton.style.animation = 'grow 0.5s linear 1';
+			postButton.style.transform = 'scale(1)';
 		}
 	}, 150);
 }, false);
@@ -192,24 +192,6 @@ const wallpaper = localStorage.getItem('wallpaper') != null;
 </script>
 
 <style lang="scss" scoped>
-@keyframes shrink {
-	from {
-			transform: scale(1);
-	}
-	to {
-			transform: scale(0);
-	}
-}
-
-@keyframes grow {
-	from {
-			transform: scale(0);
-	}
-	to {
-			transform: scale(1);
-	}
-}
-
 .widgetsDrawer-enter-active,
 .widgetsDrawer-leave-active {
 	opacity: 1;
@@ -325,12 +307,22 @@ const wallpaper = localStorage.getItem('wallpaper') != null;
 		right: 1.5rem;
 		height: 4.5rem;
 		width: 4.5rem;
+		background-position: center;
 		background: var(--panelHighlight);
+		color: var(--fg);
 		position: fixed !important;
 		z-index: 1000;
 		font-size: 16px;
 		border-radius: 10px;
 		box-shadow: var(--shadow) 0px 0px 25px;
+		transition: background 0.6s;
+		transition: 0.3s;
+
+		&:active {
+			background-color: var(--accentedBg);
+			background-size: 100%;
+			transition: background 0.1s;
+		}
 	}
 
 	> .buttons {

From dda8655ca3b318130429a7afa820c4ddf47607e2 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 18 Aug 2022 17:10:07 -0700
Subject: [PATCH 057/245] same styles for postbutton and widgetbutton

---
 packages/client/src/ui/universal.vue | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index e187f3fdb..b86088ea6 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -25,7 +25,7 @@
 		<button class="button widget _button" @click="widgetsShowing = true"><i class="fas fa-layer-group"></i></button>
 	</div>
 
-	<button v-if="isMobile" id="postButton" class="button post _button" @click="os.post()"><i class="fas fa-pencil-alt"></i></button>
+	<button v-if="isMobile" class="postButton button post _button" @click="os.post()"><i class="fas fa-pencil-alt"></i></button>
 
 	<transition :name="$store.state.animation ? 'menuDrawer-back' : ''">
 		<div
@@ -270,20 +270,6 @@ const wallpaper = localStorage.getItem('wallpaper') != null;
 		}
 	}
 
-	> .widgetButton {
-		display: block;
-		position: fixed;
-		z-index: 1000;
-		bottom: 32px;
-		right: 32px;
-		width: 64px;
-		height: 64px;
-		border-radius: 100%;
-		box-shadow: 0 3px 5px -1px rgba(0, 0, 0, 0.2), 0 6px 10px 0 rgba(0, 0, 0, 0.14), 0 1px 18px 0 rgba(0, 0, 0, 0.12);
-		font-size: 22px;
-		background: var(--panel);
-	}
-
 	> .widgetsDrawer-back {
 		z-index: 1001;
 	}
@@ -302,7 +288,7 @@ const wallpaper = localStorage.getItem('wallpaper') != null;
 		background: var(--bg);
 	}
 
-	> #postButton {
+	> .postButton, .widgetButton {
 		bottom: 6rem;
 		right: 1.5rem;
 		height: 4.5rem;

From 93cdf4313eab40c8a41bdd5afde2e9107a886d44 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 18 Aug 2022 17:23:32 -0700
Subject: [PATCH 058/245] fix: :bug: fix scroll

---
 package.json                         |  2 +-
 packages/client/src/ui/universal.vue | 48 +++++++++++++++++-----------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index f925ce25f..4b55046c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.9",
+	"version": "12.118.1-calc.9.3",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index b86088ea6..d135e552b 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -116,22 +116,6 @@ mainRouter.on('change', () => {
 
 document.documentElement.style.overflowY = 'scroll';
 
-let timer = -1;
-const postButton = document.getElementById('postButton');
-window.addEventListener('scroll', () => {
-	if (timer !== -1) {
-		if (postButton != null) {
-			postButton.style.transform = 'scale(0)';
-		}
-		clearTimeout(timer);
-	}
-	timer = setTimeout(() => {
-		if (postButton != null) {
-			postButton.style.transform = 'scale(1)';
-		}
-	}, 150);
-}, false);
-
 if (defaultStore.state.widgets.length === 0) {
 	defaultStore.set('widgets', [{
 		name: 'calendar',
@@ -153,7 +137,7 @@ onMounted(() => {
 	}
 });
 
-const onContextmenu = (ev) => {
+const onContextmenu = (ev: MouseEvent) => {
 	const isLink = (el: HTMLElement) => {
 		if (el.tagName === 'A') return true;
 		if (el.parentElement) {
@@ -176,7 +160,7 @@ const onContextmenu = (ev) => {
 	}], ev);
 };
 
-const attachSticky = (el) => {
+const attachSticky = (el: any) => {
 	const sticky = new StickySidebar(widgetsEl);
 	window.addEventListener('scroll', () => {
 		sticky.calc(window.scrollY);
@@ -187,8 +171,26 @@ function top() {
 	window.scroll({ top: 0, behavior: 'smooth' });
 }
 
+let scrollPos = 0;
+const postButton = document.querySelector<HTMLElement>('.postButton');
+
+function checkPosition() {
+	let windowY = window.scrollY;
+	if (postButton != null) {
+		if (windowY < scrollPos) {
+			postButton.style.transform = 'scale(1)';
+		} else {
+			postButton.style.transform = 'scale(0)';
+		}
+	}
+	scrollPos = windowY;
+}
+
+window.addEventListener('scroll', checkPosition);
+
 const wallpaper = localStorage.getItem('wallpaper') != null;
 
+
 </script>
 
 <style lang="scss" scoped>
@@ -302,7 +304,15 @@ const wallpaper = localStorage.getItem('wallpaper') != null;
 		border-radius: 10px;
 		box-shadow: var(--shadow) 0px 0px 25px;
 		transition: background 0.6s;
-		transition: 0.3s;
+		transition: transform 0.3s;
+
+		> .isHidden {
+			transform: scale(0);
+		}
+
+		> .isVisible {
+			transform: scale(1);
+		}
 
 		&:active {
 			background-color: var(--accentedBg);

From 4932ab2c349cd827144a097c17c9290cfed7fceb Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 18 Aug 2022 17:37:33 -0700
Subject: [PATCH 059/245] fix: :bug: fix again

---
 package.json                         | 2 +-
 packages/client/src/ui/universal.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 4b55046c3..8942b2426 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.9.3",
+	"version": "12.118.1-calc.9.4",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index d135e552b..e026b4562 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -25,7 +25,7 @@
 		<button class="button widget _button" @click="widgetsShowing = true"><i class="fas fa-layer-group"></i></button>
 	</div>
 
-	<button v-if="isMobile" class="postButton button post _button" @click="os.post()"><i class="fas fa-pencil-alt"></i></button>
+	<button v-if="isMobile" id="postButton" class="postButton button post _button" @click="os.post()"><i class="fas fa-pencil-alt"></i></button>
 
 	<transition :name="$store.state.animation ? 'menuDrawer-back' : ''">
 		<div
@@ -172,7 +172,7 @@ function top() {
 }
 
 let scrollPos = 0;
-const postButton = document.querySelector<HTMLElement>('.postButton');
+const postButton = document.getElementById('postButton');
 
 function checkPosition() {
 	let windowY = window.scrollY;

From d173aea0e48d72f17c7754dee856afc0cc619c6e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 Aug 2022 14:24:30 -0700
Subject: [PATCH 060/245] Video in messages

---
 CALCKEY.md                                         |  2 +-
 package.json                                       |  2 +-
 .../src/pages/messaging/messaging-room.message.vue | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index 21675f291..293c2baba 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -3,7 +3,6 @@
 ## Planned
 
 - MFM button
-- Better Messaging UI
 - Classic mode make instance icon bring up new context menu
 - Like/star button
 - Option to publicize instance blocks
@@ -20,6 +19,7 @@
 
 ## Work in progress
 
+- Better Messaging UI
 - OCR image captioning
 - Swipe through timelines on mobile
 - Admin custom CSS
diff --git a/package.json b/package.json
index 8942b2426..8bec08ba0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.9.4",
+	"version": "12.118.1-calc.9.5",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/messaging/messaging-room.message.vue b/packages/client/src/pages/messaging/messaging-room.message.vue
index 8f1d0bea6..8e0f24835 100644
--- a/packages/client/src/pages/messaging/messaging-room.message.vue
+++ b/packages/client/src/pages/messaging/messaging-room.message.vue
@@ -11,6 +11,18 @@
 				<div v-if="message.file" class="file">
 					<a :href="message.file.url" rel="noopener" target="_blank" :title="message.file.name">
 						<img v-if="message.file.type.split('/')[0] == 'image'" :src="message.file.url" :alt="message.file.name"/>
+						<VuePlyr v-if="message.file.type.split('/')[0] == 'video'">
+							<video
+								:alt="message.file.name"
+								preload="none"
+								controls
+								@contextmenu.stop
+							>
+								<source
+									:src="message.file.url"
+								>
+							</video>
+						</VuePlyr>
 						<p v-else>{{ message.file.name }}</p>
 					</a>
 				</div>
@@ -39,6 +51,7 @@
 import { } from 'vue';
 import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
+import VuePlyr from 'vue-plyr';
 import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm';
 import MkUrlPreview from '@/components/url-preview.vue';
 import * as os from '@/os';
@@ -62,6 +75,7 @@ function del(): void {
 <style lang="scss" scoped>
 .thvuemwp {
 	$me-balloon-color: var(--accent);
+	--plyr-color-main: var(--accent);
 
 	position: relative;
 	background-color: transparent;

From 6b7a18b967b2faf762c844bf302bee2629e68a58 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 Aug 2022 14:25:08 -0700
Subject: [PATCH 061/245] fix: :bug: scroll

---
 packages/client/src/ui/universal.vue | 33 ++++++++++++++--------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index e026b4562..d8f66d54f 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -133,6 +133,22 @@ onMounted(() => {
 	if (!isDesktop.value) {
 		window.addEventListener('resize', () => {
 			if (window.innerWidth >= DESKTOP_THRESHOLD) isDesktop.value = true;
+			let scrollPos = 0;
+			const postButton = document.getElementById('postButton');
+
+			function checkPosition() {
+				let windowY = window.scrollY;
+				if (postButton != null) {
+					if (windowY < scrollPos) {
+						postButton.style.transform = 'scale(1)';
+					} else {
+						postButton.style.transform = 'scale(0)';
+					}
+				}
+				scrollPos = windowY;
+			}
+
+			window.addEventListener('scroll', checkPosition);
 		}, { passive: true });
 	}
 });
@@ -171,23 +187,6 @@ function top() {
 	window.scroll({ top: 0, behavior: 'smooth' });
 }
 
-let scrollPos = 0;
-const postButton = document.getElementById('postButton');
-
-function checkPosition() {
-	let windowY = window.scrollY;
-	if (postButton != null) {
-		if (windowY < scrollPos) {
-			postButton.style.transform = 'scale(1)';
-		} else {
-			postButton.style.transform = 'scale(0)';
-		}
-	}
-	scrollPos = windowY;
-}
-
-window.addEventListener('scroll', checkPosition);
-
 const wallpaper = localStorage.getItem('wallpaper') != null;
 
 

From 8c35556410e7b6337fbfd7557e3613eb93e64757 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 Aug 2022 14:30:47 -0700
Subject: [PATCH 062/245] fix: :bug: fix videos having `<a>`

---
 package.json                                  |  2 +-
 .../messaging/messaging-room.message.vue      | 28 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 8bec08ba0..53a771442 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.9.5",
+	"version": "12.118.1-calc.9.6",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/messaging/messaging-room.message.vue b/packages/client/src/pages/messaging/messaging-room.message.vue
index 8e0f24835..feafd94b9 100644
--- a/packages/client/src/pages/messaging/messaging-room.message.vue
+++ b/packages/client/src/pages/messaging/messaging-room.message.vue
@@ -9,21 +9,21 @@
 			<div v-if="!message.isDeleted" class="content">
 				<Mfm v-if="message.text" ref="text" class="text" :text="message.text" :i="$i"/>
 				<div v-if="message.file" class="file">
-					<a :href="message.file.url" rel="noopener" target="_blank" :title="message.file.name">
-						<img v-if="message.file.type.split('/')[0] == 'image'" :src="message.file.url" :alt="message.file.name"/>
-						<VuePlyr v-if="message.file.type.split('/')[0] == 'video'">
-							<video
-								:alt="message.file.name"
-								preload="none"
-								controls
-								@contextmenu.stop
+					<img v-if="message.file.type.split('/')[0] == 'image'" :src="message.file.url" :alt="message.file.name"/>
+					<VuePlyr v-else-if="message.file.type.split('/')[0] == 'video'">
+						<video
+							:alt="message.file.name"
+							preload="none"
+							controls
+							@contextmenu.stop
+						>
+							<source
+								:src="message.file.url"
 							>
-								<source
-									:src="message.file.url"
-								>
-							</video>
-						</VuePlyr>
-						<p v-else>{{ message.file.name }}</p>
+						</video>
+					</VuePlyr>
+					<a v-else :href="message.file.url" rel="noopener" target="_blank" :title="message.file.name">
+						<p>{{ message.file.name }}</p>
 					</a>
 				</div>
 			</div>

From abd0c1c51b1523916e1b13c4f1af8e94768258eb Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 Aug 2022 14:31:23 -0700
Subject: [PATCH 063/245] cl

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

diff --git a/CALCKEY.md b/CALCKEY.md
index 293c2baba..25a71f567 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -20,6 +20,7 @@
 ## Work in progress
 
 - Better Messaging UI
+  - Videos can be played in DMs
 - OCR image captioning
 - Swipe through timelines on mobile
 - Admin custom CSS

From 21612d4f5e1f677015bb486dca9f560bf57730d9 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 Aug 2022 14:38:46 -0700
Subject: [PATCH 064/245] allow videos to be downloaded

---
 packages/client/src/components/media-video.vue                 | 1 +
 packages/client/src/pages/messaging/messaging-room.message.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/client/src/components/media-video.vue b/packages/client/src/components/media-video.vue
index 0dfd304aa..92e9e9d6f 100644
--- a/packages/client/src/components/media-video.vue
+++ b/packages/client/src/components/media-video.vue
@@ -11,6 +11,7 @@
 			:poster="video.thumbnailUrl"
 			:title="video.comment"
 			:alt="video.comment"
+			:download="video.url"
 			preload="none"
 			controls
 			@contextmenu.stop
diff --git a/packages/client/src/pages/messaging/messaging-room.message.vue b/packages/client/src/pages/messaging/messaging-room.message.vue
index feafd94b9..e718e386b 100644
--- a/packages/client/src/pages/messaging/messaging-room.message.vue
+++ b/packages/client/src/pages/messaging/messaging-room.message.vue
@@ -13,6 +13,7 @@
 					<VuePlyr v-else-if="message.file.type.split('/')[0] == 'video'">
 						<video
 							:alt="message.file.name"
+							:download="message.file.url"
 							preload="none"
 							controls
 							@contextmenu.stop

From b00a1c13a0c455d4e33069d30b91f0af32a0989c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 Aug 2022 14:41:05 -0700
Subject: [PATCH 065/245] fix: :lipstick: only show post button on home tl

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

diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index d8f66d54f..93bee149f 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -25,7 +25,7 @@
 		<button class="button widget _button" @click="widgetsShowing = true"><i class="fas fa-layer-group"></i></button>
 	</div>
 
-	<button v-if="isMobile" id="postButton" class="postButton button post _button" @click="os.post()"><i class="fas fa-pencil-alt"></i></button>
+	<button v-if="isMobile && mainRouter.currentRoute.value.name === 'index'" id="postButton" class="postButton button post _button" @click="os.post()"><i class="fas fa-pencil-alt"></i></button>
 
 	<transition :name="$store.state.animation ? 'menuDrawer-back' : ''">
 		<div

From 793fa94c15907562e6abc6733b183efb70a67d41 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 Aug 2022 14:41:43 -0700
Subject: [PATCH 066/245] =?UTF-8?q?=F0=9F=94=96=20.10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/package.json b/package.json
index 53a771442..3aa704aa6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.9.6",
+	"version": "12.118.1-calc.10",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From ec28c5cc73dfdfdc625ce3fc8b2dfbb82e35c6e5 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 Aug 2022 14:50:58 -0700
Subject: [PATCH 067/245] fix: :bug: ref

---
 package.json                         |  2 +-
 packages/client/src/ui/universal.vue | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 3aa704aa6..d22fc9724 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.10",
+	"version": "12.118.1-calc.10.1",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 93bee149f..2fa83c6e9 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -25,7 +25,7 @@
 		<button class="button widget _button" @click="widgetsShowing = true"><i class="fas fa-layer-group"></i></button>
 	</div>
 
-	<button v-if="isMobile && mainRouter.currentRoute.value.name === 'index'" id="postButton" class="postButton button post _button" @click="os.post()"><i class="fas fa-pencil-alt"></i></button>
+	<button v-if="isMobile && mainRouter.currentRoute.value.name === 'index'" ref="postButton" class="postButton button post _button" @click="os.post()"><i class="fas fa-pencil-alt"></i></button>
 
 	<transition :name="$store.state.animation ? 'menuDrawer-back' : ''">
 		<div
@@ -89,6 +89,7 @@ window.addEventListener('resize', () => {
 
 let pageMetadata = $ref<null | ComputedRef<PageMetadata>>();
 const widgetsEl = $ref<HTMLElement>();
+const postButton = $ref<HTMLElement>();
 const widgetsShowing = $ref(false);
 
 provide('router', mainRouter);
@@ -134,17 +135,15 @@ onMounted(() => {
 		window.addEventListener('resize', () => {
 			if (window.innerWidth >= DESKTOP_THRESHOLD) isDesktop.value = true;
 			let scrollPos = 0;
-			const postButton = document.getElementById('postButton');
 
 			function checkPosition() {
 				let windowY = window.scrollY;
-				if (postButton != null) {
-					if (windowY < scrollPos) {
-						postButton.style.transform = 'scale(1)';
-					} else {
-						postButton.style.transform = 'scale(0)';
-					}
-				}
+				postButton.style.transform = `scale(${windowY < scrollPos ? '1' : '0'})`;
+				// if (windowY < scrollPos) {
+				// 	postButton.style.transform = 'scale(1)';
+				// } else {
+				// 	postButton.style.transform = 'scale(0)';
+				// }
 				scrollPos = windowY;
 			}
 

From 532c0187f605e332c546ad94d62937fec025a9de Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 Aug 2022 14:51:40 -0700
Subject: [PATCH 068/245] chore: :coffin: works

---
 packages/client/src/ui/universal.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 2fa83c6e9..aa4498ac6 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -139,11 +139,6 @@ onMounted(() => {
 			function checkPosition() {
 				let windowY = window.scrollY;
 				postButton.style.transform = `scale(${windowY < scrollPos ? '1' : '0'})`;
-				// if (windowY < scrollPos) {
-				// 	postButton.style.transform = 'scale(1)';
-				// } else {
-				// 	postButton.style.transform = 'scale(0)';
-				// }
 				scrollPos = windowY;
 			}
 

From 1c02c1097dcf4ab2193ec39c8afe02c82e8dc9d9 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 Aug 2022 14:58:54 -0700
Subject: [PATCH 069/245] finally fix

---
 package.json                         |  2 +-
 packages/client/src/ui/universal.vue | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index d22fc9724..1ef66b1cd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.10.1",
+	"version": "12.118.1-calc.10.2",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index aa4498ac6..e095f7c20 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -134,15 +134,14 @@ onMounted(() => {
 	if (!isDesktop.value) {
 		window.addEventListener('resize', () => {
 			if (window.innerWidth >= DESKTOP_THRESHOLD) isDesktop.value = true;
-			let scrollPos = 0;
+		}, { passive: true });
 
-			function checkPosition() {
-				let windowY = window.scrollY;
-				postButton.style.transform = `scale(${windowY < scrollPos ? '1' : '0'})`;
-				scrollPos = windowY;
-			}
+		let scrollPos = 0;
 
-			window.addEventListener('scroll', checkPosition);
+		window.addEventListener('scroll', () => {
+			let windowY = window.scrollY;
+			postButton.style.transform = `scale(${windowY < scrollPos ? '1' : '0'})`;
+			scrollPos = windowY;
 		}, { passive: true });
 	}
 });
@@ -183,7 +182,6 @@ function top() {
 
 const wallpaper = localStorage.getItem('wallpaper') != null;
 
-
 </script>
 
 <style lang="scss" scoped>

From 04a7e9c14725f6acc07df5470233a204bd725698 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 Aug 2022 22:55:21 -0700
Subject: [PATCH 070/245] hide button bg

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

diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index e095f7c20..0bbd58b38 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -330,7 +330,7 @@ const wallpaper = localStorage.getItem('wallpaper') != null;
 			margin: auto;
 			height: 64px;
 			border-radius: 8px;
-			background: var(--panel);
+			/* background: var(--panel); */
 			background-position: center;
 			transition: background 0.6s;
 			color: var(--fg);

From 5e9d1ee4784d41905069778fa6f2457ec42fcb7f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 Aug 2022 23:16:06 -0700
Subject: [PATCH 071/245] fix swipes?

---
 package.json                           |  2 +-
 packages/client/src/pages/timeline.vue | 44 ++++++++++++++------------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 1ef66b1cd..d49407e8d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.10.2",
+	"version": "12.118.1-calc.10.3",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 2a6f2740b..a3a215004 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -121,17 +121,6 @@ async function chooseAntenna(ev: MouseEvent): Promise<void> {
 	os.popupMenu(items, ev.currentTarget ?? ev.target);
 }
 
-async function chooseChannel(ev: MouseEvent): Promise<void> {
-	const channels = await os.api('channels/followed');
-	const items = channels.map((channel) => ({
-		type: 'link' as const,
-		text: channel.name,
-		indicate: channel.hasUnreadNote,
-		to: `/channels/${channel.id}`,
-	}));
-	os.popupMenu(items, ev.currentTarget ?? ev.target);
-}
-
 function saveSrc(
 	newSrc: 'home' | 'local' | 'recommended' | 'social' | 'global'
 ): void {
@@ -269,24 +258,37 @@ if (isMobile.value) {
 		let xDiff = xDown - xUp;
 		let yDiff = yDown - yUp;
 
+		let next = 'home';
+		let timelines = ['home'];
+
+		if (isLocalTimelineAvailable) {
+			timelines.push('local');
+		}
+		if (isRecommendedTimelineAvailable) {
+			timelines.push('recommended');
+		}
+		if (isLocalTimelineAvailable) {
+			timelines.push('social');
+		}
+		if (isGlobalTimelineAvailable) {
+			timelines.push('global');
+		}
+
 		if (Math.abs(xDiff) > Math.abs(yDiff)) {
 			if (xDiff > 0) {
 				console.log('right swipe');
-				const current = headerTabs.values.find((x) => x.key === src.value);
-				const next =
-					headerTabs.values[
-						(headerTabs.values.indexOf(current) + 1) % headerTabs.values.length
+				next =
+					timelines[
+						(timelines.indexOf(src) + 1) % timelines.length
 					];
-				saveSrc(next.key);
 			} else {
 				console.log('left swipe');
-				const current = headerTabs.values.find((x) => x.key === src.value);
-				const next =
-					headerTabs.values[
-						(headerTabs.values.indexOf(current) - 1) % headerTabs.values.length
+				next =
+					timelines[
+						(timelines.indexOf(src) + 1) % timelines.length
 					];
-				saveSrc(next.key);
 			}
+			saveSrc(next);
 		} /* else {
 			if (yDiff > 0) {
 				// down swipe

From 817ccb5b32f2235f291cbe421030ed3af6dad520 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 Aug 2022 23:20:28 -0700
Subject: [PATCH 072/245] fix: :bug: swipe left goes back a page

---
 package.json                           | 2 +-
 packages/client/src/pages/timeline.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d49407e8d..70c24b56f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.10.3",
+	"version": "12.118.1-calc.11",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index a3a215004..b22df6285 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -285,7 +285,7 @@ if (isMobile.value) {
 				console.log('left swipe');
 				next =
 					timelines[
-						(timelines.indexOf(src) + 1) % timelines.length
+						(timelines.indexOf(src) - 1) % timelines.length
 					];
 			}
 			saveSrc(next);

From eafc3260c983d5956f0ac868dacc4d7533028d03 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 Aug 2022 23:38:01 -0700
Subject: [PATCH 073/245] feat: :sparkles: Fade

---
 package.json                           |  2 +-
 packages/client/src/pages/timeline.vue | 54 +++++++++++++++++++-------
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 70c24b56f..a5e20b0b3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.11",
+	"version": "12.118.1-calc.11.1",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index b22df6285..27ba7fece 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -1,5 +1,6 @@
 <template>
 <MkStickyContainer>
+	<svg class="fader" ref="fader"></svg>
 	<template #header>
 		<MkPageHeader
 			v-model:tab="src"
@@ -83,6 +84,7 @@ window.addEventListener('resize', () => {
 
 const tlComponent = $ref<InstanceType<typeof XTimeline>>();
 const rootEl = $ref<HTMLElement>();
+const fader = $ref<SVGElement>();
 
 let queue = $ref(0);
 const src = $computed({
@@ -276,27 +278,20 @@ if (isMobile.value) {
 
 		if (Math.abs(xDiff) > Math.abs(yDiff)) {
 			if (xDiff > 0) {
-				console.log('right swipe');
-				next =
-					timelines[
-						(timelines.indexOf(src) + 1) % timelines.length
-					];
-			} else {
-				console.log('left swipe');
 				next =
 					timelines[
 						(timelines.indexOf(src) - 1) % timelines.length
 					];
-			}
-			saveSrc(next);
-		} /* else {
-			if (yDiff > 0) {
-				// down swipe
 			} else {
-				// up swipe
+				next =
+					timelines[
+						(timelines.indexOf(src) + 1) % timelines.length
+					];
 			}
-		} */
-		/* reset values */
+			fader.classList.remove('fade');
+			fader.classList.add('fade');
+			saveSrc(next);
+		}
 		xDown = null;
 		yDown = null;
 		return;
@@ -330,4 +325,33 @@ if (isMobile.value) {
 		overflow: clip;
 	}
 }
+
+@keyframes fade {
+		0%, 100% { opacity: 0 }
+		50% { opacity: 1 }
+}
+
+.fader {
+		position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+		opacity: 0;
+    z-index: 1001;
+		pointer-events: none;
+		background: var(--acrylicBg);
+		animation-duration: 0.25s;
+    animation-timing-function: ease-in-out;
+
+		> .fadeOut {
+			opacity: 0;
+			animation-name: fade-out;
+		}
+
+		> .fadeIn {
+			opacity: 1;
+			animation-name: fade-in;
+		}
+}
 </style>

From f89f81b4c08426d08f0f3626b74b59f7a96d0a86 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 Aug 2022 23:42:15 -0700
Subject: [PATCH 074/245] fix: :bug: swipe left on home wraps back

---
 package.json                           |  2 +-
 packages/client/src/pages/timeline.vue | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index a5e20b0b3..9e05c41fc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.11.1",
+	"version": "12.118.1-calc.11.2",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 27ba7fece..1795b9a05 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -278,15 +278,14 @@ if (isMobile.value) {
 
 		if (Math.abs(xDiff) > Math.abs(yDiff)) {
 			if (xDiff > 0) {
-				next =
-					timelines[
-						(timelines.indexOf(src) - 1) % timelines.length
-					];
+				if (src === 'home') {
+					next = 'global'
+				}
+				else {
+					next = timelines[(timelines.indexOf(src) - 1) % timelines.length];
+				}
 			} else {
-				next =
-					timelines[
-						(timelines.indexOf(src) + 1) % timelines.length
-					];
+				next = timelines[(timelines.indexOf(src) + 1) % timelines.length];
 			}
 			fader.classList.remove('fade');
 			fader.classList.add('fade');

From 6c0fc88a4b3aa5069c012144e050ea1564be8acd Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 Aug 2022 23:43:39 -0700
Subject: [PATCH 075/245] cl

---
 CALCKEY.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index 25a71f567..522b34286 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -22,7 +22,6 @@
 - Better Messaging UI
   - Videos can be played in DMs
 - OCR image captioning
-- Swipe through timelines on mobile
 - Admin custom CSS
 - Add back time machine (jump to date)
 - Improve accesibility score
@@ -39,6 +38,10 @@
   - Upgrade packages with security vunrabilities
 - Saner defaults
 - Recommended instances timeline
+- Improve mobile UX
+  - Swipe through timelines on mobile
+  - Redesigned mobile bottom nav bar
+  - Post button on TL
 - Star as default reaction
 - Rosé Pine by default (+ non-themable elements made Rosé Pine)
 - Better sidebar/navbar
@@ -48,7 +51,6 @@
   - Illustrated by [Henki](https://www.youtube.com/c/Henkiwashere)!
   - Licensed under the CC-BY-SA 4.0.
 - Better timeline top bar
-- Redesigned mobile bottom nav bar
 - Improved note style
   - Make more of the post clickable like every other SNS
   - No more details tag for reply attachments

From 504753c896f22d58f3080eb81eeaae603c74377c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 Aug 2022 23:48:21 -0700
Subject: [PATCH 076/245] chore: :fire: remove fader

---
 packages/client/src/pages/timeline.vue | 33 --------------------------
 1 file changed, 33 deletions(-)

diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 1795b9a05..d5cab01e3 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -1,6 +1,5 @@
 <template>
 <MkStickyContainer>
-	<svg class="fader" ref="fader"></svg>
 	<template #header>
 		<MkPageHeader
 			v-model:tab="src"
@@ -84,7 +83,6 @@ window.addEventListener('resize', () => {
 
 const tlComponent = $ref<InstanceType<typeof XTimeline>>();
 const rootEl = $ref<HTMLElement>();
-const fader = $ref<SVGElement>();
 
 let queue = $ref(0);
 const src = $computed({
@@ -287,8 +285,6 @@ if (isMobile.value) {
 			} else {
 				next = timelines[(timelines.indexOf(src) + 1) % timelines.length];
 			}
-			fader.classList.remove('fade');
-			fader.classList.add('fade');
 			saveSrc(next);
 		}
 		xDown = null;
@@ -324,33 +320,4 @@ if (isMobile.value) {
 		overflow: clip;
 	}
 }
-
-@keyframes fade {
-		0%, 100% { opacity: 0 }
-		50% { opacity: 1 }
-}
-
-.fader {
-		position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-		opacity: 0;
-    z-index: 1001;
-		pointer-events: none;
-		background: var(--acrylicBg);
-		animation-duration: 0.25s;
-    animation-timing-function: ease-in-out;
-
-		> .fadeOut {
-			opacity: 0;
-			animation-name: fade-out;
-		}
-
-		> .fadeIn {
-			opacity: 1;
-			animation-name: fade-in;
-		}
-}
 </style>

From f0af0b60f2de87afb831e70f794800c1aa570e0e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 Aug 2022 23:50:00 -0700
Subject: [PATCH 077/245] =?UTF-8?q?chore:=20=F0=9F=92=84=20button=20height?=
 =?UTF-8?q?=203.5rem?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                         | 2 +-
 packages/client/src/ui/universal.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 9e05c41fc..a2cd0d89c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.11.2",
+	"version": "12.118.1-calc.11.3",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 0bbd58b38..d0cba07fc 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -328,7 +328,7 @@ const wallpaper = localStorage.getItem('wallpaper') != null;
 			flex: 1;
 			padding: 0;
 			margin: auto;
-			height: 64px;
+			height: 3.5rem;
 			border-radius: 8px;
 			/* background: var(--panel); */
 			background-position: center;

From c544df7246f89000b48a09db24347b4b3219f357 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 Aug 2022 23:53:00 -0700
Subject: [PATCH 078/245] fix: :lipstick: consistent cw bg hover

---
 package.json                                 | 2 +-
 packages/client/src/components/cw-button.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index a2cd0d89c..c445b4cd7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.11.3",
+	"version": "12.118.1-calc.11.4",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/cw-button.vue b/packages/client/src/components/cw-button.vue
index ec0ebac7c..87a03cd5a 100644
--- a/packages/client/src/components/cw-button.vue
+++ b/packages/client/src/components/cw-button.vue
@@ -49,7 +49,7 @@ const toggle = () => {
 	transition: background-color 0.25s ease-in-out;
 
 	&:hover {
-		background: var(--X3);
+		background: lighten(var(--cwBg), 10%);
 	}
 
 	> span {

From bca91426db41ce6c62c82e572bf171f92c170e3e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 20 Aug 2022 00:02:15 -0700
Subject: [PATCH 079/245] feat: :sparkles: swipe thru notifs

---
 CALCKEY.md                                   |  2 +-
 package.json                                 |  2 +-
 packages/client/src/components/cw-button.vue |  3 +-
 packages/client/src/pages/notifications.vue  | 64 +++++++++++++++++++-
 packages/client/src/pages/timeline.vue       |  4 +-
 5 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index 522b34286..4b079659b 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -39,7 +39,7 @@
 - Saner defaults
 - Recommended instances timeline
 - Improve mobile UX
-  - Swipe through timelines on mobile
+  - Swipe through timelines/notifications on mobile
   - Redesigned mobile bottom nav bar
   - Post button on TL
 - Star as default reaction
diff --git a/package.json b/package.json
index c445b4cd7..dd4df6415 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.11.4",
+	"version": "12.118.1-calc.11.5",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/cw-button.vue b/packages/client/src/components/cw-button.vue
index 87a03cd5a..96b89d862 100644
--- a/packages/client/src/components/cw-button.vue
+++ b/packages/client/src/components/cw-button.vue
@@ -49,7 +49,8 @@ const toggle = () => {
 	transition: background-color 0.25s ease-in-out;
 
 	&:hover {
-		background: lighten(var(--cwBg), 10%);
+		background: var(--cwFg);
+		color: var(--cwBg);
 	}
 
 	> span {
diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index a3539ac7e..b290203f0 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -16,19 +16,29 @@
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import { notificationTypes } from 'misskey-js';
 import XNotifications from '@/components/notifications.vue';
 import XNotes from '@/components/notes.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
+import { deviceKind } from '@/scripts/device-kind';
 
 let tab = $ref('all');
 let includeTypes = $ref<string[] | null>(null);
 let unreadOnly = $computed(() => tab === 'unread');
 os.api('notifications/mark-all-as-read');
 
+const MOBILE_THRESHOLD = 500;
+const isMobile = ref(
+	deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD
+);
+window.addEventListener('resize', () => {
+	isMobile.value =
+		deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD;
+});
+
 const mentionsPagination = {
 	endpoint: 'notes/mentions' as const,
 	limit: 10,
@@ -93,4 +103,56 @@ definePageMetadata(computed(() => ({
 	title: i18n.ts.notifications,
 	icon: 'fas fa-bell',
 })));
+
+if (isMobile.value) {
+	document.addEventListener('touchstart', handleTouchStart, false);
+	document.addEventListener('touchmove', handleTouchMove, false);
+
+	let xDown = null;
+	let yDown = null;
+
+	function getTouches(evt) {
+		return (
+			evt.touches || evt.originalEvent.touches
+		);
+	}
+
+	function handleTouchStart(evt) {
+		const firstTouch = getTouches(evt)[0];
+		xDown = firstTouch.clientX;
+		yDown = firstTouch.clientY;
+	}
+
+	function handleTouchMove(evt) {
+		if (!xDown || !yDown) {
+			return;
+		}
+
+		let xUp = evt.touches[0].clientX;
+		let yUp = evt.touches[0].clientY;
+
+		let xDiff = xDown - xUp;
+		let yDiff = yDown - yUp;
+
+		let next = 'home';
+		let tabs = ['all', 'unread', 'mentions', 'directNotes'];
+
+		if (Math.abs(xDiff) > Math.abs(yDiff)) {
+			if (xDiff > 0) {
+				if (tab === 'all') {
+					next = 'directNotes';
+				}
+				else {
+					next = tabs[(tabs.indexOf(tab) + 1) % tabs.length];
+				}
+			} else {
+				next = tabs[(tabs.indexOf(tab) - 1) % tabs.length];
+			}
+			tab = next;
+		}
+		xDown = null;
+		yDown = null;
+		return;
+	}
+}
 </script>
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index d5cab01e3..82fac4105 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -280,10 +280,10 @@ if (isMobile.value) {
 					next = 'global'
 				}
 				else {
-					next = timelines[(timelines.indexOf(src) - 1) % timelines.length];
+					next = timelines[(timelines.indexOf(src) + 1) % timelines.length];
 				}
 			} else {
-				next = timelines[(timelines.indexOf(src) + 1) % timelines.length];
+				next = timelines[(timelines.indexOf(src) - 1) % timelines.length];
 			}
 			saveSrc(next);
 		}

From 1886193b8e41891c698337bfbd3d630c4e0eb5ac Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 20 Aug 2022 00:04:45 -0700
Subject: [PATCH 080/245] fix: :bug: swipe bug

---
 package.json                                | 2 +-
 packages/client/src/pages/notifications.vue | 6 +++---
 packages/client/src/pages/timeline.vue      | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index dd4df6415..93ba8755c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.11.5",
+	"version": "12.118.1-calc.11.6",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index b290203f0..ea5e8228f 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -138,15 +138,15 @@ if (isMobile.value) {
 		let tabs = ['all', 'unread', 'mentions', 'directNotes'];
 
 		if (Math.abs(xDiff) > Math.abs(yDiff)) {
-			if (xDiff > 0) {
+			if (xDiff < 0) {
 				if (tab === 'all') {
 					next = 'directNotes';
 				}
 				else {
-					next = tabs[(tabs.indexOf(tab) + 1) % tabs.length];
+					next = tabs[(tabs.indexOf(tab) - 1) % tabs.length];
 				}
 			} else {
-				next = tabs[(tabs.indexOf(tab) - 1) % tabs.length];
+				next = tabs[(tabs.indexOf(tab) + 1) % tabs.length];
 			}
 			tab = next;
 		}
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 82fac4105..5f2898a8a 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -275,15 +275,15 @@ if (isMobile.value) {
 		}
 
 		if (Math.abs(xDiff) > Math.abs(yDiff)) {
-			if (xDiff > 0) {
+			if (xDiff < 0) {
 				if (src === 'home') {
-					next = 'global'
+					next = 'global';
 				}
 				else {
-					next = timelines[(timelines.indexOf(src) + 1) % timelines.length];
+					next = timelines[(timelines.indexOf(src) - 1) % timelines.length];
 				}
 			} else {
-				next = timelines[(timelines.indexOf(src) - 1) % timelines.length];
+				next = timelines[(timelines.indexOf(src) + 1) % timelines.length];
 			}
 			saveSrc(next);
 		}

From 253f005e8021b5049d185899fdfc48316fc561ba Mon Sep 17 00:00:00 2001
From: futchitwo <74236683+futchitwo@users.noreply.github.com>
Date: Sun, 21 Aug 2022 23:20:42 +0900
Subject: [PATCH 081/245] =?UTF-8?q?Fix:=20=E3=82=A2=E3=82=AF=E3=82=BB?=
 =?UTF-8?q?=E3=82=B9=E3=83=88=E3=83=BC=E3=82=AF=E3=83=B3=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=80=81=E3=82=A2=E3=82=AB=E3=82=A6=E3=83=B3?=
 =?UTF-8?q?=E3=83=88=E7=AE=A1=E7=90=86=E7=94=BB=E9=9D=A2=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E3=81=AE=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=20(#9064)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix: apps page routing

* Fix: accounts page routing

* Fix: router name
---
 packages/client/src/router.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts
index 37a8fd3dc..111b15e0a 100644
--- a/packages/client/src/router.ts
+++ b/packages/client/src/router.ts
@@ -133,6 +133,10 @@ export const routes = [{
 		path: '/api',
 		name: 'api',
 		component: page(() => import('./pages/settings/api.vue')),
+	}, {
+		path: '/apps',
+		name: 'api',
+		component: page(() => import('./pages/settings/apps.vue')),
 	}, {
 		path: '/webhook/edit/:webhookId',
 		name: 'webhook',
@@ -157,6 +161,10 @@ export const routes = [{
 		path: '/custom-css',
 		name: 'general',
 		component: page(() => import('./pages/settings/custom-css.vue')),
+	}, {
+		path: '/accounts',
+		name: 'profile',
+		component: page(() => import('./pages/settings/accounts.vue')),
 	}, {
 		path: '/account-info',
 		name: 'other',

From a82149c05de0147693b535670a6e1b2a02686368 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 22:09:43 -0700
Subject: [PATCH 082/245] fix: :bug: fix scrolling bugs

---
 package.json                           |  2 +-
 packages/client/src/pages/timeline.vue |  8 ++++----
 packages/client/src/ui/universal.vue   | 21 ++++++++++++++++++++-
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 93ba8755c..5295936e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.11.6",
+	"version": "12.118.1-calc.12",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 5f2898a8a..12268b673 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -248,9 +248,9 @@ if (isMobile.value) {
 	}
 
 	function handleTouchMove(evt) {
-		if (!xDown || !yDown) {
-			return;
-		}
+		if (!xDown || !yDown) return;
+
+		if (['INPUT', 'TEXTAREA', 'IMG', 'VIDEO', 'CANVAS'].includes(evt.target.tagName) || evt.target.attributes['contenteditable']) return;
 
 		let xUp = evt.touches[0].clientX;
 		let yUp = evt.touches[0].clientY;
@@ -274,7 +274,7 @@ if (isMobile.value) {
 			timelines.push('global');
 		}
 
-		if (Math.abs(xDiff) > Math.abs(yDiff)) {
+		if (Math.abs(xDiff) > Math.abs(yDiff) && Math.abs(xDiff) > 100) {
 			if (xDiff < 0) {
 				if (src === 'home') {
 					next = 'global';
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index d0cba07fc..f856632e0 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -140,9 +140,28 @@ onMounted(() => {
 
 		window.addEventListener('scroll', () => {
 			let windowY = window.scrollY;
-			postButton.style.transform = `scale(${windowY < scrollPos ? '1' : '0'})`;
+			postButton.style.transform = `scale(${windowY < scrollPos ? '1' : '0.3'})`;
 			scrollPos = windowY;
 		}, { passive: true });
+
+		function createScrollStopListener(element: Window, callback: TimerHandler, timeout: number): () => void {
+			let handle = 0;
+			const onScroll = () => {
+				if (handle) {
+					clearTimeout(handle);
+				}
+				postButton.style.transform = 'scale(0.3)';
+				handle = setTimeout(callback, timeout || 200);
+			};
+			element.addEventListener('scroll', onScroll, { passive: true });
+			return () => {
+				element.removeEventListener('scroll', onScroll);
+			};
+		}
+
+		createScrollStopListener(window, () => {
+			postButton.style.transform = 'scale(1)';
+		} , 200);
 	}
 });
 

From 1ddb2f202545d136920aa5c17f8c42b639d5b02f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 22:10:41 -0700
Subject: [PATCH 083/245] calckey

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

diff --git a/package.json b/package.json
index 5295936e4..68d1c6930 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "misskey",
+	"name": "calckey",
 	"version": "12.118.1-calc.12",
 	"codename": "aqua",
 	"repository": {

From 97eabe92dbd1f6a3fb928c5345809534182cb1e3 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 22:11:29 -0700
Subject: [PATCH 084/245] =?UTF-8?q?calckey=20=F0=9F=90=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 2fecca15d..7bc350648 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM node:alpine
 ENV YARN_CHECKSUM_BEHAVIOR=update
 ARG NODE_ENV=production
-WORKDIR /misskey
+WORKDIR /calckey
 
 # Copy Files
 COPY . ./

From b78b0a29e55677e7d9f659858de527e0fceba9c9 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 22:15:39 -0700
Subject: [PATCH 085/245] scale 0

---
 package.json                           |  2 +-
 packages/client/src/pages/timeline.vue |  2 +-
 packages/client/src/ui/universal.vue   | 10 +---------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 68d1c6930..7a1946e9a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.12",
+	"version": "12.118.1-calc.12.1",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 12268b673..f2144441b 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -274,7 +274,7 @@ if (isMobile.value) {
 			timelines.push('global');
 		}
 
-		if (Math.abs(xDiff) > Math.abs(yDiff) && Math.abs(xDiff) > 100) {
+		if (Math.abs(xDiff) > Math.abs(yDiff) && Math.abs(xDiff) > 50) {
 			if (xDiff < 0) {
 				if (src === 'home') {
 					next = 'global';
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index f856632e0..c0ed66d19 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -136,21 +136,13 @@ onMounted(() => {
 			if (window.innerWidth >= DESKTOP_THRESHOLD) isDesktop.value = true;
 		}, { passive: true });
 
-		let scrollPos = 0;
-
-		window.addEventListener('scroll', () => {
-			let windowY = window.scrollY;
-			postButton.style.transform = `scale(${windowY < scrollPos ? '1' : '0.3'})`;
-			scrollPos = windowY;
-		}, { passive: true });
-
 		function createScrollStopListener(element: Window, callback: TimerHandler, timeout: number): () => void {
 			let handle = 0;
 			const onScroll = () => {
 				if (handle) {
 					clearTimeout(handle);
 				}
-				postButton.style.transform = 'scale(0.3)';
+				postButton.style.transform = 'scale(0)';
 				handle = setTimeout(callback, timeout || 200);
 			};
 			element.addEventListener('scroll', onScroll, { passive: true });

From 805a3f37930d13e960f0df6573f8f1f8abd59f41 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 22:19:11 -0700
Subject: [PATCH 086/245] chore: :loud_sound: log x swipe

---
 package.json                           | 2 +-
 packages/client/src/pages/timeline.vue | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 7a1946e9a..5d3f241f3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.12.1",
+	"version": "12.118.1-calc.12.2",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index f2144441b..4693b6c46 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -274,8 +274,9 @@ if (isMobile.value) {
 			timelines.push('global');
 		}
 
-		if (Math.abs(xDiff) > Math.abs(yDiff) && Math.abs(xDiff) > 50) {
+		if (Math.abs(xDiff) > Math.abs(yDiff)) {
 			if (xDiff < 0) {
+				console.log(Math.abs(xDiff));
 				if (src === 'home') {
 					next = 'global';
 				}

From 700c36788477de7e78c21d957ccb0cc1e8635331 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 22:31:00 -0700
Subject: [PATCH 087/245] feat: :alembic: try swiper

---
 package.json                           |  2 +-
 packages/client/package.json           |  1 +
 packages/client/src/pages/timeline.vue | 66 +++++++++++++++++++-
 yarn.lock                              | 83 +++++++++++++++++---------
 4 files changed, 120 insertions(+), 32 deletions(-)

diff --git a/package.json b/package.json
index 5d3f241f3..febfddeb8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.12.2",
+	"version": "12.118.1-calc.12.3",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/package.json b/packages/client/package.json
index 62d0ed25b..1b1b5c6c3 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -46,6 +46,7 @@
 		"seedrandom": "3.0.5",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
+		"swiper": "^8.3.2",
 		"syuilo-password-strength": "0.0.1",
 		"tesseract.js": "^2.1.5",
 		"textarea-caret": "3.1.0",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 4693b6c46..335b46175 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -25,7 +25,7 @@
 					{{ i18n.ts.newNoteRecived }}
 				</button>
 			</div>
-			<div class="tl _block">
+			<div v-if="isDesktop" class="tl _block">
 				<XTimeline
 					ref="tl"
 					:key="src"
@@ -35,6 +35,64 @@
 					@queue="queueUpdated"
 				/>
 			</div>
+			<div v-else class="tl _block">
+				<swiper>
+					<swiper-slide>
+						<XTimeline
+							ref="tl"
+							key="home"
+							class="tl"
+							src="home"
+							:sound="true"
+							@queue="queueUpdated"
+						/>
+					</swiper-slide>
+					<swiper-slide>
+						<XTimeline
+							v-if="isLocalTimelineAvailable"
+							ref="tl"
+							key="local"
+							class="tl"
+							src="local"
+							:sound="true"
+							@queue="queueUpdated"
+						/>
+					</swiper-slide>
+					<swiper-slide>
+						<XTimeline
+							v-if="isRecommendedTimelineAvailable"
+							ref="tl"
+							key="recommended"
+							class="tl"
+							src="recommended"
+							:sound="true"
+							@queue="queueUpdated"
+						/>
+					</swiper-slide>
+					<swiper-slide>
+						<XTimeline
+							v-if="isLocalTimelineAvailable"
+							ref="tl"
+							key="social"
+							class="tl"
+							src="social"
+							:sound="true"
+							@queue="queueUpdated"
+						/>
+					</swiper-slide>
+					<swiper-slide>
+						<XTimeline
+							v-if="isGlobalTimelineAvailable"
+							ref="tl"
+							key="global"
+							class="tl"
+							src="global"
+							:sound="true"
+							@queue="queueUpdated"
+						/>
+					</swiper-slide>
+				</swiper>
+			</div>
 		</div>
 	</MkSpacer>
 </MkStickyContainer>
@@ -42,6 +100,7 @@
 
 <script lang="ts" setup>
 import { defineAsyncComponent, computed, watch, ref } from 'vue';
+import { Swiper, SwiperSlide } from 'swiper/vue';
 import XTimeline from '@/components/timeline.vue';
 import XPostForm from '@/components/post-form.vue';
 import { scroll } from '@/scripts/scroll';
@@ -52,6 +111,7 @@ import { instance } from '@/instance';
 import { $i } from '@/account';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { deviceKind } from '@/scripts/device-kind';
+import 'swiper/css';
 
 const XTutorial = defineAsyncComponent(() => import('./timeline.tutorial.vue'));
 
@@ -228,7 +288,7 @@ definePageMetadata(
 	}))
 );
 
-if (isMobile.value) {
+/* if (isMobile.value) {
 	document.addEventListener('touchstart', handleTouchStart, false);
 	document.addEventListener('touchmove', handleTouchMove, false);
 
@@ -292,7 +352,7 @@ if (isMobile.value) {
 		yDown = null;
 		return;
 	}
-}
+} */
 </script>
 
 <style lang="scss" scoped>
diff --git a/yarn.lock b/yarn.lock
index 07896f4f0..2967e0414 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3489,6 +3489,34 @@ __metadata:
   languageName: node
   linkType: hard
 
+"calckey@workspace:.":
+  version: 0.0.0-use.local
+  resolution: "calckey@workspace:."
+  dependencies:
+    "@bull-board/api": ^4.2.2
+    "@bull-board/ui": ^4.2.2
+    "@tensorflow/tfjs": ^3.18.0
+    "@types/gulp": 4.0.9
+    "@types/gulp-rename": 2.0.1
+    "@typescript-eslint/parser": 5.33.0
+    cross-env: 7.0.3
+    cypress: 10.4.0
+    eslint: ^8.20.0
+    execa: 5.1.1
+    gulp: 4.0.2
+    gulp-cssnano: 2.1.3
+    gulp-rename: 2.0.0
+    gulp-replace: 1.1.3
+    gulp-terser: 2.1.0
+    js-yaml: 4.1.0
+    long: ^5.2.0
+    seedrandom: ^3.0.5
+    start-server-and-test: 1.14.0
+    typescript: 4.7.4
+    vue-eslint-parser: ^9.0.2
+  languageName: unknown
+  linkType: soft
+
 "call-bind@npm:^1.0.0, call-bind@npm:^1.0.2":
   version: 1.0.2
   resolution: "call-bind@npm:1.0.2"
@@ -3910,6 +3938,7 @@ __metadata:
     start-server-and-test: 1.14.0
     strict-event-emitter-types: 2.0.0
     stringz: 2.1.0
+    swiper: ^8.3.2
     syuilo-password-strength: 0.0.1
     tesseract.js: ^2.1.5
     textarea-caret: 3.1.0
@@ -5115,6 +5144,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"dom7@npm:^4.0.4":
+  version: 4.0.4
+  resolution: "dom7@npm:4.0.4"
+  dependencies:
+    ssr-window: ^4.0.0
+  checksum: b38604f74e915b4d05b6634f9ff239a708c468180f498a28ff67f2a61233697d9bd7192703b788a24541c3591e7f1a6e83a2cbf70bc871a85e033f82e19abc31
+  languageName: node
+  linkType: hard
+
 "domelementtype@npm:1, domelementtype@npm:^1.3.0, domelementtype@npm:^1.3.1":
   version: 1.3.1
   resolution: "domelementtype@npm:1.3.1"
@@ -10108,34 +10146,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"misskey@workspace:.":
-  version: 0.0.0-use.local
-  resolution: "misskey@workspace:."
-  dependencies:
-    "@bull-board/api": ^4.2.2
-    "@bull-board/ui": ^4.2.2
-    "@tensorflow/tfjs": ^3.18.0
-    "@types/gulp": 4.0.9
-    "@types/gulp-rename": 2.0.1
-    "@typescript-eslint/parser": 5.33.0
-    cross-env: 7.0.3
-    cypress: 10.4.0
-    eslint: ^8.20.0
-    execa: 5.1.1
-    gulp: 4.0.2
-    gulp-cssnano: 2.1.3
-    gulp-rename: 2.0.0
-    gulp-replace: 1.1.3
-    gulp-terser: 2.1.0
-    js-yaml: 4.1.0
-    long: ^5.2.0
-    seedrandom: ^3.0.5
-    start-server-and-test: 1.14.0
-    typescript: 4.7.4
-    vue-eslint-parser: ^9.0.2
-  languageName: unknown
-  linkType: soft
-
 "mixin-deep@npm:^1.2.0":
   version: 1.3.2
   resolution: "mixin-deep@npm:1.3.2"
@@ -13692,6 +13702,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ssr-window@npm:^4.0.0, ssr-window@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "ssr-window@npm:4.0.2"
+  checksum: df182600927f4f3225224cf8c02338ea637c9750519505bbfb9a9236741a2a7ec088386fb948bca7b447b8303d9109e7dc7672e3de041c79ac2a0e03665af7d2
+  languageName: node
+  linkType: hard
+
 "ssri@npm:^9.0.0":
   version: 9.0.1
   resolution: "ssri@npm:9.0.1"
@@ -14095,6 +14112,16 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"swiper@npm:^8.3.2":
+  version: 8.3.2
+  resolution: "swiper@npm:8.3.2"
+  dependencies:
+    dom7: ^4.0.4
+    ssr-window: ^4.0.2
+  checksum: 881d8e4fdedc391593c9ecee1ca0fddaebd16b2f6be493f80869fbaf848761cf7e41a7d7ba4b9fe4c4d61e9bef87ba33154d22bb6a8a8503c22c49f793bef1c1
+  languageName: node
+  linkType: hard
+
 "symbol-tree@npm:^3.2.4":
   version: 3.2.4
   resolution: "symbol-tree@npm:3.2.4"

From 80e085dadccf165d329bc5086270f7c09eec01a6 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 22:35:07 -0700
Subject: [PATCH 088/245] external

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

diff --git a/packages/client/vite.config.ts b/packages/client/vite.config.ts
index f23c62113..d1949e24b 100644
--- a/packages/client/vite.config.ts
+++ b/packages/client/vite.config.ts
@@ -53,6 +53,9 @@ export default defineConfig(({ command, mode }) => {
 			],
 			manifest: 'manifest.json',
 			rollupOptions: {
+				external: {
+					'swiper': 'swiper',
+				},
 				input: {
 					app: './src/init.ts',
 				},

From 0dc7992a6f9a10f6f1249a5cbc4c5bfb4ad98a6a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 22:35:54 -0700
Subject: [PATCH 089/245] vue

---
 packages/client/vite.config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/vite.config.ts b/packages/client/vite.config.ts
index d1949e24b..058fc6853 100644
--- a/packages/client/vite.config.ts
+++ b/packages/client/vite.config.ts
@@ -55,6 +55,7 @@ export default defineConfig(({ command, mode }) => {
 			rollupOptions: {
 				external: {
 					'swiper': 'swiper',
+					'vue': 'vue',
 				},
 				input: {
 					app: './src/init.ts',

From 631907e0ce818f4273b7c589f44f630873bc6b52 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 22:39:11 -0700
Subject: [PATCH 090/245] s

---
 packages/client/vite.config.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/client/vite.config.ts b/packages/client/vite.config.ts
index 058fc6853..b51ca3190 100644
--- a/packages/client/vite.config.ts
+++ b/packages/client/vite.config.ts
@@ -53,9 +53,8 @@ export default defineConfig(({ command, mode }) => {
 			],
 			manifest: 'manifest.json',
 			rollupOptions: {
-				external: {
-					'swiper': 'swiper',
-					'vue': 'vue',
+				optimizeDeps: {
+					exclude: ['swiper'],
 				},
 				input: {
 					app: './src/init.ts',

From bcf3466584ac4c93a84d7a1d846f57892ec7c20c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 22:39:53 -0700
Subject: [PATCH 091/245] fix

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

diff --git a/packages/client/vite.config.ts b/packages/client/vite.config.ts
index b51ca3190..49005a88a 100644
--- a/packages/client/vite.config.ts
+++ b/packages/client/vite.config.ts
@@ -52,10 +52,10 @@ export default defineConfig(({ command, mode }) => {
 				'es2017', // TODO: そのうち消す
 			],
 			manifest: 'manifest.json',
+			optimizeDeps: {
+				exclude: ['swiper'],
+			},
 			rollupOptions: {
-				optimizeDeps: {
-					exclude: ['swiper'],
-				},
 				input: {
 					app: './src/init.ts',
 				},

From 3b09e6f5106256f85136d1e70f26e70ebf093bda Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 22:42:30 -0700
Subject: [PATCH 092/245] fix????

---
 .yarnrc.yml                    | 3 +++
 packages/client/vite.config.ts | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.yarnrc.yml b/.yarnrc.yml
index de253e72e..788c5deb0 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -15,6 +15,9 @@ packageExtensions:
   chartjs-adapter-date-fns@*:
     peerDependencies:
       date-fns: "*"
+  swiper@*:
+    peerDependencies:
+      vue: "*"
   consolidate@*:
     dependencies:
       ejs: "*"
diff --git a/packages/client/vite.config.ts b/packages/client/vite.config.ts
index 49005a88a..f23c62113 100644
--- a/packages/client/vite.config.ts
+++ b/packages/client/vite.config.ts
@@ -52,9 +52,6 @@ export default defineConfig(({ command, mode }) => {
 				'es2017', // TODO: そのうち消す
 			],
 			manifest: 'manifest.json',
-			optimizeDeps: {
-				exclude: ['swiper'],
-			},
 			rollupOptions: {
 				input: {
 					app: './src/init.ts',

From 2b2abd67a415d34a297d95b443baf297e3208377 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 22:57:03 -0700
Subject: [PATCH 093/245] fix

---
 package.json                           |  2 +-
 packages/client/src/pages/timeline.vue | 71 ++------------------------
 2 files changed, 4 insertions(+), 69 deletions(-)

diff --git a/package.json b/package.json
index febfddeb8..9c6a9d2e3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.12.3",
+	"version": "12.118.1-calc.12.4",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 335b46175..e4300bc2e 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -25,7 +25,7 @@
 					{{ i18n.ts.newNoteRecived }}
 				</button>
 			</div>
-			<div v-if="isDesktop" class="tl _block">
+			<div v-if="!isMobile" class="tl _block">
 				<XTimeline
 					ref="tl"
 					:key="src"
@@ -36,7 +36,7 @@
 				/>
 			</div>
 			<div v-else class="tl _block">
-				<swiper>
+				<swiper :modules="[Virtual]" virtual>
 					<swiper-slide>
 						<XTimeline
 							ref="tl"
@@ -100,6 +100,7 @@
 
 <script lang="ts" setup>
 import { defineAsyncComponent, computed, watch, ref } from 'vue';
+import { Virtual } from 'swiper';
 import { Swiper, SwiperSlide } from 'swiper/vue';
 import XTimeline from '@/components/timeline.vue';
 import XPostForm from '@/components/post-form.vue';
@@ -287,72 +288,6 @@ definePageMetadata(
 							: 'fas fa-home',
 	}))
 );
-
-/* if (isMobile.value) {
-	document.addEventListener('touchstart', handleTouchStart, false);
-	document.addEventListener('touchmove', handleTouchMove, false);
-
-	let xDown = null;
-	let yDown = null;
-
-	function getTouches(evt) {
-		return (
-			evt.touches || evt.originalEvent.touches
-		);
-	}
-
-	function handleTouchStart(evt) {
-		const firstTouch = getTouches(evt)[0];
-		xDown = firstTouch.clientX;
-		yDown = firstTouch.clientY;
-	}
-
-	function handleTouchMove(evt) {
-		if (!xDown || !yDown) return;
-
-		if (['INPUT', 'TEXTAREA', 'IMG', 'VIDEO', 'CANVAS'].includes(evt.target.tagName) || evt.target.attributes['contenteditable']) return;
-
-		let xUp = evt.touches[0].clientX;
-		let yUp = evt.touches[0].clientY;
-
-		let xDiff = xDown - xUp;
-		let yDiff = yDown - yUp;
-
-		let next = 'home';
-		let timelines = ['home'];
-
-		if (isLocalTimelineAvailable) {
-			timelines.push('local');
-		}
-		if (isRecommendedTimelineAvailable) {
-			timelines.push('recommended');
-		}
-		if (isLocalTimelineAvailable) {
-			timelines.push('social');
-		}
-		if (isGlobalTimelineAvailable) {
-			timelines.push('global');
-		}
-
-		if (Math.abs(xDiff) > Math.abs(yDiff)) {
-			if (xDiff < 0) {
-				console.log(Math.abs(xDiff));
-				if (src === 'home') {
-					next = 'global';
-				}
-				else {
-					next = timelines[(timelines.indexOf(src) - 1) % timelines.length];
-				}
-			} else {
-				next = timelines[(timelines.indexOf(src) + 1) % timelines.length];
-			}
-			saveSrc(next);
-		}
-		xDown = null;
-		yDown = null;
-		return;
-	}
-} */
 </script>
 
 <style lang="scss" scoped>

From 62c3b001decb758e4f6eed079f5c6b0da29c6de3 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 23:00:42 -0700
Subject: [PATCH 094/245] feat: :sparkles: pagination

---
 package.json                           | 2 +-
 packages/client/src/pages/timeline.vue | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 9c6a9d2e3..363254a41 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.12.4",
+	"version": "12.118.1-calc.12.5",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index e4300bc2e..e2765903f 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -36,7 +36,7 @@
 				/>
 			</div>
 			<div v-else class="tl _block">
-				<swiper :modules="[Virtual]" virtual>
+				<swiper :modules="[Pagination, Virtual]" virtual>
 					<swiper-slide>
 						<XTimeline
 							ref="tl"
@@ -100,7 +100,7 @@
 
 <script lang="ts" setup>
 import { defineAsyncComponent, computed, watch, ref } from 'vue';
-import { Virtual } from 'swiper';
+import { Pagination, Virtual } from 'swiper';
 import { Swiper, SwiperSlide } from 'swiper/vue';
 import XTimeline from '@/components/timeline.vue';
 import XPostForm from '@/components/post-form.vue';
@@ -112,7 +112,8 @@ import { instance } from '@/instance';
 import { $i } from '@/account';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { deviceKind } from '@/scripts/device-kind';
-import 'swiper/css';
+import 'swiper/scss';
+import 'swiper/scss/pagination';
 
 const XTutorial = defineAsyncComponent(() => import('./timeline.tutorial.vue'));
 

From 91cefe12f1fdfd98fddb8185a4a4f7feb1e86f12 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 23:05:23 -0700
Subject: [PATCH 095/245] fix: :zap: prerender prev and after slide

---
 package.json                           | 2 +-
 packages/client/src/pages/timeline.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 363254a41..d01c91864 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.12.5",
+	"version": "12.118.1-calc.12.6",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index e2765903f..ed8a10083 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -36,7 +36,7 @@
 				/>
 			</div>
 			<div v-else class="tl _block">
-				<swiper :modules="[Pagination, Virtual]" virtual>
+				<swiper :modules="[Pagination, Virtual]" :add-slides-after="1" :add-slides-before="1" virtual>
 					<swiper-slide>
 						<XTimeline
 							ref="tl"

From 5acac6cbfbd11c83266910adcc4cf6bb1fa1fdcb Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 23:12:12 -0700
Subject: [PATCH 096/245] pag

---
 package.json                           | 2 +-
 packages/client/src/pages/timeline.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d01c91864..2f3a59235 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.12.6",
+	"version": "12.118.1-calc.12.7",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index ed8a10083..8cb0c32ec 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -36,7 +36,7 @@
 				/>
 			</div>
 			<div v-else class="tl _block">
-				<swiper :modules="[Pagination, Virtual]" :add-slides-after="1" :add-slides-before="1" virtual>
+				<swiper :modules="[Pagination]" :pagination="{ dynamicBullets: true, }">
 					<swiper-slide>
 						<XTimeline
 							ref="tl"

From 44e03b08f18adf43136bd2c2857d932ff9cb2897 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 23:23:19 -0700
Subject: [PATCH 097/245] =?UTF-8?q?feat:=20=F0=9F=92=84=20style=20swiper?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                           |  2 +-
 packages/client/src/pages/timeline.vue | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 2f3a59235..85a87b21c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.12.7",
+	"version": "12.118.1-calc.12.8",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 8cb0c32ec..cfee5a48b 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -36,7 +36,7 @@
 				/>
 			</div>
 			<div v-else class="tl _block">
-				<swiper :modules="[Pagination]" :pagination="{ dynamicBullets: true, }">
+				<swiper :modules="[Pagination]" :pagination="{ dynamicBullets: true, }" :space-between="20">
 					<swiper-slide>
 						<XTimeline
 							ref="tl"
@@ -293,6 +293,8 @@ definePageMetadata(
 
 <style lang="scss" scoped>
 .cmuxhskf {
+	--swiper-theme-color: var(--accent);
+
 	> .new {
 		position: sticky;
 		top: calc(var(--stickyTop, 0px) + 16px);
@@ -316,5 +318,20 @@ definePageMetadata(
 		border-radius: var(--radius);
 		overflow: clip;
 	}
+
+	> .swiper-pagination {
+		position: fixed;
+		margin-bottom: 100px;
+		z-index: 99999;
+		background-color: var(--panelHighlight);
+		padding: 0.5rem 1rem;
+		border-radius: 999px;
+		color: var(--accent);
+	}
+
+	> .swiper-pagination-bullet-active {
+		background: var(--accent, var(--panel));
+	}
+
 }
 </style>

From e1e3049455ad70e7addf4542714443d758d5e215 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 23:28:20 -0700
Subject: [PATCH 098/245] fix: :bug: show swiper

---
 package.json                           |  2 +-
 packages/client/src/pages/timeline.vue | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 85a87b21c..7c67450af 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.12.8",
+	"version": "12.118.1-calc.12.9",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index cfee5a48b..69c6fd360 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -319,19 +319,18 @@ definePageMetadata(
 		overflow: clip;
 	}
 
-	> .swiper-pagination {
-		position: fixed;
-		margin-bottom: 100px;
-		z-index: 99999;
-		background-color: var(--panelHighlight);
-		padding: 0.5rem 1rem;
-		border-radius: 999px;
-		color: var(--accent);
-	}
-
 	> .swiper-pagination-bullet-active {
 		background: var(--accent, var(--panel));
 	}
+}
 
+.swiper-pagination {
+	position: fixed;
+	top: 5rem;
+	z-index: 1001;
+	background-color: var(--panelHighlight);
+	padding: 0.5rem 1rem;
+	border-radius: 999px;
+	color: var(--accent);
 }
 </style>

From 89a1bc87d3b773afd5b1cb4d57128092652af4cd Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 23:33:08 -0700
Subject: [PATCH 099/245] rc

---
 package.json                           |  2 +-
 packages/client/src/pages/timeline.vue | 17 +----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 7c67450af..db94b5935 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.12.9",
+	"version": "12.118.1-calc.2-rc.0",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 69c6fd360..2a1d2fc05 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -36,7 +36,7 @@
 				/>
 			</div>
 			<div v-else class="tl _block">
-				<swiper :modules="[Pagination]" :pagination="{ dynamicBullets: true, }" :space-between="20">
+				<swiper :space-between="20">
 					<swiper-slide>
 						<XTimeline
 							ref="tl"
@@ -100,7 +100,6 @@
 
 <script lang="ts" setup>
 import { defineAsyncComponent, computed, watch, ref } from 'vue';
-import { Pagination, Virtual } from 'swiper';
 import { Swiper, SwiperSlide } from 'swiper/vue';
 import XTimeline from '@/components/timeline.vue';
 import XPostForm from '@/components/post-form.vue';
@@ -318,19 +317,5 @@ definePageMetadata(
 		border-radius: var(--radius);
 		overflow: clip;
 	}
-
-	> .swiper-pagination-bullet-active {
-		background: var(--accent, var(--panel));
-	}
-}
-
-.swiper-pagination {
-	position: fixed;
-	top: 5rem;
-	z-index: 1001;
-	background-color: var(--panelHighlight);
-	padding: 0.5rem 1rem;
-	border-radius: 999px;
-	color: var(--accent);
 }
 </style>

From f0fa0cce6b45cc072d7a2bca9c4ad389d157817f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 23:44:25 -0700
Subject: [PATCH 100/245] Always `signToActivityPubGet`

---
 chart/files/default.yml | 3 ---
 locales/en-US.yml       | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/chart/files/default.yml b/chart/files/default.yml
index a9ef22f42..91a947f26 100644
--- a/chart/files/default.yml
+++ b/chart/files/default.yml
@@ -154,9 +154,6 @@ id: "aid"
 # Media Proxy
 #mediaProxy: https://example.com/proxy
 
-# Sign to ActivityPub GET request (default: false)
-#signToActivityPubGet: true
-
 #allowedPrivateNetworks: [
 #  '127.0.0.1/32'
 #]
diff --git a/locales/en-US.yml b/locales/en-US.yml
index f64a7c20d..7f4e43ec2 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -783,7 +783,7 @@ emailNotConfiguredWarning: "Email address not set."
 ratio: "Ratio"
 secureMode: "Secure Mode (Authorized Fetch)"
 instanceSecurity: "Instance Security"
-secureModeInfo: "When requesting from other instances, do not send back without proof. signToActivityPubGet must be true in the other instance's configuration file."
+secureModeInfo: "When requesting from other instances, do not send back without proof."
 privateMode: "Private Mode"
 privateModeInfo: "When enabled, only whitelisted instances can federate with your instances. All notes will be hidden from the public."
 allowedInstances: "Whitelisted Instances"

From 899d7b42b50c854a82199ec032d3f9184961640d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 23:44:26 -0700
Subject: [PATCH 101/245] Always `signToActivityPubGet`

---
 .config/example.yml                                 | 3 ---
 packages/backend/src/config/types.ts                | 2 --
 packages/backend/src/remote/activitypub/resolver.ts | 2 +-
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.config/example.yml b/.config/example.yml
index 8b9d9b482..7817578d9 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -138,9 +138,6 @@ id: 'aid'
 # Proxy remote files (default: false)
 #proxyRemoteFiles: true
 
-# Sign to ActivityPub GET request (default: false)
-#signToActivityPubGet: true
-
 #allowedPrivateNetworks: [
 #  '127.0.0.1/32'
 #]
diff --git a/packages/backend/src/config/types.ts b/packages/backend/src/config/types.ts
index 78510c837..2f182e1ae 100644
--- a/packages/backend/src/config/types.ts
+++ b/packages/backend/src/config/types.ts
@@ -63,8 +63,6 @@ export type Source = {
 
 	mediaProxy?: string;
 	proxyRemoteFiles?: boolean;
-
-	signToActivityPubGet?: boolean;
 };
 
 /**
diff --git a/packages/backend/src/remote/activitypub/resolver.ts b/packages/backend/src/remote/activitypub/resolver.ts
index e89a7b21a..5c9d44292 100644
--- a/packages/backend/src/remote/activitypub/resolver.ts
+++ b/packages/backend/src/remote/activitypub/resolver.ts
@@ -76,7 +76,7 @@ export default class Resolver {
 			throw new Error('Instance is not allowed');
 		}
 
-		if (config.signToActivityPubGet && !this.user) {
+		if (!this.user) {
 			this.user = await getInstanceActor();
 		}
 

From 9adce79471df66dc48d0cdb11efdd79c29777f8a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 23:45:18 -0700
Subject: [PATCH 102/245] cl

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

diff --git a/CALCKEY.md b/CALCKEY.md
index 4b079659b..ae8112805 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -64,6 +64,7 @@
 - New spinner animation
 - Spinner instead of "Loading..."
 - SearchX instead of Google
+- Always signToActivityPubGet
 - Spacing on group items
 - Quotes have solid border
 - Reply limit bug fixed

From 533c5066c197ac667c241808e9a2d8e22c85ed75 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 23:51:15 -0700
Subject: [PATCH 103/245] remove old scroll engine for notifs

---
 packages/client/src/pages/notifications.vue | 52 ---------------------
 1 file changed, 52 deletions(-)

diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index ea5e8228f..ae8025e22 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -103,56 +103,4 @@ definePageMetadata(computed(() => ({
 	title: i18n.ts.notifications,
 	icon: 'fas fa-bell',
 })));
-
-if (isMobile.value) {
-	document.addEventListener('touchstart', handleTouchStart, false);
-	document.addEventListener('touchmove', handleTouchMove, false);
-
-	let xDown = null;
-	let yDown = null;
-
-	function getTouches(evt) {
-		return (
-			evt.touches || evt.originalEvent.touches
-		);
-	}
-
-	function handleTouchStart(evt) {
-		const firstTouch = getTouches(evt)[0];
-		xDown = firstTouch.clientX;
-		yDown = firstTouch.clientY;
-	}
-
-	function handleTouchMove(evt) {
-		if (!xDown || !yDown) {
-			return;
-		}
-
-		let xUp = evt.touches[0].clientX;
-		let yUp = evt.touches[0].clientY;
-
-		let xDiff = xDown - xUp;
-		let yDiff = yDown - yUp;
-
-		let next = 'home';
-		let tabs = ['all', 'unread', 'mentions', 'directNotes'];
-
-		if (Math.abs(xDiff) > Math.abs(yDiff)) {
-			if (xDiff < 0) {
-				if (tab === 'all') {
-					next = 'directNotes';
-				}
-				else {
-					next = tabs[(tabs.indexOf(tab) - 1) % tabs.length];
-				}
-			} else {
-				next = tabs[(tabs.indexOf(tab) + 1) % tabs.length];
-			}
-			tab = next;
-		}
-		xDown = null;
-		yDown = null;
-		return;
-	}
-}
 </script>

From e2d556ca9e65834a043835acef2e374c48c3a752 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 23:51:41 -0700
Subject: [PATCH 104/245] =?UTF-8?q?=F0=9F=94=96=20beta,=20not=20rc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/package.json b/package.json
index db94b5935..ccb067753 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-rc.0",
+	"version": "12.118.1-calc.2-beta.1",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 437ab8e8fe71c271d88166beb5c7a6e115fff185 Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@biribiri.dev>
Date: Mon, 22 Aug 2022 22:04:49 -0400
Subject: [PATCH 105/245] fix lints in folder.vue

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

diff --git a/packages/client/src/components/form/folder.vue b/packages/client/src/components/form/folder.vue
index a9d8bd97b..533ee4bbe 100644
--- a/packages/client/src/components/form/folder.vue
+++ b/packages/client/src/components/form/folder.vue
@@ -26,10 +26,10 @@ const props = withDefaults(defineProps<{
   defaultOpen: false,
 });
 
-let opened = $ref(props.defaultOpen);
-let openedAtLeastOnce = $ref(props.defaultOpen);
+let opened: boolean = $ref(props.defaultOpen);
+let openedAtLeastOnce: boolean = $ref(props.defaultOpen);
 
-const toggle = () => {
+const toggle = (): void => {
 	opened = !opened;
 	if (opened) {
 		openedAtLeastOnce = true;

From 5d7fea344b6374a77456b9313ab4e6f5e9469f3c Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@biribiri.dev>
Date: Mon, 22 Aug 2022 23:16:56 -0400
Subject: [PATCH 106/245] fix pagination.vue lints

---
 packages/client/src/components/ui/pagination.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/components/ui/pagination.vue b/packages/client/src/components/ui/pagination.vue
index 62cfd4061..11885414c 100644
--- a/packages/client/src/components/ui/pagination.vue
+++ b/packages/client/src/components/ui/pagination.vue
@@ -39,8 +39,6 @@ import { onScrollTop, isTopVisible, getScrollPosition, getScrollContainer } from
 import MkButton from '@/components/ui/button.vue';
 import { i18n } from '@/i18n';
 
-const SECOND_FETCH_LIMIT = 30;
-
 export type Paging<E extends keyof misskey.Endpoints = keyof misskey.Endpoints> = {
 	endpoint: E;
 	limit: number;
@@ -60,6 +58,8 @@ export type Paging<E extends keyof misskey.Endpoints = keyof misskey.Endpoints>
 	offsetMode?: boolean;
 };
 
+const SECOND_FETCH_LIMIT = 30;
+
 const props = withDefaults(defineProps<{
 	pagination: Paging;
 	disableAutoLoad?: boolean;
@@ -244,8 +244,8 @@ const prepend = (item: Item): void => {
 		} else {
 			queue.value.push(item);
 			onScrollTop(rootEl.value, () => {
-				for (const item of queue.value) {
-					prepend(item);
+				for (const queueItem of queue.value) {
+					prepend(queueItem);
 				}
 				queue.value = [];
 			});
@@ -257,7 +257,7 @@ const append = (item: Item): void => {
 	items.value.push(item);
 };
 
-const removeItem = (finder: (item: Item) => boolean) => {
+const removeItem = (finder: (item: Item) => boolean): void => {
 	const i = items.value.findIndex(finder);
 	items.value.splice(i, 1);
 };

From dc1c1553d8c1eaab6f15e3171fb760bdf7f04003 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 23:55:46 -0700
Subject: [PATCH 107/245] cl

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

diff --git a/CALCKEY.md b/CALCKEY.md
index ae8112805..d5c877b5d 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -103,3 +103,5 @@
 	- 30d8bc9259cb6b72ed76d67b21dbb4cdceca8327: refactor: welcome.setup.vue to composition api
 	- 751921e24f37ed707fe44a40d88eebb1299efa35: make emoji picker case insensitive
 	- 298febeb9c9501e3e3df16982c08657d1da474e0: enhance: add re-collapsing to quoted notes
+	- b0fdedb264db87575063abed45e52ad71ce4a6af: fix lints in folder.vue
+	- 6fed87f85d132304eb84b0a59b84dce299a1822f: fix pagination.vue lints

From fcd6c843510edf152b6817cac73753821f633b2b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 Aug 2022 23:55:58 -0700
Subject: [PATCH 108/245] .2

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

diff --git a/package.json b/package.json
index ccb067753..cc0b44dfd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-beta.1",
+	"version": "12.118.1-calc.2-beta.2",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 38907e3e087cd6143d1122a6ffecbb435fdb82af Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 23 Aug 2022 00:01:04 -0700
Subject: [PATCH 109/245] squareAvatars true by default

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

diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index 1f141b2c1..be3e4599a 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -229,7 +229,7 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	squareAvatars: {
 		where: 'device',
-		default: false,
+		default: true,
 	},
 	postFormWithHashtags: {
 		where: 'device',

From 450076cfa4a9e0b5ddcadeb64c26d0a7450d490e Mon Sep 17 00:00:00 2001
From: Caipira <caipira113@ocellaris.dev>
Date: Wed, 24 Aug 2022 21:02:06 +0900
Subject: [PATCH 110/245] enhance(client): mobile twitter url can be used as
 widget (#9057)

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

diff --git a/packages/client/src/components/url-preview.vue b/packages/client/src/components/url-preview.vue
index df4b0e53b..9b2a78535 100644
--- a/packages/client/src/components/url-preview.vue
+++ b/packages/client/src/components/url-preview.vue
@@ -68,7 +68,7 @@ let tweetHeight = $ref(150);
 
 const requestUrl = new URL(props.url);
 
-if (requestUrl.hostname === 'twitter.com') {
+if (requestUrl.hostname === 'twitter.com' || requestUrl.hostname === 'mobile.twitter.com') {
 	const m = requestUrl.pathname.match(/^\/.+\/status(?:es)?\/(\d+)/);
 	if (m) tweetId = m[1];
 }

From 806a80a1e54c3e77af05f5aa3afcaf62d49605f2 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Fri, 26 Aug 2022 08:39:31 +0200
Subject: [PATCH 111/245] fix: volume sliders

Fixed a typo that made a required property be undefined.
---
 packages/client/src/pages/settings/sounds.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/settings/sounds.vue b/packages/client/src/pages/settings/sounds.vue
index f29c9eb04..2d2b5a0a0 100644
--- a/packages/client/src/pages/settings/sounds.vue
+++ b/packages/client/src/pages/settings/sounds.vue
@@ -90,7 +90,7 @@ async function edit(type) {
 		},
 		volume: {
 			type: 'range',
-			mim: 0,
+			min: 0,
 			max: 1,
 			step: 0.05,
 			textConverter: (v) => `${Math.floor(v * 100)}%`,

From 773139b737fa5c7a597c78abbb39675964343075 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 27 Aug 2022 00:39:59 +0900
Subject: [PATCH 112/245] enhance(client): add html color-schema support

---
 packages/backend/src/server/web/boot.js | 4 ++++
 packages/client/src/scripts/theme.ts    | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js
index b0d529ec3..2aef689d3 100644
--- a/packages/backend/src/server/web/boot.js
+++ b/packages/backend/src/server/web/boot.js
@@ -92,6 +92,10 @@
 			}
 		}
 	}
+	const colorSchema = localStorage.getItem('colorSchema');
+	if (colorSchema) {
+		document.documentElement.style.setProperty('color-schema', colorSchema);
+	}
 	//#endregion
 
 	const fontSize = localStorage.getItem('fontSize');
diff --git a/packages/client/src/scripts/theme.ts b/packages/client/src/scripts/theme.ts
index 02ac77b59..3f55d9ae8 100644
--- a/packages/client/src/scripts/theme.ts
+++ b/packages/client/src/scripts/theme.ts
@@ -57,6 +57,8 @@ export function applyTheme(theme: Theme, persist = true) {
 		document.documentElement.classList.remove('_themeChanging_');
 	}, 1000);
 
+	const colorSchema = theme.base === 'dark' ? 'dark' : 'light';
+
 	// Deep copy
 	const _theme = JSON.parse(JSON.stringify(theme));
 
@@ -78,8 +80,11 @@ export function applyTheme(theme: Theme, persist = true) {
 		document.documentElement.style.setProperty(`--${k}`, v.toString());
 	}
 
+	document.documentElement.style.setProperty('color-schema', colorSchema);
+
 	if (persist) {
 		localStorage.setItem('theme', JSON.stringify(props));
+		localStorage.setItem('colorSchema', colorSchema);
 	}
 
 	// 色計算など再度行えるようにクライアント全体に通知

From 0dfb9f8291cc38360c18b91ce784cd6a9e1596b1 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 27 Aug 2022 00:40:20 +0900
Subject: [PATCH 113/245] enhance(client): tweak clock

---
 .../client/src/components/analog-clock.vue    | 44 ++++++++++++++++++-
 packages/client/src/widgets/unix-clock.vue    |  2 +-
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/analog-clock.vue b/packages/client/src/components/analog-clock.vue
index b138bfcb4..b709a2254 100644
--- a/packages/client/src/components/analog-clock.vue
+++ b/packages/client/src/components/analog-clock.vue
@@ -26,6 +26,7 @@
 		</text>
 	</template>
 
+	<!--
 	<line
 		:x1="5 - (Math.sin(sAngle) * (sHandLengthRatio * handsTailLength))"
 		:y1="5 + (Math.cos(sAngle) * (sHandLengthRatio * handsTailLength))"
@@ -35,6 +36,20 @@
 		:stroke-width="thickness / 2"
 		stroke-linecap="round"
 	/>
+	-->
+
+	<line
+		class="s"
+		:class="{ animate: !disableSAnimate }"
+		:x1="5 - (0 * (sHandLengthRatio * handsTailLength))"
+		:y1="5 + (1 * (sHandLengthRatio * handsTailLength))"
+		:x2="5 + (0 * ((sHandLengthRatio * 5) - handsPadding))"
+		:y2="5 - (1 * ((sHandLengthRatio * 5) - handsPadding))"
+		:stroke="sHandColor"
+		:stroke-width="thickness / 2"
+		:style="`transform: rotateZ(${sAngle}rad)`"
+		stroke-linecap="round"
+	/>
 
 	<line
 		:x1="5 - (Math.sin(mAngle) * (mHandLengthRatio * handsTailLength))"
@@ -59,7 +74,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, onMounted, onBeforeUnmount, shallowRef } from 'vue';
+import { ref, computed, onMounted, onBeforeUnmount, shallowRef, nextTick } from 'vue';
 import tinycolor from 'tinycolor2';
 import { globalEvents } from '@/events.js';
 
@@ -125,6 +140,8 @@ let s = $ref<number>(0);
 let hAngle = $ref<number>(0);
 let mAngle = $ref<number>(0);
 let sAngle = $ref<number>(0);
+let disableSAnimate = $ref(false);
+let sOneRound = false;
 
 function tick() {
 	const now = new Date();
@@ -134,7 +151,21 @@ function tick() {
 	h = now.getHours();
 	hAngle = Math.PI * (h % (props.twentyfour ? 24 : 12) + (m + s / 60) / 60) / (props.twentyfour ? 12 : 6);
 	mAngle = Math.PI * (m + s / 60) / 30;
-	sAngle = Math.PI * s / 30;
+	if (sOneRound) { // 秒針が一周した際のアニメーションをよしなに処理する(これが無いと秒が59->0になったときに期待したアニメーションにならない)
+		sAngle = Math.PI * 60 / 30;
+		window.setTimeout(() => {
+			disableSAnimate = true;
+			window.setTimeout(() => {
+				sAngle = 0;
+				window.setTimeout(() => {
+					disableSAnimate = false;
+				}, 100);
+			}, 100);
+		}, 500);
+	} else {
+		sAngle = Math.PI * s / 30;
+	}
+	sOneRound = s === 59;
 }
 
 tick();
@@ -175,5 +206,14 @@ onBeforeUnmount(() => {
 <style lang="scss" scoped>
 .mbcofsoe {
 	display: block;
+
+	> .s {
+		will-change: transform;
+		transform-origin: 50% 50%;
+
+		&.animate {
+			transition: transform .2s cubic-bezier(.4,2.08,.55,.44);
+		}
+	}
 }
 </style>
diff --git a/packages/client/src/widgets/unix-clock.vue b/packages/client/src/widgets/unix-clock.vue
index c9e2b4b92..cf85ac782 100644
--- a/packages/client/src/widgets/unix-clock.vue
+++ b/packages/client/src/widgets/unix-clock.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="mkw-unixClock _monospace" :class="{ _panel: !widgetProps.transparent }" :style="{ fontSize: `${widgetProps.fontSize}em` }">
-	<div v-if="widgetProps.showLabel" class="label">UNIX time</div>
+	<div v-if="widgetProps.showLabel" class="label">UNIX Epoch</div>
 	<div class="time">
 		<span v-text="ss"></span>
 		<span v-if="widgetProps.showMs" class="colon" :class="{ showColon }">:</span>

From 8dee3c92c76d9c30071de0b2b268f3358e5444d5 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 26 Aug 2022 16:13:26 -0700
Subject: [PATCH 114/245] feat: :package: use swc

---
 package.json                   |   2 +
 packages/client/vite.config.ts |   2 +
 yarn.lock                      | 219 +++++++++++++++++++++++++++++++++
 3 files changed, 223 insertions(+)

diff --git a/package.json b/package.json
index cc0b44dfd..26af85ecd 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
 		"seedrandom": "^3.0.5"
 	},
 	"devDependencies": {
+		"@swc/core": "^1.2.244",
 		"@types/gulp": "4.0.9",
 		"@types/gulp-rename": "2.0.1",
 		"@typescript-eslint/parser": "5.33.0",
@@ -61,6 +62,7 @@
 		"cypress": "10.4.0",
 		"start-server-and-test": "1.14.0",
 		"typescript": "4.7.4",
+		"unplugin-swc": "^1.3.2",
 		"vue-eslint-parser": "^9.0.2"
 	}
 }
diff --git a/packages/client/vite.config.ts b/packages/client/vite.config.ts
index f23c62113..3dae5f1f0 100644
--- a/packages/client/vite.config.ts
+++ b/packages/client/vite.config.ts
@@ -1,6 +1,7 @@
 import * as fs from 'fs';
 import pluginVue from '@vitejs/plugin-vue';
 import { defineConfig } from 'vite';
+import swc from 'unplugin-swc';
 
 import locales from '../../locales';
 import meta from '../../package.json';
@@ -20,6 +21,7 @@ export default defineConfig(({ command, mode }) => {
 				reactivityTransform: true,
 			}),
 			pluginJson5(),
+			swc.vite(),
 		],
 
 		resolve: {
diff --git a/yarn.lock b/yarn.lock
index 2967e0414..4b6b0f8cf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -805,6 +805,173 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@swc/core-android-arm-eabi@npm:1.2.244":
+  version: 1.2.244
+  resolution: "@swc/core-android-arm-eabi@npm:1.2.244"
+  dependencies:
+    "@swc/wasm": 1.2.122
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@swc/core-android-arm64@npm:1.2.244":
+  version: 1.2.244
+  resolution: "@swc/core-android-arm64@npm:1.2.244"
+  dependencies:
+    "@swc/wasm": 1.2.130
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@swc/core-darwin-arm64@npm:1.2.244":
+  version: 1.2.244
+  resolution: "@swc/core-darwin-arm64@npm:1.2.244"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@swc/core-darwin-x64@npm:1.2.244":
+  version: 1.2.244
+  resolution: "@swc/core-darwin-x64@npm:1.2.244"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@swc/core-freebsd-x64@npm:1.2.244":
+  version: 1.2.244
+  resolution: "@swc/core-freebsd-x64@npm:1.2.244"
+  dependencies:
+    "@swc/wasm": 1.2.130
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@swc/core-linux-arm-gnueabihf@npm:1.2.244":
+  version: 1.2.244
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.2.244"
+  dependencies:
+    "@swc/wasm": 1.2.130
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@swc/core-linux-arm64-gnu@npm:1.2.244":
+  version: 1.2.244
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.2.244"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@swc/core-linux-arm64-musl@npm:1.2.244":
+  version: 1.2.244
+  resolution: "@swc/core-linux-arm64-musl@npm:1.2.244"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@swc/core-linux-x64-gnu@npm:1.2.244":
+  version: 1.2.244
+  resolution: "@swc/core-linux-x64-gnu@npm:1.2.244"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@swc/core-linux-x64-musl@npm:1.2.244":
+  version: 1.2.244
+  resolution: "@swc/core-linux-x64-musl@npm:1.2.244"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@swc/core-win32-arm64-msvc@npm:1.2.244":
+  version: 1.2.244
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.2.244"
+  dependencies:
+    "@swc/wasm": 1.2.130
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@swc/core-win32-ia32-msvc@npm:1.2.244":
+  version: 1.2.244
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.2.244"
+  dependencies:
+    "@swc/wasm": 1.2.130
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@swc/core-win32-x64-msvc@npm:1.2.244":
+  version: 1.2.244
+  resolution: "@swc/core-win32-x64-msvc@npm:1.2.244"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@swc/core@npm:^1.2.244":
+  version: 1.2.244
+  resolution: "@swc/core@npm:1.2.244"
+  dependencies:
+    "@swc/core-android-arm-eabi": 1.2.244
+    "@swc/core-android-arm64": 1.2.244
+    "@swc/core-darwin-arm64": 1.2.244
+    "@swc/core-darwin-x64": 1.2.244
+    "@swc/core-freebsd-x64": 1.2.244
+    "@swc/core-linux-arm-gnueabihf": 1.2.244
+    "@swc/core-linux-arm64-gnu": 1.2.244
+    "@swc/core-linux-arm64-musl": 1.2.244
+    "@swc/core-linux-x64-gnu": 1.2.244
+    "@swc/core-linux-x64-musl": 1.2.244
+    "@swc/core-win32-arm64-msvc": 1.2.244
+    "@swc/core-win32-ia32-msvc": 1.2.244
+    "@swc/core-win32-x64-msvc": 1.2.244
+  dependenciesMeta:
+    "@swc/core-android-arm-eabi":
+      optional: true
+    "@swc/core-android-arm64":
+      optional: true
+    "@swc/core-darwin-arm64":
+      optional: true
+    "@swc/core-darwin-x64":
+      optional: true
+    "@swc/core-freebsd-x64":
+      optional: true
+    "@swc/core-linux-arm-gnueabihf":
+      optional: true
+    "@swc/core-linux-arm64-gnu":
+      optional: true
+    "@swc/core-linux-arm64-musl":
+      optional: true
+    "@swc/core-linux-x64-gnu":
+      optional: true
+    "@swc/core-linux-x64-musl":
+      optional: true
+    "@swc/core-win32-arm64-msvc":
+      optional: true
+    "@swc/core-win32-ia32-msvc":
+      optional: true
+    "@swc/core-win32-x64-msvc":
+      optional: true
+  bin:
+    swcx: run_swcx.js
+  checksum: be714bc484b0e3ad8e68269e739f02a8b9ba47cd4ea2fd2d223832fa78d00f85b02fed12bb8e7a61c430981d9260c6319d3215af86c8d1f4832bb419e269691f
+  languageName: node
+  linkType: hard
+
+"@swc/wasm@npm:1.2.122":
+  version: 1.2.122
+  resolution: "@swc/wasm@npm:1.2.122"
+  checksum: 563345370c5ad18373d3b403590ab880fe52dcd8fc8c8601be263fcd9886520b28a7f4e46236cf49ca2b136c79d4ef50c960bc34b7cdc2068118b0d84dfca1f4
+  languageName: node
+  linkType: hard
+
+"@swc/wasm@npm:1.2.130":
+  version: 1.2.130
+  resolution: "@swc/wasm@npm:1.2.130"
+  checksum: 02203bfef3e382c64cbbd63c138c8fdf61865e74d923b317e9d9e9f33f5a3f0a9533b5fdbc9505e76d78e864be04a82fc847eb987a1e47ccac5850146c858292
+  languageName: node
+  linkType: hard
+
 "@syuilo/aiscript@npm:0.11.1":
   version: 0.11.1
   resolution: "@syuilo/aiscript@npm:0.11.1"
@@ -3495,6 +3662,7 @@ __metadata:
   dependencies:
     "@bull-board/api": ^4.2.2
     "@bull-board/ui": ^4.2.2
+    "@swc/core": ^1.2.244
     "@tensorflow/tfjs": ^3.18.0
     "@types/gulp": 4.0.9
     "@types/gulp-rename": 2.0.1
@@ -3513,6 +3681,7 @@ __metadata:
     seedrandom: ^3.0.5
     start-server-and-test: 1.14.0
     typescript: 4.7.4
+    unplugin-swc: ^1.3.2
     vue-eslint-parser: ^9.0.2
   languageName: unknown
   linkType: soft
@@ -15011,6 +15180,42 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unplugin-swc@npm:^1.3.2":
+  version: 1.3.2
+  resolution: "unplugin-swc@npm:1.3.2"
+  dependencies:
+    unplugin: ^0.6.0
+  peerDependencies:
+    "@swc/core": ^1.2.108
+  checksum: 3aea46ef5980603ec8842597c4d75254d8c09729ece3f221ab2b51f589bbbe4c53cd54d617baadc2786a68c4ddcf27bf53a4cd91226ff775d5b5736c2091d6c4
+  languageName: node
+  linkType: hard
+
+"unplugin@npm:^0.6.0":
+  version: 0.6.3
+  resolution: "unplugin@npm:0.6.3"
+  dependencies:
+    chokidar: ^3.5.3
+    webpack-sources: ^3.2.3
+    webpack-virtual-modules: ^0.4.3
+  peerDependencies:
+    esbuild: ">=0.13"
+    rollup: ^2.50.0
+    vite: ^2.3.0
+    webpack: 4 || 5
+  peerDependenciesMeta:
+    esbuild:
+      optional: true
+    rollup:
+      optional: true
+    vite:
+      optional: true
+    webpack:
+      optional: true
+  checksum: 14e1f9c941e87e97fdda3efc745183e027de7d8b88eed8be5fa0708c2ec5dd114cc10e569c4b9dd2dafc89ba84d8bf90935d01e02cef510b7faedaa8af2b081f
+  languageName: node
+  linkType: hard
+
 "unset-value@npm:^1.0.0":
   version: 1.0.0
   resolution: "unset-value@npm:1.0.0"
@@ -15485,6 +15690,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"webpack-sources@npm:^3.2.3":
+  version: 3.2.3
+  resolution: "webpack-sources@npm:3.2.3"
+  checksum: 989e401b9fe3536529e2a99dac8c1bdc50e3a0a2c8669cbafad31271eadd994bc9405f88a3039cd2e29db5e6d9d0926ceb7a1a4e7409ece021fe79c37d9c4607
+  languageName: node
+  linkType: hard
+
+"webpack-virtual-modules@npm:^0.4.3":
+  version: 0.4.4
+  resolution: "webpack-virtual-modules@npm:0.4.4"
+  checksum: 6720b4c47d76dc9cbaff557562506c192da7560a90395e9918a418e257a0c0cda9f5e3ac92107ec0789f8f23ad942313bd8cdebc95031d0adef1032bf6142bc7
+  languageName: node
+  linkType: hard
+
 "websocket@npm:1.0.34":
   version: 1.0.34
   resolution: "websocket@npm:1.0.34"

From e0dce7767872708dd8ecfde02480b6a9ade28268 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 27 Aug 2022 16:26:14 +0900
Subject: [PATCH 115/245] chore(client): tweak loading display

---
 packages/client/src/components/global/loading.vue     | 2 +-
 packages/client/src/components/global/router-view.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/global/loading.vue b/packages/client/src/components/global/loading.vue
index bcc6dfac0..bcf592523 100644
--- a/packages/client/src/components/global/loading.vue
+++ b/packages/client/src/components/global/loading.vue
@@ -44,7 +44,7 @@ const props = withDefaults(defineProps<{
 	text-align: center;
 	cursor: wait;
 
-	--size: 40px;
+	--size: 38px;
 
 	&.colored {
 		color: var(--accent);
diff --git a/packages/client/src/components/global/router-view.vue b/packages/client/src/components/global/router-view.vue
index 1d841e050..e21a57471 100644
--- a/packages/client/src/components/global/router-view.vue
+++ b/packages/client/src/components/global/router-view.vue
@@ -4,7 +4,7 @@
 		<component :is="currentPageComponent" :key="key" v-bind="Object.fromEntries(currentPageProps)"/>
 
 		<template #fallback>
-			Loading...
+			<MkLoading/>
 		</template>
 	</Suspense>
 </KeepAlive>

From 47b2e56967744fd9c09a853c8044e3a448783ec5 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 27 Aug 2022 16:34:14 +0900
Subject: [PATCH 116/245] update deps

---
 package.json                         |   6 +-
 packages/backend/package.json        |  28 +--
 packages/backend/yarn.lock           | 325 +++++++++++++--------------
 packages/client/package.json         |  26 +--
 packages/client/src/init.ts          |   2 +-
 packages/client/src/ui/universal.vue |   1 -
 packages/client/yarn.lock            | 219 +++++++++---------
 yarn.lock                            |  72 +++---
 8 files changed, 338 insertions(+), 341 deletions(-)

diff --git a/package.json b/package.json
index 27d5fd20a..f55572773 100644
--- a/package.json
+++ b/package.json
@@ -41,10 +41,10 @@
 	"devDependencies": {
 		"@types/gulp": "4.0.9",
 		"@types/gulp-rename": "2.0.1",
-		"@typescript-eslint/parser": "5.33.0",
+		"@typescript-eslint/parser": "5.35.1",
 		"cross-env": "7.0.3",
-		"cypress": "10.4.0",
+		"cypress": "10.6.0",
 		"start-server-and-test": "1.14.0",
-		"typescript": "4.7.4"
+		"typescript": "4.8.2"
 	}
 }
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 5ddcaeb91..61adf788a 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -14,7 +14,7 @@
 		"lodash": "^4.17.21"
 	},
 	"optionalDependencies": {
-		"@tensorflow/tfjs-node": "3.19.0"
+		"@tensorflow/tfjs-node": "3.20.0"
 	},
 	"dependencies": {
 		"@bull-board/koa": "4.2.2",
@@ -30,7 +30,7 @@
 		"archiver": "5.3.1",
 		"autobind-decorator": "2.4.0",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.1194.0",
+		"aws-sdk": "2.1204.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "1.1.5",
 		"bull": "4.8.5",
@@ -42,7 +42,7 @@
 		"cli-highlight": "2.1.11",
 		"color-convert": "2.0.1",
 		"content-disposition": "0.5.4",
-		"date-fns": "2.29.1",
+		"date-fns": "2.29.2",
 		"deep-email-validator": "0.1.21",
 		"escape-regexp": "0.0.1",
 		"feed": "4.2.2",
@@ -58,7 +58,7 @@
 		"json5": "2.2.1",
 		"json5-loader": "4.0.1",
 		"jsonld": "6.0.0",
-		"jsrsasign": "10.5.26",
+		"jsrsasign": "10.5.27",
 		"koa": "2.13.4",
 		"koa-bodyparser": "4.3.0",
 		"koa-favicon": "2.1.0",
@@ -80,7 +80,7 @@
 		"nsfwjs": "2.4.1",
 		"os-utils": "0.0.14",
 		"parse5": "7.0.0",
-		"pg": "8.7.3",
+		"pg": "8.8.0",
 		"private-ip": "2.3.4",
 		"probe-image-size": "7.2.3",
 		"promise-limit": "2.7.0",
@@ -105,7 +105,7 @@
 		"stringz": "2.1.0",
 		"summaly": "2.7.0",
 		"syslog-pro": "1.0.0",
-		"systeminformation": "5.12.5",
+		"systeminformation": "5.12.6",
 		"tinycolor2": "1.4.2",
 		"tmp": "0.2.1",
 		"ts-loader": "9.3.1",
@@ -113,7 +113,7 @@
 		"tsc-alias": "1.7.0",
 		"tsconfig-paths": "4.1.0",
 		"twemoji-parser": "14.0.0",
-		"typeorm": "0.3.7",
+		"typeorm": "0.3.8",
 		"ulid": "2.3.0",
 		"unzipper": "0.10.11",
 		"uuid": "8.3.2",
@@ -123,7 +123,7 @@
 		"xev": "3.0.2"
 	},
 	"devDependencies": {
-		"@redocly/openapi-core": "1.0.0-beta.106",
+		"@redocly/openapi-core": "1.0.0-beta.108",
 		"@types/bcryptjs": "2.4.2",
 		"@types/bull": "3.15.9",
 		"@types/cbor": "6.0.0",
@@ -145,13 +145,13 @@
 		"@types/koa__multer": "2.0.4",
 		"@types/koa__router": "8.0.11",
 		"@types/mocha": "9.1.1",
-		"@types/node": "18.7.2",
+		"@types/node": "18.7.13",
 		"@types/node-fetch": "3.0.3",
 		"@types/nodemailer": "6.4.5",
 		"@types/oauth": "0.9.1",
 		"@types/pug": "2.0.6",
 		"@types/punycode": "2.1.0",
-		"@types/qrcode": "1.4.2",
+		"@types/qrcode": "1.5.0",
 		"@types/random-seed": "0.3.3",
 		"@types/ratelimiter": "3.4.3",
 		"@types/redis": "4.0.11",
@@ -167,12 +167,12 @@
 		"@types/web-push": "3.3.2",
 		"@types/websocket": "1.0.5",
 		"@types/ws": "8.5.3",
-		"@typescript-eslint/eslint-plugin": "5.33.0",
-		"@typescript-eslint/parser": "5.33.0",
+		"@typescript-eslint/eslint-plugin": "5.35.1",
+		"@typescript-eslint/parser": "5.35.1",
 		"cross-env": "7.0.3",
-		"eslint": "8.21.0",
+		"eslint": "8.23.0",
 		"eslint-plugin-import": "2.26.0",
 		"execa": "6.1.0",
-		"typescript": "4.7.4"
+		"typescript": "4.8.2"
 	}
 }
diff --git a/packages/backend/yarn.lock b/packages/backend/yarn.lock
index cbc63d873..48dcf05c2 100644
--- a/packages/backend/yarn.lock
+++ b/packages/backend/yarn.lock
@@ -91,14 +91,14 @@
     pump "^3.0.0"
     secure-json-parse "^2.1.0"
 
-"@eslint/eslintrc@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f"
-  integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==
+"@eslint/eslintrc@^1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.1.tgz#de0807bfeffc37b964a7d0400e0c348ce5a2543d"
+  integrity sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.3.2"
+    espree "^9.4.0"
     globals "^13.15.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
@@ -125,6 +125,11 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d"
   integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==
 
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
 "@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
@@ -282,22 +287,22 @@
     jsprim "^1.2.2"
     sshpk "^1.14.1"
 
-"@redocly/ajv@^8.6.4":
-  version "8.6.4"
-  resolved "https://registry.yarnpkg.com/@redocly/ajv/-/ajv-8.6.4.tgz#94053e7a9d4146d1a4feacd3813892873f229a85"
-  integrity sha512-y9qNj0//tZtWB2jfXNK3BX18BSBp9zNR7KE7lMysVHwbZtY392OJCjm6Rb/h4UHH2r1AqjNEHFD6bRn+DqU9Mw==
+"@redocly/ajv@^8.6.5":
+  version "8.6.5"
+  resolved "https://registry.yarnpkg.com/@redocly/ajv/-/ajv-8.6.5.tgz#b6e737248b791905b3f600fb329779a807f0f774"
+  integrity sha512-3P2TY/u4c6OBqkP+1cTH1iGAEv0O34PV3vV2Wnos/nNHu62OTrtC4zcaxttG0pHtPtn42StrhGq7SsiFgP4Bfw==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-"@redocly/openapi-core@1.0.0-beta.106":
-  version "1.0.0-beta.106"
-  resolved "https://registry.yarnpkg.com/@redocly/openapi-core/-/openapi-core-1.0.0-beta.106.tgz#5df810aee2ed64ecadf3d5100d8fbdf0d74c2924"
-  integrity sha512-ZHeczZ6iJrHL7K1v4s+NRFUOHsfZ1ZrB+bcS42CP4bhL/Y17PkOMWA+6Ubk0NVT4Ihdt5cLLWGfjVABD/bEM2A==
+"@redocly/openapi-core@1.0.0-beta.108":
+  version "1.0.0-beta.108"
+  resolved "https://registry.yarnpkg.com/@redocly/openapi-core/-/openapi-core-1.0.0-beta.108.tgz#fbf1b4e31c148f8816d2d63aa37b7831e305ec0f"
+  integrity sha512-4Lq7KB+XiBvVzpaY/M0a8qog/Zr8kGrvJbRW2z7Sk2Zpc/m+8LTuZbRh15eMoneVc13M9qbHFIRh3PG18g3Tng==
   dependencies:
-    "@redocly/ajv" "^8.6.4"
+    "@redocly/ajv" "^8.6.5"
     "@types/node" "^14.11.8"
     colorette "^1.2.0"
     js-levenshtein "^1.1.6"
@@ -362,35 +367,35 @@
   dependencies:
     defer-to-connect "^2.0.1"
 
-"@tensorflow/tfjs-backend-cpu@3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-backend-cpu/-/tfjs-backend-cpu-3.19.0.tgz#c7524ccdfded81df0c5cb53185b14e5222ac51e5"
-  integrity sha512-02f+WkiL9gc9G7P8PwfsvuXREcAUdM/3uAL6fTle3xKEj7KOxX+E/mc3jxPY5UzjAsgHVBZrPJ2xi6AG16WPkQ==
+"@tensorflow/tfjs-backend-cpu@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-backend-cpu/-/tfjs-backend-cpu-3.20.0.tgz#338ec5cfc7c713355839fd85ddf90b5b59b6099a"
+  integrity sha512-gf075YaBLwSAAiUwa0D4GvYyUBhbJ1BVSivUNQmUfGKvIr2lIhF0qstBr033YTc3lhkbFSHEEPAHh/EfpqyjXQ==
   dependencies:
     "@types/seedrandom" "^2.4.28"
     seedrandom "^3.0.5"
 
-"@tensorflow/tfjs-backend-webgl@3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-backend-webgl/-/tfjs-backend-webgl-3.19.0.tgz#64b8a14df35ee7d27859c7d141c527cefc6d9484"
-  integrity sha512-2HTkAE21t3WQTt8P6iK80ni03AzC8UNZmbIB7/pBDYBbhDwZwe/C5fXrJWnP9m6u4hvCdMAJ3o+OP3NeaEL1pw==
+"@tensorflow/tfjs-backend-webgl@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-backend-webgl/-/tfjs-backend-webgl-3.20.0.tgz#1ea6dff51a62cda64bd80ff9e7861a6010924f5a"
+  integrity sha512-SucbyQ08re3HvRgVfarRtKFIjNM4JvIAzcXmw4vaE/HrCtPEePkGO1VrmfQoN470EdUmGiwgqAjoyBvM2VOlVg==
   dependencies:
-    "@tensorflow/tfjs-backend-cpu" "3.19.0"
+    "@tensorflow/tfjs-backend-cpu" "3.20.0"
     "@types/offscreencanvas" "~2019.3.0"
     "@types/seedrandom" "^2.4.28"
     "@types/webgl-ext" "0.0.30"
     "@types/webgl2" "0.0.6"
     seedrandom "^3.0.5"
 
-"@tensorflow/tfjs-converter@3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-3.19.0.tgz#701db7255ef45578811a191478db5a09bcca6dda"
-  integrity sha512-B69HQq9/orsM8pGJPjNp1cV+hIcc90mxcRIsQSYGovTUNEcftmz2Sh+mqXDWysKUk0gRfx5CX6eJk6NaE55Xow==
+"@tensorflow/tfjs-converter@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-3.20.0.tgz#5d3d2b388775997585204bc867ecdf1e52789a38"
+  integrity sha512-8EIYqtQwvSYw9GFNW2OFU8Qnl/FQF/kKAsQJoORYaZ419WJo+FIZWbAWDtCpJSAgkgoHH1jYWgV9H313cVmqxg==
 
-"@tensorflow/tfjs-core@3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-3.19.0.tgz#981c50bb38a6441a4375cfc8806784e7490f01bc"
-  integrity sha512-znJ+TOJ3NdNL5yjw8M7dn2jO96sokiH1wfFuD7gglCkbZ4SXlFpFj2xelNdRHHmeYanMhJzqeyOW9whUnNcBqw==
+"@tensorflow/tfjs-core@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-3.20.0.tgz#b6f89ae6490099e2c0c992faa59c96f563f9eba2"
+  integrity sha512-L16JyVA4a8jFJXFgB9/oYZxcGq/GfLypt5dMVTyedznARZZ9SiY/UMMbo3IKl9ZylG1dOVVTpjzV3EvBYfeJXw==
   dependencies:
     "@types/long" "^4.0.1"
     "@types/offscreencanvas" "~2019.3.0"
@@ -401,27 +406,27 @@
     node-fetch "~2.6.1"
     seedrandom "^3.0.5"
 
-"@tensorflow/tfjs-data@3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-3.19.0.tgz#31de23cbea6cc594d60bd2216ab39faa8b2219cb"
-  integrity sha512-rkZv+YZowZwnm4RaedkV44WDrjokRHld9Py/0Fb7IvMyUh37lY0WsAsV94kJ+QuLc6iVNcDLaV29K+dUz57bRA==
+"@tensorflow/tfjs-data@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-3.20.0.tgz#8e267ea9f01066e0276be3226cb21b7d38711144"
+  integrity sha512-DiD3M/K/RYyTpOsrTL0ZUsdLgoczbSEx1+cQgCtlO3wUFoMxGYMxRTFeqp4hnJalY9MDptEqZ2gXAO1BMd2IXA==
   dependencies:
     "@types/node-fetch" "^2.1.2"
     node-fetch "~2.6.1"
     string_decoder "^1.3.0"
 
-"@tensorflow/tfjs-layers@3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-3.19.0.tgz#b624c25a2bdec09ea1c71db6547eb0952707fb35"
-  integrity sha512-+sVWjWWyTuT3sImrtNLtMv8/4FS30GAYpTgyJKhCQ3+GSvHUXulxJfncD0QqOg9fTbhtuF1TRAkzDU8v64791g==
+"@tensorflow/tfjs-layers@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-3.20.0.tgz#53aac3e719c9aa06cdff894e564704555e73a069"
+  integrity sha512-CbeDFX7XgWVsjsqp9HisbhO+a+soLt9tMNNBD/F+Rmw+YDJ5+X64iRpsMj3OWK8yKp895waoeads56UhG+Pxlw==
 
-"@tensorflow/tfjs-node@3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-node/-/tfjs-node-3.19.0.tgz#b7e58ff8bbea48881554d9178361726a83e56f92"
-  integrity sha512-6l8+56J66zf5k+WS8zTA1SbXno+iV7LgchwKPa62fsPRwjdzNIm1QondJbQYbFOILYx6bsgJs7nOoxStOlygAw==
+"@tensorflow/tfjs-node@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-node/-/tfjs-node-3.20.0.tgz#df401f99a6e7690d64f35136910d541cd337ba0f"
+  integrity sha512-lhMaqydtFNQ89kiET2nNMsV/rhOVa/Xh+hUHpxJP5e6KpVBzACmcJD8MjxM122G2EBntbf/vOQUAfnbX9AI9PA==
   dependencies:
     "@mapbox/node-pre-gyp" "1.0.9"
-    "@tensorflow/tfjs" "3.19.0"
+    "@tensorflow/tfjs" "3.20.0"
     adm-zip "^0.5.2"
     google-protobuf "^3.9.2"
     https-proxy-agent "^2.2.1"
@@ -429,17 +434,17 @@
     rimraf "^2.6.2"
     tar "^4.4.6"
 
-"@tensorflow/tfjs@3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-3.19.0.tgz#a08c35e6101bdbc0bf9a58f468270eee15f77bb0"
-  integrity sha512-fZF3HOON8jgKhFk06WIScIXf7j/gkl6cLbU1brFWutBhHlPSzxSWvdJR/TivCK7p+yMBunoyK50TjiwOrcoclA==
+"@tensorflow/tfjs@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-3.20.0.tgz#4a525be52c72deb9964fe2e5a0abaae04b95d862"
+  integrity sha512-Vx6MBFgZs+o413a/tM9nLdo4LM5U8Rh3d1fB8ioPL4j8dsqoqfCeee/215J3zzWPHIiSqv3pcD7bkK3fDA27GQ==
   dependencies:
-    "@tensorflow/tfjs-backend-cpu" "3.19.0"
-    "@tensorflow/tfjs-backend-webgl" "3.19.0"
-    "@tensorflow/tfjs-converter" "3.19.0"
-    "@tensorflow/tfjs-core" "3.19.0"
-    "@tensorflow/tfjs-data" "3.19.0"
-    "@tensorflow/tfjs-layers" "3.19.0"
+    "@tensorflow/tfjs-backend-cpu" "3.20.0"
+    "@tensorflow/tfjs-backend-webgl" "3.20.0"
+    "@tensorflow/tfjs-converter" "3.20.0"
+    "@tensorflow/tfjs-core" "3.20.0"
+    "@tensorflow/tfjs-data" "3.20.0"
+    "@tensorflow/tfjs-layers" "3.20.0"
     argparse "^1.0.10"
     chalk "^4.1.0"
     core-js "3"
@@ -806,10 +811,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.6.2.tgz#331b7b9f8621c638284787c5559423822fdffc50"
   integrity sha512-LSw8TZt12ZudbpHc6EkIyDM3nHVWKYrAvGy6EAJfNfjusbwnThqjqxUKKRwuV3iWYeW/LYMzNgaq3MaLffQ2xA==
 
-"@types/node@18.7.2":
-  version "18.7.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.2.tgz#22306626110c459aedd2cdf131c749ec781e3b34"
-  integrity sha512-ce7MIiaYWCFv6A83oEultwhBXb22fxwNOQf5DIxWA4WXvDQ7K+L0fbWl/YOfCzlR5B/uFkSnVBhPcOfOECcWvA==
+"@types/node@18.7.13":
+  version "18.7.13"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.13.tgz#23e6c5168333480d454243378b69e861ab5c011a"
+  integrity sha512-46yIhxSe5xEaJZXWdIBP7GU4HDTG8/eo0qd9atdiL+lFpA03y8KS+lkTN834TWJj5767GbWv4n/P6efyTFt1Dw==
 
 "@types/node@^14.11.8":
   version "14.17.9"
@@ -845,10 +850,10 @@
   resolved "https://registry.yarnpkg.com/@types/punycode/-/punycode-2.1.0.tgz#89e4f3d09b3f92e87a80505af19be7e0c31d4e83"
   integrity sha512-PG5aLpW6PJOeV2fHRslP4IOMWn+G+Uq8CfnyJ+PDS8ndCbU+soO+fB3NKCKo0p/Jh2Y4aPaiQZsrOXFdzpcA6g==
 
-"@types/qrcode@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.4.2.tgz#7d7142d6fa9921f195db342ed08b539181546c74"
-  integrity sha512-7uNT9L4WQTNJejHTSTdaJhfBSCN73xtXaHFyBJ8TSwiLhe4PRuTue7Iph0s2nG9R/ifUaSnGhLUOZavlBEqDWQ==
+"@types/qrcode@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.5.0.tgz#6a98fe9a9a7b2a9a3167b6dde17eff999eabe40b"
+  integrity sha512-x5ilHXRxUPIMfjtM+1vf/GPTRWZ81nqscursm5gMznJeK9M0YnZ1c3bEvRLQ0zSSgedLx1J6MGL231ObQGGhaA==
   dependencies:
     "@types/node" "*"
 
@@ -995,14 +1000,14 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.0.tgz#059798888720ec52ffa96c5f868e31a8f70fa3ec"
-  integrity sha512-jHvZNSW2WZ31OPJ3enhLrEKvAZNyAFWZ6rx9tUwaessTc4sx9KmgMNhVcqVAl1ETnT5rU5fpXTLmY9YvC1DCNg==
+"@typescript-eslint/eslint-plugin@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.35.1.tgz#0d822bfea7469904dfc1bb8f13cabd362b967c93"
+  integrity sha512-RBZZXZlI4XCY4Wzgy64vB+0slT9+yAPQRjj/HSaRwUot33xbDjF1oN9BLwOLTewoOI0jothIltZRe9uJCHf8gg==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.33.0"
-    "@typescript-eslint/type-utils" "5.33.0"
-    "@typescript-eslint/utils" "5.33.0"
+    "@typescript-eslint/scope-manager" "5.35.1"
+    "@typescript-eslint/type-utils" "5.35.1"
+    "@typescript-eslint/utils" "5.35.1"
     debug "^4.3.4"
     functional-red-black-tree "^1.0.1"
     ignore "^5.2.0"
@@ -1010,69 +1015,69 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.33.0.tgz#26ec3235b74f0667414613727cb98f9b69dc5383"
-  integrity sha512-cgM5cJrWmrDV2KpvlcSkelTBASAs1mgqq+IUGKJvFxWrapHpaRy5EXPQz9YaKF3nZ8KY18ILTiVpUtbIac86/w==
+"@typescript-eslint/parser@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.35.1.tgz#bf2ee2ebeaa0a0567213748243fb4eec2857f04f"
+  integrity sha512-XL2TBTSrh3yWAsMYpKseBYTVpvudNf69rPOWXWVBI08My2JVT5jR66eTt4IgQFHA/giiKJW5dUD4x/ZviCKyGg==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.33.0"
-    "@typescript-eslint/types" "5.33.0"
-    "@typescript-eslint/typescript-estree" "5.33.0"
+    "@typescript-eslint/scope-manager" "5.35.1"
+    "@typescript-eslint/types" "5.35.1"
+    "@typescript-eslint/typescript-estree" "5.35.1"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.33.0.tgz#509d7fa540a2c58f66bdcfcf278a3fa79002e18d"
-  integrity sha512-/Jta8yMNpXYpRDl8EwF/M8It2A9sFJTubDo0ATZefGXmOqlaBffEw0ZbkbQ7TNDK6q55NPHFshGBPAZvZkE8Pw==
+"@typescript-eslint/scope-manager@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.35.1.tgz#ccb69d54b7fd0f2d0226a11a75a8f311f525ff9e"
+  integrity sha512-kCYRSAzIW9ByEIzmzGHE50NGAvAP3wFTaZevgWva7GpquDyFPFcmvVkFJGWJJktg/hLwmys/FZwqM9EKr2u24Q==
   dependencies:
-    "@typescript-eslint/types" "5.33.0"
-    "@typescript-eslint/visitor-keys" "5.33.0"
+    "@typescript-eslint/types" "5.35.1"
+    "@typescript-eslint/visitor-keys" "5.35.1"
 
-"@typescript-eslint/type-utils@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.33.0.tgz#92ad1fba973c078d23767ce2d8d5a601baaa9338"
-  integrity sha512-2zB8uEn7hEH2pBeyk3NpzX1p3lF9dKrEbnXq1F7YkpZ6hlyqb2yZujqgRGqXgRBTHWIUG3NGx/WeZk224UKlIA==
+"@typescript-eslint/type-utils@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.35.1.tgz#d50903b56758c5c8fc3be52b3be40569f27f9c4a"
+  integrity sha512-8xT8ljvo43Mp7BiTn1vxLXkjpw8wS4oAc00hMSB4L1/jIiYbjjnc3Qp2GAUOG/v8zsNCd1qwcqfCQ0BuishHkw==
   dependencies:
-    "@typescript-eslint/utils" "5.33.0"
+    "@typescript-eslint/utils" "5.35.1"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.33.0.tgz#d41c584831805554b063791338b0220b613a275b"
-  integrity sha512-nIMt96JngB4MYFYXpZ/3ZNU4GWPNdBbcB5w2rDOCpXOVUkhtNlG2mmm8uXhubhidRZdwMaMBap7Uk8SZMU/ppw==
+"@typescript-eslint/types@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.35.1.tgz#af355fe52a0cc88301e889bc4ada72f279b63d61"
+  integrity sha512-FDaujtsH07VHzG0gQ6NDkVVhi1+rhq0qEvzHdJAQjysN+LHDCKDKCBRlZFFE0ec0jKxiv0hN63SNfExy0KrbQQ==
 
-"@typescript-eslint/typescript-estree@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.0.tgz#02d9c9ade6f4897c09e3508c27de53ad6bfa54cf"
-  integrity sha512-tqq3MRLlggkJKJUrzM6wltk8NckKyyorCSGMq4eVkyL5sDYzJJcMgZATqmF8fLdsWrW7OjjIZ1m9v81vKcaqwQ==
+"@typescript-eslint/typescript-estree@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.35.1.tgz#db878a39a0dbdc9bb133f11cdad451770bfba211"
+  integrity sha512-JUqE1+VRTGyoXlDWWjm6MdfpBYVq+hixytrv1oyjYIBEOZhBCwtpp5ZSvBt4wIA1MKWlnaC2UXl2XmYGC3BoQA==
   dependencies:
-    "@typescript-eslint/types" "5.33.0"
-    "@typescript-eslint/visitor-keys" "5.33.0"
+    "@typescript-eslint/types" "5.35.1"
+    "@typescript-eslint/visitor-keys" "5.35.1"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.33.0.tgz#46797461ce3146e21c095d79518cc0f8ec574038"
-  integrity sha512-JxOAnXt9oZjXLIiXb5ZIcZXiwVHCkqZgof0O8KPgz7C7y0HS42gi75PdPlqh1Tf109M0fyUw45Ao6JLo7S5AHw==
+"@typescript-eslint/utils@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.35.1.tgz#ae1399afbfd6aa7d0ed1b7d941e9758d950250eb"
+  integrity sha512-v6F8JNXgeBWI4pzZn36hT2HXXzoBBBJuOYvoQiaQaEEjdi5STzux3Yj8v7ODIpx36i/5s8TdzuQ54TPc5AITQQ==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.33.0"
-    "@typescript-eslint/types" "5.33.0"
-    "@typescript-eslint/typescript-estree" "5.33.0"
+    "@typescript-eslint/scope-manager" "5.35.1"
+    "@typescript-eslint/types" "5.35.1"
+    "@typescript-eslint/typescript-estree" "5.35.1"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/visitor-keys@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.0.tgz#fbcbb074e460c11046e067bc3384b5d66b555484"
-  integrity sha512-/XsqCzD4t+Y9p5wd9HZiptuGKBlaZO5showwqODii5C0nZawxWLF+Q6k5wYHBrQv96h6GYKyqqMHCSTqta8Kiw==
+"@typescript-eslint/visitor-keys@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.35.1.tgz#285e9e34aed7c876f16ff646a3984010035898e6"
+  integrity sha512-cEB1DvBVo1bxbW/S5axbGPE6b7FIMAbo3w+AGq6zNDA7+NYJOIkKj/sInfTv4edxd4PxJSgdN4t6/pbvgA+n5g==
   dependencies:
-    "@typescript-eslint/types" "5.33.0"
+    "@typescript-eslint/types" "5.35.1"
     eslint-visitor-keys "^3.3.0"
 
 "@ungap/promise-all-settled@1.1.2":
@@ -1458,10 +1463,10 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
-aws-sdk@2.1194.0:
-  version "2.1194.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1194.0.tgz#6a820684fa3f58ea40caf90d302414a23df7c308"
-  integrity sha512-wbgib7r7sHPkZIhqSMduueKYqe+DrFyxsKnUKHj6hdNcRKqEeqzvKp4olWmFs/3z3qU8+g78kBXr9rujvko1ug==
+aws-sdk@2.1204.0:
+  version "2.1204.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1204.0.tgz#6e0c5d0b4b50ff122b66772bb0ab5453009e6106"
+  integrity sha512-H3dRQBdgzAfZ/e/dfiW44fhQrgAuCfIzWhI5y5J9122caI4uZY6TEUd003UXP4nXq2eMfuPWg0bA/mPwbj8RkA==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"
@@ -2293,10 +2298,10 @@ data-urls@^3.0.2:
     whatwg-mimetype "^3.0.0"
     whatwg-url "^11.0.0"
 
-date-fns@2.29.1:
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.1.tgz#9667c2615525e552b5135a3116b95b1961456e60"
-  integrity sha512-dlLD5rKaKxpFdnjrs+5azHDFOPEu4ANy/LTh04A1DTzMM7qoajmKCBc8pkKRFT41CNzw+4gQh79X5C+Jq27HAw==
+date-fns@2.29.2:
+  version "2.29.2"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.2.tgz#0d4b3d0f3dff0f920820a070920f0d9662c51931"
+  integrity sha512-0VNbwmWJDS/G3ySwFSJA3ayhbURMTJLtwM2DTxf9CWondCnh6DTNlO9JgRSq6ibf4eD0lfMJNBxUdEAHHix+bA==
 
 date-fns@^2.28.0:
   version "2.28.0"
@@ -2949,14 +2954,15 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@8.21.0:
-  version "8.21.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.21.0.tgz#1940a68d7e0573cef6f50037addee295ff9be9ef"
-  integrity sha512-/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA==
+eslint@8.23.0:
+  version "8.23.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.23.0.tgz#a184918d288820179c6041bb3ddcc99ce6eea040"
+  integrity sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==
   dependencies:
-    "@eslint/eslintrc" "^1.3.0"
+    "@eslint/eslintrc" "^1.3.1"
     "@humanwhocodes/config-array" "^0.10.4"
     "@humanwhocodes/gitignore-to-minimatch" "^1.0.2"
+    "@humanwhocodes/module-importer" "^1.0.1"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
@@ -2966,7 +2972,7 @@ eslint@8.21.0:
     eslint-scope "^7.1.1"
     eslint-utils "^3.0.0"
     eslint-visitor-keys "^3.3.0"
-    espree "^9.3.3"
+    espree "^9.4.0"
     esquery "^1.4.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
@@ -2992,21 +2998,11 @@ eslint@8.21.0:
     strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
-espree@^9.3.2:
-  version "9.3.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.2.tgz#f58f77bd334731182801ced3380a8cc859091596"
-  integrity sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==
-  dependencies:
-    acorn "^8.7.1"
-    acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.3.0"
-
-espree@^9.3.3:
-  version "9.3.3"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.3.tgz#2dd37c4162bb05f433ad3c1a52ddf8a49dc08e9d"
-  integrity sha512-ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng==
+espree@^9.4.0:
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a"
+  integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==
   dependencies:
     acorn "^8.8.0"
     acorn-jsx "^5.3.2"
@@ -4568,10 +4564,10 @@ jsprim@^1.2.2:
     json-schema "0.4.0"
     verror "1.10.0"
 
-jsrsasign@10.5.26:
-  version "10.5.26"
-  resolved "https://registry.yarnpkg.com/jsrsasign/-/jsrsasign-10.5.26.tgz#bc36d4c4019c83f144066725ea0ca6ab306702fc"
-  integrity sha512-TjEu1yPdI+8whpe6CA/6XNb7U1sm9+PUItOUfSThOLvx7JCfYHIfuvZK2Egz2DWUKioafn98LPuk+geLGckxMg==
+jsrsasign@10.5.27:
+  version "10.5.27"
+  resolved "https://registry.yarnpkg.com/jsrsasign/-/jsrsasign-10.5.27.tgz#481defb1206aa48cd740c3fce8ff546efb5bb45e"
+  integrity sha512-1F4LmDeJZHYwoVvB44jEo2uZL3XuwYNzXCDOu53Ui6vqofGQ/gCYDmaxfVZtN0TGd92UKXr/BONcfrPonUIcQQ==
 
 jstransformer@1.0.0:
   version "1.0.0"
@@ -5955,10 +5951,10 @@ pg-int8@1.0.1:
   resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
   integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
 
-pg-pool@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.5.1.tgz#f499ce76f9bf5097488b3b83b19861f28e4ed905"
-  integrity sha512-6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ==
+pg-pool@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.5.2.tgz#ed1bed1fb8d79f1c6fd5fb1c99e990fbf9ddf178"
+  integrity sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w==
 
 pg-protocol@^1.5.0:
   version "1.5.0"
@@ -5976,15 +5972,15 @@ pg-types@^2.1.0:
     postgres-date "~1.0.4"
     postgres-interval "^1.1.0"
 
-pg@8.7.3:
-  version "8.7.3"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-8.7.3.tgz#8a5bdd664ca4fda4db7997ec634c6e5455b27c44"
-  integrity sha512-HPmH4GH4H3AOprDJOazoIcpI49XFsHCe8xlrjHkWiapdbHK+HLtbm/GQzXYAZwmPju/kzKhjaSfMACG+8cgJcw==
+pg@8.8.0:
+  version "8.8.0"
+  resolved "https://registry.yarnpkg.com/pg/-/pg-8.8.0.tgz#a77f41f9d9ede7009abfca54667c775a240da686"
+  integrity sha512-UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw==
   dependencies:
     buffer-writer "2.0.0"
     packet-reader "1.0.0"
     pg-connection-string "^2.5.0"
-    pg-pool "^3.5.1"
+    pg-pool "^3.5.2"
     pg-protocol "^1.5.0"
     pg-types "^2.1.0"
     pgpass "1.x"
@@ -7246,10 +7242,10 @@ syslog-pro@1.0.0:
   dependencies:
     moment "^2.22.2"
 
-systeminformation@5.12.5:
-  version "5.12.5"
-  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.12.5.tgz#ba223aca6d99453136986fb6a4c96518d13d27b5"
-  integrity sha512-lWhWMZTQzwHaB2aacQ9wbhSncgXo8bYv7M9K5Qrz9tJuvqPepiCvb5Uauq2xwH+JhbjPO9YJD2qLXQEXFAjwwA==
+systeminformation@5.12.6:
+  version "5.12.6"
+  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.12.6.tgz#b75d7aaf9f5da32439fc633d2be9eb741691d200"
+  integrity sha512-FkCvT5BOuH1OE3+8lFM25oXIYJ0CM8kq4Wgvz2jyBTrsOIgha/6gdJXgbF4rv+g0j/5wJqQLDKan7kc/p7uIvw==
 
 tapable@^2.2.0:
   version "2.2.0"
@@ -7586,10 +7582,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typeorm@0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.3.7.tgz#5776ed5058f0acb75d64723b39ff458d21de64c1"
-  integrity sha512-MsPJeP6Zuwfe64c++l80+VRqpGEGxf0CkztIEnehQ+CMmQPSHjOnFbFxwBuZ2jiLqZTjLk2ZqQdVF0RmvxNF3Q==
+typeorm@0.3.8:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.3.8.tgz#134ab0736592da5d5ca66d4eb8cea5999e34d5f9"
+  integrity sha512-77PNamypfwieZlhwbUAjMudX2T+5F6JCoNR18RdKenJ5Uu+9gc9AWa1kmz/2hH84MU23lGqPCu8u2lKnlfsN2g==
   dependencies:
     "@sqltools/formatter" "^1.2.2"
     app-root-path "^3.0.0"
@@ -7609,10 +7605,10 @@ typeorm@0.3.7:
     xml2js "^0.4.23"
     yargs "^17.3.1"
 
-typescript@4.7.4:
-  version "4.7.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
-  integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
+typescript@4.8.2:
+  version "4.8.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790"
+  integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==
 
 ulid@2.3.0:
   version "2.3.0"
@@ -7758,11 +7754,6 @@ v8-compile-cache-lib@^3.0.1:
   resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
   integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
 
-v8-compile-cache@^2.0.3:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"
-  integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==
-
 vary@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
diff --git a/packages/client/package.json b/packages/client/package.json
index 0cab29f27..188b42021 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -24,11 +24,11 @@
 		"browser-image-resizer": "git+https://github.com/misskey-dev/browser-image-resizer#v2.2.1-misskey.2",
 		"chart.js": "3.9.1",
 		"chartjs-adapter-date-fns": "2.0.0",
-		"chartjs-plugin-gradient": "0.5.0",
+		"chartjs-plugin-gradient": "0.5.1",
 		"chartjs-plugin-zoom": "1.2.1",
-		"compare-versions": "4.1.3",
+		"compare-versions": "5.0.1",
 		"cropperjs": "2.0.0-beta",
-		"date-fns": "2.29.1",
+		"date-fns": "2.29.2",
 		"escape-regexp": "0.0.1",
 		"eventemitter3": "4.0.7",
 		"idb-keyval": "6.2.0",
@@ -39,12 +39,12 @@
 		"mfm-js": "0.23.0",
 		"misskey-js": "0.0.14",
 		"photoswipe": "5.3.0",
-		"prismjs": "1.28.0",
+		"prismjs": "1.29.0",
 		"punycode": "2.1.1",
 		"querystring": "0.2.1",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"sass": "1.54.4",
+		"sass": "1.54.5",
 		"seedrandom": "3.0.5",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
@@ -56,10 +56,10 @@
 		"tsc-alias": "1.7.0",
 		"tsconfig-paths": "4.1.0",
 		"twemoji-parser": "14.0.0",
-		"typescript": "4.7.4",
+		"typescript": "4.8.2",
 		"uuid": "8.3.2",
 		"vanilla-tilt": "1.7.2",
-		"vite": "3.0.7",
+		"vite": "3.0.9",
 		"vue": "3.2.37",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vuedraggable": "4.0.1"
@@ -76,14 +76,14 @@
 		"@types/throttle-debounce": "5.0.0",
 		"@types/tinycolor2": "1.4.3",
 		"@types/uuid": "8.3.4",
-		"@typescript-eslint/eslint-plugin": "5.33.0",
-		"@typescript-eslint/parser": "5.33.0",
+		"@typescript-eslint/eslint-plugin": "5.35.1",
+		"@typescript-eslint/parser": "5.35.1",
 		"cross-env": "7.0.3",
-		"cypress": "10.4.0",
-		"eslint": "8.21.0",
+		"cypress": "10.6.0",
+		"eslint": "8.23.0",
 		"eslint-plugin-import": "2.26.0",
-		"eslint-plugin-vue": "9.3.0",
-		"rollup": "2.77.3",
+		"eslint-plugin-vue": "9.4.0",
+		"rollup": "2.78.1",
 		"start-server-and-test": "1.14.0"
 	}
 }
diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index 94e7f9f6b..a8cc38ba9 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -14,7 +14,7 @@ if (localStorage.getItem('accounts') != null) {
 //#endregion
 
 import { computed, createApp, watch, markRaw, version as vueVersion, defineAsyncComponent } from 'vue';
-import compareVersions from 'compare-versions';
+import { compareVersions } from 'compare-versions';
 import JSON5 from 'json5';
 
 import widgets from '@/widgets';
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 0ef0da70b..140c23a35 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -91,7 +91,6 @@ const widgetsShowing = $ref(false);
 
 provide('router', mainRouter);
 provideMetadataReceiver((info) => {
-	console.log(info);
 	pageMetadata = info;
 	if (pageMetadata.value) {
 		document.title = `${pageMetadata.value.title} | ${instanceName}`;
diff --git a/packages/client/yarn.lock b/packages/client/yarn.lock
index ec81943a2..b01f95c65 100644
--- a/packages/client/yarn.lock
+++ b/packages/client/yarn.lock
@@ -162,14 +162,14 @@
     twemoji-parser "14.0.0"
     universalify "^0.1.2"
 
-"@eslint/eslintrc@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f"
-  integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==
+"@eslint/eslintrc@^1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.1.tgz#de0807bfeffc37b964a7d0400e0c348ce5a2543d"
+  integrity sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.3.2"
+    espree "^9.4.0"
     globals "^13.15.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
@@ -208,6 +208,11 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d"
   integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==
 
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
 "@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
@@ -458,14 +463,14 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.0.tgz#059798888720ec52ffa96c5f868e31a8f70fa3ec"
-  integrity sha512-jHvZNSW2WZ31OPJ3enhLrEKvAZNyAFWZ6rx9tUwaessTc4sx9KmgMNhVcqVAl1ETnT5rU5fpXTLmY9YvC1DCNg==
+"@typescript-eslint/eslint-plugin@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.35.1.tgz#0d822bfea7469904dfc1bb8f13cabd362b967c93"
+  integrity sha512-RBZZXZlI4XCY4Wzgy64vB+0slT9+yAPQRjj/HSaRwUot33xbDjF1oN9BLwOLTewoOI0jothIltZRe9uJCHf8gg==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.33.0"
-    "@typescript-eslint/type-utils" "5.33.0"
-    "@typescript-eslint/utils" "5.33.0"
+    "@typescript-eslint/scope-manager" "5.35.1"
+    "@typescript-eslint/type-utils" "5.35.1"
+    "@typescript-eslint/utils" "5.35.1"
     debug "^4.3.4"
     functional-red-black-tree "^1.0.1"
     ignore "^5.2.0"
@@ -473,69 +478,69 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.33.0.tgz#26ec3235b74f0667414613727cb98f9b69dc5383"
-  integrity sha512-cgM5cJrWmrDV2KpvlcSkelTBASAs1mgqq+IUGKJvFxWrapHpaRy5EXPQz9YaKF3nZ8KY18ILTiVpUtbIac86/w==
+"@typescript-eslint/parser@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.35.1.tgz#bf2ee2ebeaa0a0567213748243fb4eec2857f04f"
+  integrity sha512-XL2TBTSrh3yWAsMYpKseBYTVpvudNf69rPOWXWVBI08My2JVT5jR66eTt4IgQFHA/giiKJW5dUD4x/ZviCKyGg==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.33.0"
-    "@typescript-eslint/types" "5.33.0"
-    "@typescript-eslint/typescript-estree" "5.33.0"
+    "@typescript-eslint/scope-manager" "5.35.1"
+    "@typescript-eslint/types" "5.35.1"
+    "@typescript-eslint/typescript-estree" "5.35.1"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.33.0.tgz#509d7fa540a2c58f66bdcfcf278a3fa79002e18d"
-  integrity sha512-/Jta8yMNpXYpRDl8EwF/M8It2A9sFJTubDo0ATZefGXmOqlaBffEw0ZbkbQ7TNDK6q55NPHFshGBPAZvZkE8Pw==
+"@typescript-eslint/scope-manager@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.35.1.tgz#ccb69d54b7fd0f2d0226a11a75a8f311f525ff9e"
+  integrity sha512-kCYRSAzIW9ByEIzmzGHE50NGAvAP3wFTaZevgWva7GpquDyFPFcmvVkFJGWJJktg/hLwmys/FZwqM9EKr2u24Q==
   dependencies:
-    "@typescript-eslint/types" "5.33.0"
-    "@typescript-eslint/visitor-keys" "5.33.0"
+    "@typescript-eslint/types" "5.35.1"
+    "@typescript-eslint/visitor-keys" "5.35.1"
 
-"@typescript-eslint/type-utils@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.33.0.tgz#92ad1fba973c078d23767ce2d8d5a601baaa9338"
-  integrity sha512-2zB8uEn7hEH2pBeyk3NpzX1p3lF9dKrEbnXq1F7YkpZ6hlyqb2yZujqgRGqXgRBTHWIUG3NGx/WeZk224UKlIA==
+"@typescript-eslint/type-utils@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.35.1.tgz#d50903b56758c5c8fc3be52b3be40569f27f9c4a"
+  integrity sha512-8xT8ljvo43Mp7BiTn1vxLXkjpw8wS4oAc00hMSB4L1/jIiYbjjnc3Qp2GAUOG/v8zsNCd1qwcqfCQ0BuishHkw==
   dependencies:
-    "@typescript-eslint/utils" "5.33.0"
+    "@typescript-eslint/utils" "5.35.1"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.33.0.tgz#d41c584831805554b063791338b0220b613a275b"
-  integrity sha512-nIMt96JngB4MYFYXpZ/3ZNU4GWPNdBbcB5w2rDOCpXOVUkhtNlG2mmm8uXhubhidRZdwMaMBap7Uk8SZMU/ppw==
+"@typescript-eslint/types@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.35.1.tgz#af355fe52a0cc88301e889bc4ada72f279b63d61"
+  integrity sha512-FDaujtsH07VHzG0gQ6NDkVVhi1+rhq0qEvzHdJAQjysN+LHDCKDKCBRlZFFE0ec0jKxiv0hN63SNfExy0KrbQQ==
 
-"@typescript-eslint/typescript-estree@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.0.tgz#02d9c9ade6f4897c09e3508c27de53ad6bfa54cf"
-  integrity sha512-tqq3MRLlggkJKJUrzM6wltk8NckKyyorCSGMq4eVkyL5sDYzJJcMgZATqmF8fLdsWrW7OjjIZ1m9v81vKcaqwQ==
+"@typescript-eslint/typescript-estree@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.35.1.tgz#db878a39a0dbdc9bb133f11cdad451770bfba211"
+  integrity sha512-JUqE1+VRTGyoXlDWWjm6MdfpBYVq+hixytrv1oyjYIBEOZhBCwtpp5ZSvBt4wIA1MKWlnaC2UXl2XmYGC3BoQA==
   dependencies:
-    "@typescript-eslint/types" "5.33.0"
-    "@typescript-eslint/visitor-keys" "5.33.0"
+    "@typescript-eslint/types" "5.35.1"
+    "@typescript-eslint/visitor-keys" "5.35.1"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.33.0.tgz#46797461ce3146e21c095d79518cc0f8ec574038"
-  integrity sha512-JxOAnXt9oZjXLIiXb5ZIcZXiwVHCkqZgof0O8KPgz7C7y0HS42gi75PdPlqh1Tf109M0fyUw45Ao6JLo7S5AHw==
+"@typescript-eslint/utils@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.35.1.tgz#ae1399afbfd6aa7d0ed1b7d941e9758d950250eb"
+  integrity sha512-v6F8JNXgeBWI4pzZn36hT2HXXzoBBBJuOYvoQiaQaEEjdi5STzux3Yj8v7ODIpx36i/5s8TdzuQ54TPc5AITQQ==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.33.0"
-    "@typescript-eslint/types" "5.33.0"
-    "@typescript-eslint/typescript-estree" "5.33.0"
+    "@typescript-eslint/scope-manager" "5.35.1"
+    "@typescript-eslint/types" "5.35.1"
+    "@typescript-eslint/typescript-estree" "5.35.1"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/visitor-keys@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.0.tgz#fbcbb074e460c11046e067bc3384b5d66b555484"
-  integrity sha512-/XsqCzD4t+Y9p5wd9HZiptuGKBlaZO5showwqODii5C0nZawxWLF+Q6k5wYHBrQv96h6GYKyqqMHCSTqta8Kiw==
+"@typescript-eslint/visitor-keys@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.35.1.tgz#285e9e34aed7c876f16ff646a3984010035898e6"
+  integrity sha512-cEB1DvBVo1bxbW/S5axbGPE6b7FIMAbo3w+AGq6zNDA7+NYJOIkKj/sInfTv4edxd4PxJSgdN4t6/pbvgA+n5g==
   dependencies:
-    "@typescript-eslint/types" "5.33.0"
+    "@typescript-eslint/types" "5.35.1"
     eslint-visitor-keys "^3.3.0"
 
 "@vitejs/plugin-vue@3.0.3":
@@ -934,10 +939,10 @@ chartjs-adapter-date-fns@2.0.0:
   resolved "https://registry.yarnpkg.com/chartjs-adapter-date-fns/-/chartjs-adapter-date-fns-2.0.0.tgz#5e53b2f660b993698f936f509c86dddf9ed44c6b"
   integrity sha512-rmZINGLe+9IiiEB0kb57vH3UugAtYw33anRiw5kS2Tu87agpetDDoouquycWc9pRsKtQo5j+vLsYHyr8etAvFw==
 
-chartjs-plugin-gradient@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/chartjs-plugin-gradient/-/chartjs-plugin-gradient-0.5.0.tgz#907b15102ce164fc32640d43f9c3bad2f5ae3fd5"
-  integrity sha512-VHys58pMPNYRXngCrN5kvQZb1EiAvl/BhU3G9wNXxf2hETWiPYgN63Ud6RK1hyST+nZdZ61x4us546djZX2rYQ==
+chartjs-plugin-gradient@0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/chartjs-plugin-gradient/-/chartjs-plugin-gradient-0.5.1.tgz#ac7ce246bcafb749ec7b64fe0668d518c75c9475"
+  integrity sha512-vhwlYGZWan4MGZZ4Wj64Y4aIql1uCPCU1JcggLWn3cgYEv4G7pXp1YgM4XH5ugmyn6BVCgQqAhiJ2h6hppzHmQ==
 
 chartjs-plugin-zoom@1.2.1:
   version "1.2.1"
@@ -1049,10 +1054,10 @@ common-tags@^1.8.0:
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
   integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
 
-compare-versions@4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-4.1.3.tgz#8f7b8966aef7dc4282b45dfa6be98434fc18a1a4"
-  integrity sha512-WQfnbDcrYnGr55UwbxKiQKASnTtNnaAWVi8jZyy8NTpVAXWACSne8lMD1iaIo9AiU6mnuLvSVshCzewVuWxHUg==
+compare-versions@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-5.0.1.tgz#14c6008436d994c3787aba38d4087fabe858555e"
+  integrity sha512-v8Au3l0b+Nwkp4G142JcgJFh1/TUhdxut7wzD1Nq1dyp5oa3tXaqb03EXOAB6jS4gMlalkjAUPZBMiAfKUixHQ==
 
 concat-map@0.0.1:
   version "0.0.1"
@@ -1098,10 +1103,10 @@ csstype@^2.6.8:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.13.tgz#a6893015b90e84dd6e85d0e3b442a1e84f2dbe0f"
   integrity sha512-ul26pfSQTZW8dcOnD2iiJssfXw0gdNVX9IJDH/X3K5DGPfj+fUYe3kB+swUY6BF3oZDxaID3AJt+9/ojSAE05A==
 
-cypress@10.4.0:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.4.0.tgz#bb5b3b6588ad49eff172fecf5778cc0da2980e4e"
-  integrity sha512-OM7F8MRE01SHQRVVzunid1ZK1m90XTxYnl+7uZfIrB4CYqUDCrZEeSyCXzIbsS6qcaijVCAhqDL60SxG8N6hew==
+cypress@10.6.0:
+  version "10.6.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.6.0.tgz#13f46867febf2c3715874ed5dce9c2e946b175fe"
+  integrity sha512-6sOpHjostp8gcLO34p6r/Ci342lBs8S5z9/eb3ZCQ22w2cIhMWGUoGKkosabPBfKcvRS9BE4UxybBtlIs8gTQA==
   dependencies:
     "@cypress/request" "^2.88.10"
     "@cypress/xvfb" "^1.2.4"
@@ -1153,10 +1158,10 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-date-fns@2.29.1:
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.1.tgz#9667c2615525e552b5135a3116b95b1961456e60"
-  integrity sha512-dlLD5rKaKxpFdnjrs+5azHDFOPEu4ANy/LTh04A1DTzMM7qoajmKCBc8pkKRFT41CNzw+4gQh79X5C+Jq27HAw==
+date-fns@2.29.2:
+  version "2.29.2"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.2.tgz#0d4b3d0f3dff0f920820a070920f0d9662c51931"
+  integrity sha512-0VNbwmWJDS/G3ySwFSJA3ayhbURMTJLtwM2DTxf9CWondCnh6DTNlO9JgRSq6ibf4eD0lfMJNBxUdEAHHix+bA==
 
 dayjs@^1.10.4:
   version "1.10.6"
@@ -1484,10 +1489,10 @@ eslint-plugin-import@2.26.0:
     resolve "^1.22.0"
     tsconfig-paths "^3.14.1"
 
-eslint-plugin-vue@9.3.0:
-  version "9.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.3.0.tgz#c3f5ce515dae387e062428725c5cf96098d9da0b"
-  integrity sha512-iscKKkBZgm6fGZwFt6poRoWC0Wy2dQOlwUPW++CiPoQiw1enctV2Hj5DBzzjJZfyqs+FAXhgzL4q0Ww03AgSmQ==
+eslint-plugin-vue@9.4.0:
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.4.0.tgz#31c2d9002b5bb437b351a5feffdf37c4397e5cb9"
+  integrity sha512-Nzz2QIJ8FG+rtJaqT/7/ru5ie2XgT9KCudkbN0y3uFYhQ41nuHEaboLAiqwMcK006hZPQv/rVMRhUIwEGhIvfQ==
   dependencies:
     eslint-utils "^3.0.0"
     natural-compare "^1.4.0"
@@ -1530,14 +1535,15 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@8.21.0:
-  version "8.21.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.21.0.tgz#1940a68d7e0573cef6f50037addee295ff9be9ef"
-  integrity sha512-/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA==
+eslint@8.23.0:
+  version "8.23.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.23.0.tgz#a184918d288820179c6041bb3ddcc99ce6eea040"
+  integrity sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==
   dependencies:
-    "@eslint/eslintrc" "^1.3.0"
+    "@eslint/eslintrc" "^1.3.1"
     "@humanwhocodes/config-array" "^0.10.4"
     "@humanwhocodes/gitignore-to-minimatch" "^1.0.2"
+    "@humanwhocodes/module-importer" "^1.0.1"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
@@ -1547,7 +1553,7 @@ eslint@8.21.0:
     eslint-scope "^7.1.1"
     eslint-utils "^3.0.0"
     eslint-visitor-keys "^3.3.0"
-    espree "^9.3.3"
+    espree "^9.4.0"
     esquery "^1.4.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
@@ -1573,9 +1579,8 @@ eslint@8.21.0:
     strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
-espree@^9.3.1, espree@^9.3.2:
+espree@^9.3.1:
   version "9.3.2"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.2.tgz#f58f77bd334731182801ced3380a8cc859091596"
   integrity sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==
@@ -1584,10 +1589,10 @@ espree@^9.3.1, espree@^9.3.2:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.3.0"
 
-espree@^9.3.3:
-  version "9.3.3"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.3.tgz#2dd37c4162bb05f433ad3c1a52ddf8a49dc08e9d"
-  integrity sha512-ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng==
+espree@^9.4.0:
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a"
+  integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==
   dependencies:
     acorn "^8.8.0"
     acorn-jsx "^5.3.2"
@@ -2924,10 +2929,10 @@ pretty-bytes@^5.6.0:
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
   integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
 
-prismjs@1.28.0:
-  version "1.28.0"
-  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.28.0.tgz#0d8f561fa0f7cf6ebca901747828b149147044b6"
-  integrity sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw==
+prismjs@1.29.0:
+  version "1.29.0"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.29.0.tgz#f113555a8fa9b57c35e637bba27509dcf802dd12"
+  integrity sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==
 
 proxy-from-env@1.0.0:
   version "1.0.0"
@@ -3067,7 +3072,14 @@ rndstr@1.0.0:
     rangestr "0.0.1"
     seedrandom "2.4.2"
 
-rollup@2.77.3, "rollup@>=2.75.6 <2.77.0 || ~2.77.0":
+rollup@2.78.1:
+  version "2.78.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.78.1.tgz#52fe3934d9c83cb4f7c4cb5fb75d88591be8648f"
+  integrity sha512-VeeCgtGi4P+o9hIg+xz4qQpRl6R401LWEXBmxYKOV4zlF82lyhgh2hTZnheFUbANE8l2A41F458iwj2vEYaXJg==
+  optionalDependencies:
+    fsevents "~2.3.2"
+
+"rollup@>=2.75.6 <2.77.0 || ~2.77.0":
   version "2.77.3"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.3.tgz#8f00418d3a2740036e15deb653bed1a90ee0cc12"
   integrity sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g==
@@ -3113,10 +3125,10 @@ safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass@1.54.4:
-  version "1.54.4"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.54.4.tgz#803ff2fef5525f1dd01670c3915b4b68b6cba72d"
-  integrity sha512-3tmF16yvnBwtlPrNBHw/H907j8MlOX8aTBnlNX1yrKx24RKcJGPyLhFUwkoKBKesR3unP93/2z14Ll8NicwQUA==
+sass@1.54.5:
+  version "1.54.5"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.54.5.tgz#93708f5560784f6ff2eab8542ade021a4a947b3a"
+  integrity sha512-p7DTOzxkUPa/63FU0R3KApkRHwcVZYC0PLnLm5iyZACyp15qSi32x7zVUhRdABAATmkALqgGrjCJAcWvobmhHw==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -3493,10 +3505,10 @@ type-fest@^0.21.3:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
-typescript@4.7.4:
-  version "4.7.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
-  integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
+typescript@4.8.2:
+  version "4.8.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790"
+  integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==
 
 unbox-primitive@^1.0.1:
   version "1.0.1"
@@ -3553,11 +3565,6 @@ uuid@8.3.2, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-v8-compile-cache@^2.0.3:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"
-  integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==
-
 vanilla-tilt@1.7.2:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/vanilla-tilt/-/vanilla-tilt-1.7.2.tgz#59a5565d9f1f6d392a36969f223fb600dd101a81"
@@ -3572,10 +3579,10 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vite@3.0.7:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-3.0.7.tgz#f1e379857e9c5d652126f8b20d371e1365eb700f"
-  integrity sha512-dILhvKba1mbP1wCezVQx/qhEK7/+jVn9ciadEcyKMMhZpsuAi/eWZfJRMkmYlkSFG7Qq9NvJbgFq4XOBxugJsA==
+vite@3.0.9:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-3.0.9.tgz#45fac22c2a5290a970f23d66c1aef56a04be8a30"
+  integrity sha512-waYABTM+G6DBTCpYAxvevpG50UOlZuynR0ckTK5PawNVt7ebX6X7wNXHaGIO6wYYFXSM7/WcuFuO2QzhBB6aMw==
   dependencies:
     esbuild "^0.14.47"
     postcss "^8.4.16"
diff --git a/yarn.lock b/yarn.lock
index eb0176628..89e994a7e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -234,48 +234,48 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/parser@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.33.0.tgz#26ec3235b74f0667414613727cb98f9b69dc5383"
-  integrity sha512-cgM5cJrWmrDV2KpvlcSkelTBASAs1mgqq+IUGKJvFxWrapHpaRy5EXPQz9YaKF3nZ8KY18ILTiVpUtbIac86/w==
+"@typescript-eslint/parser@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.35.1.tgz#bf2ee2ebeaa0a0567213748243fb4eec2857f04f"
+  integrity sha512-XL2TBTSrh3yWAsMYpKseBYTVpvudNf69rPOWXWVBI08My2JVT5jR66eTt4IgQFHA/giiKJW5dUD4x/ZviCKyGg==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.33.0"
-    "@typescript-eslint/types" "5.33.0"
-    "@typescript-eslint/typescript-estree" "5.33.0"
+    "@typescript-eslint/scope-manager" "5.35.1"
+    "@typescript-eslint/types" "5.35.1"
+    "@typescript-eslint/typescript-estree" "5.35.1"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.33.0.tgz#509d7fa540a2c58f66bdcfcf278a3fa79002e18d"
-  integrity sha512-/Jta8yMNpXYpRDl8EwF/M8It2A9sFJTubDo0ATZefGXmOqlaBffEw0ZbkbQ7TNDK6q55NPHFshGBPAZvZkE8Pw==
+"@typescript-eslint/scope-manager@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.35.1.tgz#ccb69d54b7fd0f2d0226a11a75a8f311f525ff9e"
+  integrity sha512-kCYRSAzIW9ByEIzmzGHE50NGAvAP3wFTaZevgWva7GpquDyFPFcmvVkFJGWJJktg/hLwmys/FZwqM9EKr2u24Q==
   dependencies:
-    "@typescript-eslint/types" "5.33.0"
-    "@typescript-eslint/visitor-keys" "5.33.0"
+    "@typescript-eslint/types" "5.35.1"
+    "@typescript-eslint/visitor-keys" "5.35.1"
 
-"@typescript-eslint/types@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.33.0.tgz#d41c584831805554b063791338b0220b613a275b"
-  integrity sha512-nIMt96JngB4MYFYXpZ/3ZNU4GWPNdBbcB5w2rDOCpXOVUkhtNlG2mmm8uXhubhidRZdwMaMBap7Uk8SZMU/ppw==
+"@typescript-eslint/types@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.35.1.tgz#af355fe52a0cc88301e889bc4ada72f279b63d61"
+  integrity sha512-FDaujtsH07VHzG0gQ6NDkVVhi1+rhq0qEvzHdJAQjysN+LHDCKDKCBRlZFFE0ec0jKxiv0hN63SNfExy0KrbQQ==
 
-"@typescript-eslint/typescript-estree@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.0.tgz#02d9c9ade6f4897c09e3508c27de53ad6bfa54cf"
-  integrity sha512-tqq3MRLlggkJKJUrzM6wltk8NckKyyorCSGMq4eVkyL5sDYzJJcMgZATqmF8fLdsWrW7OjjIZ1m9v81vKcaqwQ==
+"@typescript-eslint/typescript-estree@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.35.1.tgz#db878a39a0dbdc9bb133f11cdad451770bfba211"
+  integrity sha512-JUqE1+VRTGyoXlDWWjm6MdfpBYVq+hixytrv1oyjYIBEOZhBCwtpp5ZSvBt4wIA1MKWlnaC2UXl2XmYGC3BoQA==
   dependencies:
-    "@typescript-eslint/types" "5.33.0"
-    "@typescript-eslint/visitor-keys" "5.33.0"
+    "@typescript-eslint/types" "5.35.1"
+    "@typescript-eslint/visitor-keys" "5.35.1"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/visitor-keys@5.33.0":
-  version "5.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.0.tgz#fbcbb074e460c11046e067bc3384b5d66b555484"
-  integrity sha512-/XsqCzD4t+Y9p5wd9HZiptuGKBlaZO5showwqODii5C0nZawxWLF+Q6k5wYHBrQv96h6GYKyqqMHCSTqta8Kiw==
+"@typescript-eslint/visitor-keys@5.35.1":
+  version "5.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.35.1.tgz#285e9e34aed7c876f16ff646a3984010035898e6"
+  integrity sha512-cEB1DvBVo1bxbW/S5axbGPE6b7FIMAbo3w+AGq6zNDA7+NYJOIkKj/sInfTv4edxd4PxJSgdN4t6/pbvgA+n5g==
   dependencies:
-    "@typescript-eslint/types" "5.33.0"
+    "@typescript-eslint/types" "5.35.1"
     eslint-visitor-keys "^3.3.0"
 
 acorn@^8.5.0:
@@ -1129,10 +1129,10 @@ csso@~2.3.1:
     clap "^1.0.9"
     source-map "^0.5.3"
 
-cypress@10.4.0:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.4.0.tgz#bb5b3b6588ad49eff172fecf5778cc0da2980e4e"
-  integrity sha512-OM7F8MRE01SHQRVVzunid1ZK1m90XTxYnl+7uZfIrB4CYqUDCrZEeSyCXzIbsS6qcaijVCAhqDL60SxG8N6hew==
+cypress@10.6.0:
+  version "10.6.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.6.0.tgz#13f46867febf2c3715874ed5dce9c2e946b175fe"
+  integrity sha512-6sOpHjostp8gcLO34p6r/Ci342lBs8S5z9/eb3ZCQ22w2cIhMWGUoGKkosabPBfKcvRS9BE4UxybBtlIs8gTQA==
   dependencies:
     "@cypress/request" "^2.88.10"
     "@cypress/xvfb" "^1.2.4"
@@ -4242,10 +4242,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@4.7.4:
-  version "4.7.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
-  integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
+typescript@4.8.2:
+  version "4.8.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790"
+  integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==
 
 unc-path-regex@^0.1.2:
   version "0.1.2"

From dfac661e2ac8ab5cc0cf26bba16b6b286054d04d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 27 Aug 2022 15:25:51 -0700
Subject: [PATCH 117/245] feat: :alembic: vsides

---
 package.json                           |  2 +-
 packages/client/src/pages/timeline.vue | 54 +++-----------------------
 2 files changed, 6 insertions(+), 50 deletions(-)

diff --git a/package.json b/package.json
index d601b615e..e925c29e9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-beta.2",
+	"version": "12.118.1-calc.2-beta.2-rc.1",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 2a1d2fc05..3a725c7ad 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -36,57 +36,13 @@
 				/>
 			</div>
 			<div v-else class="tl _block">
-				<swiper :space-between="20">
+				<swiper :modules="[Pagination, Virtual]" :space-between="20" virtual>
 					<swiper-slide>
 						<XTimeline
 							ref="tl"
-							key="home"
+							:key="src"
 							class="tl"
-							src="home"
-							:sound="true"
-							@queue="queueUpdated"
-						/>
-					</swiper-slide>
-					<swiper-slide>
-						<XTimeline
-							v-if="isLocalTimelineAvailable"
-							ref="tl"
-							key="local"
-							class="tl"
-							src="local"
-							:sound="true"
-							@queue="queueUpdated"
-						/>
-					</swiper-slide>
-					<swiper-slide>
-						<XTimeline
-							v-if="isRecommendedTimelineAvailable"
-							ref="tl"
-							key="recommended"
-							class="tl"
-							src="recommended"
-							:sound="true"
-							@queue="queueUpdated"
-						/>
-					</swiper-slide>
-					<swiper-slide>
-						<XTimeline
-							v-if="isLocalTimelineAvailable"
-							ref="tl"
-							key="social"
-							class="tl"
-							src="social"
-							:sound="true"
-							@queue="queueUpdated"
-						/>
-					</swiper-slide>
-					<swiper-slide>
-						<XTimeline
-							v-if="isGlobalTimelineAvailable"
-							ref="tl"
-							key="global"
-							class="tl"
-							src="global"
+							:src="src"
 							:sound="true"
 							@queue="queueUpdated"
 						/>
@@ -100,6 +56,7 @@
 
 <script lang="ts" setup>
 import { defineAsyncComponent, computed, watch, ref } from 'vue';
+import { Pagination, Virtual } from 'swiper';
 import { Swiper, SwiperSlide } from 'swiper/vue';
 import XTimeline from '@/components/timeline.vue';
 import XPostForm from '@/components/post-form.vue';
@@ -125,7 +82,6 @@ const isRecommendedTimelineAvailable =
 const isGlobalTimelineAvailable =
 	!instance.disableGlobalTimeline ||
 	($i != null && ($i.isModerator || $i.isAdmin));
-const enableGuestTimeline = instance.enableGuestTimeline;
 const keymap = {
 	t: focus,
 };
@@ -286,7 +242,7 @@ definePageMetadata(
 						: src === 'global'
 							? 'fas fa-globe'
 							: 'fas fa-home',
-	}))
+	})),
 );
 </script>
 

From 10b51595730b3c8839a85c7d51d5c0d0adcae583 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 27 Aug 2022 15:49:10 -0700
Subject: [PATCH 118/245] lol

---
 package.json                                |  2 +-
 packages/client/src/pages/notifications.vue |  9 ++++-
 packages/client/src/pages/timeline.vue      | 45 ++++++++++++++++++---
 3 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index e925c29e9..a6a7bb6b2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-beta.2-rc.1",
+	"version": "12.118.1-calc.2-beta.2-rc.2",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index ae8025e22..0e9e4646e 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -1,6 +1,13 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header>
+		<MkPageHeader
+			v-model:tab="tab"
+			:actions="headerActions"
+			:tabs="headerTabs"
+			:display-my-avatar="true"
+		/>
+	</template>
 	<MkSpacer :content-max="800">
 		<div v-if="tab === 'all' || tab === 'unread'">
 			<XNotifications class="notifications" :include-types="includeTypes" :unread-only="unreadOnly"/>
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 3a725c7ad..745e9ddb6 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -36,13 +36,22 @@
 				/>
 			</div>
 			<div v-else class="tl _block">
-				<swiper :modules="[Pagination, Virtual]" :space-between="20" virtual>
-					<swiper-slide>
+				<swiper
+					:modules="[Pagination, Virtual]"
+					:space-between="20"
+					:virtual="true"
+					@swiper="setSwiperRef"
+				>
+					<swiper-slide
+						v-for="index in timelines"
+						:key="index"
+						:virtual-index="index"
+					>
 						<XTimeline
 							ref="tl"
-							:key="src"
+							:key="index"
 							class="tl"
-							:src="src"
+							:src="index"
 							:sound="true"
 							@queue="queueUpdated"
 						/>
@@ -70,6 +79,7 @@ import { definePageMetadata } from '@/scripts/page-metadata';
 import { deviceKind } from '@/scripts/device-kind';
 import 'swiper/scss';
 import 'swiper/scss/pagination';
+import 'swiper/css/virtual';
 
 const XTutorial = defineAsyncComponent(() => import('./timeline.tutorial.vue'));
 
@@ -86,7 +96,6 @@ const keymap = {
 	t: focus,
 };
 
-const DESKTOP_THRESHOLD = 1100;
 const MOBILE_THRESHOLD = 500;
 
 // デスクトップでウィンドウを狭くしたときモバイルUIが表示されて欲しいことはあるので deviceKind === 'desktop' の判定は行わない
@@ -244,6 +253,32 @@ definePageMetadata(
 							: 'fas fa-home',
 	})),
 );
+
+let timelines = ['home'];
+
+if (isLocalTimelineAvailable) {
+	timelines.push('local');
+}
+if (isRecommendedTimelineAvailable) {
+	timelines.push('recommended');
+}
+if (isLocalTimelineAvailable) {
+	timelines.push('social');
+}
+if (isGlobalTimelineAvailable) {
+	timelines.push('global');
+}
+
+let swiperRef = null;
+
+const setSwiperRef = (swiper) => {
+	swiperRef = swiper;
+};
+
+const slideTo = (index) => {
+	swiperRef.slideTo(index - 1, 0);
+};
+
 </script>
 
 <style lang="scss" scoped>

From b28594389e3aa0630a6705f0d33ef7a2217401d6 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 27 Aug 2022 19:55:04 -0700
Subject: [PATCH 119/245] cl

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

diff --git a/CALCKEY.md b/CALCKEY.md
index d5c877b5d..4caa7ccc5 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -5,6 +5,7 @@
 - MFM button
 - Classic mode make instance icon bring up new context menu
 - Like/star button
+- Backfill remote users
 - Option to publicize instance blocks
 - Better intro/onboarding
 - Fully revamp non-logged-in screen

From 5c6cff93ef0fd61f50bec9faf4c176e37179df48 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 27 Aug 2022 21:42:38 -0700
Subject: [PATCH 120/245] =?UTF-8?q?feat:=20=E2=9C=A8=20improve=20pwa=20man?=
 =?UTF-8?q?ifest?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/assets/screenshots/1.webp    | Bin 0 -> 42328 bytes
 packages/backend/assets/screenshots/2.webp    | Bin 0 -> 28696 bytes
 packages/backend/src/server/web/manifest.json |  30 +++++++++++++++++-
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 packages/backend/assets/screenshots/1.webp
 create mode 100644 packages/backend/assets/screenshots/2.webp

diff --git a/packages/backend/assets/screenshots/1.webp b/packages/backend/assets/screenshots/1.webp
new file mode 100644
index 0000000000000000000000000000000000000000..50a69a1a54f40d7c6b0881ce75f29bf4791c2967
GIT binary patch
literal 42328
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%0DNEi9v7%`6GmP
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
Uc!%Y8wM^n9e*gdg0000009jiQGynhq

literal 0
HcmV?d00001

diff --git a/packages/backend/assets/screenshots/2.webp b/packages/backend/assets/screenshots/2.webp
new file mode 100644
index 0000000000000000000000000000000000000000..3686dc6307bd27d7eb38dedd1d698edbb4207bee
GIT binary patch
literal 28696
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
W22Z`3T7L*lkN<tI1w{Y=00006LY%_@

literal 0
HcmV?d00001

diff --git a/packages/backend/src/server/web/manifest.json b/packages/backend/src/server/web/manifest.json
index 4106e91fc..da61f63b7 100644
--- a/packages/backend/src/server/web/manifest.json
+++ b/packages/backend/src/server/web/manifest.json
@@ -5,6 +5,7 @@
 	"display": "standalone",
 	"background_color": "#6e6a86",
 	"theme_color": "#31748f",
+	"orientation": "portrait-primary",
 	"icons": [
 		{
 			"src": "/static-assets/icons/192.png",
@@ -24,5 +25,32 @@
 			"text": "text",
 			"url": "url"
 		}
-	}
+	},
+	"screenshots" : [
+		{
+			"src": "/static-assets/screenshots/1.webp",
+			"sizes": "1195x579",
+			"type": "image/webp",
+			"platform": "narrow",
+			"label": "Profile page"
+		},
+		{
+			"src": "/static-assets/screenshots/2.webp",
+			"sizes": "1280x720",
+			"type": "image/webp",
+			"platform": "narrow",
+			"label": "Posts"
+		}
+	],
+	"shortcuts" : [
+		{
+			"name": "Notifications",
+			"short_name": "Notifs",
+			"url": "/my/notifications"
+		},
+		{
+			"name": "Chats",
+			"url": "/my/messaging"
+		}
+	]
 }

From ef801a4b94577f9e669013cdd32d9ec05ca09253 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 27 Aug 2022 21:43:57 -0700
Subject: [PATCH 121/245] description

---
 packages/backend/src/server/web/manifest.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/server/web/manifest.json b/packages/backend/src/server/web/manifest.json
index da61f63b7..bcfe73314 100644
--- a/packages/backend/src/server/web/manifest.json
+++ b/packages/backend/src/server/web/manifest.json
@@ -1,6 +1,7 @@
 {
 	"short_name": "Calckey",
 	"name": "Calckey",
+	"description": "An open source, decentralized social media platform that's free forever!",
 	"start_url": "/",
 	"display": "standalone",
 	"background_color": "#6e6a86",

From 770b2d99083d68f3f8d9a4371a583cbbf7f388ee Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 27 Aug 2022 21:44:17 -0700
Subject: [PATCH 122/245] bg col

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

diff --git a/packages/backend/src/server/web/manifest.json b/packages/backend/src/server/web/manifest.json
index bcfe73314..6d27be30c 100644
--- a/packages/backend/src/server/web/manifest.json
+++ b/packages/backend/src/server/web/manifest.json
@@ -4,7 +4,7 @@
 	"description": "An open source, decentralized social media platform that's free forever!",
 	"start_url": "/",
 	"display": "standalone",
-	"background_color": "#6e6a86",
+	"background_color": "#1f1d2e",
 	"theme_color": "#31748f",
 	"orientation": "portrait-primary",
 	"icons": [

From e6236a2ffb443ebdceca9b102321e437fc2f49c8 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 27 Aug 2022 21:44:30 -0700
Subject: [PATCH 123/245] fix screenshot size

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

diff --git a/packages/backend/src/server/web/manifest.json b/packages/backend/src/server/web/manifest.json
index 6d27be30c..2f053fdc4 100644
--- a/packages/backend/src/server/web/manifest.json
+++ b/packages/backend/src/server/web/manifest.json
@@ -37,7 +37,7 @@
 		},
 		{
 			"src": "/static-assets/screenshots/2.webp",
-			"sizes": "1280x720",
+			"sizes": "1195x579",
 			"type": "image/webp",
 			"platform": "narrow",
 			"label": "Posts"

From 3619881008fd14982caf1a87c4dc43f72e420610 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 27 Aug 2022 21:44:45 -0700
Subject: [PATCH 124/245] .3

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

diff --git a/package.json b/package.json
index a6a7bb6b2..9feea3fa9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-beta.2-rc.2",
+	"version": "12.118.1-calc.2-beta.2-rc.3",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 7a6a9e0f65fee0daf2235be13d828cad9d873dbd Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 27 Aug 2022 21:45:06 -0700
Subject: [PATCH 125/245] cl

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

diff --git a/CALCKEY.md b/CALCKEY.md
index 4caa7ccc5..ed0dfc54d 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -70,6 +70,7 @@
 - Quotes have solid border
 - Reply limit bug fixed
 - Make showing the update popup optional
+- Improve PWA manifest
 - Obliteration of Ai-chan
 - [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996)
 - [Tapping avatar in mobile opens account modal](https://github.com/misskey-dev/misskey/pull/9056)

From 35406c0d2251d6b5b54ba1351861ec1c92ba3e7a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 27 Aug 2022 22:26:06 -0700
Subject: [PATCH 126/245] fix: :lipstick: no blur on emoji picker --> blur safe
 by default

---
 packages/client/src/components/emoji-picker.vue | 6 +++---
 packages/client/src/store.ts                    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/components/emoji-picker.vue b/packages/client/src/components/emoji-picker.vue
index b564eae45..0d3466ce7 100644
--- a/packages/client/src/components/emoji-picker.vue
+++ b/packages/client/src/components/emoji-picker.vue
@@ -46,7 +46,7 @@
 			</section>
 
 			<section>
-				<header class="_acrylic"><i class="far fa-clock fa-fw"></i> {{ i18n.ts.recentUsed }}</header>
+				<header><i class="far fa-clock fa-fw"></i> {{ i18n.ts.recentUsed }}</header>
 				<div class="body">
 					<button
 						v-for="emoji in recentlyUsedEmojis"
@@ -60,11 +60,11 @@
 			</section>
 		</div>
 		<div v-once class="group">
-			<header class="_acrylic">{{ i18n.ts.customEmojis }}</header>
+			<header>{{ i18n.ts.customEmojis }}</header>
 			<XSection v-for="category in customEmojiCategories" :key="'custom:' + category" :initial-shown="false" :emojis="customEmojis.filter(e => e.category === category).map(e => ':' + e.name + ':')" @chosen="chosen">{{ category || i18n.ts.other }}</XSection>
 		</div>
 		<div v-once class="group">
-			<header class="_acrylic">{{ i18n.ts.emoji }}</header>
+			<header>{{ i18n.ts.emoji }}</header>
 			<XSection v-for="category in categories" :key="category" :emojis="emojilist.filter(e => e.category === category).map(e => e.char)" @chosen="chosen">{{ category }}</XSection>
 		</div>
 	</div>
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index be3e4599a..2cbd21f83 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -165,7 +165,7 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	useBlurEffect: {
 		where: 'device',
-		default: false,
+		default: true,
 	},
 	showFixedPostForm: {
 		where: 'device',

From 786b150ea75111b5f6102c256d5cfa42cb83d1fb Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 31 Aug 2022 00:24:33 +0900
Subject: [PATCH 127/245] refactor(client): align filename to component name

---
 packages/client/src/account.ts                |  4 +-
 .../{abuse-report.vue => MkAbuseReport.vue}   |  2 +-
 ...ort-window.vue => MkAbuseReportWindow.vue} |  0
 .../{analog-clock.vue => MkAnalogClock.vue}   |  0
 .../{autocomplete.vue => MkAutocomplete.vue}  |  0
 .../components/{avatars.vue => MkAvatars.vue} |  0
 .../components/{captcha.vue => MkCaptcha.vue} |  0
 ...w-button.vue => MkChannelFollowButton.vue} |  0
 ...annel-preview.vue => MkChannelPreview.vue} |  0
 .../src/components/{chart.vue => MkChart.vue} |  0
 .../{chart-tooltip.vue => MkChartTooltip.vue} |  0
 .../{code-core.vue => MkCode.core.vue}        |  0
 .../src/components/{code.vue => MkCode.vue}   |  2 +-
 ...cropper-dialog.vue => MkCropperDialog.vue} |  0
 .../{cw-button.vue => MkCwButton.vue}         |  0
 ...rated-list.vue => MkDateSeparatedList.vue} | 40 +++++++++----------
 .../components/{dialog.vue => MkDialog.vue}   |  0
 .../{digital-clock.vue => MkDigitalClock.vue} |  0
 .../{drive.file.vue => MkDrive.file.vue}      | 31 +++++++-------
 .../{drive.folder.vue => MkDrive.folder.vue}  | 27 +++++++------
 ...e.nav-folder.vue => MkDrive.navFolder.vue} |  0
 .../src/components/{drive.vue => MkDrive.vue} |  6 +--
 ...thumbnail.vue => MkDriveFileThumbnail.vue} |  2 +-
 ...ect-dialog.vue => MkDriveSelectDialog.vue} |  5 ++-
 .../{drive-window.vue => MkDriveWindow.vue}   |  5 ++-
 ....section.vue => MkEmojiPicker.section.vue} |  0
 .../{emoji-picker.vue => MkEmojiPicker.vue}   |  4 +-
 ...ker-dialog.vue => MkEmojiPickerDialog.vue} |  2 +-
 ...ker-window.vue => MkEmojiPickerWindow.vue} |  2 +-
 ...atured-photos.vue => MkFeaturedPhotos.vue} |  0
 ...t-for-admin.vue => MkFileListForAdmin.vue} |  2 +-
 ...{file-type-icon.vue => MkFileTypeIcon.vue} |  0
 .../{follow-button.vue => MkFollowButton.vue} |  0
 ...rgot-password.vue => MkForgotPassword.vue} |  0
 .../{form-dialog.vue => MkFormDialog.vue}     |  0
 .../components/{formula.vue => MkFormula.vue} | 12 +++---
 .../{formula-core.vue => MkFormulaCore.vue}   |  0
 ...t-preview.vue => MkGalleryPostPreview.vue} | 10 ++---
 .../components/{google.vue => MkGoogle.vue}   |  0
 .../{image-viewer.vue => MkImageViewer.vue}   |  0
 ...ith-blurhash.vue => MkImgWithBlurhash.vue} |  0
 ...e-card-mini.vue => MkInstanceCardMini.vue} |  2 +-
 ...instance-stats.vue => MkInstanceStats.vue} |  2 +-
 ...stance-ticker.vue => MkInstanceTicker.vue} |  0
 .../{key-value.vue => MkKeyValue.vue}         |  0
 .../{launch-pad.vue => MkLaunchPad.vue}       |  0
 .../src/components/{link.vue => MkLink.vue}   |  2 +-
 .../components/{marquee.vue => MkMarquee.vue} |  0
 .../{media-banner.vue => MkMediaBanner.vue}   |  0
 .../{media-caption.vue => MkMediaCaption.vue} |  0
 .../{media-image.vue => MkMediaImage.vue}     |  2 +-
 .../{media-list.vue => MkMediaList.vue}       |  6 +--
 .../{media-video.vue => MkMediaVideo.vue}     |  0
 .../components/{mention.vue => MkMention.vue} |  0
 .../{mini-chart.vue => MkMiniChart.vue}       |  0
 ...-page-window.vue => MkModalPageWindow.vue} |  0
 .../src/components/{note.vue => MkNote.vue}   | 22 +++++-----
 .../{note-detailed.vue => MkNoteDetailed.vue} | 20 +++++-----
 .../{note-header.vue => MkNoteHeader.vue}     |  2 +-
 .../{note-preview.vue => MkNotePreview.vue}   |  0
 .../{note-simple.vue => MkNoteSimple.vue}     |  8 ++--
 packages/client/src/components/MkNoteSub.vue  |  8 ++--
 .../src/components/{notes.vue => MkNotes.vue} |  4 +-
 .../{notification.vue => MkNotification.vue}  |  6 +--
 ...ow.vue => MkNotificationSettingWindow.vue} |  0
 ...tion-toast.vue => MkNotificationToast.vue} |  2 +-
 ...{notifications.vue => MkNotifications.vue} |  6 +--
 .../{number-diff.vue => MkNumberDiff.vue}     |  0
 ...-view.value.vue => MkObjectView.value.vue} |  0
 .../{object-view.vue => MkObjectView.vue}     |  2 +-
 .../{page-preview.vue => MkPagePreview.vue}   |  0
 .../{page-window.vue => MkPageWindow.vue}     |  2 +-
 .../src/components/{poll.vue => MkPoll.vue}   |  0
 .../{poll-editor.vue => MkPollEditor.vue}     |  0
 .../{post-form.vue => MkPostForm.vue}         | 10 ++---
 ...rm-attaches.vue => MkPostFormAttaches.vue} |  4 +-
 ...t-form-dialog.vue => MkPostFormDialog.vue} |  2 +-
 .../{reaction-icon.vue => MkReactionIcon.vue} |  0
 ...tion-tooltip.vue => MkReactionTooltip.vue} |  2 +-
 ...ails.vue => MkReactionsViewer.details.vue} |  2 +-
 ...ion.vue => MkReactionsViewer.reaction.vue} |  4 +-
 ...tions-viewer.vue => MkReactionsViewer.vue} |  2 +-
 ...remote-caution.vue => MkRemoteCaution.vue} |  0
 .../{renote-button.vue => MkRenoteButton.vue} |  2 +-
 .../components/{ripple.vue => MkRipple.vue}   |  0
 .../components/{sample.vue => MkSample.vue}   |  0
 .../components/{signin.vue => MkSignin.vue}   |  2 +-
 .../{signin-dialog.vue => MkSigninDialog.vue} |  2 +-
 .../components/{signup.vue => MkSignup.vue}   |  2 +-
 .../{signup-dialog.vue => MkSignupDialog.vue} |  2 +-
 .../components/{sparkle.vue => MkSparkle.vue} |  0
 ...-note-content.vue => MkSubNoteContent.vue} |  4 +-
 .../src/components/{tab.vue => MkTab.vue}     |  0
 .../{tag-cloud.vue => MkTagCloud.vue}         |  0
 .../{timeline.vue => MkTimeline.vue}          | 16 ++++----
 .../src/components/{toast.vue => MkToast.vue} |  0
 ...e-window.vue => MkTokenGenerateWindow.vue} |  0
 .../components/{updated.vue => MkUpdated.vue} |  2 +-
 .../{url-preview.vue => MkUrlPreview.vue}     |  0
 ...review-popup.vue => MkUrlPreviewPopup.vue} | 10 ++---
 ...{user-card-mini.vue => MkUserCardMini.vue} |  2 +-
 .../{user-info.vue => MkUserInfo.vue}         |  2 +-
 .../{user-list.vue => MkUserList.vue}         |  2 +-
 ...ndicator.vue => MkUserOnlineIndicator.vue} |  0
 .../{user-preview.vue => MkUserPreview.vue}   | 16 ++++----
 ...lect-dialog.vue => MkUserSelectDialog.vue} |  0
 .../{users-tooltip.vue => MkUsersTooltip.vue} |  0
 .../{visibility.vue => MkVisibility.vue}      |  2 +-
 ...lity-picker.vue => MkVisibilityPicker.vue} |  0
 ...waiting-dialog.vue => MkWaitingDialog.vue} |  0
 .../components/{widgets.vue => MkWidgets.vue} |  0
 .../client/src/components/form/checkbox.vue   |  2 +-
 .../src/components/global/{a.vue => MkA.vue}  |  0
 .../global/{acct.vue => MkAcct.vue}           |  0
 .../components/global/{ad.vue => MkAd.vue}    |  0
 .../global/{avatar.vue => MkAvatar.vue}       |  2 +-
 .../global/{ellipsis.vue => MkEllipsis.vue}   |  0
 .../global/{emoji.vue => MkEmoji.vue}         |  0
 .../global/{error.vue => MkError.vue}         |  0
 .../global/{loading.vue => MkLoading.vue}     |  0
 ...down.vue => MkMisskeyFlavoredMarkdown.vue} |  0
 .../{page-header.vue => MkPageHeader.vue}     |  0
 .../global/{spacer.vue => MkSpacer.vue}       |  0
 ...ky-container.vue => MkStickyContainer.vue} |  0
 .../global/{time.vue => MkTime.vue}           |  0
 .../components/global/{url.vue => MkUrl.vue}  |  2 +-
 .../global/{user-name.vue => MkUserName.vue}  |  0
 .../{router-view.vue => RouterView.vue}       |  0
 packages/client/src/components/index.ts       | 32 +++++++--------
 packages/client/src/components/mfm.ts         | 18 ++++-----
 .../client/src/components/page/page.image.vue |  2 +-
 .../client/src/components/page/page.note.vue  |  4 +-
 .../client/src/components/page/page.text.vue  |  2 +-
 packages/client/src/directives/ripple.ts      |  2 +-
 .../client/src/directives/user-preview.ts     |  2 +-
 packages/client/src/init.ts                   |  2 +-
 packages/client/src/os.ts                     | 40 +++++++++----------
 packages/client/src/pages/about-misskey.vue   |  2 +-
 packages/client/src/pages/about.emojis.vue    |  2 +-
 .../client/src/pages/about.federation.vue     |  2 +-
 packages/client/src/pages/about.vue           |  4 +-
 packages/client/src/pages/admin-file.vue      |  8 ++--
 packages/client/src/pages/admin/abuses.vue    |  2 +-
 .../client/src/pages/admin/bot-protection.vue |  2 +-
 packages/client/src/pages/admin/database.vue  |  2 +-
 packages/client/src/pages/admin/emojis.vue    |  2 +-
 packages/client/src/pages/admin/files.vue     |  2 +-
 .../src/pages/admin/overview.federation.vue   |  2 +-
 .../client/src/pages/admin/overview.user.vue  |  2 +-
 packages/client/src/pages/admin/overview.vue  |  6 +--
 .../client/src/pages/admin/proxy-account.vue  |  2 +-
 packages/client/src/pages/admin/users.vue     |  2 +-
 .../client/src/pages/antenna-timeline.vue     |  2 +-
 packages/client/src/pages/auth.vue            |  2 +-
 packages/client/src/pages/channel.vue         |  6 +--
 packages/client/src/pages/channels.vue        |  2 +-
 packages/client/src/pages/clip.vue            |  2 +-
 packages/client/src/pages/drive.vue           |  2 +-
 .../client/src/pages/explore.featured.vue     |  4 +-
 packages/client/src/pages/explore.users.vue   |  4 +-
 packages/client/src/pages/explore.vue         |  2 +-
 packages/client/src/pages/favorites.vue       |  4 +-
 packages/client/src/pages/gallery/index.vue   |  6 +--
 packages/client/src/pages/gallery/post.vue    |  6 +--
 packages/client/src/pages/instance-info.vue   | 10 ++---
 .../messaging/messaging-room.message.vue      |  2 +-
 .../src/pages/messaging/messaging-room.vue    |  2 +-
 packages/client/src/pages/miauth.vue          |  2 +-
 packages/client/src/pages/my-lists/index.vue  |  2 +-
 packages/client/src/pages/note.vue            |  8 ++--
 packages/client/src/pages/notifications.vue   |  4 +-
 .../page-editor/els/page-editor.el.image.vue  |  2 +-
 .../page-editor/els/page-editor.el.note.vue   |  4 +-
 packages/client/src/pages/page.vue            |  4 +-
 packages/client/src/pages/pages.vue           |  2 +-
 packages/client/src/pages/preview.vue         |  2 +-
 packages/client/src/pages/registry.keys.vue   |  2 +-
 packages/client/src/pages/registry.value.vue  |  2 +-
 packages/client/src/pages/reset-password.vue  |  2 +-
 packages/client/src/pages/search.vue          |  2 +-
 .../src/pages/settings/account-info.vue       |  2 +-
 .../client/src/pages/settings/accounts.vue    |  4 +-
 packages/client/src/pages/settings/api.vue    |  2 +-
 packages/client/src/pages/settings/drive.vue  |  4 +-
 .../client/src/pages/settings/general.vue     |  2 +-
 .../client/src/pages/settings/mute-block.vue  |  2 +-
 .../src/pages/settings/notifications.vue      |  2 +-
 .../src/pages/settings/plugin.install.vue     |  2 +-
 packages/client/src/pages/settings/plugin.vue |  2 +-
 .../client/src/pages/settings/reaction.vue    |  2 +-
 .../client/src/pages/settings/word-mute.vue   |  4 +-
 packages/client/src/pages/share.vue           |  2 +-
 packages/client/src/pages/tag.vue             |  2 +-
 packages/client/src/pages/timeline.vue        |  4 +-
 packages/client/src/pages/user-info.vue       |  8 ++--
 .../client/src/pages/user-list-timeline.vue   |  2 +-
 .../client/src/pages/user/follow-list.vue     |  2 +-
 packages/client/src/pages/user/gallery.vue    |  2 +-
 packages/client/src/pages/user/home.vue       |  8 ++--
 .../client/src/pages/user/index.activity.vue  |  2 +-
 .../client/src/pages/user/index.photos.vue    |  2 +-
 .../client/src/pages/user/index.timeline.vue  |  4 +-
 packages/client/src/pages/user/pages.vue      |  2 +-
 packages/client/src/pages/user/reactions.vue  |  4 +-
 .../client/src/pages/welcome.entrance.a.vue   | 10 ++---
 .../client/src/pages/welcome.entrance.b.vue   |  8 ++--
 .../client/src/pages/welcome.entrance.c.vue   |  8 ++--
 .../client/src/pages/welcome.timeline.vue     |  6 +--
 packages/client/src/scripts/autocomplete.ts   |  2 +-
 packages/client/src/scripts/get-note-menu.ts  |  2 +-
 packages/client/src/scripts/get-user-menu.ts  |  2 +-
 packages/client/src/scripts/please-login.ts   |  2 +-
 .../client/src/scripts/reaction-picker.ts     |  2 +-
 .../client/src/scripts/use-chart-tooltip.ts   |  2 +-
 packages/client/src/ui/_common_/common.vue    |  2 +-
 .../src/ui/_common_/navbar-for-mobile.vue     |  2 +-
 packages/client/src/ui/_common_/navbar.vue    |  2 +-
 .../src/ui/_common_/statusbar-federation.vue  |  2 +-
 .../client/src/ui/_common_/statusbar-rss.vue  |  2 +-
 .../src/ui/_common_/statusbar-user-list.vue   |  2 +-
 packages/client/src/ui/classic.header.vue     |  2 +-
 packages/client/src/ui/classic.sidebar.vue    |  2 +-
 packages/client/src/ui/classic.widgets.vue    |  2 +-
 .../client/src/ui/deck/antenna-column.vue     |  2 +-
 packages/client/src/ui/deck/direct-column.vue |  2 +-
 packages/client/src/ui/deck/list-column.vue   |  2 +-
 .../client/src/ui/deck/mentions-column.vue    |  2 +-
 .../src/ui/deck/notifications-column.vue      |  4 +-
 packages/client/src/ui/deck/tl-column.vue     |  2 +-
 .../client/src/ui/deck/widgets-column.vue     |  2 +-
 packages/client/src/ui/universal.widgets.vue  |  2 +-
 packages/client/src/ui/visitor/b.vue          |  4 +-
 packages/client/src/ui/visitor/header.vue     |  4 +-
 packages/client/src/ui/visitor/kanban.vue     |  4 +-
 packages/client/src/widgets/clock.vue         |  4 +-
 packages/client/src/widgets/digital-clock.vue |  2 +-
 packages/client/src/widgets/federation.vue    |  2 +-
 .../client/src/widgets/instance-cloud.vue     |  2 +-
 packages/client/src/widgets/notifications.vue |  4 +-
 packages/client/src/widgets/post-form.vue     |  2 +-
 packages/client/src/widgets/rss-ticker.vue    |  2 +-
 packages/client/src/widgets/timeline.vue      |  2 +-
 packages/client/src/widgets/trends.vue        |  2 +-
 243 files changed, 390 insertions(+), 386 deletions(-)
 rename packages/client/src/components/{abuse-report.vue => MkAbuseReport.vue} (98%)
 rename packages/client/src/components/{abuse-report-window.vue => MkAbuseReportWindow.vue} (100%)
 rename packages/client/src/components/{analog-clock.vue => MkAnalogClock.vue} (100%)
 rename packages/client/src/components/{autocomplete.vue => MkAutocomplete.vue} (100%)
 rename packages/client/src/components/{avatars.vue => MkAvatars.vue} (100%)
 rename packages/client/src/components/{captcha.vue => MkCaptcha.vue} (100%)
 rename packages/client/src/components/{channel-follow-button.vue => MkChannelFollowButton.vue} (100%)
 rename packages/client/src/components/{channel-preview.vue => MkChannelPreview.vue} (100%)
 rename packages/client/src/components/{chart.vue => MkChart.vue} (100%)
 rename packages/client/src/components/{chart-tooltip.vue => MkChartTooltip.vue} (100%)
 rename packages/client/src/components/{code-core.vue => MkCode.core.vue} (100%)
 rename packages/client/src/components/{code.vue => MkCode.vue} (73%)
 rename packages/client/src/components/{cropper-dialog.vue => MkCropperDialog.vue} (100%)
 rename packages/client/src/components/{cw-button.vue => MkCwButton.vue} (100%)
 rename packages/client/src/components/{date-separated-list.vue => MkDateSeparatedList.vue} (86%)
 rename packages/client/src/components/{dialog.vue => MkDialog.vue} (100%)
 rename packages/client/src/components/{digital-clock.vue => MkDigitalClock.vue} (100%)
 rename packages/client/src/components/{drive.file.vue => MkDrive.file.vue} (92%)
 rename packages/client/src/components/{drive.folder.vue => MkDrive.folder.vue} (93%)
 rename packages/client/src/components/{drive.nav-folder.vue => MkDrive.navFolder.vue} (100%)
 rename packages/client/src/components/{drive.vue => MkDrive.vue} (99%)
 rename packages/client/src/components/{drive-file-thumbnail.vue => MkDriveFileThumbnail.vue} (97%)
 rename packages/client/src/components/{drive-select-dialog.vue => MkDriveSelectDialog.vue} (95%)
 rename packages/client/src/components/{drive-window.vue => MkDriveWindow.vue} (88%)
 rename packages/client/src/components/{emoji-picker.section.vue => MkEmojiPicker.section.vue} (100%)
 rename packages/client/src/components/{emoji-picker.vue => MkEmojiPicker.vue} (99%)
 rename packages/client/src/components/{emoji-picker-dialog.vue => MkEmojiPickerDialog.vue} (96%)
 rename packages/client/src/components/{emoji-picker-window.vue => MkEmojiPickerWindow.vue} (97%)
 rename packages/client/src/components/{featured-photos.vue => MkFeaturedPhotos.vue} (100%)
 rename packages/client/src/components/{file-list-for-admin.vue => MkFileListForAdmin.vue} (97%)
 rename packages/client/src/components/{file-type-icon.vue => MkFileTypeIcon.vue} (100%)
 rename packages/client/src/components/{follow-button.vue => MkFollowButton.vue} (100%)
 rename packages/client/src/components/{forgot-password.vue => MkForgotPassword.vue} (100%)
 rename packages/client/src/components/{form-dialog.vue => MkFormDialog.vue} (100%)
 rename packages/client/src/components/{formula.vue => MkFormula.vue} (60%)
 rename packages/client/src/components/{formula-core.vue => MkFormulaCore.vue} (100%)
 rename packages/client/src/components/{gallery-post-preview.vue => MkGalleryPostPreview.vue} (94%)
 rename packages/client/src/components/{google.vue => MkGoogle.vue} (100%)
 rename packages/client/src/components/{image-viewer.vue => MkImageViewer.vue} (100%)
 rename packages/client/src/components/{img-with-blurhash.vue => MkImgWithBlurhash.vue} (100%)
 rename packages/client/src/components/{instance-card-mini.vue => MkInstanceCardMini.vue} (98%)
 rename packages/client/src/components/{instance-stats.vue => MkInstanceStats.vue} (99%)
 rename packages/client/src/components/{instance-ticker.vue => MkInstanceTicker.vue} (100%)
 rename packages/client/src/components/{key-value.vue => MkKeyValue.vue} (100%)
 rename packages/client/src/components/{launch-pad.vue => MkLaunchPad.vue} (100%)
 rename packages/client/src/components/{link.vue => MkLink.vue} (91%)
 rename packages/client/src/components/{marquee.vue => MkMarquee.vue} (100%)
 rename packages/client/src/components/{media-banner.vue => MkMediaBanner.vue} (100%)
 rename packages/client/src/components/{media-caption.vue => MkMediaCaption.vue} (100%)
 rename packages/client/src/components/{media-image.vue => MkMediaImage.vue} (97%)
 rename packages/client/src/components/{media-list.vue => MkMediaList.vue} (96%)
 rename packages/client/src/components/{media-video.vue => MkMediaVideo.vue} (100%)
 rename packages/client/src/components/{mention.vue => MkMention.vue} (100%)
 rename packages/client/src/components/{mini-chart.vue => MkMiniChart.vue} (100%)
 rename packages/client/src/components/{modal-page-window.vue => MkModalPageWindow.vue} (100%)
 rename packages/client/src/components/{note.vue => MkNote.vue} (96%)
 rename packages/client/src/components/{note-detailed.vue => MkNoteDetailed.vue} (96%)
 rename packages/client/src/components/{note-header.vue => MkNoteHeader.vue} (96%)
 rename packages/client/src/components/{note-preview.vue => MkNotePreview.vue} (100%)
 rename packages/client/src/components/{note-simple.vue => MkNoteSimple.vue} (87%)
 rename packages/client/src/components/{notes.vue => MkNotes.vue} (92%)
 rename packages/client/src/components/{notification.vue => MkNotification.vue} (98%)
 rename packages/client/src/components/{notification-setting-window.vue => MkNotificationSettingWindow.vue} (100%)
 rename packages/client/src/components/{notification-toast.vue => MkNotificationToast.vue} (95%)
 rename packages/client/src/components/{notifications.vue => MkNotifications.vue} (94%)
 rename packages/client/src/components/{number-diff.vue => MkNumberDiff.vue} (100%)
 rename packages/client/src/components/{object-view.value.vue => MkObjectView.value.vue} (100%)
 rename packages/client/src/components/{object-view.vue => MkObjectView.vue} (85%)
 rename packages/client/src/components/{page-preview.vue => MkPagePreview.vue} (100%)
 rename packages/client/src/components/{page-window.vue => MkPageWindow.vue} (98%)
 rename packages/client/src/components/{poll.vue => MkPoll.vue} (100%)
 rename packages/client/src/components/{poll-editor.vue => MkPollEditor.vue} (100%)
 rename packages/client/src/components/{post-form.vue => MkPostForm.vue} (98%)
 rename packages/client/src/components/{post-form-attaches.vue => MkPostFormAttaches.vue} (96%)
 rename packages/client/src/components/{post-form-dialog.vue => MkPostFormDialog.vue} (89%)
 rename packages/client/src/components/{reaction-icon.vue => MkReactionIcon.vue} (100%)
 rename packages/client/src/components/{reaction-tooltip.vue => MkReactionTooltip.vue} (93%)
 rename packages/client/src/components/{reactions-viewer.details.vue => MkReactionsViewer.details.vue} (96%)
 rename packages/client/src/components/{reactions-viewer.reaction.vue => MkReactionsViewer.reaction.vue} (95%)
 rename packages/client/src/components/{reactions-viewer.vue => MkReactionsViewer.vue} (91%)
 rename packages/client/src/components/{remote-caution.vue => MkRemoteCaution.vue} (100%)
 rename packages/client/src/components/{renote-button.vue => MkRenoteButton.vue} (97%)
 rename packages/client/src/components/{ripple.vue => MkRipple.vue} (100%)
 rename packages/client/src/components/{sample.vue => MkSample.vue} (100%)
 rename packages/client/src/components/{signin.vue => MkSignin.vue} (98%)
 rename packages/client/src/components/{signin-dialog.vue => MkSigninDialog.vue} (94%)
 rename packages/client/src/components/{signup.vue => MkSignup.vue} (99%)
 rename packages/client/src/components/{signup-dialog.vue => MkSignupDialog.vue} (94%)
 rename packages/client/src/components/{sparkle.vue => MkSparkle.vue} (100%)
 rename packages/client/src/components/{sub-note-content.vue => MkSubNoteContent.vue} (95%)
 rename packages/client/src/components/{tab.vue => MkTab.vue} (100%)
 rename packages/client/src/components/{tag-cloud.vue => MkTagCloud.vue} (100%)
 rename packages/client/src/components/{timeline.vue => MkTimeline.vue} (93%)
 rename packages/client/src/components/{toast.vue => MkToast.vue} (100%)
 rename packages/client/src/components/{token-generate-window.vue => MkTokenGenerateWindow.vue} (100%)
 rename packages/client/src/components/{updated.vue => MkUpdated.vue} (95%)
 rename packages/client/src/components/{url-preview.vue => MkUrlPreview.vue} (100%)
 rename packages/client/src/components/{url-preview-popup.vue => MkUrlPreviewPopup.vue} (88%)
 rename packages/client/src/components/{user-card-mini.vue => MkUserCardMini.vue} (97%)
 rename packages/client/src/components/{user-info.vue => MkUserInfo.vue} (97%)
 rename packages/client/src/components/{user-list.vue => MkUserList.vue} (94%)
 rename packages/client/src/components/{user-online-indicator.vue => MkUserOnlineIndicator.vue} (100%)
 rename packages/client/src/components/{user-preview.vue => MkUserPreview.vue} (96%)
 rename packages/client/src/components/{user-select-dialog.vue => MkUserSelectDialog.vue} (100%)
 rename packages/client/src/components/{users-tooltip.vue => MkUsersTooltip.vue} (100%)
 rename packages/client/src/components/{visibility.vue => MkVisibility.vue} (95%)
 rename packages/client/src/components/{visibility-picker.vue => MkVisibilityPicker.vue} (100%)
 rename packages/client/src/components/{waiting-dialog.vue => MkWaitingDialog.vue} (100%)
 rename packages/client/src/components/{widgets.vue => MkWidgets.vue} (100%)
 rename packages/client/src/components/global/{a.vue => MkA.vue} (100%)
 rename packages/client/src/components/global/{acct.vue => MkAcct.vue} (100%)
 rename packages/client/src/components/global/{ad.vue => MkAd.vue} (100%)
 rename packages/client/src/components/global/{avatar.vue => MkAvatar.vue} (98%)
 rename packages/client/src/components/global/{ellipsis.vue => MkEllipsis.vue} (100%)
 rename packages/client/src/components/global/{emoji.vue => MkEmoji.vue} (100%)
 rename packages/client/src/components/global/{error.vue => MkError.vue} (100%)
 rename packages/client/src/components/global/{loading.vue => MkLoading.vue} (100%)
 rename packages/client/src/components/global/{misskey-flavored-markdown.vue => MkMisskeyFlavoredMarkdown.vue} (100%)
 rename packages/client/src/components/global/{page-header.vue => MkPageHeader.vue} (100%)
 rename packages/client/src/components/global/{spacer.vue => MkSpacer.vue} (100%)
 rename packages/client/src/components/global/{sticky-container.vue => MkStickyContainer.vue} (100%)
 rename packages/client/src/components/global/{time.vue => MkTime.vue} (100%)
 rename packages/client/src/components/global/{url.vue => MkUrl.vue} (96%)
 rename packages/client/src/components/global/{user-name.vue => MkUserName.vue} (100%)
 rename packages/client/src/components/global/{router-view.vue => RouterView.vue} (100%)

diff --git a/packages/client/src/account.ts b/packages/client/src/account.ts
index 243aea68c..10257b841 100644
--- a/packages/client/src/account.ts
+++ b/packages/client/src/account.ts
@@ -146,7 +146,7 @@ export async function openAccountMenu(opts: {
 	onChoose?: (account: misskey.entities.UserDetailed) => void;
 }, ev: MouseEvent) {
 	function showSigninDialog() {
-		popup(defineAsyncComponent(() => import('@/components/signin-dialog.vue')), {}, {
+		popup(defineAsyncComponent(() => import('@/components/MkSigninDialog.vue')), {}, {
 			done: res => {
 				addAccount(res.id, res.i);
 				success();
@@ -155,7 +155,7 @@ export async function openAccountMenu(opts: {
 	}
 
 	function createAccount() {
-		popup(defineAsyncComponent(() => import('@/components/signup-dialog.vue')), {}, {
+		popup(defineAsyncComponent(() => import('@/components/MkSignupDialog.vue')), {}, {
 			done: res => {
 				addAccount(res.id, res.i);
 				switchAccountWithToken(res.i);
diff --git a/packages/client/src/components/abuse-report.vue b/packages/client/src/components/MkAbuseReport.vue
similarity index 98%
rename from packages/client/src/components/abuse-report.vue
rename to packages/client/src/components/MkAbuseReport.vue
index 8c25df110..42bd1af3f 100644
--- a/packages/client/src/components/abuse-report.vue
+++ b/packages/client/src/components/MkAbuseReport.vue
@@ -38,7 +38,7 @@
 <script lang="ts" setup>
 import MkButton from '@/components/ui/button.vue';
 import MkSwitch from '@/components/form/switch.vue';
-import MkKeyValue from '@/components/key-value.vue';
+import MkKeyValue from '@/components/MkKeyValue.vue';
 import { acct, userPage } from '@/filters/user';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/components/abuse-report-window.vue b/packages/client/src/components/MkAbuseReportWindow.vue
similarity index 100%
rename from packages/client/src/components/abuse-report-window.vue
rename to packages/client/src/components/MkAbuseReportWindow.vue
diff --git a/packages/client/src/components/analog-clock.vue b/packages/client/src/components/MkAnalogClock.vue
similarity index 100%
rename from packages/client/src/components/analog-clock.vue
rename to packages/client/src/components/MkAnalogClock.vue
diff --git a/packages/client/src/components/autocomplete.vue b/packages/client/src/components/MkAutocomplete.vue
similarity index 100%
rename from packages/client/src/components/autocomplete.vue
rename to packages/client/src/components/MkAutocomplete.vue
diff --git a/packages/client/src/components/avatars.vue b/packages/client/src/components/MkAvatars.vue
similarity index 100%
rename from packages/client/src/components/avatars.vue
rename to packages/client/src/components/MkAvatars.vue
diff --git a/packages/client/src/components/captcha.vue b/packages/client/src/components/MkCaptcha.vue
similarity index 100%
rename from packages/client/src/components/captcha.vue
rename to packages/client/src/components/MkCaptcha.vue
diff --git a/packages/client/src/components/channel-follow-button.vue b/packages/client/src/components/MkChannelFollowButton.vue
similarity index 100%
rename from packages/client/src/components/channel-follow-button.vue
rename to packages/client/src/components/MkChannelFollowButton.vue
diff --git a/packages/client/src/components/channel-preview.vue b/packages/client/src/components/MkChannelPreview.vue
similarity index 100%
rename from packages/client/src/components/channel-preview.vue
rename to packages/client/src/components/MkChannelPreview.vue
diff --git a/packages/client/src/components/chart.vue b/packages/client/src/components/MkChart.vue
similarity index 100%
rename from packages/client/src/components/chart.vue
rename to packages/client/src/components/MkChart.vue
diff --git a/packages/client/src/components/chart-tooltip.vue b/packages/client/src/components/MkChartTooltip.vue
similarity index 100%
rename from packages/client/src/components/chart-tooltip.vue
rename to packages/client/src/components/MkChartTooltip.vue
diff --git a/packages/client/src/components/code-core.vue b/packages/client/src/components/MkCode.core.vue
similarity index 100%
rename from packages/client/src/components/code-core.vue
rename to packages/client/src/components/MkCode.core.vue
diff --git a/packages/client/src/components/code.vue b/packages/client/src/components/MkCode.vue
similarity index 73%
rename from packages/client/src/components/code.vue
rename to packages/client/src/components/MkCode.vue
index d6478fd2f..1640258d5 100644
--- a/packages/client/src/components/code.vue
+++ b/packages/client/src/components/MkCode.vue
@@ -11,5 +11,5 @@ defineProps<{
 	inline?: boolean;
 }>();
 
-const XCode = defineAsyncComponent(() => import('./code-core.vue'));
+const XCode = defineAsyncComponent(() => import('@/components/MkCode.core.vue'));
 </script>
diff --git a/packages/client/src/components/cropper-dialog.vue b/packages/client/src/components/MkCropperDialog.vue
similarity index 100%
rename from packages/client/src/components/cropper-dialog.vue
rename to packages/client/src/components/MkCropperDialog.vue
diff --git a/packages/client/src/components/cw-button.vue b/packages/client/src/components/MkCwButton.vue
similarity index 100%
rename from packages/client/src/components/cw-button.vue
rename to packages/client/src/components/MkCwButton.vue
diff --git a/packages/client/src/components/date-separated-list.vue b/packages/client/src/components/MkDateSeparatedList.vue
similarity index 86%
rename from packages/client/src/components/date-separated-list.vue
rename to packages/client/src/components/MkDateSeparatedList.vue
index 085ef871e..f63d9782b 100644
--- a/packages/client/src/components/date-separated-list.vue
+++ b/packages/client/src/components/MkDateSeparatedList.vue
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { defineComponent, h, PropType, TransitionGroup } from 'vue';
-import MkAd from '@/components/global/ad.vue';
+import MkAd from '@/components/global/MkAd.vue';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
 
@@ -13,22 +13,22 @@ export default defineComponent({
 		direction: {
 			type: String,
 			required: false,
-			default: 'down'
+			default: 'down',
 		},
 		reversed: {
 			type: Boolean,
 			required: false,
-			default: false
+			default: false,
 		},
 		noGap: {
 			type: Boolean,
 			required: false,
-			default: false
+			default: false,
 		},
 		ad: {
 			type: Boolean,
 			required: false,
-			default: false
+			default: false,
 		},
 	},
 
@@ -38,7 +38,7 @@ export default defineComponent({
 			const month = new Date(time).getMonth() + 1;
 			return i18n.t('monthAndDay', {
 				month: month.toString(),
-				day: date.toString()
+				day: date.toString(),
 			});
 		}
 
@@ -48,7 +48,7 @@ export default defineComponent({
 			if (!slots || !slots.default) return;
 
 			const el = slots.default({
-				item: item
+				item: item,
 			})[0];
 			if (el.key == null && item.id) el.key = item.id;
 
@@ -60,20 +60,20 @@ export default defineComponent({
 					class: 'separator',
 					key: item.id + ':separator',
 				}, h('p', {
-					class: 'date'
+					class: 'date',
 				}, [
 					h('span', [
 						h('i', {
 							class: 'fas fa-angle-up icon',
 						}),
-						getDateText(item.createdAt)
+						getDateText(item.createdAt),
 					]),
 					h('span', [
 						getDateText(props.items[i + 1].createdAt),
 						h('i', {
 							class: 'fas fa-angle-down icon',
-						})
-					])
+						}),
+					]),
 				]));
 
 				return [el, separator];
@@ -93,16 +93,16 @@ export default defineComponent({
 		return () => h(
 			defaultStore.state.animation ? TransitionGroup : 'div',
 			defaultStore.state.animation ? {
-					class: 'sqadhkmv' + (props.noGap ? ' noGap' : ''),
-					name: 'list',
-					tag: 'div',
-					'data-direction': props.direction,
-					'data-reversed': props.reversed ? 'true' : 'false',
-				} : {
-					class: 'sqadhkmv' + (props.noGap ? ' noGap' : ''),
-				},
+				class: 'sqadhkmv' + (props.noGap ? ' noGap' : ''),
+				name: 'list',
+				tag: 'div',
+				'data-direction': props.direction,
+				'data-reversed': props.reversed ? 'true' : 'false',
+			} : {
+				class: 'sqadhkmv' + (props.noGap ? ' noGap' : ''),
+			},
 			{ default: renderChildren });
-	}
+	},
 });
 </script>
 
diff --git a/packages/client/src/components/dialog.vue b/packages/client/src/components/MkDialog.vue
similarity index 100%
rename from packages/client/src/components/dialog.vue
rename to packages/client/src/components/MkDialog.vue
diff --git a/packages/client/src/components/digital-clock.vue b/packages/client/src/components/MkDigitalClock.vue
similarity index 100%
rename from packages/client/src/components/digital-clock.vue
rename to packages/client/src/components/MkDigitalClock.vue
diff --git a/packages/client/src/components/drive.file.vue b/packages/client/src/components/MkDrive.file.vue
similarity index 92%
rename from packages/client/src/components/drive.file.vue
rename to packages/client/src/components/MkDrive.file.vue
index aaf7ca3ca..22916d568 100644
--- a/packages/client/src/components/drive.file.vue
+++ b/packages/client/src/components/MkDrive.file.vue
@@ -1,5 +1,6 @@
 <template>
-<div class="ncvczrfv"
+<div
+	class="ncvczrfv"
 	:class="{ isSelected }"
 	draggable="true"
 	:title="title"
@@ -34,7 +35,7 @@
 import { computed, defineAsyncComponent, ref } from 'vue';
 import * as Misskey from 'misskey-js';
 import copyToClipboard from '@/scripts/copy-to-clipboard';
-import MkDriveFileThumbnail from './drive-file-thumbnail.vue';
+import MkDriveFileThumbnail from '@/components/MkDriveFileThumbnail.vue';
 import bytes from '@/filters/bytes';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
@@ -63,31 +64,31 @@ function getMenu() {
 	return [{
 		text: i18n.ts.rename,
 		icon: 'fas fa-i-cursor',
-		action: rename
+		action: rename,
 	}, {
 		text: props.file.isSensitive ? i18n.ts.unmarkAsSensitive : i18n.ts.markAsSensitive,
 		icon: props.file.isSensitive ? 'fas fa-eye' : 'fas fa-eye-slash',
-		action: toggleSensitive
+		action: toggleSensitive,
 	}, {
 		text: i18n.ts.describeFile,
 		icon: 'fas fa-i-cursor',
-		action: describe
+		action: describe,
 	}, null, {
 		text: i18n.ts.copyUrl,
 		icon: 'fas fa-link',
-		action: copyUrl
+		action: copyUrl,
 	}, {
 		type: 'a',
 		href: props.file.url,
 		target: '_blank',
 		text: i18n.ts.download,
 		icon: 'fas fa-download',
-		download: props.file.name
+		download: props.file.name,
 	}, null, {
 		text: i18n.ts.delete,
 		icon: 'fas fa-trash-alt',
 		danger: true,
-		action: deleteFile
+		action: deleteFile,
 	}];
 }
 
@@ -127,35 +128,35 @@ function rename() {
 		if (canceled) return;
 		os.api('drive/files/update', {
 			fileId: props.file.id,
-			name: name
+			name: name,
 		});
 	});
 }
 
 function describe() {
-	os.popup(defineAsyncComponent(() => import('@/components/media-caption.vue')), {
+	os.popup(defineAsyncComponent(() => import('@/components/MkMediaCaption.vue')), {
 		title: i18n.ts.describeFile,
 		input: {
 			placeholder: i18n.ts.inputNewDescription,
 			default: props.file.comment != null ? props.file.comment : '',
 		},
-		image: props.file
+		image: props.file,
 	}, {
 		done: result => {
 			if (!result || result.canceled) return;
 			let comment = result.result;
 			os.api('drive/files/update', {
 				fileId: props.file.id,
-				comment: comment.length === 0 ? null : comment
+				comment: comment.length === 0 ? null : comment,
 			});
-		}
+		},
 	}, 'closed');
 }
 
 function toggleSensitive() {
 	os.api('drive/files/update', {
 		fileId: props.file.id,
-		isSensitive: !props.file.isSensitive
+		isSensitive: !props.file.isSensitive,
 	});
 }
 
@@ -176,7 +177,7 @@ async function deleteFile() {
 
 	if (canceled) return;
 	os.api('drive/files/delete', {
-		fileId: props.file.id
+		fileId: props.file.id,
 	});
 }
 </script>
diff --git a/packages/client/src/components/drive.folder.vue b/packages/client/src/components/MkDrive.folder.vue
similarity index 93%
rename from packages/client/src/components/drive.folder.vue
rename to packages/client/src/components/MkDrive.folder.vue
index 3ccb5d621..e55fa4f0f 100644
--- a/packages/client/src/components/drive.folder.vue
+++ b/packages/client/src/components/MkDrive.folder.vue
@@ -1,5 +1,6 @@
 <template>
-<div class="rghtznwe"
+<div
+	class="rghtznwe"
 	:class="{ draghover }"
 	draggable="true"
 	:title="title"
@@ -123,7 +124,7 @@ function onDrop(ev: DragEvent) {
 		emit('removeFile', file.id);
 		os.api('drive/files/update', {
 			fileId: file.id,
-			folderId: props.folder.id
+			folderId: props.folder.id,
 		});
 	}
 	//#endregion
@@ -139,7 +140,7 @@ function onDrop(ev: DragEvent) {
 		emit('removeFolder', folder.id);
 		os.api('drive/folders/update', {
 			folderId: folder.id,
-			parentId: props.folder.id
+			parentId: props.folder.id,
 		}).then(() => {
 			// noop
 		}).catch(err => {
@@ -147,13 +148,13 @@ function onDrop(ev: DragEvent) {
 				case 'detected-circular-definition':
 					os.alert({
 						title: i18n.ts.unableToProcess,
-						text: i18n.ts.circularReferenceFolder
+						text: i18n.ts.circularReferenceFolder,
 					});
 					break;
 				default:
 					os.alert({
 						type: 'error',
-						text: i18n.ts.somethingHappened
+						text: i18n.ts.somethingHappened,
 					});
 			}
 		});
@@ -186,19 +187,19 @@ function rename() {
 	os.inputText({
 		title: i18n.ts.renameFolder,
 		placeholder: i18n.ts.inputNewFolderName,
-		default: props.folder.name
+		default: props.folder.name,
 	}).then(({ canceled, result: name }) => {
 		if (canceled) return;
 		os.api('drive/folders/update', {
 			folderId: props.folder.id,
-			name: name
+			name: name,
 		});
 	});
 }
 
 function deleteFolder() {
 	os.api('drive/folders/delete', {
-		folderId: props.folder.id
+		folderId: props.folder.id,
 	}).then(() => {
 		if (defaultStore.state.uploadFolder === props.folder.id) {
 			defaultStore.set('uploadFolder', null);
@@ -209,13 +210,13 @@ function deleteFolder() {
 				os.alert({
 					type: 'error',
 					title: i18n.ts.unableToDelete,
-					text: i18n.ts.hasChildFilesOrFolders
+					text: i18n.ts.hasChildFilesOrFolders,
 				});
 				break;
 			default:
 				os.alert({
 					type: 'error',
-					text: i18n.ts.unableToDelete
+					text: i18n.ts.unableToDelete,
 				});
 		}
 	});
@@ -230,11 +231,11 @@ function onContextmenu(ev: MouseEvent) {
 		text: i18n.ts.openInWindow,
 		icon: 'fas fa-window-restore',
 		action: () => {
-			os.popup(defineAsyncComponent(() => import('./drive-window.vue')), {
-				initialFolder: props.folder
+			os.popup(defineAsyncComponent(() => import('@/components/MkDriveWindow.vue')), {
+				initialFolder: props.folder,
 			}, {
 			}, 'closed');
-		}
+		},
 	}, null, {
 		text: i18n.ts.rename,
 		icon: 'fas fa-i-cursor',
diff --git a/packages/client/src/components/drive.nav-folder.vue b/packages/client/src/components/MkDrive.navFolder.vue
similarity index 100%
rename from packages/client/src/components/drive.nav-folder.vue
rename to packages/client/src/components/MkDrive.navFolder.vue
diff --git a/packages/client/src/components/drive.vue b/packages/client/src/components/MkDrive.vue
similarity index 99%
rename from packages/client/src/components/drive.vue
rename to packages/client/src/components/MkDrive.vue
index 9e2ef1b93..9f0016adc 100644
--- a/packages/client/src/components/drive.vue
+++ b/packages/client/src/components/MkDrive.vue
@@ -90,10 +90,10 @@
 <script lang="ts" setup>
 import { markRaw, nextTick, onActivated, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 import * as Misskey from 'misskey-js';
-import XNavFolder from './drive.nav-folder.vue';
-import XFolder from './drive.folder.vue';
-import XFile from './drive.file.vue';
 import MkButton from './ui/button.vue';
+import XNavFolder from '@/components/MkDrive.navFolder.vue';
+import XFolder from '@/components/MkDrive.folder.vue';
+import XFile from '@/components/MkDrive.file.vue';
 import * as os from '@/os';
 import { stream } from '@/stream';
 import { defaultStore } from '@/store';
diff --git a/packages/client/src/components/drive-file-thumbnail.vue b/packages/client/src/components/MkDriveFileThumbnail.vue
similarity index 97%
rename from packages/client/src/components/drive-file-thumbnail.vue
rename to packages/client/src/components/MkDriveFileThumbnail.vue
index b346585ce..de65d2f25 100644
--- a/packages/client/src/components/drive-file-thumbnail.vue
+++ b/packages/client/src/components/MkDriveFileThumbnail.vue
@@ -17,7 +17,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import * as Misskey from 'misskey-js';
-import ImgWithBlurhash from '@/components/img-with-blurhash.vue';
+import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
 
 const props = defineProps<{
 	file: Misskey.entities.DriveFile;
diff --git a/packages/client/src/components/drive-select-dialog.vue b/packages/client/src/components/MkDriveSelectDialog.vue
similarity index 95%
rename from packages/client/src/components/drive-select-dialog.vue
rename to packages/client/src/components/MkDriveSelectDialog.vue
index 03974559d..95a9a6fdb 100644
--- a/packages/client/src/components/drive-select-dialog.vue
+++ b/packages/client/src/components/MkDriveSelectDialog.vue
@@ -1,5 +1,6 @@
 <template>
-<XModalWindow ref="dialog"
+<XModalWindow
+	ref="dialog"
 	:width="800"
 	:height="500"
 	:with-ok-button="true"
@@ -20,7 +21,7 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import * as Misskey from 'misskey-js';
-import XDrive from './drive.vue';
+import XDrive from '@/components/MkDrive.vue';
 import XModalWindow from '@/components/ui/modal-window.vue';
 import number from '@/filters/number';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/components/drive-window.vue b/packages/client/src/components/MkDriveWindow.vue
similarity index 88%
rename from packages/client/src/components/drive-window.vue
rename to packages/client/src/components/MkDriveWindow.vue
index 51ea2b501..113aabb9f 100644
--- a/packages/client/src/components/drive-window.vue
+++ b/packages/client/src/components/MkDriveWindow.vue
@@ -1,5 +1,6 @@
 <template>
-<XWindow ref="window"
+<XWindow
+	ref="window"
 	:initial-width="800"
 	:initial-height="500"
 	:can-resize="true"
@@ -15,7 +16,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import * as Misskey from 'misskey-js';
-import XDrive from './drive.vue';
+import XDrive from '@/components/MkDrive.vue';
 import XWindow from '@/components/ui/window.vue';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/components/emoji-picker.section.vue b/packages/client/src/components/MkEmojiPicker.section.vue
similarity index 100%
rename from packages/client/src/components/emoji-picker.section.vue
rename to packages/client/src/components/MkEmojiPicker.section.vue
diff --git a/packages/client/src/components/emoji-picker.vue b/packages/client/src/components/MkEmojiPicker.vue
similarity index 99%
rename from packages/client/src/components/emoji-picker.vue
rename to packages/client/src/components/MkEmojiPicker.vue
index 4a46e0ecf..3de0afbf5 100644
--- a/packages/client/src/components/emoji-picker.vue
+++ b/packages/client/src/components/MkEmojiPicker.vue
@@ -80,10 +80,10 @@
 <script lang="ts" setup>
 import { ref, computed, watch, onMounted } from 'vue';
 import * as Misskey from 'misskey-js';
-import XSection from './emoji-picker.section.vue';
+import XSection from '@/components/MkEmojiPicker.section.vue';
 import { emojilist, UnicodeEmojiDef, unicodeEmojiCategories as categories } from '@/scripts/emojilist';
 import { getStaticImageUrl } from '@/scripts/get-static-image-url';
-import Ripple from '@/components/ripple.vue';
+import Ripple from '@/components/MkRipple.vue';
 import * as os from '@/os';
 import { isTouchUsing } from '@/scripts/touch';
 import { deviceKind } from '@/scripts/device-kind';
diff --git a/packages/client/src/components/emoji-picker-dialog.vue b/packages/client/src/components/MkEmojiPickerDialog.vue
similarity index 96%
rename from packages/client/src/components/emoji-picker-dialog.vue
rename to packages/client/src/components/MkEmojiPickerDialog.vue
index 2c0b2e9a8..94e66b971 100644
--- a/packages/client/src/components/emoji-picker-dialog.vue
+++ b/packages/client/src/components/MkEmojiPickerDialog.vue
@@ -28,7 +28,7 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import MkModal from '@/components/ui/modal.vue';
-import MkEmojiPicker from '@/components/emoji-picker.vue';
+import MkEmojiPicker from '@/components/MkEmojiPicker.vue';
 import { defaultStore } from '@/store';
 
 withDefaults(defineProps<{
diff --git a/packages/client/src/components/emoji-picker-window.vue b/packages/client/src/components/MkEmojiPickerWindow.vue
similarity index 97%
rename from packages/client/src/components/emoji-picker-window.vue
rename to packages/client/src/components/MkEmojiPickerWindow.vue
index 610690d70..a1a2fd932 100644
--- a/packages/client/src/components/emoji-picker-window.vue
+++ b/packages/client/src/components/MkEmojiPickerWindow.vue
@@ -14,7 +14,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import MkWindow from '@/components/ui/window.vue';
-import MkEmojiPicker from '@/components/emoji-picker.vue';
+import MkEmojiPicker from '@/components/MkEmojiPicker.vue';
 
 withDefaults(defineProps<{
 	src?: HTMLElement;
diff --git a/packages/client/src/components/featured-photos.vue b/packages/client/src/components/MkFeaturedPhotos.vue
similarity index 100%
rename from packages/client/src/components/featured-photos.vue
rename to packages/client/src/components/MkFeaturedPhotos.vue
diff --git a/packages/client/src/components/file-list-for-admin.vue b/packages/client/src/components/MkFileListForAdmin.vue
similarity index 97%
rename from packages/client/src/components/file-list-for-admin.vue
rename to packages/client/src/components/MkFileListForAdmin.vue
index 489c017a9..e03b8b94d 100644
--- a/packages/client/src/components/file-list-for-admin.vue
+++ b/packages/client/src/components/MkFileListForAdmin.vue
@@ -36,7 +36,7 @@ import { computed } from 'vue';
 import * as Acct from 'misskey-js/built/acct';
 import MkSwitch from '@/components/ui/switch.vue';
 import MkPagination from '@/components/ui/pagination.vue';
-import MkDriveFileThumbnail from '@/components/drive-file-thumbnail.vue';
+import MkDriveFileThumbnail from '@/components/MkDriveFileThumbnail.vue';
 import bytes from '@/filters/bytes';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/components/file-type-icon.vue b/packages/client/src/components/MkFileTypeIcon.vue
similarity index 100%
rename from packages/client/src/components/file-type-icon.vue
rename to packages/client/src/components/MkFileTypeIcon.vue
diff --git a/packages/client/src/components/follow-button.vue b/packages/client/src/components/MkFollowButton.vue
similarity index 100%
rename from packages/client/src/components/follow-button.vue
rename to packages/client/src/components/MkFollowButton.vue
diff --git a/packages/client/src/components/forgot-password.vue b/packages/client/src/components/MkForgotPassword.vue
similarity index 100%
rename from packages/client/src/components/forgot-password.vue
rename to packages/client/src/components/MkForgotPassword.vue
diff --git a/packages/client/src/components/form-dialog.vue b/packages/client/src/components/MkFormDialog.vue
similarity index 100%
rename from packages/client/src/components/form-dialog.vue
rename to packages/client/src/components/MkFormDialog.vue
diff --git a/packages/client/src/components/formula.vue b/packages/client/src/components/MkFormula.vue
similarity index 60%
rename from packages/client/src/components/formula.vue
rename to packages/client/src/components/MkFormula.vue
index 431b4e6c3..65a2fee93 100644
--- a/packages/client/src/components/formula.vue
+++ b/packages/client/src/components/MkFormula.vue
@@ -1,5 +1,5 @@
 <template>
-<XFormula :formula="formula" :block="block" />
+<XFormula :formula="formula" :block="block"/>
 </template>
 
 <script lang="ts">
@@ -8,17 +8,17 @@ import * as os from '@/os';
 
 export default defineComponent({
 	components: {
-		XFormula: defineAsyncComponent(() => import('./formula-core.vue'))
+		XFormula: defineAsyncComponent(() => import('@/components/MkFormulaCore.vue')),
 	},
 	props: {
 		formula: {
 			type: String,
-			required: true
+			required: true,
 		},
 		block: {
 			type: Boolean,
-			required: true
-		}
-	}
+			required: true,
+		},
+	},
 });
 </script>
diff --git a/packages/client/src/components/formula-core.vue b/packages/client/src/components/MkFormulaCore.vue
similarity index 100%
rename from packages/client/src/components/formula-core.vue
rename to packages/client/src/components/MkFormulaCore.vue
diff --git a/packages/client/src/components/gallery-post-preview.vue b/packages/client/src/components/MkGalleryPostPreview.vue
similarity index 94%
rename from packages/client/src/components/gallery-post-preview.vue
rename to packages/client/src/components/MkGalleryPostPreview.vue
index 824590297..cef9b2a39 100644
--- a/packages/client/src/components/gallery-post-preview.vue
+++ b/packages/client/src/components/MkGalleryPostPreview.vue
@@ -17,22 +17,22 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { userName } from '@/filters/user';
-import ImgWithBlurhash from '@/components/img-with-blurhash.vue';
+import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
 import * as os from '@/os';
 
 export default defineComponent({
 	components: {
-		ImgWithBlurhash
+		ImgWithBlurhash,
 	},
 	props: {
 		post: {
 			type: Object,
-			required: true
+			required: true,
 		},
 	},
 	methods: {
-		userName
-	}
+		userName,
+	},
 });
 </script>
 
diff --git a/packages/client/src/components/google.vue b/packages/client/src/components/MkGoogle.vue
similarity index 100%
rename from packages/client/src/components/google.vue
rename to packages/client/src/components/MkGoogle.vue
diff --git a/packages/client/src/components/image-viewer.vue b/packages/client/src/components/MkImageViewer.vue
similarity index 100%
rename from packages/client/src/components/image-viewer.vue
rename to packages/client/src/components/MkImageViewer.vue
diff --git a/packages/client/src/components/img-with-blurhash.vue b/packages/client/src/components/MkImgWithBlurhash.vue
similarity index 100%
rename from packages/client/src/components/img-with-blurhash.vue
rename to packages/client/src/components/MkImgWithBlurhash.vue
diff --git a/packages/client/src/components/instance-card-mini.vue b/packages/client/src/components/MkInstanceCardMini.vue
similarity index 98%
rename from packages/client/src/components/instance-card-mini.vue
rename to packages/client/src/components/MkInstanceCardMini.vue
index 88621e72c..f6e2f4eaa 100644
--- a/packages/client/src/components/instance-card-mini.vue
+++ b/packages/client/src/components/MkInstanceCardMini.vue
@@ -11,7 +11,7 @@
 
 <script lang="ts" setup>
 import * as misskey from 'misskey-js';
-import MkMiniChart from '@/components/mini-chart.vue';
+import MkMiniChart from '@/components/MkMiniChart.vue';
 import * as os from '@/os';
 
 const props = defineProps<{
diff --git a/packages/client/src/components/instance-stats.vue b/packages/client/src/components/MkInstanceStats.vue
similarity index 99%
rename from packages/client/src/components/instance-stats.vue
rename to packages/client/src/components/MkInstanceStats.vue
index 65465dd9a..0437e05fa 100644
--- a/packages/client/src/components/instance-stats.vue
+++ b/packages/client/src/components/MkInstanceStats.vue
@@ -68,7 +68,7 @@ import {
 	DoughnutController,
 } from 'chart.js';
 import MkSelect from '@/components/form/select.vue';
-import MkChart from '@/components/chart.vue';
+import MkChart from '@/components/MkChart.vue';
 import { useChartTooltip } from '@/scripts/use-chart-tooltip';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/components/instance-ticker.vue b/packages/client/src/components/MkInstanceTicker.vue
similarity index 100%
rename from packages/client/src/components/instance-ticker.vue
rename to packages/client/src/components/MkInstanceTicker.vue
diff --git a/packages/client/src/components/key-value.vue b/packages/client/src/components/MkKeyValue.vue
similarity index 100%
rename from packages/client/src/components/key-value.vue
rename to packages/client/src/components/MkKeyValue.vue
diff --git a/packages/client/src/components/launch-pad.vue b/packages/client/src/components/MkLaunchPad.vue
similarity index 100%
rename from packages/client/src/components/launch-pad.vue
rename to packages/client/src/components/MkLaunchPad.vue
diff --git a/packages/client/src/components/link.vue b/packages/client/src/components/MkLink.vue
similarity index 91%
rename from packages/client/src/components/link.vue
rename to packages/client/src/components/MkLink.vue
index 846a9a3a7..649523abc 100644
--- a/packages/client/src/components/link.vue
+++ b/packages/client/src/components/MkLink.vue
@@ -26,7 +26,7 @@ const target = self ? null : '_blank';
 const el = $ref();
 
 useTooltip($$(el), (showing) => {
-	os.popup(defineAsyncComponent(() => import('@/components/url-preview-popup.vue')), {
+	os.popup(defineAsyncComponent(() => import('@/components/MkUrlPreviewPopup.vue')), {
 		showing,
 		url: props.url,
 		source: el,
diff --git a/packages/client/src/components/marquee.vue b/packages/client/src/components/MkMarquee.vue
similarity index 100%
rename from packages/client/src/components/marquee.vue
rename to packages/client/src/components/MkMarquee.vue
diff --git a/packages/client/src/components/media-banner.vue b/packages/client/src/components/MkMediaBanner.vue
similarity index 100%
rename from packages/client/src/components/media-banner.vue
rename to packages/client/src/components/MkMediaBanner.vue
diff --git a/packages/client/src/components/media-caption.vue b/packages/client/src/components/MkMediaCaption.vue
similarity index 100%
rename from packages/client/src/components/media-caption.vue
rename to packages/client/src/components/MkMediaCaption.vue
diff --git a/packages/client/src/components/media-image.vue b/packages/client/src/components/MkMediaImage.vue
similarity index 97%
rename from packages/client/src/components/media-image.vue
rename to packages/client/src/components/MkMediaImage.vue
index 9d417bd99..92f1bd2db 100644
--- a/packages/client/src/components/media-image.vue
+++ b/packages/client/src/components/MkMediaImage.vue
@@ -24,7 +24,7 @@
 import { watch } from 'vue';
 import * as misskey from 'misskey-js';
 import { getStaticImageUrl } from '@/scripts/get-static-image-url';
-import ImgWithBlurhash from '@/components/img-with-blurhash.vue';
+import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
 import { defaultStore } from '@/store';
 
 const props = defineProps<{
diff --git a/packages/client/src/components/media-list.vue b/packages/client/src/components/MkMediaList.vue
similarity index 96%
rename from packages/client/src/components/media-list.vue
rename to packages/client/src/components/MkMediaList.vue
index 7e330575e..c6f861218 100644
--- a/packages/client/src/components/media-list.vue
+++ b/packages/client/src/components/MkMediaList.vue
@@ -18,9 +18,9 @@ import * as misskey from 'misskey-js';
 import PhotoSwipeLightbox from 'photoswipe/lightbox';
 import PhotoSwipe from 'photoswipe';
 import 'photoswipe/style.css';
-import XBanner from './media-banner.vue';
-import XImage from './media-image.vue';
-import XVideo from './media-video.vue';
+import XBanner from '@/components/MkMediaBanner.vue';
+import XImage from '@/components/MkMediaImage.vue';
+import XVideo from '@/components/MkMediaVideo.vue';
 import * as os from '@/os';
 import { FILE_TYPE_BROWSERSAFE } from '@/const';
 import { defaultStore } from '@/store';
diff --git a/packages/client/src/components/media-video.vue b/packages/client/src/components/MkMediaVideo.vue
similarity index 100%
rename from packages/client/src/components/media-video.vue
rename to packages/client/src/components/MkMediaVideo.vue
diff --git a/packages/client/src/components/mention.vue b/packages/client/src/components/MkMention.vue
similarity index 100%
rename from packages/client/src/components/mention.vue
rename to packages/client/src/components/MkMention.vue
diff --git a/packages/client/src/components/mini-chart.vue b/packages/client/src/components/MkMiniChart.vue
similarity index 100%
rename from packages/client/src/components/mini-chart.vue
rename to packages/client/src/components/MkMiniChart.vue
diff --git a/packages/client/src/components/modal-page-window.vue b/packages/client/src/components/MkModalPageWindow.vue
similarity index 100%
rename from packages/client/src/components/modal-page-window.vue
rename to packages/client/src/components/MkModalPageWindow.vue
diff --git a/packages/client/src/components/note.vue b/packages/client/src/components/MkNote.vue
similarity index 96%
rename from packages/client/src/components/note.vue
rename to packages/client/src/components/MkNote.vue
index 0279f014c..efe786ba4 100644
--- a/packages/client/src/components/note.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -106,17 +106,17 @@
 import { computed, inject, onMounted, onUnmounted, reactive, ref, Ref } from 'vue';
 import * as mfm from 'mfm-js';
 import * as misskey from 'misskey-js';
-import MkNoteSub from './MkNoteSub.vue';
-import XNoteHeader from './note-header.vue';
-import XNoteSimple from './note-simple.vue';
-import XReactionsViewer from './reactions-viewer.vue';
-import XMediaList from './media-list.vue';
-import XCwButton from './cw-button.vue';
-import XPoll from './poll.vue';
-import XRenoteButton from './renote-button.vue';
-import MkUrlPreview from '@/components/url-preview.vue';
-import MkInstanceTicker from '@/components/instance-ticker.vue';
-import MkVisibility from '@/components/visibility.vue';
+import MkNoteSub from '@/components/MkNoteSub.vue';
+import XNoteHeader from '@/components/MkNoteHeader.vue';
+import XNoteSimple from '@/components/MkNoteSimple.vue';
+import XReactionsViewer from '@/components/MkReactionsViewer.vue';
+import XMediaList from '@/components/MkMediaList.vue';
+import XCwButton from '@/components/MkCwButton.vue';
+import XPoll from '@/components/MkPoll.vue';
+import XRenoteButton from '@/components/MkRenoteButton.vue';
+import MkUrlPreview from '@/components/MkUrlPreview.vue';
+import MkInstanceTicker from '@/components/MkInstanceTicker.vue';
+import MkVisibility from '@/components/MkVisibility.vue';
 import { pleaseLogin } from '@/scripts/please-login';
 import { focusPrev, focusNext } from '@/scripts/focus';
 import { checkWordMute } from '@/scripts/check-word-mute';
diff --git a/packages/client/src/components/note-detailed.vue b/packages/client/src/components/MkNoteDetailed.vue
similarity index 96%
rename from packages/client/src/components/note-detailed.vue
rename to packages/client/src/components/MkNoteDetailed.vue
index 1e0625b6c..0bf8f330b 100644
--- a/packages/client/src/components/note-detailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -117,16 +117,16 @@
 import { computed, inject, onMounted, onUnmounted, reactive, ref } from 'vue';
 import * as mfm from 'mfm-js';
 import * as misskey from 'misskey-js';
-import MkNoteSub from './MkNoteSub.vue';
-import XNoteSimple from './note-simple.vue';
-import XReactionsViewer from './reactions-viewer.vue';
-import XMediaList from './media-list.vue';
-import XCwButton from './cw-button.vue';
-import XPoll from './poll.vue';
-import XRenoteButton from './renote-button.vue';
-import MkUrlPreview from '@/components/url-preview.vue';
-import MkInstanceTicker from '@/components/instance-ticker.vue';
-import MkVisibility from '@/components/visibility.vue';
+import MkNoteSub from '@/components/MkNoteSub.vue';
+import XNoteSimple from '@/components/MkNoteSimple.vue';
+import XReactionsViewer from '@/components/MkReactionsViewer.vue';
+import XMediaList from '@/components/MkMediaList.vue';
+import XCwButton from '@/components/MkCwButton.vue';
+import XPoll from '@/components/MkPoll.vue';
+import XRenoteButton from '@/components/MkRenoteButton.vue';
+import MkUrlPreview from '@/components/MkUrlPreview.vue';
+import MkInstanceTicker from '@/components/MkInstanceTicker.vue';
+import MkVisibility from '@/components/MkVisibility.vue';
 import { pleaseLogin } from '@/scripts/please-login';
 import { checkWordMute } from '@/scripts/check-word-mute';
 import { userPage } from '@/filters/user';
diff --git a/packages/client/src/components/note-header.vue b/packages/client/src/components/MkNoteHeader.vue
similarity index 96%
rename from packages/client/src/components/note-header.vue
rename to packages/client/src/components/MkNoteHeader.vue
index 0b0549856..333c3ddbd 100644
--- a/packages/client/src/components/note-header.vue
+++ b/packages/client/src/components/MkNoteHeader.vue
@@ -17,7 +17,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import * as misskey from 'misskey-js';
-import MkVisibility from '@/components/visibility.vue';
+import MkVisibility from '@/components/MkVisibility.vue';
 import { notePage } from '@/filters/note';
 import { userPage } from '@/filters/user';
 
diff --git a/packages/client/src/components/note-preview.vue b/packages/client/src/components/MkNotePreview.vue
similarity index 100%
rename from packages/client/src/components/note-preview.vue
rename to packages/client/src/components/MkNotePreview.vue
diff --git a/packages/client/src/components/note-simple.vue b/packages/client/src/components/MkNoteSimple.vue
similarity index 87%
rename from packages/client/src/components/note-simple.vue
rename to packages/client/src/components/MkNoteSimple.vue
index b813b9a2b..1bbbe0e1a 100644
--- a/packages/client/src/components/note-simple.vue
+++ b/packages/client/src/components/MkNoteSimple.vue
@@ -9,7 +9,7 @@
 				<XCwButton v-model="showContent" :note="note"/>
 			</p>
 			<div v-show="note.cw == null || showContent" class="content">
-				<MkNoteSubNoteContent class="text" :note="note"/>
+				<MkSubNoteContent class="text" :note="note"/>
 			</div>
 		</div>
 	</div>
@@ -19,9 +19,9 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import * as misskey from 'misskey-js';
-import XNoteHeader from './note-header.vue';
-import MkNoteSubNoteContent from './sub-note-content.vue';
-import XCwButton from './cw-button.vue';
+import XNoteHeader from '@/components/MkNoteHeader.vue';
+import MkSubNoteContent from '@/components/MkSubNoteContent.vue';
+import XCwButton from '@/components/MkCwButton.vue';
 
 const props = defineProps<{
 	note: misskey.entities.Note;
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 9ae773bfb..a69336f8a 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -10,7 +10,7 @@
 					<XCwButton v-model="showContent" :note="note"/>
 				</p>
 				<div v-show="note.cw == null || showContent" class="content">
-					<MkNoteSubNoteContent class="text" :note="note"/>
+					<MkSubNoteContent class="text" :note="note"/>
 				</div>
 			</div>
 		</div>
@@ -27,9 +27,9 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import * as misskey from 'misskey-js';
-import XNoteHeader from './note-header.vue';
-import MkNoteSubNoteContent from './sub-note-content.vue';
-import XCwButton from './cw-button.vue';
+import XNoteHeader from '@/components/MkNoteHeader.vue';
+import MkSubNoteContent from '@/components/MkSubNoteContent.vue';
+import XCwButton from '@/components/MkCwButton.vue';
 import { notePage } from '@/filters/note';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/components/notes.vue b/packages/client/src/components/MkNotes.vue
similarity index 92%
rename from packages/client/src/components/notes.vue
rename to packages/client/src/components/MkNotes.vue
index e351a76eb..67e894a09 100644
--- a/packages/client/src/components/notes.vue
+++ b/packages/client/src/components/MkNotes.vue
@@ -19,8 +19,8 @@
 
 <script lang="ts" setup>
 import { ref } from 'vue';
-import XNote from '@/components/note.vue';
-import XList from '@/components/date-separated-list.vue';
+import XNote from '@/components/MkNote.vue';
+import XList from '@/components/MkDateSeparatedList.vue';
 import MkPagination, { Paging } from '@/components/ui/pagination.vue';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/components/notification.vue b/packages/client/src/components/MkNotification.vue
similarity index 98%
rename from packages/client/src/components/notification.vue
rename to packages/client/src/components/MkNotification.vue
index 9589970a4..c00e9fbf4 100644
--- a/packages/client/src/components/notification.vue
+++ b/packages/client/src/components/MkNotification.vue
@@ -75,9 +75,9 @@
 <script lang="ts" setup>
 import { ref, onMounted, onUnmounted, watch } from 'vue';
 import * as misskey from 'misskey-js';
-import XReactionIcon from './reaction-icon.vue';
-import MkFollowButton from './follow-button.vue';
-import XReactionTooltip from './reaction-tooltip.vue';
+import XReactionIcon from '@/components/MkReactionIcon.vue';
+import MkFollowButton from '@/components/MkFollowButton.vue';
+import XReactionTooltip from '@/components/MkReactionTooltip.vue';
 import { getNoteSummary } from '@/scripts/get-note-summary';
 import { notePage } from '@/filters/note';
 import { userPage } from '@/filters/user';
diff --git a/packages/client/src/components/notification-setting-window.vue b/packages/client/src/components/MkNotificationSettingWindow.vue
similarity index 100%
rename from packages/client/src/components/notification-setting-window.vue
rename to packages/client/src/components/MkNotificationSettingWindow.vue
diff --git a/packages/client/src/components/notification-toast.vue b/packages/client/src/components/MkNotificationToast.vue
similarity index 95%
rename from packages/client/src/components/notification-toast.vue
rename to packages/client/src/components/MkNotificationToast.vue
index b808647bb..398f64d54 100644
--- a/packages/client/src/components/notification-toast.vue
+++ b/packages/client/src/components/MkNotificationToast.vue
@@ -8,7 +8,7 @@
 
 <script lang="ts" setup>
 import { onMounted } from 'vue';
-import XNotification from './notification.vue';
+import XNotification from '@/components/MkNotification.vue';
 import * as os from '@/os';
 
 defineProps<{
diff --git a/packages/client/src/components/notifications.vue b/packages/client/src/components/MkNotifications.vue
similarity index 94%
rename from packages/client/src/components/notifications.vue
rename to packages/client/src/components/MkNotifications.vue
index baac2fdca..1ee091a22 100644
--- a/packages/client/src/components/notifications.vue
+++ b/packages/client/src/components/MkNotifications.vue
@@ -20,9 +20,9 @@
 import { defineComponent, markRaw, onUnmounted, onMounted, computed, ref } from 'vue';
 import { notificationTypes } from 'misskey-js';
 import MkPagination, { Paging } from '@/components/ui/pagination.vue';
-import XNotification from '@/components/notification.vue';
-import XList from '@/components/date-separated-list.vue';
-import XNote from '@/components/note.vue';
+import XNotification from '@/components/MkNotification.vue';
+import XList from '@/components/MkDateSeparatedList.vue';
+import XNote from '@/components/MkNote.vue';
 import * as os from '@/os';
 import { stream } from '@/stream';
 import { $i } from '@/account';
diff --git a/packages/client/src/components/number-diff.vue b/packages/client/src/components/MkNumberDiff.vue
similarity index 100%
rename from packages/client/src/components/number-diff.vue
rename to packages/client/src/components/MkNumberDiff.vue
diff --git a/packages/client/src/components/object-view.value.vue b/packages/client/src/components/MkObjectView.value.vue
similarity index 100%
rename from packages/client/src/components/object-view.value.vue
rename to packages/client/src/components/MkObjectView.value.vue
diff --git a/packages/client/src/components/object-view.vue b/packages/client/src/components/MkObjectView.vue
similarity index 85%
rename from packages/client/src/components/object-view.vue
rename to packages/client/src/components/MkObjectView.vue
index db66049fc..55578a37f 100644
--- a/packages/client/src/components/object-view.vue
+++ b/packages/client/src/components/MkObjectView.vue
@@ -6,7 +6,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import XValue from './object-view.value.vue';
+import XValue from './MkObjectView.value.vue';
 
 const props = defineProps<{
 	value: Record<string, unknown>;
diff --git a/packages/client/src/components/page-preview.vue b/packages/client/src/components/MkPagePreview.vue
similarity index 100%
rename from packages/client/src/components/page-preview.vue
rename to packages/client/src/components/MkPagePreview.vue
diff --git a/packages/client/src/components/page-window.vue b/packages/client/src/components/MkPageWindow.vue
similarity index 98%
rename from packages/client/src/components/page-window.vue
rename to packages/client/src/components/MkPageWindow.vue
index 43d75b0cf..76eb77825 100644
--- a/packages/client/src/components/page-window.vue
+++ b/packages/client/src/components/MkPageWindow.vue
@@ -25,7 +25,7 @@
 
 <script lang="ts" setup>
 import { ComputedRef, inject, provide } from 'vue';
-import RouterView from './global/router-view.vue';
+import RouterView from '@/components/global/RouterView.vue';
 import XWindow from '@/components/ui/window.vue';
 import { popout as _popout } from '@/scripts/popout';
 import copyToClipboard from '@/scripts/copy-to-clipboard';
diff --git a/packages/client/src/components/poll.vue b/packages/client/src/components/MkPoll.vue
similarity index 100%
rename from packages/client/src/components/poll.vue
rename to packages/client/src/components/MkPoll.vue
diff --git a/packages/client/src/components/poll-editor.vue b/packages/client/src/components/MkPollEditor.vue
similarity index 100%
rename from packages/client/src/components/poll-editor.vue
rename to packages/client/src/components/MkPollEditor.vue
diff --git a/packages/client/src/components/post-form.vue b/packages/client/src/components/MkPostForm.vue
similarity index 98%
rename from packages/client/src/components/post-form.vue
rename to packages/client/src/components/MkPostForm.vue
index 6dfb2edcb..a499a62dd 100644
--- a/packages/client/src/components/post-form.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -71,10 +71,10 @@ import { length } from 'stringz';
 import { toASCII } from 'punycode/';
 import * as Acct from 'misskey-js/built/acct';
 import { throttle } from 'throttle-debounce';
-import XNoteSimple from './note-simple.vue';
-import XNotePreview from './note-preview.vue';
-import XPostFormAttaches from './post-form-attaches.vue';
-import XPollEditor from './poll-editor.vue';
+import XNoteSimple from '@/components/MkNoteSimple.vue';
+import XNotePreview from '@/components/MkNotePreview.vue';
+import XPostFormAttaches from '@/components/MkPostFormAttaches.vue';
+import XPollEditor from '@/components/MkPollEditor.vue';
 import { host, url } from '@/config';
 import { erase, unique } from '@/scripts/array';
 import { extractMentions } from '@/scripts/extract-mentions';
@@ -384,7 +384,7 @@ function setVisibility() {
 		return;
 	}
 
-	os.popup(defineAsyncComponent(() => import('./visibility-picker.vue')), {
+	os.popup(defineAsyncComponent(() => import('@/components/MkVisibilityPicker.vue')), {
 		currentVisibility: visibility,
 		currentLocalOnly: localOnly,
 		src: visibilityButton,
diff --git a/packages/client/src/components/post-form-attaches.vue b/packages/client/src/components/MkPostFormAttaches.vue
similarity index 96%
rename from packages/client/src/components/post-form-attaches.vue
rename to packages/client/src/components/MkPostFormAttaches.vue
index 98bf2df09..a8ec8c33b 100644
--- a/packages/client/src/components/post-form-attaches.vue
+++ b/packages/client/src/components/MkPostFormAttaches.vue
@@ -16,7 +16,7 @@
 
 <script lang="ts">
 import { defineComponent, defineAsyncComponent } from 'vue';
-import MkDriveFileThumbnail from './drive-file-thumbnail.vue';
+import MkDriveFileThumbnail from '@/components/MkDriveFileThumbnail.vue';
 import * as os from '@/os';
 
 export default defineComponent({
@@ -88,7 +88,7 @@ export default defineComponent({
 		},
 
 		async describe(file) {
-			os.popup(defineAsyncComponent(() => import('@/components/media-caption.vue')), {
+			os.popup(defineAsyncComponent(() => import('@/components/MkMediaCaption.vue')), {
 				title: this.$ts.describeFile,
 				input: {
 					placeholder: this.$ts.inputNewDescription,
diff --git a/packages/client/src/components/post-form-dialog.vue b/packages/client/src/components/MkPostFormDialog.vue
similarity index 89%
rename from packages/client/src/components/post-form-dialog.vue
rename to packages/client/src/components/MkPostFormDialog.vue
index dc4e84205..90b281d2c 100644
--- a/packages/client/src/components/post-form-dialog.vue
+++ b/packages/client/src/components/MkPostFormDialog.vue
@@ -7,7 +7,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import MkModal from '@/components/ui/modal.vue';
-import MkPostForm from '@/components/post-form.vue';
+import MkPostForm from '@/components/MkPostForm.vue';
 
 export default defineComponent({
 	components: {
diff --git a/packages/client/src/components/reaction-icon.vue b/packages/client/src/components/MkReactionIcon.vue
similarity index 100%
rename from packages/client/src/components/reaction-icon.vue
rename to packages/client/src/components/MkReactionIcon.vue
diff --git a/packages/client/src/components/reaction-tooltip.vue b/packages/client/src/components/MkReactionTooltip.vue
similarity index 93%
rename from packages/client/src/components/reaction-tooltip.vue
rename to packages/client/src/components/MkReactionTooltip.vue
index b53061df4..44f268170 100644
--- a/packages/client/src/components/reaction-tooltip.vue
+++ b/packages/client/src/components/MkReactionTooltip.vue
@@ -10,7 +10,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import MkTooltip from './ui/tooltip.vue';
-import XReactionIcon from './reaction-icon.vue';
+import XReactionIcon from '@/components/MkReactionIcon.vue';
 
 const props = defineProps<{
 	reaction: string;
diff --git a/packages/client/src/components/reactions-viewer.details.vue b/packages/client/src/components/MkReactionsViewer.details.vue
similarity index 96%
rename from packages/client/src/components/reactions-viewer.details.vue
rename to packages/client/src/components/MkReactionsViewer.details.vue
index eaebc3541..e886ff502 100644
--- a/packages/client/src/components/reactions-viewer.details.vue
+++ b/packages/client/src/components/MkReactionsViewer.details.vue
@@ -19,7 +19,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import MkTooltip from './ui/tooltip.vue';
-import XReactionIcon from './reaction-icon.vue';
+import XReactionIcon from '@/components/MkReactionIcon.vue';
 
 const props = defineProps<{
 	reaction: string;
diff --git a/packages/client/src/components/reactions-viewer.reaction.vue b/packages/client/src/components/MkReactionsViewer.reaction.vue
similarity index 95%
rename from packages/client/src/components/reactions-viewer.reaction.vue
rename to packages/client/src/components/MkReactionsViewer.reaction.vue
index c29bd4640..31342b0b4 100644
--- a/packages/client/src/components/reactions-viewer.reaction.vue
+++ b/packages/client/src/components/MkReactionsViewer.reaction.vue
@@ -15,8 +15,8 @@
 <script lang="ts" setup>
 import { computed, onMounted, ref, watch } from 'vue';
 import * as misskey from 'misskey-js';
-import XDetails from '@/components/reactions-viewer.details.vue';
-import XReactionIcon from '@/components/reaction-icon.vue';
+import XDetails from '@/components/MkReactionsViewer.details.vue';
+import XReactionIcon from '@/components/MkReactionIcon.vue';
 import * as os from '@/os';
 import { useTooltip } from '@/scripts/use-tooltip';
 import { $i } from '@/account';
diff --git a/packages/client/src/components/reactions-viewer.vue b/packages/client/src/components/MkReactionsViewer.vue
similarity index 91%
rename from packages/client/src/components/reactions-viewer.vue
rename to packages/client/src/components/MkReactionsViewer.vue
index a9bf51f65..a88311efa 100644
--- a/packages/client/src/components/reactions-viewer.vue
+++ b/packages/client/src/components/MkReactionsViewer.vue
@@ -8,7 +8,7 @@
 import { computed } from 'vue';
 import * as misskey from 'misskey-js';
 import { $i } from '@/account';
-import XReaction from './reactions-viewer.reaction.vue';
+import XReaction from '@/components/MkReactionsViewer.reaction.vue';
 
 const props = defineProps<{
 	note: misskey.entities.Note;
diff --git a/packages/client/src/components/remote-caution.vue b/packages/client/src/components/MkRemoteCaution.vue
similarity index 100%
rename from packages/client/src/components/remote-caution.vue
rename to packages/client/src/components/MkRemoteCaution.vue
diff --git a/packages/client/src/components/renote-button.vue b/packages/client/src/components/MkRenoteButton.vue
similarity index 97%
rename from packages/client/src/components/renote-button.vue
rename to packages/client/src/components/MkRenoteButton.vue
index d267f3040..413f3406a 100644
--- a/packages/client/src/components/renote-button.vue
+++ b/packages/client/src/components/MkRenoteButton.vue
@@ -16,7 +16,7 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
 import * as misskey from 'misskey-js';
-import XDetails from '@/components/users-tooltip.vue';
+import XDetails from '@/components/MkUsersTooltip.vue';
 import { pleaseLogin } from '@/scripts/please-login';
 import * as os from '@/os';
 import { $i } from '@/account';
diff --git a/packages/client/src/components/ripple.vue b/packages/client/src/components/MkRipple.vue
similarity index 100%
rename from packages/client/src/components/ripple.vue
rename to packages/client/src/components/MkRipple.vue
diff --git a/packages/client/src/components/sample.vue b/packages/client/src/components/MkSample.vue
similarity index 100%
rename from packages/client/src/components/sample.vue
rename to packages/client/src/components/MkSample.vue
diff --git a/packages/client/src/components/signin.vue b/packages/client/src/components/MkSignin.vue
similarity index 98%
rename from packages/client/src/components/signin.vue
rename to packages/client/src/components/MkSignin.vue
index dacc61016..e84163171 100644
--- a/packages/client/src/components/signin.vue
+++ b/packages/client/src/components/MkSignin.vue
@@ -237,7 +237,7 @@ function loginFailed(err) {
 }
 
 function resetPassword() {
-	os.popup(defineAsyncComponent(() => import('@/components/forgot-password.vue')), {}, {
+	os.popup(defineAsyncComponent(() => import('@/components/MkForgotPassword.vue')), {}, {
 	}, 'closed');
 }
 </script>
diff --git a/packages/client/src/components/signin-dialog.vue b/packages/client/src/components/MkSigninDialog.vue
similarity index 94%
rename from packages/client/src/components/signin-dialog.vue
rename to packages/client/src/components/MkSigninDialog.vue
index ec68668a7..19b82b36d 100644
--- a/packages/client/src/components/signin-dialog.vue
+++ b/packages/client/src/components/MkSigninDialog.vue
@@ -14,7 +14,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import MkSignin from './signin.vue';
+import MkSignin from '@/components/MkSignin.vue';
 import XModalWindow from '@/components/ui/modal-window.vue';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/components/signup.vue b/packages/client/src/components/MkSignup.vue
similarity index 99%
rename from packages/client/src/components/signup.vue
rename to packages/client/src/components/MkSignup.vue
index f8e39985b..dbd332ce6 100644
--- a/packages/client/src/components/signup.vue
+++ b/packages/client/src/components/MkSignup.vue
@@ -68,9 +68,9 @@ import { } from 'vue';
 import getPasswordStrength from 'syuilo-password-strength';
 import { toUnicode } from 'punycode/';
 import MkButton from './ui/button.vue';
-import MkCaptcha from './captcha.vue';
 import MkInput from './form/input.vue';
 import MkSwitch from './form/switch.vue';
+import MkCaptcha from '@/components/MkCaptcha.vue';
 import * as config from '@/config';
 import * as os from '@/os';
 import { login } from '@/account';
diff --git a/packages/client/src/components/signup-dialog.vue b/packages/client/src/components/MkSignupDialog.vue
similarity index 94%
rename from packages/client/src/components/signup-dialog.vue
rename to packages/client/src/components/MkSignupDialog.vue
index c5f933f6b..3e989fcb7 100644
--- a/packages/client/src/components/signup-dialog.vue
+++ b/packages/client/src/components/MkSignupDialog.vue
@@ -18,7 +18,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import XSignup from './signup.vue';
+import XSignup from '@/components/MkSignup.vue';
 import XModalWindow from '@/components/ui/modal-window.vue';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/components/sparkle.vue b/packages/client/src/components/MkSparkle.vue
similarity index 100%
rename from packages/client/src/components/sparkle.vue
rename to packages/client/src/components/MkSparkle.vue
diff --git a/packages/client/src/components/sub-note-content.vue b/packages/client/src/components/MkSubNoteContent.vue
similarity index 95%
rename from packages/client/src/components/sub-note-content.vue
rename to packages/client/src/components/MkSubNoteContent.vue
index 25ab883f4..237f4cf22 100644
--- a/packages/client/src/components/sub-note-content.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -24,8 +24,8 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import * as misskey from 'misskey-js';
-import XPoll from './poll.vue';
-import XMediaList from './media-list.vue';
+import XMediaList from '@/components/MkMediaList.vue';
+import XPoll from '@/components/MkPoll.vue';
 import { i18n } from '@/i18n';
 
 const props = defineProps<{
diff --git a/packages/client/src/components/tab.vue b/packages/client/src/components/MkTab.vue
similarity index 100%
rename from packages/client/src/components/tab.vue
rename to packages/client/src/components/MkTab.vue
diff --git a/packages/client/src/components/tag-cloud.vue b/packages/client/src/components/MkTagCloud.vue
similarity index 100%
rename from packages/client/src/components/tag-cloud.vue
rename to packages/client/src/components/MkTagCloud.vue
diff --git a/packages/client/src/components/timeline.vue b/packages/client/src/components/MkTimeline.vue
similarity index 93%
rename from packages/client/src/components/timeline.vue
rename to packages/client/src/components/MkTimeline.vue
index a3fa27ab7..831a194ce 100644
--- a/packages/client/src/components/timeline.vue
+++ b/packages/client/src/components/MkTimeline.vue
@@ -4,7 +4,7 @@
 
 <script lang="ts" setup>
 import { ref, computed, provide, onUnmounted } from 'vue';
-import XNotes from './notes.vue';
+import XNotes from '@/components/MkNotes.vue';
 import * as os from '@/os';
 import { stream } from '@/stream';
 import * as sound from '@/scripts/sound';
@@ -59,10 +59,10 @@ let connection2;
 if (props.src === 'antenna') {
 	endpoint = 'antennas/notes';
 	query = {
-		antennaId: props.antenna
+		antennaId: props.antenna,
 	};
 	connection = stream.useChannel('antenna', {
-		antennaId: props.antenna
+		antennaId: props.antenna,
 	});
 	connection.on('note', prepend);
 } else if (props.src === 'home') {
@@ -92,7 +92,7 @@ if (props.src === 'antenna') {
 } else if (props.src === 'directs') {
 	endpoint = 'notes/mentions';
 	query = {
-		visibility: 'specified'
+		visibility: 'specified',
 	};
 	const onNote = note => {
 		if (note.visibility === 'specified') {
@@ -104,10 +104,10 @@ if (props.src === 'antenna') {
 } else if (props.src === 'list') {
 	endpoint = 'notes/user-list-timeline';
 	query = {
-		listId: props.list
+		listId: props.list,
 	};
 	connection = stream.useChannel('userList', {
-		listId: props.list
+		listId: props.list,
 	});
 	connection.on('note', prepend);
 	connection.on('userAdded', onUserAdded);
@@ -115,10 +115,10 @@ if (props.src === 'antenna') {
 } else if (props.src === 'channel') {
 	endpoint = 'channels/timeline';
 	query = {
-		channelId: props.channel
+		channelId: props.channel,
 	};
 	connection = stream.useChannel('channel', {
-		channelId: props.channel
+		channelId: props.channel,
 	});
 	connection.on('note', prepend);
 }
diff --git a/packages/client/src/components/toast.vue b/packages/client/src/components/MkToast.vue
similarity index 100%
rename from packages/client/src/components/toast.vue
rename to packages/client/src/components/MkToast.vue
diff --git a/packages/client/src/components/token-generate-window.vue b/packages/client/src/components/MkTokenGenerateWindow.vue
similarity index 100%
rename from packages/client/src/components/token-generate-window.vue
rename to packages/client/src/components/MkTokenGenerateWindow.vue
diff --git a/packages/client/src/components/updated.vue b/packages/client/src/components/MkUpdated.vue
similarity index 95%
rename from packages/client/src/components/updated.vue
rename to packages/client/src/components/MkUpdated.vue
index 1c1e5f4ae..f3ce2731b 100644
--- a/packages/client/src/components/updated.vue
+++ b/packages/client/src/components/MkUpdated.vue
@@ -13,7 +13,7 @@
 import { ref } from 'vue';
 import MkModal from '@/components/ui/modal.vue';
 import MkButton from '@/components/ui/button.vue';
-import MkSparkle from '@/components/sparkle.vue';
+import MkSparkle from '@/components/MkSparkle.vue';
 import { version } from '@/config';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/components/url-preview.vue b/packages/client/src/components/MkUrlPreview.vue
similarity index 100%
rename from packages/client/src/components/url-preview.vue
rename to packages/client/src/components/MkUrlPreview.vue
diff --git a/packages/client/src/components/url-preview-popup.vue b/packages/client/src/components/MkUrlPreviewPopup.vue
similarity index 88%
rename from packages/client/src/components/url-preview-popup.vue
rename to packages/client/src/components/MkUrlPreviewPopup.vue
index 5f3717ab9..2f0ffaa38 100644
--- a/packages/client/src/components/url-preview-popup.vue
+++ b/packages/client/src/components/MkUrlPreviewPopup.vue
@@ -8,25 +8,25 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import MkUrlPreview from './url-preview.vue';
+import MkUrlPreview from '@/components/MkUrlPreview.vue';
 import * as os from '@/os';
 
 export default defineComponent({
 	components: {
-		MkUrlPreview
+		MkUrlPreview,
 	},
 
 	props: {
 		url: {
 			type: String,
-			required: true
+			required: true,
 		},
 		source: {
-			required: true
+			required: true,
 		},
 		showing: {
 			type: Boolean,
-			required: true
+			required: true,
 		},
 	},
 
diff --git a/packages/client/src/components/user-card-mini.vue b/packages/client/src/components/MkUserCardMini.vue
similarity index 97%
rename from packages/client/src/components/user-card-mini.vue
rename to packages/client/src/components/MkUserCardMini.vue
index 732adf7f5..1a4c49498 100644
--- a/packages/client/src/components/user-card-mini.vue
+++ b/packages/client/src/components/MkUserCardMini.vue
@@ -11,7 +11,7 @@
 
 <script lang="ts" setup>
 import * as misskey from 'misskey-js';
-import MkMiniChart from '@/components/mini-chart.vue';
+import MkMiniChart from '@/components/MkMiniChart.vue';
 import * as os from '@/os';
 import { acct } from '@/filters/user';
 
diff --git a/packages/client/src/components/user-info.vue b/packages/client/src/components/MkUserInfo.vue
similarity index 97%
rename from packages/client/src/components/user-info.vue
rename to packages/client/src/components/MkUserInfo.vue
index 1cd275a6d..4670def56 100644
--- a/packages/client/src/components/user-info.vue
+++ b/packages/client/src/components/MkUserInfo.vue
@@ -29,7 +29,7 @@
 
 <script lang="ts" setup>
 import * as misskey from 'misskey-js';
-import MkFollowButton from './follow-button.vue';
+import MkFollowButton from '@/components/MkFollowButton.vue';
 import { userPage } from '@/filters/user';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/components/user-list.vue b/packages/client/src/components/MkUserList.vue
similarity index 94%
rename from packages/client/src/components/user-list.vue
rename to packages/client/src/components/MkUserList.vue
index fe30d371f..d8e28e17d 100644
--- a/packages/client/src/components/user-list.vue
+++ b/packages/client/src/components/MkUserList.vue
@@ -17,7 +17,7 @@
 
 <script lang="ts" setup>
 import { ref } from 'vue';
-import MkUserInfo from '@/components/user-info.vue';
+import MkUserInfo from '@/components/MkUserInfo.vue';
 import MkPagination, { Paging } from '@/components/ui/pagination.vue';
 import { userPage } from '@/filters/user';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/components/user-online-indicator.vue b/packages/client/src/components/MkUserOnlineIndicator.vue
similarity index 100%
rename from packages/client/src/components/user-online-indicator.vue
rename to packages/client/src/components/MkUserOnlineIndicator.vue
diff --git a/packages/client/src/components/user-preview.vue b/packages/client/src/components/MkUserPreview.vue
similarity index 96%
rename from packages/client/src/components/user-preview.vue
rename to packages/client/src/components/MkUserPreview.vue
index 523960564..427e46ef1 100644
--- a/packages/client/src/components/user-preview.vue
+++ b/packages/client/src/components/MkUserPreview.vue
@@ -36,27 +36,27 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import * as Acct from 'misskey-js/built/acct';
-import MkFollowButton from './follow-button.vue';
+import MkFollowButton from '@/components/MkFollowButton.vue';
 import { userPage } from '@/filters/user';
 import * as os from '@/os';
 
 export default defineComponent({
 	components: {
-		MkFollowButton
+		MkFollowButton,
 	},
 
 	props: {
 		showing: {
 			type: Boolean,
-			required: true
+			required: true,
 		},
 		q: {
 			type: String,
-			required: true
+			required: true,
 		},
 		source: {
-			required: true
-		}
+			required: true,
+		},
 	},
 
 	emits: ['closed', 'mouseover', 'mouseleave'],
@@ -96,8 +96,8 @@ export default defineComponent({
 	},
 
 	methods: {
-		userPage
-	}
+		userPage,
+	},
 });
 </script>
 
diff --git a/packages/client/src/components/user-select-dialog.vue b/packages/client/src/components/MkUserSelectDialog.vue
similarity index 100%
rename from packages/client/src/components/user-select-dialog.vue
rename to packages/client/src/components/MkUserSelectDialog.vue
diff --git a/packages/client/src/components/users-tooltip.vue b/packages/client/src/components/MkUsersTooltip.vue
similarity index 100%
rename from packages/client/src/components/users-tooltip.vue
rename to packages/client/src/components/MkUsersTooltip.vue
diff --git a/packages/client/src/components/visibility.vue b/packages/client/src/components/MkVisibility.vue
similarity index 95%
rename from packages/client/src/components/visibility.vue
rename to packages/client/src/components/MkVisibility.vue
index b41c95033..739720bf9 100644
--- a/packages/client/src/components/visibility.vue
+++ b/packages/client/src/components/MkVisibility.vue
@@ -9,7 +9,7 @@
 
 <script lang="ts" setup>
 import { ref } from 'vue';
-import XDetails from '@/components/users-tooltip.vue';
+import XDetails from '@/components/MkUsersTooltip.vue';
 import * as os from '@/os';
 import { useTooltip } from '@/scripts/use-tooltip';
 
diff --git a/packages/client/src/components/visibility-picker.vue b/packages/client/src/components/MkVisibilityPicker.vue
similarity index 100%
rename from packages/client/src/components/visibility-picker.vue
rename to packages/client/src/components/MkVisibilityPicker.vue
diff --git a/packages/client/src/components/waiting-dialog.vue b/packages/client/src/components/MkWaitingDialog.vue
similarity index 100%
rename from packages/client/src/components/waiting-dialog.vue
rename to packages/client/src/components/MkWaitingDialog.vue
diff --git a/packages/client/src/components/widgets.vue b/packages/client/src/components/MkWidgets.vue
similarity index 100%
rename from packages/client/src/components/widgets.vue
rename to packages/client/src/components/MkWidgets.vue
diff --git a/packages/client/src/components/form/checkbox.vue b/packages/client/src/components/form/checkbox.vue
index fb5c82bb4..bd56c9c7e 100644
--- a/packages/client/src/components/form/checkbox.vue
+++ b/packages/client/src/components/form/checkbox.vue
@@ -23,7 +23,7 @@
 <script lang="ts" setup>
 import { toRefs, Ref } from 'vue';
 import * as os from '@/os';
-import Ripple from '@/components/ripple.vue';
+import Ripple from '@/components/MkRipple.vue';
 import { i18n } from '@/i18n';
 
 const props = defineProps<{
diff --git a/packages/client/src/components/global/a.vue b/packages/client/src/components/global/MkA.vue
similarity index 100%
rename from packages/client/src/components/global/a.vue
rename to packages/client/src/components/global/MkA.vue
diff --git a/packages/client/src/components/global/acct.vue b/packages/client/src/components/global/MkAcct.vue
similarity index 100%
rename from packages/client/src/components/global/acct.vue
rename to packages/client/src/components/global/MkAcct.vue
diff --git a/packages/client/src/components/global/ad.vue b/packages/client/src/components/global/MkAd.vue
similarity index 100%
rename from packages/client/src/components/global/ad.vue
rename to packages/client/src/components/global/MkAd.vue
diff --git a/packages/client/src/components/global/avatar.vue b/packages/client/src/components/global/MkAvatar.vue
similarity index 98%
rename from packages/client/src/components/global/avatar.vue
rename to packages/client/src/components/global/MkAvatar.vue
index 4868896c9..5f3e3c176 100644
--- a/packages/client/src/components/global/avatar.vue
+++ b/packages/client/src/components/global/MkAvatar.vue
@@ -15,7 +15,7 @@ import * as misskey from 'misskey-js';
 import { getStaticImageUrl } from '@/scripts/get-static-image-url';
 import { extractAvgColorFromBlurhash } from '@/scripts/extract-avg-color-from-blurhash';
 import { acct, userPage } from '@/filters/user';
-import MkUserOnlineIndicator from '@/components/user-online-indicator.vue';
+import MkUserOnlineIndicator from '@/components/MkUserOnlineIndicator.vue';
 import { defaultStore } from '@/store';
 
 const props = withDefaults(defineProps<{
diff --git a/packages/client/src/components/global/ellipsis.vue b/packages/client/src/components/global/MkEllipsis.vue
similarity index 100%
rename from packages/client/src/components/global/ellipsis.vue
rename to packages/client/src/components/global/MkEllipsis.vue
diff --git a/packages/client/src/components/global/emoji.vue b/packages/client/src/components/global/MkEmoji.vue
similarity index 100%
rename from packages/client/src/components/global/emoji.vue
rename to packages/client/src/components/global/MkEmoji.vue
diff --git a/packages/client/src/components/global/error.vue b/packages/client/src/components/global/MkError.vue
similarity index 100%
rename from packages/client/src/components/global/error.vue
rename to packages/client/src/components/global/MkError.vue
diff --git a/packages/client/src/components/global/loading.vue b/packages/client/src/components/global/MkLoading.vue
similarity index 100%
rename from packages/client/src/components/global/loading.vue
rename to packages/client/src/components/global/MkLoading.vue
diff --git a/packages/client/src/components/global/misskey-flavored-markdown.vue b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
similarity index 100%
rename from packages/client/src/components/global/misskey-flavored-markdown.vue
rename to packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
diff --git a/packages/client/src/components/global/page-header.vue b/packages/client/src/components/global/MkPageHeader.vue
similarity index 100%
rename from packages/client/src/components/global/page-header.vue
rename to packages/client/src/components/global/MkPageHeader.vue
diff --git a/packages/client/src/components/global/spacer.vue b/packages/client/src/components/global/MkSpacer.vue
similarity index 100%
rename from packages/client/src/components/global/spacer.vue
rename to packages/client/src/components/global/MkSpacer.vue
diff --git a/packages/client/src/components/global/sticky-container.vue b/packages/client/src/components/global/MkStickyContainer.vue
similarity index 100%
rename from packages/client/src/components/global/sticky-container.vue
rename to packages/client/src/components/global/MkStickyContainer.vue
diff --git a/packages/client/src/components/global/time.vue b/packages/client/src/components/global/MkTime.vue
similarity index 100%
rename from packages/client/src/components/global/time.vue
rename to packages/client/src/components/global/MkTime.vue
diff --git a/packages/client/src/components/global/url.vue b/packages/client/src/components/global/MkUrl.vue
similarity index 96%
rename from packages/client/src/components/global/url.vue
rename to packages/client/src/components/global/MkUrl.vue
index dc79a2064..d002727d5 100644
--- a/packages/client/src/components/global/url.vue
+++ b/packages/client/src/components/global/MkUrl.vue
@@ -44,7 +44,7 @@ export default defineComponent({
 		const el = ref();
 		
 		useTooltip(el, (showing) => {
-			os.popup(defineAsyncComponent(() => import('@/components/url-preview-popup.vue')), {
+			os.popup(defineAsyncComponent(() => import('@/components/MkUrlPreviewPopup.vue')), {
 				showing,
 				url: props.url,
 				source: el.value,
diff --git a/packages/client/src/components/global/user-name.vue b/packages/client/src/components/global/MkUserName.vue
similarity index 100%
rename from packages/client/src/components/global/user-name.vue
rename to packages/client/src/components/global/MkUserName.vue
diff --git a/packages/client/src/components/global/router-view.vue b/packages/client/src/components/global/RouterView.vue
similarity index 100%
rename from packages/client/src/components/global/router-view.vue
rename to packages/client/src/components/global/RouterView.vue
diff --git a/packages/client/src/components/index.ts b/packages/client/src/components/index.ts
index aa8a591e5..863925700 100644
--- a/packages/client/src/components/index.ts
+++ b/packages/client/src/components/index.ts
@@ -1,22 +1,22 @@
 import { App } from 'vue';
 
-import Mfm from './global/misskey-flavored-markdown.vue';
-import MkA from './global/a.vue';
-import MkAcct from './global/acct.vue';
-import MkAvatar from './global/avatar.vue';
-import MkEmoji from './global/emoji.vue';
-import MkUserName from './global/user-name.vue';
-import MkEllipsis from './global/ellipsis.vue';
-import MkTime from './global/time.vue';
-import MkUrl from './global/url.vue';
+import Mfm from './global/MkMisskeyFlavoredMarkdown.vue';
+import MkA from './global/MkA.vue';
+import MkAcct from './global/MkAcct.vue';
+import MkAvatar from './global/MkAvatar.vue';
+import MkEmoji from './global/MkEmoji.vue';
+import MkUserName from './global/MkUserName.vue';
+import MkEllipsis from './global/MkEllipsis.vue';
+import MkTime from './global/MkTime.vue';
+import MkUrl from './global/MkUrl.vue';
 import I18n from './global/i18n';
-import RouterView from './global/router-view.vue';
-import MkLoading from './global/loading.vue';
-import MkError from './global/error.vue';
-import MkAd from './global/ad.vue';
-import MkPageHeader from './global/page-header.vue';
-import MkSpacer from './global/spacer.vue';
-import MkStickyContainer from './global/sticky-container.vue';
+import RouterView from './global/RouterView.vue';
+import MkLoading from './global/MkLoading.vue';
+import MkError from './global/MkError.vue';
+import MkAd from './global/MkAd.vue';
+import MkPageHeader from './global/MkPageHeader.vue';
+import MkSpacer from './global/MkSpacer.vue';
+import MkStickyContainer from './global/MkStickyContainer.vue';
 
 export default function(app: App) {
 	app.component('I18n', I18n);
diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index 16ae45bfe..688857a49 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -1,15 +1,15 @@
 import { VNode, defineComponent, h } from 'vue';
 import * as mfm from 'mfm-js';
-import MkUrl from '@/components/global/url.vue';
-import MkLink from '@/components/link.vue';
-import MkMention from '@/components/mention.vue';
-import MkEmoji from '@/components/global/emoji.vue';
+import MkUrl from '@/components/global/MkUrl.vue';
+import MkLink from '@/components/MkLink.vue';
+import MkMention from '@/components/MkMention.vue';
+import MkEmoji from '@/components/global/MkEmoji.vue';
 import { concat } from '@/scripts/array';
-import MkFormula from '@/components/formula.vue';
-import MkCode from '@/components/code.vue';
-import MkGoogle from '@/components/google.vue';
-import MkSparkle from '@/components/sparkle.vue';
-import MkA from '@/components/global/a.vue';
+import MkFormula from '@/components/MkFormula.vue';
+import MkCode from '@/components/MkCode.vue';
+import MkGoogle from '@/components/MkGoogle.vue';
+import MkSparkle from '@/components/MkSparkle.vue';
+import MkA from '@/components/global/MkA.vue';
 import { host } from '@/config';
 import { MFM_TAGS } from '@/scripts/mfm-tags';
 
diff --git a/packages/client/src/components/page/page.image.vue b/packages/client/src/components/page/page.image.vue
index 6e38a9f42..8ba70c585 100644
--- a/packages/client/src/components/page/page.image.vue
+++ b/packages/client/src/components/page/page.image.vue
@@ -6,7 +6,7 @@
 
 <script lang="ts" setup>
 import { defineComponent, PropType } from 'vue';
-import ImgWithBlurhash from '@/components/img-with-blurhash.vue';
+import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
 import * as os from '@/os';
 import { ImageBlock } from '@/scripts/hpml/block';
 import { Hpml } from '@/scripts/hpml/evaluator';
diff --git a/packages/client/src/components/page/page.note.vue b/packages/client/src/components/page/page.note.vue
index 3bb338b09..431f0b08d 100644
--- a/packages/client/src/components/page/page.note.vue
+++ b/packages/client/src/components/page/page.note.vue
@@ -7,8 +7,8 @@
 
 <script lang="ts">
 import { defineComponent, onMounted, PropType, Ref, ref } from 'vue';
-import XNote from '@/components/note.vue';
-import XNoteDetailed from '@/components/note-detailed.vue';
+import XNote from '@/components/MkNote.vue';
+import XNoteDetailed from '@/components/MkNoteDetailed.vue';
 import * as os from '@/os';
 import { NoteBlock } from '@/scripts/hpml/block';
 
diff --git a/packages/client/src/components/page/page.text.vue b/packages/client/src/components/page/page.text.vue
index 8d2955466..b4abe8284 100644
--- a/packages/client/src/components/page/page.text.vue
+++ b/packages/client/src/components/page/page.text.vue
@@ -14,7 +14,7 @@ import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm';
 
 export default defineComponent({
 	components: {
-		MkUrlPreview: defineAsyncComponent(() => import('@/components/url-preview.vue')),
+		MkUrlPreview: defineAsyncComponent(() => import('@/components/MkUrlPreview.vue')),
 	},
 	props: {
 		block: {
diff --git a/packages/client/src/directives/ripple.ts b/packages/client/src/directives/ripple.ts
index f1d41ddb0..5329d021f 100644
--- a/packages/client/src/directives/ripple.ts
+++ b/packages/client/src/directives/ripple.ts
@@ -1,4 +1,4 @@
-import Ripple from '@/components/ripple.vue';
+import Ripple from '@/components/MkRipple.vue';
 import { popup } from '@/os';
 
 export default {
diff --git a/packages/client/src/directives/user-preview.ts b/packages/client/src/directives/user-preview.ts
index 9d18a6987..c46167662 100644
--- a/packages/client/src/directives/user-preview.ts
+++ b/packages/client/src/directives/user-preview.ts
@@ -24,7 +24,7 @@ export class UserPreview {
 
 		const showing = ref(true);
 
-		popup(defineAsyncComponent(() => import('@/components/user-preview.vue')), {
+		popup(defineAsyncComponent(() => import('@/components/MkUserPreview.vue')), {
 			showing,
 			q: this.user,
 			source: this.el
diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index a8cc38ba9..737c044e6 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -241,7 +241,7 @@ import { getAccountFromId } from '@/scripts/get-account-from-id';
 			if (lastVersion != null && compareVersions(version, lastVersion) === 1) {
 				// ログインしてる場合だけ
 				if ($i) {
-					popup(defineAsyncComponent(() => import('@/components/updated.vue')), {}, {}, 'closed');
+					popup(defineAsyncComponent(() => import('@/components/MkUpdated.vue')), {}, {}, 'closed');
 				}
 			}
 		} catch (err) {
diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts
index 00dae867d..e014eb529 100644
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@@ -5,8 +5,8 @@ import { EventEmitter } from 'eventemitter3';
 import insertTextAtCursor from 'insert-text-at-cursor';
 import * as Misskey from 'misskey-js';
 import { apiUrl, url } from '@/config';
-import MkPostFormDialog from '@/components/post-form-dialog.vue';
-import MkWaitingDialog from '@/components/waiting-dialog.vue';
+import MkPostFormDialog from '@/components/MkPostFormDialog.vue';
+import MkWaitingDialog from '@/components/MkWaitingDialog.vue';
 import { MenuItem } from '@/types/menu';
 import { $i } from '@/account';
 
@@ -187,19 +187,19 @@ export async function popup(component: Component, props: Record<string, any>, ev
 }
 
 export function pageWindow(path: string) {
-	popup(defineAsyncComponent(() => import('@/components/page-window.vue')), {
+	popup(defineAsyncComponent(() => import('@/components/MkPageWindow.vue')), {
 		initialPath: path,
 	}, {}, 'closed');
 }
 
 export function modalPageWindow(path: string) {
-	popup(defineAsyncComponent(() => import('@/components/modal-page-window.vue')), {
+	popup(defineAsyncComponent(() => import('@/components/MkModalPageWindow.vue')), {
 		initialPath: path,
 	}, {}, 'closed');
 }
 
 export function toast(message: string) {
-	popup(defineAsyncComponent(() => import('@/components/toast.vue')), {
+	popup(defineAsyncComponent(() => import('@/components/MkToast.vue')), {
 		message,
 	}, {}, 'closed');
 }
@@ -210,7 +210,7 @@ export function alert(props: {
 	text?: string | null;
 }): Promise<void> {
 	return new Promise((resolve, reject) => {
-		popup(defineAsyncComponent(() => import('@/components/dialog.vue')), props, {
+		popup(defineAsyncComponent(() => import('@/components/MkDialog.vue')), props, {
 			done: result => {
 				resolve();
 			},
@@ -224,7 +224,7 @@ export function confirm(props: {
 	text?: string | null;
 }): Promise<{ canceled: boolean }> {
 	return new Promise((resolve, reject) => {
-		popup(defineAsyncComponent(() => import('@/components/dialog.vue')), {
+		popup(defineAsyncComponent(() => import('@/components/MkDialog.vue')), {
 			...props,
 			showCancelButton: true,
 		}, {
@@ -245,7 +245,7 @@ export function inputText(props: {
 	canceled: false; result: string;
 }> {
 	return new Promise((resolve, reject) => {
-		popup(defineAsyncComponent(() => import('@/components/dialog.vue')), {
+		popup(defineAsyncComponent(() => import('@/components/MkDialog.vue')), {
 			title: props.title,
 			text: props.text,
 			input: {
@@ -270,7 +270,7 @@ export function inputNumber(props: {
 	canceled: false; result: number;
 }> {
 	return new Promise((resolve, reject) => {
-		popup(defineAsyncComponent(() => import('@/components/dialog.vue')), {
+		popup(defineAsyncComponent(() => import('@/components/MkDialog.vue')), {
 			title: props.title,
 			text: props.text,
 			input: {
@@ -295,7 +295,7 @@ export function inputDate(props: {
 	canceled: false; result: Date;
 }> {
 	return new Promise((resolve, reject) => {
-		popup(defineAsyncComponent(() => import('@/components/dialog.vue')), {
+		popup(defineAsyncComponent(() => import('@/components/MkDialog.vue')), {
 			title: props.title,
 			text: props.text,
 			input: {
@@ -332,7 +332,7 @@ export function select<C = any>(props: {
 	canceled: false; result: C;
 }> {
 	return new Promise((resolve, reject) => {
-		popup(defineAsyncComponent(() => import('@/components/dialog.vue')), {
+		popup(defineAsyncComponent(() => import('@/components/MkDialog.vue')), {
 			title: props.title,
 			text: props.text,
 			select: {
@@ -354,7 +354,7 @@ export function success() {
 		window.setTimeout(() => {
 			showing.value = false;
 		}, 1000);
-		popup(defineAsyncComponent(() => import('@/components/waiting-dialog.vue')), {
+		popup(defineAsyncComponent(() => import('@/components/MkWaitingDialog.vue')), {
 			success: true,
 			showing: showing,
 		}, {
@@ -366,7 +366,7 @@ export function success() {
 export function waiting() {
 	return new Promise((resolve, reject) => {
 		const showing = ref(true);
-		popup(defineAsyncComponent(() => import('@/components/waiting-dialog.vue')), {
+		popup(defineAsyncComponent(() => import('@/components/MkWaitingDialog.vue')), {
 			success: false,
 			showing: showing,
 		}, {
@@ -377,7 +377,7 @@ export function waiting() {
 
 export function form(title, form) {
 	return new Promise((resolve, reject) => {
-		popup(defineAsyncComponent(() => import('@/components/form-dialog.vue')), { title, form }, {
+		popup(defineAsyncComponent(() => import('@/components/MkFormDialog.vue')), { title, form }, {
 			done: result => {
 				resolve(result);
 			},
@@ -387,7 +387,7 @@ export function form(title, form) {
 
 export async function selectUser() {
 	return new Promise((resolve, reject) => {
-		popup(defineAsyncComponent(() => import('@/components/user-select-dialog.vue')), {}, {
+		popup(defineAsyncComponent(() => import('@/components/MkUserSelectDialog.vue')), {}, {
 			ok: user => {
 				resolve(user);
 			},
@@ -397,7 +397,7 @@ export async function selectUser() {
 
 export async function selectDriveFile(multiple: boolean) {
 	return new Promise((resolve, reject) => {
-		popup(defineAsyncComponent(() => import('@/components/drive-select-dialog.vue')), {
+		popup(defineAsyncComponent(() => import('@/components/MkDriveSelectDialog.vue')), {
 			type: 'file',
 			multiple,
 		}, {
@@ -412,7 +412,7 @@ export async function selectDriveFile(multiple: boolean) {
 
 export async function selectDriveFolder(multiple: boolean) {
 	return new Promise((resolve, reject) => {
-		popup(defineAsyncComponent(() => import('@/components/drive-select-dialog.vue')), {
+		popup(defineAsyncComponent(() => import('@/components/MkDriveSelectDialog.vue')), {
 			type: 'folder',
 			multiple,
 		}, {
@@ -427,7 +427,7 @@ export async function selectDriveFolder(multiple: boolean) {
 
 export async function pickEmoji(src: HTMLElement | null, opts) {
 	return new Promise((resolve, reject) => {
-		popup(defineAsyncComponent(() => import('@/components/emoji-picker-dialog.vue')), {
+		popup(defineAsyncComponent(() => import('@/components/MkEmojiPickerDialog.vue')), {
 			src,
 			...opts,
 		}, {
@@ -442,7 +442,7 @@ export async function cropImage(image: Misskey.entities.DriveFile, options: {
 	aspectRatio: number;
 }): Promise<Misskey.entities.DriveFile> {
 	return new Promise((resolve, reject) => {
-		popup(defineAsyncComponent(() => import('@/components/cropper-dialog.vue')), {
+		popup(defineAsyncComponent(() => import('@/components/MkCropperDialog.vue')), {
 			file: image,
 			aspectRatio: options.aspectRatio,
 		}, {
@@ -492,7 +492,7 @@ export async function openEmojiPicker(src?: HTMLElement, opts, initialTextarea:
 		characterData: false,
 	});
 
-	openingEmojiPicker = await popup(defineAsyncComponent(() => import('@/components/emoji-picker-window.vue')), {
+	openingEmojiPicker = await popup(defineAsyncComponent(() => import('@/components/MkEmojiPickerWindow.vue')), {
 		src,
 		...opts,
 	}, {
diff --git a/packages/client/src/pages/about-misskey.vue b/packages/client/src/pages/about-misskey.vue
index fd7b5f936..06c016116 100644
--- a/packages/client/src/pages/about-misskey.vue
+++ b/packages/client/src/pages/about-misskey.vue
@@ -68,7 +68,7 @@ import { version } from '@/config';
 import FormLink from '@/components/form/link.vue';
 import FormSection from '@/components/form/section.vue';
 import MkButton from '@/components/ui/button.vue';
-import MkLink from '@/components/link.vue';
+import MkLink from '@/components/MkLink.vue';
 import { physics } from '@/scripts/physics';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
diff --git a/packages/client/src/pages/about.emojis.vue b/packages/client/src/pages/about.emojis.vue
index 6d915c584..8049975da 100644
--- a/packages/client/src/pages/about.emojis.vue
+++ b/packages/client/src/pages/about.emojis.vue
@@ -34,7 +34,7 @@ import MkButton from '@/components/ui/button.vue';
 import MkInput from '@/components/form/input.vue';
 import MkSelect from '@/components/form/select.vue';
 import MkFolder from '@/components/ui/folder.vue';
-import MkTab from '@/components/tab.vue';
+import MkTab from '@/components/MkTab.vue';
 import * as os from '@/os';
 import { emojiCategories, emojiTags } from '@/instance';
 import XEmoji from './emojis.emoji.vue';
diff --git a/packages/client/src/pages/about.federation.vue b/packages/client/src/pages/about.federation.vue
index 8d9390872..51a49ba59 100644
--- a/packages/client/src/pages/about.federation.vue
+++ b/packages/client/src/pages/about.federation.vue
@@ -52,7 +52,7 @@ import MkButton from '@/components/ui/button.vue';
 import MkInput from '@/components/form/input.vue';
 import MkSelect from '@/components/form/select.vue';
 import MkPagination from '@/components/ui/pagination.vue';
-import MkInstanceCardMini from '@/components/instance-card-mini.vue';
+import MkInstanceCardMini from '@/components/MkInstanceCardMini.vue';
 import FormSplit from '@/components/form/split.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue
index ff50ba845..33c55fece 100644
--- a/packages/client/src/pages/about.vue
+++ b/packages/client/src/pages/about.vue
@@ -88,8 +88,8 @@ import FormLink from '@/components/form/link.vue';
 import FormSection from '@/components/form/section.vue';
 import FormSuspense from '@/components/form/suspense.vue';
 import FormSplit from '@/components/form/split.vue';
-import MkKeyValue from '@/components/key-value.vue';
-import MkInstanceStats from '@/components/instance-stats.vue';
+import MkKeyValue from '@/components/MkKeyValue.vue';
+import MkInstanceStats from '@/components/MkInstanceStats.vue';
 import * as os from '@/os';
 import number from '@/filters/number';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/admin-file.vue b/packages/client/src/pages/admin-file.vue
index f96a41a7e..dfdbb1f0d 100644
--- a/packages/client/src/pages/admin-file.vue
+++ b/packages/client/src/pages/admin-file.vue
@@ -65,11 +65,11 @@
 import { computed } from 'vue';
 import MkButton from '@/components/ui/button.vue';
 import MkSwitch from '@/components/form/switch.vue';
-import MkObjectView from '@/components/object-view.vue';
-import MkDriveFileThumbnail from '@/components/drive-file-thumbnail.vue';
-import MkKeyValue from '@/components/key-value.vue';
+import MkObjectView from '@/components/MkObjectView.vue';
+import MkDriveFileThumbnail from '@/components/MkDriveFileThumbnail.vue';
+import MkKeyValue from '@/components/MkKeyValue.vue';
 import FormSection from '@/components/form/section.vue';
-import MkUserCardMini from '@/components/user-card-mini.vue';
+import MkUserCardMini from '@/components/MkUserCardMini.vue';
 import MkInfo from '@/components/ui/info.vue';
 import bytes from '@/filters/bytes';
 import * as os from '@/os';
diff --git a/packages/client/src/pages/admin/abuses.vue b/packages/client/src/pages/admin/abuses.vue
index 9c718ab9e..25fd8bcb6 100644
--- a/packages/client/src/pages/admin/abuses.vue
+++ b/packages/client/src/pages/admin/abuses.vue
@@ -53,7 +53,7 @@ import XHeader from './_header_.vue';
 import MkInput from '@/components/form/input.vue';
 import MkSelect from '@/components/form/select.vue';
 import MkPagination from '@/components/ui/pagination.vue';
-import XAbuseReport from '@/components/abuse-report.vue';
+import XAbuseReport from '@/components/MkAbuseReport.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/client/src/pages/admin/bot-protection.vue b/packages/client/src/pages/admin/bot-protection.vue
index cf2cdea92..2c404380a 100644
--- a/packages/client/src/pages/admin/bot-protection.vue
+++ b/packages/client/src/pages/admin/bot-protection.vue
@@ -54,7 +54,7 @@ import * as os from '@/os';
 import { fetchInstance } from '@/instance';
 import { i18n } from '@/i18n';
 
-const MkCaptcha = defineAsyncComponent(() => import('@/components/captcha.vue'));
+const MkCaptcha = defineAsyncComponent(() => import('@/components/MkCaptcha.vue'));
 
 let provider = $ref(null);
 let hcaptchaSiteKey: string | null = $ref(null);
diff --git a/packages/client/src/pages/admin/database.vue b/packages/client/src/pages/admin/database.vue
index ca8718ef6..1c2656b8f 100644
--- a/packages/client/src/pages/admin/database.vue
+++ b/packages/client/src/pages/admin/database.vue
@@ -13,7 +13,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import FormSuspense from '@/components/form/suspense.vue';
-import MkKeyValue from '@/components/key-value.vue';
+import MkKeyValue from '@/components/MkKeyValue.vue';
 import * as os from '@/os';
 import bytes from '@/filters/bytes';
 import number from '@/filters/number';
diff --git a/packages/client/src/pages/admin/emojis.vue b/packages/client/src/pages/admin/emojis.vue
index 51ecd1b79..cb886ee37 100644
--- a/packages/client/src/pages/admin/emojis.vue
+++ b/packages/client/src/pages/admin/emojis.vue
@@ -73,7 +73,7 @@ import XHeader from './_header_.vue';
 import MkButton from '@/components/ui/button.vue';
 import MkInput from '@/components/form/input.vue';
 import MkPagination from '@/components/ui/pagination.vue';
-import MkTab from '@/components/tab.vue';
+import MkTab from '@/components/MkTab.vue';
 import MkSwitch from '@/components/form/switch.vue';
 import FormSplit from '@/components/form/split.vue';
 import { selectFile, selectFiles } from '@/scripts/select-file';
diff --git a/packages/client/src/pages/admin/files.vue b/packages/client/src/pages/admin/files.vue
index 2614a6b8d..f919571ce 100644
--- a/packages/client/src/pages/admin/files.vue
+++ b/packages/client/src/pages/admin/files.vue
@@ -39,7 +39,7 @@ import XHeader from './_header_.vue';
 import MkButton from '@/components/ui/button.vue';
 import MkInput from '@/components/form/input.vue';
 import MkSelect from '@/components/form/select.vue';
-import MkFileListForAdmin from '@/components/file-list-for-admin.vue';
+import MkFileListForAdmin from '@/components/MkFileListForAdmin.vue';
 import bytes from '@/filters/bytes';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/admin/overview.federation.vue b/packages/client/src/pages/admin/overview.federation.vue
index 6c99cad33..e8cb5867a 100644
--- a/packages/client/src/pages/admin/overview.federation.vue
+++ b/packages/client/src/pages/admin/overview.federation.vue
@@ -16,7 +16,7 @@
 
 <script lang="ts" setup>
 import { onMounted, onUnmounted, ref } from 'vue';
-import MkMiniChart from '@/components/mini-chart.vue';
+import MkMiniChart from '@/components/MkMiniChart.vue';
 import * as os from '@/os';
 import { useInterval } from '@/scripts/use-interval';
 
diff --git a/packages/client/src/pages/admin/overview.user.vue b/packages/client/src/pages/admin/overview.user.vue
index d70336f3c..0dd4a749b 100644
--- a/packages/client/src/pages/admin/overview.user.vue
+++ b/packages/client/src/pages/admin/overview.user.vue
@@ -11,7 +11,7 @@
 
 <script lang="ts" setup>
 import * as misskey from 'misskey-js';
-import MkMiniChart from '@/components/mini-chart.vue';
+import MkMiniChart from '@/components/MkMiniChart.vue';
 import * as os from '@/os';
 import { acct } from '@/filters/user';
 
diff --git a/packages/client/src/pages/admin/overview.vue b/packages/client/src/pages/admin/overview.vue
index c186df15a..e532a908f 100644
--- a/packages/client/src/pages/admin/overview.vue
+++ b/packages/client/src/pages/admin/overview.vue
@@ -165,8 +165,8 @@ import XFederation from './overview.federation.vue';
 import XQueueChart from './overview.queue-chart.vue';
 import XUser from './overview.user.vue';
 import XPie from './overview.pie.vue';
-import MkNumberDiff from '@/components/number-diff.vue';
-import MkTagCloud from '@/components/tag-cloud.vue';
+import MkNumberDiff from '@/components/MkNumberDiff.vue';
+import MkTagCloud from '@/components/MkTagCloud.vue';
 import { version, url } from '@/config';
 import number from '@/filters/number';
 import * as os from '@/os';
@@ -176,7 +176,7 @@ import { definePageMetadata } from '@/scripts/page-metadata';
 import 'chartjs-adapter-date-fns';
 import { defaultStore } from '@/store';
 import { useChartTooltip } from '@/scripts/use-chart-tooltip';
-import MkFileListForAdmin from '@/components/file-list-for-admin.vue';
+import MkFileListForAdmin from '@/components/MkFileListForAdmin.vue';
 
 Chart.register(
 	ArcElement,
diff --git a/packages/client/src/pages/admin/proxy-account.vue b/packages/client/src/pages/admin/proxy-account.vue
index 0951d26c2..71f35bf0f 100644
--- a/packages/client/src/pages/admin/proxy-account.vue
+++ b/packages/client/src/pages/admin/proxy-account.vue
@@ -15,7 +15,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import MkKeyValue from '@/components/key-value.vue';
+import MkKeyValue from '@/components/MkKeyValue.vue';
 import FormButton from '@/components/ui/button.vue';
 import MkInfo from '@/components/ui/info.vue';
 import FormSuspense from '@/components/form/suspense.vue';
diff --git a/packages/client/src/pages/admin/users.vue b/packages/client/src/pages/admin/users.vue
index 6bc569f24..9cdb6d8be 100644
--- a/packages/client/src/pages/admin/users.vue
+++ b/packages/client/src/pages/admin/users.vue
@@ -62,7 +62,7 @@ import * as os from '@/os';
 import { lookupUser } from '@/scripts/lookup-user';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
-import MkUserCardMini from '@/components/user-card-mini.vue';
+import MkUserCardMini from '@/components/MkUserCardMini.vue';
 
 let paginationComponent = $ref<InstanceType<typeof MkPagination>>();
 
diff --git a/packages/client/src/pages/antenna-timeline.vue b/packages/client/src/pages/antenna-timeline.vue
index 1865781a0..500cb3a7c 100644
--- a/packages/client/src/pages/antenna-timeline.vue
+++ b/packages/client/src/pages/antenna-timeline.vue
@@ -19,7 +19,7 @@
 
 <script lang="ts" setup>
 import { computed, inject, watch } from 'vue';
-import XTimeline from '@/components/timeline.vue';
+import XTimeline from '@/components/MkTimeline.vue';
 import { scroll } from '@/scripts/scroll';
 import * as os from '@/os';
 import { useRouter } from '@/router';
diff --git a/packages/client/src/pages/auth.vue b/packages/client/src/pages/auth.vue
index 9457cd6b2..bb55881a2 100644
--- a/packages/client/src/pages/auth.vue
+++ b/packages/client/src/pages/auth.vue
@@ -31,7 +31,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import XForm from './auth.form.vue';
-import MkSignin from '@/components/signin.vue';
+import MkSignin from '@/components/MkSignin.vue';
 import * as os from '@/os';
 import { login } from '@/account';
 
diff --git a/packages/client/src/pages/channel.vue b/packages/client/src/pages/channel.vue
index 4a3c97cda..04c302f4d 100644
--- a/packages/client/src/pages/channel.vue
+++ b/packages/client/src/pages/channel.vue
@@ -34,9 +34,9 @@
 <script lang="ts" setup>
 import { computed, inject, watch } from 'vue';
 import MkContainer from '@/components/ui/container.vue';
-import XPostForm from '@/components/post-form.vue';
-import XTimeline from '@/components/timeline.vue';
-import XChannelFollowButton from '@/components/channel-follow-button.vue';
+import XPostForm from '@/components/MkPostForm.vue';
+import XTimeline from '@/components/MkTimeline.vue';
+import XChannelFollowButton from '@/components/MkChannelFollowButton.vue';
 import * as os from '@/os';
 import { useRouter } from '@/router';
 import { $i } from '@/account';
diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue
index 63612bc57..fbc17b689 100644
--- a/packages/client/src/pages/channels.vue
+++ b/packages/client/src/pages/channels.vue
@@ -24,7 +24,7 @@
 
 <script lang="ts" setup>
 import { computed, defineComponent, inject } from 'vue';
-import MkChannelPreview from '@/components/channel-preview.vue';
+import MkChannelPreview from '@/components/MkChannelPreview.vue';
 import MkPagination from '@/components/ui/pagination.vue';
 import MkButton from '@/components/ui/button.vue';
 import { useRouter } from '@/router';
diff --git a/packages/client/src/pages/clip.vue b/packages/client/src/pages/clip.vue
index 608e4ba7e..5b56651bd 100644
--- a/packages/client/src/pages/clip.vue
+++ b/packages/client/src/pages/clip.vue
@@ -21,7 +21,7 @@
 <script lang="ts" setup>
 import { computed, watch, provide } from 'vue';
 import * as misskey from 'misskey-js';
-import XNotes from '@/components/notes.vue';
+import XNotes from '@/components/MkNotes.vue';
 import { $i } from '@/account';
 import { i18n } from '@/i18n';
 import * as os from '@/os';
diff --git a/packages/client/src/pages/drive.vue b/packages/client/src/pages/drive.vue
index 988a1bf3d..088f0eacd 100644
--- a/packages/client/src/pages/drive.vue
+++ b/packages/client/src/pages/drive.vue
@@ -6,7 +6,7 @@
 
 <script lang="ts" setup>
 import { computed } from 'vue';
-import XDrive from '@/components/drive.vue';
+import XDrive from '@/components/MkDrive.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/client/src/pages/explore.featured.vue b/packages/client/src/pages/explore.featured.vue
index 0f32804b7..18a371a08 100644
--- a/packages/client/src/pages/explore.featured.vue
+++ b/packages/client/src/pages/explore.featured.vue
@@ -10,8 +10,8 @@
 </template>
 
 <script lang="ts" setup>
-import XNotes from '@/components/notes.vue';
-import MkTab from '@/components/tab.vue';
+import XNotes from '@/components/MkNotes.vue';
+import MkTab from '@/components/MkTab.vue';
 import { i18n } from '@/i18n';
 
 const paginationForNotes = {
diff --git a/packages/client/src/pages/explore.users.vue b/packages/client/src/pages/explore.users.vue
index ed5ee3b79..f25015620 100644
--- a/packages/client/src/pages/explore.users.vue
+++ b/packages/client/src/pages/explore.users.vue
@@ -59,9 +59,9 @@
 
 <script lang="ts" setup>
 import { computed, watch } from 'vue';
-import XUserList from '@/components/user-list.vue';
+import XUserList from '@/components/MkUserList.vue';
 import MkFolder from '@/components/ui/folder.vue';
-import MkTab from '@/components/tab.vue';
+import MkTab from '@/components/MkTab.vue';
 import number from '@/filters/number';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index 4725278ab..1fac32c03 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -41,7 +41,7 @@ import * as os from '@/os';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { i18n } from '@/i18n';
 import { instance } from '@/instance';
-import XUserList from '@/components/user-list.vue';
+import XUserList from '@/components/MkUserList.vue';
 
 const props = defineProps<{
 	tag?: string;
diff --git a/packages/client/src/pages/favorites.vue b/packages/client/src/pages/favorites.vue
index 203dc4a51..1501484cc 100644
--- a/packages/client/src/pages/favorites.vue
+++ b/packages/client/src/pages/favorites.vue
@@ -23,8 +23,8 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import MkPagination from '@/components/ui/pagination.vue';
-import XNote from '@/components/note.vue';
-import XList from '@/components/date-separated-list.vue';
+import XNote from '@/components/MkNote.vue';
+import XList from '@/components/MkDateSeparatedList.vue';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 
diff --git a/packages/client/src/pages/gallery/index.vue b/packages/client/src/pages/gallery/index.vue
index fba8b96bd..1dfedb4a6 100644
--- a/packages/client/src/pages/gallery/index.vue
+++ b/packages/client/src/pages/gallery/index.vue
@@ -43,13 +43,13 @@
 
 <script lang="ts" setup>
 import { computed, defineComponent, watch } from 'vue';
-import XUserList from '@/components/user-list.vue';
+import XUserList from '@/components/MkUserList.vue';
 import MkFolder from '@/components/ui/folder.vue';
 import MkInput from '@/components/form/input.vue';
 import MkButton from '@/components/ui/button.vue';
-import MkTab from '@/components/tab.vue';
+import MkTab from '@/components/MkTab.vue';
 import MkPagination from '@/components/ui/pagination.vue';
-import MkGalleryPostPreview from '@/components/gallery-post-preview.vue';
+import MkGalleryPostPreview from '@/components/MkGalleryPostPreview.vue';
 import number from '@/filters/number';
 import * as os from '@/os';
 import { definePageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/client/src/pages/gallery/post.vue b/packages/client/src/pages/gallery/post.vue
index a3a11d9a6..1e7a99716 100644
--- a/packages/client/src/pages/gallery/post.vue
+++ b/packages/client/src/pages/gallery/post.vue
@@ -59,10 +59,10 @@ import { computed, defineComponent, inject, watch } from 'vue';
 import MkButton from '@/components/ui/button.vue';
 import * as os from '@/os';
 import MkContainer from '@/components/ui/container.vue';
-import ImgWithBlurhash from '@/components/img-with-blurhash.vue';
+import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
 import MkPagination from '@/components/ui/pagination.vue';
-import MkGalleryPostPreview from '@/components/gallery-post-preview.vue';
-import MkFollowButton from '@/components/follow-button.vue';
+import MkGalleryPostPreview from '@/components/MkGalleryPostPreview.vue';
+import MkFollowButton from '@/components/MkFollowButton.vue';
 import { url } from '@/config';
 import { useRouter } from '@/router';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue
index eaa9b2b31..a4d462f82 100644
--- a/packages/client/src/pages/instance-info.vue
+++ b/packages/client/src/pages/instance-info.vue
@@ -117,13 +117,13 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import * as misskey from 'misskey-js';
-import MkChart from '@/components/chart.vue';
-import MkObjectView from '@/components/object-view.vue';
+import MkChart from '@/components/MkChart.vue';
+import MkObjectView from '@/components/MkObjectView.vue';
 import FormLink from '@/components/form/link.vue';
-import MkLink from '@/components/link.vue';
+import MkLink from '@/components/MkLink.vue';
 import MkButton from '@/components/ui/button.vue';
 import FormSection from '@/components/form/section.vue';
-import MkKeyValue from '@/components/key-value.vue';
+import MkKeyValue from '@/components/MkKeyValue.vue';
 import MkSelect from '@/components/form/select.vue';
 import FormSwitch from '@/components/form/switch.vue';
 import * as os from '@/os';
@@ -132,7 +132,7 @@ import bytes from '@/filters/bytes';
 import { iAmModerator } from '@/account';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { i18n } from '@/i18n';
-import MkUserCardMini from '@/components/user-card-mini.vue';
+import MkUserCardMini from '@/components/MkUserCardMini.vue';
 import MkPagination from '@/components/ui/pagination.vue';
 
 const props = defineProps<{
diff --git a/packages/client/src/pages/messaging/messaging-room.message.vue b/packages/client/src/pages/messaging/messaging-room.message.vue
index 393d2a17b..2b5a9569a 100644
--- a/packages/client/src/pages/messaging/messaging-room.message.vue
+++ b/packages/client/src/pages/messaging/messaging-room.message.vue
@@ -40,7 +40,7 @@ import { } from 'vue';
 import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
 import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm';
-import MkUrlPreview from '@/components/url-preview.vue';
+import MkUrlPreview from '@/components/MkUrlPreview.vue';
 import * as os from '@/os';
 import { $i } from '@/account';
 
diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
index fe1590b24..b91cba7ec 100644
--- a/packages/client/src/pages/messaging/messaging-room.vue
+++ b/packages/client/src/pages/messaging/messaging-room.vue
@@ -55,7 +55,7 @@ import * as Misskey from 'misskey-js';
 import * as Acct from 'misskey-js/built/acct';
 import XMessage from './messaging-room.message.vue';
 import XForm from './messaging-room.form.vue';
-import XList from '@/components/date-separated-list.vue';
+import XList from '@/components/MkDateSeparatedList.vue';
 import MkPagination, { Paging } from '@/components/ui/pagination.vue';
 import { isBottomVisible, onScrollBottom, scrollToBottom } from '@/scripts/scroll';
 import * as os from '@/os';
diff --git a/packages/client/src/pages/miauth.vue b/packages/client/src/pages/miauth.vue
index cbdf6b283..5a890c7b3 100644
--- a/packages/client/src/pages/miauth.vue
+++ b/packages/client/src/pages/miauth.vue
@@ -40,7 +40,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import MkSignin from '@/components/signin.vue';
+import MkSignin from '@/components/MkSignin.vue';
 import MkButton from '@/components/ui/button.vue';
 import * as os from '@/os';
 import { $i, login } from '@/account';
diff --git a/packages/client/src/pages/my-lists/index.vue b/packages/client/src/pages/my-lists/index.vue
index 144cba684..7dc5b3e90 100644
--- a/packages/client/src/pages/my-lists/index.vue
+++ b/packages/client/src/pages/my-lists/index.vue
@@ -20,7 +20,7 @@
 import { } from 'vue';
 import MkPagination from '@/components/ui/pagination.vue';
 import MkButton from '@/components/ui/button.vue';
-import MkAvatars from '@/components/avatars.vue';
+import MkAvatars from '@/components/MkAvatars.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue
index 240a0d4eb..ba05a7b88 100644
--- a/packages/client/src/pages/note.vue
+++ b/packages/client/src/pages/note.vue
@@ -43,10 +43,10 @@
 <script lang="ts" setup>
 import { computed, defineComponent, watch } from 'vue';
 import * as misskey from 'misskey-js';
-import XNote from '@/components/note.vue';
-import XNoteDetailed from '@/components/note-detailed.vue';
-import XNotes from '@/components/notes.vue';
-import MkRemoteCaution from '@/components/remote-caution.vue';
+import XNote from '@/components/MkNote.vue';
+import XNoteDetailed from '@/components/MkNoteDetailed.vue';
+import XNotes from '@/components/MkNotes.vue';
+import MkRemoteCaution from '@/components/MkRemoteCaution.vue';
 import MkButton from '@/components/ui/button.vue';
 import * as os from '@/os';
 import { definePageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index acf338c2c..dd57060fd 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -18,8 +18,8 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import { notificationTypes } from 'misskey-js';
-import XNotifications from '@/components/notifications.vue';
-import XNotes from '@/components/notes.vue';
+import XNotifications from '@/components/MkNotifications.vue';
+import XNotes from '@/components/MkNotes.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.image.vue b/packages/client/src/pages/page-editor/els/page-editor.el.image.vue
index b22bf1cb3..4d471e7b9 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.image.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.image.vue
@@ -18,7 +18,7 @@
 /* eslint-disable vue/no-mutating-props */
 import { onMounted } from 'vue';
 import XContainer from '../page-editor.container.vue';
-import MkDriveFileThumbnail from '@/components/drive-file-thumbnail.vue';
+import MkDriveFileThumbnail from '@/components/MkDriveFileThumbnail.vue';
 import * as os from '@/os';
 
 const props = withDefaults(defineProps<{
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.note.vue b/packages/client/src/pages/page-editor/els/page-editor.el.note.vue
index 27f9f961f..5e494ee23 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.note.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.note.vue
@@ -22,8 +22,8 @@ import { watch } from 'vue';
 import XContainer from '../page-editor.container.vue';
 import MkInput from '@/components/form/input.vue';
 import MkSwitch from '@/components/form/switch.vue';
-import XNote from '@/components/note.vue';
-import XNoteDetailed from '@/components/note-detailed.vue';
+import XNote from '@/components/MkNote.vue';
+import XNoteDetailed from '@/components/MkNoteDetailed.vue';
 import * as os from '@/os';
 
 const props = withDefaults(defineProps<{
diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue
index 02fd61f58..48d62a954 100644
--- a/packages/client/src/pages/page.vue
+++ b/packages/client/src/pages/page.vue
@@ -68,10 +68,10 @@ import XPage from '@/components/page/page.vue';
 import MkButton from '@/components/ui/button.vue';
 import * as os from '@/os';
 import { url } from '@/config';
-import MkFollowButton from '@/components/follow-button.vue';
+import MkFollowButton from '@/components/MkFollowButton.vue';
 import MkContainer from '@/components/ui/container.vue';
 import MkPagination from '@/components/ui/pagination.vue';
-import MkPagePreview from '@/components/page-preview.vue';
+import MkPagePreview from '@/components/MkPagePreview.vue';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 
diff --git a/packages/client/src/pages/pages.vue b/packages/client/src/pages/pages.vue
index 62c675e41..6e71d9c83 100644
--- a/packages/client/src/pages/pages.vue
+++ b/packages/client/src/pages/pages.vue
@@ -26,7 +26,7 @@
 
 <script lang="ts" setup>
 import { computed, inject } from 'vue';
-import MkPagePreview from '@/components/page-preview.vue';
+import MkPagePreview from '@/components/MkPagePreview.vue';
 import MkPagination from '@/components/ui/pagination.vue';
 import MkButton from '@/components/ui/button.vue';
 import { useRouter } from '@/router';
diff --git a/packages/client/src/pages/preview.vue b/packages/client/src/pages/preview.vue
index 8f211081d..efbe53a52 100644
--- a/packages/client/src/pages/preview.vue
+++ b/packages/client/src/pages/preview.vue
@@ -6,7 +6,7 @@
 
 <script lang="ts" setup>
 import { computed } from 'vue';
-import MkSample from '@/components/sample.vue';
+import MkSample from '@/components/MkSample.vue';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 
diff --git a/packages/client/src/pages/registry.keys.vue b/packages/client/src/pages/registry.keys.vue
index ae500386d..372b5faa4 100644
--- a/packages/client/src/pages/registry.keys.vue
+++ b/packages/client/src/pages/registry.keys.vue
@@ -34,7 +34,7 @@ import { definePageMetadata } from '@/scripts/page-metadata';
 import FormLink from '@/components/form/link.vue';
 import FormSection from '@/components/form/section.vue';
 import MkButton from '@/components/ui/button.vue';
-import MkKeyValue from '@/components/key-value.vue';
+import MkKeyValue from '@/components/MkKeyValue.vue';
 import FormSplit from '@/components/form/split.vue';
 
 const props = defineProps<{
diff --git a/packages/client/src/pages/registry.value.vue b/packages/client/src/pages/registry.value.vue
index 562f9df88..9fac7f990 100644
--- a/packages/client/src/pages/registry.value.vue
+++ b/packages/client/src/pages/registry.value.vue
@@ -46,7 +46,7 @@ import { definePageMetadata } from '@/scripts/page-metadata';
 import FormLink from '@/components/form/link.vue';
 import FormSection from '@/components/form/section.vue';
 import MkButton from '@/components/ui/button.vue';
-import MkKeyValue from '@/components/key-value.vue';
+import MkKeyValue from '@/components/MkKeyValue.vue';
 import FormTextarea from '@/components/form/textarea.vue';
 import FormSplit from '@/components/form/split.vue';
 import FormInfo from '@/components/ui/info.vue';
diff --git a/packages/client/src/pages/reset-password.vue b/packages/client/src/pages/reset-password.vue
index 10c41f2d2..4c4cdb810 100644
--- a/packages/client/src/pages/reset-password.vue
+++ b/packages/client/src/pages/reset-password.vue
@@ -39,7 +39,7 @@ async function save() {
 
 onMounted(() => {
 	if (props.token == null) {
-		os.popup(defineAsyncComponent(() => import('@/components/forgot-password.vue')), {}, {}, 'closed');
+		os.popup(defineAsyncComponent(() => import('@/components/MkForgotPassword.vue')), {}, {}, 'closed');
 		mainRouter.push('/');
 	}
 });
diff --git a/packages/client/src/pages/search.vue b/packages/client/src/pages/search.vue
index 404b9e3db..fdcbb57e4 100644
--- a/packages/client/src/pages/search.vue
+++ b/packages/client/src/pages/search.vue
@@ -9,7 +9,7 @@
 
 <script lang="ts" setup>
 import { computed } from 'vue';
-import XNotes from '@/components/notes.vue';
+import XNotes from '@/components/MkNotes.vue';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 
diff --git a/packages/client/src/pages/settings/account-info.vue b/packages/client/src/pages/settings/account-info.vue
index 65b623369..93e65d55b 100644
--- a/packages/client/src/pages/settings/account-info.vue
+++ b/packages/client/src/pages/settings/account-info.vue
@@ -129,7 +129,7 @@
 <script lang="ts" setup>
 import { onMounted, ref } from 'vue';
 import FormSection from '@/components/form/section.vue';
-import MkKeyValue from '@/components/key-value.vue';
+import MkKeyValue from '@/components/MkKeyValue.vue';
 import * as os from '@/os';
 import number from '@/filters/number';
 import bytes from '@/filters/bytes';
diff --git a/packages/client/src/pages/settings/accounts.vue b/packages/client/src/pages/settings/accounts.vue
index d1e71c454..33a0fcc32 100644
--- a/packages/client/src/pages/settings/accounts.vue
+++ b/packages/client/src/pages/settings/accounts.vue
@@ -75,7 +75,7 @@ function removeAccount(account) {
 }
 
 function addExistingAccount() {
-	os.popup(defineAsyncComponent(() => import('@/components/signin-dialog.vue')), {}, {
+	os.popup(defineAsyncComponent(() => import('@/components/MkSigninDialog.vue')), {}, {
 		done: res => {
 			addAccounts(res.id, res.i);
 			os.success();
@@ -84,7 +84,7 @@ function addExistingAccount() {
 }
 
 function createAccount() {
-	os.popup(defineAsyncComponent(() => import('@/components/signup-dialog.vue')), {}, {
+	os.popup(defineAsyncComponent(() => import('@/components/MkSignupDialog.vue')), {}, {
 		done: res => {
 			addAccounts(res.id, res.i);
 			switchAccountWithToken(res.i);
diff --git a/packages/client/src/pages/settings/api.vue b/packages/client/src/pages/settings/api.vue
index b8a2dedb5..b0a787fc4 100644
--- a/packages/client/src/pages/settings/api.vue
+++ b/packages/client/src/pages/settings/api.vue
@@ -17,7 +17,7 @@ import { definePageMetadata } from '@/scripts/page-metadata';
 const isDesktop = ref(window.innerWidth >= 1100);
 
 function generateToken() {
-	os.popup(defineAsyncComponent(() => import('@/components/token-generate-window.vue')), {}, {
+	os.popup(defineAsyncComponent(() => import('@/components/MkTokenGenerateWindow.vue')), {}, {
 		done: async result => {
 			const { name, permissions } = result;
 			const { token } = await os.api('miauth/gen-token', {
diff --git a/packages/client/src/pages/settings/drive.vue b/packages/client/src/pages/settings/drive.vue
index c8c78f292..a10e2d9f7 100644
--- a/packages/client/src/pages/settings/drive.vue
+++ b/packages/client/src/pages/settings/drive.vue
@@ -49,12 +49,12 @@ import tinycolor from 'tinycolor2';
 import FormLink from '@/components/form/link.vue';
 import FormSwitch from '@/components/form/switch.vue';
 import FormSection from '@/components/form/section.vue';
-import MkKeyValue from '@/components/key-value.vue';
+import MkKeyValue from '@/components/MkKeyValue.vue';
 import FormSplit from '@/components/form/split.vue';
 import * as os from '@/os';
 import bytes from '@/filters/bytes';
 import { defaultStore } from '@/store';
-import MkChart from '@/components/chart.vue';
+import MkChart from '@/components/MkChart.vue';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { $i } from '@/account';
diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue
index cd2bcc581..2710a41ec 100644
--- a/packages/client/src/pages/settings/general.vue
+++ b/packages/client/src/pages/settings/general.vue
@@ -100,7 +100,7 @@ import FormRadios from '@/components/form/radios.vue';
 import FormRange from '@/components/form/range.vue';
 import FormSection from '@/components/form/section.vue';
 import FormLink from '@/components/form/link.vue';
-import MkLink from '@/components/link.vue';
+import MkLink from '@/components/MkLink.vue';
 import { langs } from '@/config';
 import { defaultStore } from '@/store';
 import * as os from '@/os';
diff --git a/packages/client/src/pages/settings/mute-block.vue b/packages/client/src/pages/settings/mute-block.vue
index 495d52d4d..28c215a04 100644
--- a/packages/client/src/pages/settings/mute-block.vue
+++ b/packages/client/src/pages/settings/mute-block.vue
@@ -30,7 +30,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import MkPagination from '@/components/ui/pagination.vue';
-import MkTab from '@/components/tab.vue';
+import MkTab from '@/components/MkTab.vue';
 import FormInfo from '@/components/ui/info.vue';
 import FormLink from '@/components/form/link.vue';
 import { userPage } from '@/filters/user';
diff --git a/packages/client/src/pages/settings/notifications.vue b/packages/client/src/pages/settings/notifications.vue
index d2a363965..47c51e600 100644
--- a/packages/client/src/pages/settings/notifications.vue
+++ b/packages/client/src/pages/settings/notifications.vue
@@ -34,7 +34,7 @@ async function readAllNotifications() {
 
 function configure() {
 	const includingTypes = notificationTypes.filter(x => !$i!.mutingNotificationTypes.includes(x));
-	os.popup(defineAsyncComponent(() => import('@/components/notification-setting-window.vue')), {
+	os.popup(defineAsyncComponent(() => import('@/components/MkNotificationSettingWindow.vue')), {
 		includingTypes,
 		showGlobalToggle: false,
 	}, {
diff --git a/packages/client/src/pages/settings/plugin.install.vue b/packages/client/src/pages/settings/plugin.install.vue
index a4cab4b7a..4940f3b5f 100644
--- a/packages/client/src/pages/settings/plugin.install.vue
+++ b/packages/client/src/pages/settings/plugin.install.vue
@@ -79,7 +79,7 @@ async function install() {
 	}
 
 	const token = permissions == null || permissions.length === 0 ? null : await new Promise((res, rej) => {
-		os.popup(defineAsyncComponent(() => import('@/components/token-generate-window.vue')), {
+		os.popup(defineAsyncComponent(() => import('@/components/MkTokenGenerateWindow.vue')), {
 			title: i18n.ts.tokenRequested,
 			information: i18n.ts.pluginTokenRequestedDescription,
 			initialName: name,
diff --git a/packages/client/src/pages/settings/plugin.vue b/packages/client/src/pages/settings/plugin.vue
index 8e773b799..b557bd538 100644
--- a/packages/client/src/pages/settings/plugin.vue
+++ b/packages/client/src/pages/settings/plugin.vue
@@ -37,7 +37,7 @@ import FormLink from '@/components/form/link.vue';
 import FormSwitch from '@/components/form/switch.vue';
 import FormSection from '@/components/form/section.vue';
 import MkButton from '@/components/ui/button.vue';
-import MkKeyValue from '@/components/key-value.vue';
+import MkKeyValue from '@/components/MkKeyValue.vue';
 import * as os from '@/os';
 import { ColdDeviceStorage } from '@/store';
 import { unisonReload } from '@/scripts/unison-reload';
diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue
index 170124eac..eae95c1e9 100644
--- a/packages/client/src/pages/settings/reaction.vue
+++ b/packages/client/src/pages/settings/reaction.vue
@@ -88,7 +88,7 @@ function remove(reaction, ev: MouseEvent) {
 }
 
 function preview(ev: MouseEvent) {
-	os.popup(defineAsyncComponent(() => import('@/components/emoji-picker-dialog.vue')), {
+	os.popup(defineAsyncComponent(() => import('@/components/MkEmojiPickerDialog.vue')), {
 		asReactionPicker: true,
 		src: ev.currentTarget ?? ev.target,
 	}, {}, 'closed');
diff --git a/packages/client/src/pages/settings/word-mute.vue b/packages/client/src/pages/settings/word-mute.vue
index 5fee7cd35..daa2a4804 100644
--- a/packages/client/src/pages/settings/word-mute.vue
+++ b/packages/client/src/pages/settings/word-mute.vue
@@ -31,10 +31,10 @@
 <script lang="ts" setup>
 import { ref, watch } from 'vue';
 import FormTextarea from '@/components/form/textarea.vue';
-import MkKeyValue from '@/components/key-value.vue';
+import MkKeyValue from '@/components/MkKeyValue.vue';
 import MkButton from '@/components/ui/button.vue';
 import MkInfo from '@/components/ui/info.vue';
-import MkTab from '@/components/tab.vue';
+import MkTab from '@/components/MkTab.vue';
 import * as os from '@/os';
 import number from '@/filters/number';
 import { defaultStore } from '@/store';
diff --git a/packages/client/src/pages/share.vue b/packages/client/src/pages/share.vue
index f4b6f66fa..d41a701a7 100644
--- a/packages/client/src/pages/share.vue
+++ b/packages/client/src/pages/share.vue
@@ -29,7 +29,7 @@ import { noteVisibilities } from 'misskey-js';
 import * as Acct from 'misskey-js/built/acct';
 import * as Misskey from 'misskey-js';
 import MkButton from '@/components/ui/button.vue';
-import XPostForm from '@/components/post-form.vue';
+import XPostForm from '@/components/MkPostForm.vue';
 import * as os from '@/os';
 import { mainRouter } from '@/router';
 import { definePageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/client/src/pages/tag.vue b/packages/client/src/pages/tag.vue
index 950d26a72..5498c2999 100644
--- a/packages/client/src/pages/tag.vue
+++ b/packages/client/src/pages/tag.vue
@@ -9,7 +9,7 @@
 
 <script lang="ts" setup>
 import { computed } from 'vue';
-import XNotes from '@/components/notes.vue';
+import XNotes from '@/components/MkNotes.vue';
 import { definePageMetadata } from '@/scripts/page-metadata';
 
 const props = defineProps<{
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 1c62964a5..9d4299702 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -23,8 +23,8 @@
 
 <script lang="ts" setup>
 import { defineAsyncComponent, computed, watch } from 'vue';
-import XTimeline from '@/components/timeline.vue';
-import XPostForm from '@/components/post-form.vue';
+import XTimeline from '@/components/MkTimeline.vue';
+import XPostForm from '@/components/MkPostForm.vue';
 import { scroll } from '@/scripts/scroll';
 import * as os from '@/os';
 import { defaultStore } from '@/store';
diff --git a/packages/client/src/pages/user-info.vue b/packages/client/src/pages/user-info.vue
index 9154c7348..316a3975c 100644
--- a/packages/client/src/pages/user-info.vue
+++ b/packages/client/src/pages/user-info.vue
@@ -154,8 +154,8 @@
 <script lang="ts" setup>
 import { computed, watch } from 'vue';
 import * as misskey from 'misskey-js';
-import MkChart from '@/components/chart.vue';
-import MkObjectView from '@/components/object-view.vue';
+import MkChart from '@/components/MkChart.vue';
+import MkObjectView from '@/components/MkObjectView.vue';
 import FormTextarea from '@/components/form/textarea.vue';
 import FormSwitch from '@/components/form/switch.vue';
 import FormLink from '@/components/form/link.vue';
@@ -164,10 +164,10 @@ import FormButton from '@/components/ui/button.vue';
 import FormInput from '@/components/form/input.vue';
 import FormSplit from '@/components/form/split.vue';
 import FormFolder from '@/components/form/folder.vue';
-import MkKeyValue from '@/components/key-value.vue';
+import MkKeyValue from '@/components/MkKeyValue.vue';
 import MkSelect from '@/components/form/select.vue';
 import FormSuspense from '@/components/form/suspense.vue';
-import MkFileListForAdmin from '@/components/file-list-for-admin.vue';
+import MkFileListForAdmin from '@/components/MkFileListForAdmin.vue';
 import MkInfo from '@/components/ui/info.vue';
 import * as os from '@/os';
 import number from '@/filters/number';
diff --git a/packages/client/src/pages/user-list-timeline.vue b/packages/client/src/pages/user-list-timeline.vue
index c1f4569a0..4a534e47b 100644
--- a/packages/client/src/pages/user-list-timeline.vue
+++ b/packages/client/src/pages/user-list-timeline.vue
@@ -19,7 +19,7 @@
 
 <script lang="ts" setup>
 import { computed, watch, inject } from 'vue';
-import XTimeline from '@/components/timeline.vue';
+import XTimeline from '@/components/MkTimeline.vue';
 import { scroll } from '@/scripts/scroll';
 import * as os from '@/os';
 import { useRouter } from '@/router';
diff --git a/packages/client/src/pages/user/follow-list.vue b/packages/client/src/pages/user/follow-list.vue
index e84b7ff57..6ee395f28 100644
--- a/packages/client/src/pages/user/follow-list.vue
+++ b/packages/client/src/pages/user/follow-list.vue
@@ -11,7 +11,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import * as misskey from 'misskey-js';
-import MkUserInfo from '@/components/user-info.vue';
+import MkUserInfo from '@/components/MkUserInfo.vue';
 import MkPagination from '@/components/ui/pagination.vue';
 
 const props = defineProps<{
diff --git a/packages/client/src/pages/user/gallery.vue b/packages/client/src/pages/user/gallery.vue
index 6af28d455..786268497 100644
--- a/packages/client/src/pages/user/gallery.vue
+++ b/packages/client/src/pages/user/gallery.vue
@@ -11,7 +11,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import * as misskey from 'misskey-js';
-import MkGalleryPostPreview from '@/components/gallery-post-preview.vue';
+import MkGalleryPostPreview from '@/components/MkGalleryPostPreview.vue';
 import MkPagination from '@/components/ui/pagination.vue';
 
 const props = withDefaults(defineProps<{
diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index fa72a995b..7ab363efe 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -112,12 +112,12 @@ import { defineAsyncComponent, computed, inject, onMounted, onUnmounted, watch }
 import calcAge from 's-age';
 import * as misskey from 'misskey-js';
 import XUserTimeline from './index.timeline.vue';
-import XNote from '@/components/note.vue';
-import MkFollowButton from '@/components/follow-button.vue';
+import XNote from '@/components/MkNote.vue';
+import MkFollowButton from '@/components/MkFollowButton.vue';
 import MkContainer from '@/components/ui/container.vue';
 import MkFolder from '@/components/ui/folder.vue';
-import MkRemoteCaution from '@/components/remote-caution.vue';
-import MkTab from '@/components/tab.vue';
+import MkRemoteCaution from '@/components/MkRemoteCaution.vue';
+import MkTab from '@/components/MkTab.vue';
 import MkInfo from '@/components/ui/info.vue';
 import { getScrollPosition } from '@/scripts/scroll';
 import { getUserMenu } from '@/scripts/get-user-menu';
diff --git a/packages/client/src/pages/user/index.activity.vue b/packages/client/src/pages/user/index.activity.vue
index 8a7a86e0f..30e5a56f3 100644
--- a/packages/client/src/pages/user/index.activity.vue
+++ b/packages/client/src/pages/user/index.activity.vue
@@ -17,7 +17,7 @@
 import { } from 'vue';
 import * as misskey from 'misskey-js';
 import MkContainer from '@/components/ui/container.vue';
-import MkChart from '@/components/chart.vue';
+import MkChart from '@/components/MkChart.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/pages/user/index.photos.vue b/packages/client/src/pages/user/index.photos.vue
index 79dd1726e..2a58b49f6 100644
--- a/packages/client/src/pages/user/index.photos.vue
+++ b/packages/client/src/pages/user/index.photos.vue
@@ -23,7 +23,7 @@ import { getStaticImageUrl } from '@/scripts/get-static-image-url';
 import { notePage } from '@/filters/note';
 import * as os from '@/os';
 import MkContainer from '@/components/ui/container.vue';
-import ImgWithBlurhash from '@/components/img-with-blurhash.vue';
+import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
 
 export default defineComponent({
 	components: {
diff --git a/packages/client/src/pages/user/index.timeline.vue b/packages/client/src/pages/user/index.timeline.vue
index 0345978b8..41983a5ae 100644
--- a/packages/client/src/pages/user/index.timeline.vue
+++ b/packages/client/src/pages/user/index.timeline.vue
@@ -14,8 +14,8 @@
 <script lang="ts" setup>
 import { ref, computed } from 'vue';
 import * as misskey from 'misskey-js';
-import XNotes from '@/components/notes.vue';
-import MkTab from '@/components/tab.vue';
+import XNotes from '@/components/MkNotes.vue';
+import MkTab from '@/components/MkTab.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/pages/user/pages.vue b/packages/client/src/pages/user/pages.vue
index ad101158e..69bf926eb 100644
--- a/packages/client/src/pages/user/pages.vue
+++ b/packages/client/src/pages/user/pages.vue
@@ -9,7 +9,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import * as misskey from 'misskey-js';
-import MkPagePreview from '@/components/page-preview.vue';
+import MkPagePreview from '@/components/MkPagePreview.vue';
 import MkPagination from '@/components/ui/pagination.vue';
 
 const props = defineProps<{
diff --git a/packages/client/src/pages/user/reactions.vue b/packages/client/src/pages/user/reactions.vue
index d2c1f92eb..f1e8f61b0 100644
--- a/packages/client/src/pages/user/reactions.vue
+++ b/packages/client/src/pages/user/reactions.vue
@@ -17,8 +17,8 @@
 import { computed } from 'vue';
 import * as misskey from 'misskey-js';
 import MkPagination from '@/components/ui/pagination.vue';
-import MkNote from '@/components/note.vue';
-import MkReactionIcon from '@/components/reaction-icon.vue';
+import MkNote from '@/components/MkNote.vue';
+import MkReactionIcon from '@/components/MkReactionIcon.vue';
 
 const props = defineProps<{
 	user: misskey.entities.User;
diff --git a/packages/client/src/pages/welcome.entrance.a.vue b/packages/client/src/pages/welcome.entrance.a.vue
index 240177c9d..6452280f5 100644
--- a/packages/client/src/pages/welcome.entrance.a.vue
+++ b/packages/client/src/pages/welcome.entrance.a.vue
@@ -49,12 +49,12 @@
 import { } from 'vue';
 import { toUnicode } from 'punycode/';
 import XTimeline from './welcome.timeline.vue';
-import MarqueeText from '@/components/marquee.vue';
-import XSigninDialog from '@/components/signin-dialog.vue';
-import XSignupDialog from '@/components/signup-dialog.vue';
+import MarqueeText from '@/components/MkMarquee.vue';
+import XSigninDialog from '@/components/MkSigninDialog.vue';
+import XSignupDialog from '@/components/MkSignupDialog.vue';
 import MkButton from '@/components/ui/button.vue';
-import XNote from '@/components/note.vue';
-import MkFeaturedPhotos from '@/components/featured-photos.vue';
+import XNote from '@/components/MkNote.vue';
+import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue';
 import { host, instanceName } from '@/config';
 import * as os from '@/os';
 import number from '@/filters/number';
diff --git a/packages/client/src/pages/welcome.entrance.b.vue b/packages/client/src/pages/welcome.entrance.b.vue
index 344dc9aed..46cf8c228 100644
--- a/packages/client/src/pages/welcome.entrance.b.vue
+++ b/packages/client/src/pages/welcome.entrance.b.vue
@@ -38,11 +38,11 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { toUnicode } from 'punycode/';
-import XSigninDialog from '@/components/signin-dialog.vue';
-import XSignupDialog from '@/components/signup-dialog.vue';
+import XSigninDialog from '@/components/MkSigninDialog.vue';
+import XSignupDialog from '@/components/MkSignupDialog.vue';
 import MkButton from '@/components/ui/button.vue';
-import XNote from '@/components/note.vue';
-import MkFeaturedPhotos from '@/components/featured-photos.vue';
+import XNote from '@/components/MkNote.vue';
+import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue';
 import XTimeline from './welcome.timeline.vue';
 import { host, instanceName } from '@/config';
 import * as os from '@/os';
diff --git a/packages/client/src/pages/welcome.entrance.c.vue b/packages/client/src/pages/welcome.entrance.c.vue
index d583c5df3..6422d2923 100644
--- a/packages/client/src/pages/welcome.entrance.c.vue
+++ b/packages/client/src/pages/welcome.entrance.c.vue
@@ -58,11 +58,11 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { toUnicode } from 'punycode/';
-import XSigninDialog from '@/components/signin-dialog.vue';
-import XSignupDialog from '@/components/signup-dialog.vue';
+import XSigninDialog from '@/components/MkSigninDialog.vue';
+import XSignupDialog from '@/components/MkSignupDialog.vue';
 import MkButton from '@/components/ui/button.vue';
-import XNote from '@/components/note.vue';
-import MkFeaturedPhotos from '@/components/featured-photos.vue';
+import XNote from '@/components/MkNote.vue';
+import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue';
 import XTimeline from './welcome.timeline.vue';
 import { host, instanceName } from '@/config';
 import * as os from '@/os';
diff --git a/packages/client/src/pages/welcome.timeline.vue b/packages/client/src/pages/welcome.timeline.vue
index bec9481ff..e19ebac3e 100644
--- a/packages/client/src/pages/welcome.timeline.vue
+++ b/packages/client/src/pages/welcome.timeline.vue
@@ -23,9 +23,9 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import XReactionsViewer from '@/components/reactions-viewer.vue';
-import XMediaList from '@/components/media-list.vue';
-import XPoll from '@/components/poll.vue';
+import XReactionsViewer from '@/components/MkReactionsViewer.vue';
+import XMediaList from '@/components/MkMediaList.vue';
+import XPoll from '@/components/MkPoll.vue';
 import * as os from '@/os';
 
 export default defineComponent({
diff --git a/packages/client/src/scripts/autocomplete.ts b/packages/client/src/scripts/autocomplete.ts
index 3ef622417..206724de9 100644
--- a/packages/client/src/scripts/autocomplete.ts
+++ b/packages/client/src/scripts/autocomplete.ts
@@ -157,7 +157,7 @@ export class Autocomplete {
 			const _y = ref(y);
 			const _q = ref(q);
 
-			const { dispose } = await popup(defineAsyncComponent(() => import('@/components/autocomplete.vue')), {
+			const { dispose } = await popup(defineAsyncComponent(() => import('@/components/MkAutocomplete.vue')), {
 				textarea: this.textarea,
 				close: this.close,
 				type: type,
diff --git a/packages/client/src/scripts/get-note-menu.ts b/packages/client/src/scripts/get-note-menu.ts
index 632143f51..a5cf98206 100644
--- a/packages/client/src/scripts/get-note-menu.ts
+++ b/packages/client/src/scripts/get-note-menu.ts
@@ -289,7 +289,7 @@ export function getNoteMenu(props: {
 					text: i18n.ts.reportAbuse,
 					action: () => {
 						const u = appearNote.url || appearNote.uri || `${url}/notes/${appearNote.id}`;
-						os.popup(defineAsyncComponent(() => import('@/components/abuse-report-window.vue')), {
+						os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
 							user: appearNote.user,
 							initialComment: `Note: ${u}\n-----\n`,
 						}, {}, 'closed');
diff --git a/packages/client/src/scripts/get-user-menu.ts b/packages/client/src/scripts/get-user-menu.ts
index c609fddd5..4a5a2d42f 100644
--- a/packages/client/src/scripts/get-user-menu.ts
+++ b/packages/client/src/scripts/get-user-menu.ts
@@ -129,7 +129,7 @@ export function getUserMenu(user, router: Router = mainRouter) {
 	}
 
 	function reportAbuse() {
-		os.popup(defineAsyncComponent(() => import('@/components/abuse-report-window.vue')), {
+		os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
 			user: user,
 		}, {}, 'closed');
 	}
diff --git a/packages/client/src/scripts/please-login.ts b/packages/client/src/scripts/please-login.ts
index 1f3806184..3323968f7 100644
--- a/packages/client/src/scripts/please-login.ts
+++ b/packages/client/src/scripts/please-login.ts
@@ -6,7 +6,7 @@ import { popup } from '@/os';
 export function pleaseLogin(path?: string) {
 	if ($i) return;
 
-	popup(defineAsyncComponent(() => import('@/components/signin-dialog.vue')), {
+	popup(defineAsyncComponent(() => import('@/components/MkSigninDialog.vue')), {
 		autoSet: true,
 		message: i18n.ts.signinRequired
 	}, {
diff --git a/packages/client/src/scripts/reaction-picker.ts b/packages/client/src/scripts/reaction-picker.ts
index b7699cae4..a6d0940a4 100644
--- a/packages/client/src/scripts/reaction-picker.ts
+++ b/packages/client/src/scripts/reaction-picker.ts
@@ -12,7 +12,7 @@ class ReactionPicker {
 	}
 
 	public async init() {
-		await popup(defineAsyncComponent(() => import('@/components/emoji-picker-dialog.vue')), {
+		await popup(defineAsyncComponent(() => import('@/components/MkEmojiPickerDialog.vue')), {
 			src: this.src,
 			asReactionPicker: true,
 			manualShowing: this.manualShowing
diff --git a/packages/client/src/scripts/use-chart-tooltip.ts b/packages/client/src/scripts/use-chart-tooltip.ts
index ab5716569..91c27585f 100644
--- a/packages/client/src/scripts/use-chart-tooltip.ts
+++ b/packages/client/src/scripts/use-chart-tooltip.ts
@@ -1,6 +1,6 @@
 import { onUnmounted, ref } from 'vue';
 import * as os from '@/os';
-import MkChartTooltip from '@/components/chart-tooltip.vue';
+import MkChartTooltip from '@/components/MkChartTooltip.vue';
 
 export function useChartTooltip() {
 	const tooltipShowing = ref(false);
diff --git a/packages/client/src/ui/_common_/common.vue b/packages/client/src/ui/_common_/common.vue
index f32cd3fe0..1ea59dd26 100644
--- a/packages/client/src/ui/_common_/common.vue
+++ b/packages/client/src/ui/_common_/common.vue
@@ -38,7 +38,7 @@ const onNotification = notification => {
 			id: notification.id,
 		});
 
-		popup(defineAsyncComponent(() => import('@/components/notification-toast.vue')), {
+		popup(defineAsyncComponent(() => import('@/components/MkNotificationToast.vue')), {
 			notification,
 		}, {}, 'closed');
 	}
diff --git a/packages/client/src/ui/_common_/navbar-for-mobile.vue b/packages/client/src/ui/_common_/navbar-for-mobile.vue
index 2bac239d4..de000447a 100644
--- a/packages/client/src/ui/_common_/navbar-for-mobile.vue
+++ b/packages/client/src/ui/_common_/navbar-for-mobile.vue
@@ -123,7 +123,7 @@ function openInstanceMenu(ev: MouseEvent) {
 }
 
 function more() {
-	os.popup(defineAsyncComponent(() => import('@/components/launch-pad.vue')), {}, {
+	os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {}, {
 	}, 'closed');
 }
 </script>
diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index 30837ed28..0c46e8941 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -146,7 +146,7 @@ function openInstanceMenu(ev: MouseEvent) {
 }
 
 function more(ev: MouseEvent) {
-	os.popup(defineAsyncComponent(() => import('@/components/launch-pad.vue')), {
+	os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
 		src: ev.currentTarget ?? ev.target,
 	}, {
 	}, 'closed');
diff --git a/packages/client/src/ui/_common_/statusbar-federation.vue b/packages/client/src/ui/_common_/statusbar-federation.vue
index 7cf6b1f97..7d4f0d616 100644
--- a/packages/client/src/ui/_common_/statusbar-federation.vue
+++ b/packages/client/src/ui/_common_/statusbar-federation.vue
@@ -22,7 +22,7 @@
 <script lang="ts" setup>
 import { computed, defineAsyncComponent, ref, toRef, watch } from 'vue';
 import * as misskey from 'misskey-js';
-import MarqueeText from '@/components/marquee.vue';
+import MarqueeText from '@/components/MkMarquee.vue';
 import * as os from '@/os';
 import { useInterval } from '@/scripts/use-interval';
 import { getNoteSummary } from '@/scripts/get-note-summary';
diff --git a/packages/client/src/ui/_common_/statusbar-rss.vue b/packages/client/src/ui/_common_/statusbar-rss.vue
index 635b875ca..e75e13bb4 100644
--- a/packages/client/src/ui/_common_/statusbar-rss.vue
+++ b/packages/client/src/ui/_common_/statusbar-rss.vue
@@ -17,7 +17,7 @@
 
 <script lang="ts" setup>
 import { computed, defineAsyncComponent, ref, toRef, watch } from 'vue';
-import MarqueeText from '@/components/marquee.vue';
+import MarqueeText from '@/components/MkMarquee.vue';
 import * as os from '@/os';
 import { useInterval } from '@/scripts/use-interval';
 import { shuffle } from '@/scripts/shuffle';
diff --git a/packages/client/src/ui/_common_/statusbar-user-list.vue b/packages/client/src/ui/_common_/statusbar-user-list.vue
index 490c8a096..f4d989c38 100644
--- a/packages/client/src/ui/_common_/statusbar-user-list.vue
+++ b/packages/client/src/ui/_common_/statusbar-user-list.vue
@@ -22,7 +22,7 @@
 <script lang="ts" setup>
 import { computed, defineAsyncComponent, ref, toRef, watch } from 'vue';
 import * as misskey from 'misskey-js';
-import MarqueeText from '@/components/marquee.vue';
+import MarqueeText from '@/components/MkMarquee.vue';
 import * as os from '@/os';
 import { useInterval } from '@/scripts/use-interval';
 import { getNoteSummary } from '@/scripts/get-note-summary';
diff --git a/packages/client/src/ui/classic.header.vue b/packages/client/src/ui/classic.header.vue
index 131767c0e..34248486c 100644
--- a/packages/client/src/ui/classic.header.vue
+++ b/packages/client/src/ui/classic.header.vue
@@ -101,7 +101,7 @@ export default defineComponent({
 		},
 
 		more(ev) {
-			os.popup(defineAsyncComponent(() => import('@/components/launch-pad.vue')), {
+			os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
 				src: ev.currentTarget ?? ev.target,
 				anchor: { x: 'center', y: 'bottom' },
 			}, {
diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue
index 172401f42..3d15f5fcb 100644
--- a/packages/client/src/ui/classic.sidebar.vue
+++ b/packages/client/src/ui/classic.sidebar.vue
@@ -121,7 +121,7 @@ export default defineComponent({
 		},
 
 		more(ev) {
-			os.popup(defineAsyncComponent(() => import('@/components/launch-pad.vue')), {
+			os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
 				src: ev.currentTarget ?? ev.target,
 			}, {}, 'closed');
 		},
diff --git a/packages/client/src/ui/classic.widgets.vue b/packages/client/src/ui/classic.widgets.vue
index 6f9d18bde..ca8e3f4db 100644
--- a/packages/client/src/ui/classic.widgets.vue
+++ b/packages/client/src/ui/classic.widgets.vue
@@ -10,7 +10,7 @@
 
 <script lang="ts">
 import { defineComponent, defineAsyncComponent } from 'vue';
-import XWidgets from '@/components/widgets.vue';
+import XWidgets from '@/components/MkWidgets.vue';
 
 export default defineComponent({
 	components: {
diff --git a/packages/client/src/ui/deck/antenna-column.vue b/packages/client/src/ui/deck/antenna-column.vue
index 6268c357e..df9539617 100644
--- a/packages/client/src/ui/deck/antenna-column.vue
+++ b/packages/client/src/ui/deck/antenna-column.vue
@@ -12,7 +12,7 @@
 import { onMounted } from 'vue';
 import XColumn from './column.vue';
 import { updateColumn, Column } from './deck-store';
-import XTimeline from '@/components/timeline.vue';
+import XTimeline from '@/components/MkTimeline.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/ui/deck/direct-column.vue b/packages/client/src/ui/deck/direct-column.vue
index 4837c0ce3..104f781b3 100644
--- a/packages/client/src/ui/deck/direct-column.vue
+++ b/packages/client/src/ui/deck/direct-column.vue
@@ -9,7 +9,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import XColumn from './column.vue';
-import XNotes from '@/components/notes.vue';
+import XNotes from '@/components/MkNotes.vue';
 import { Column } from './deck-store';
 
 defineProps<{
diff --git a/packages/client/src/ui/deck/list-column.vue b/packages/client/src/ui/deck/list-column.vue
index 6fbb9f0e6..9a1fb5b44 100644
--- a/packages/client/src/ui/deck/list-column.vue
+++ b/packages/client/src/ui/deck/list-column.vue
@@ -12,7 +12,7 @@
 import { } from 'vue';
 import XColumn from './column.vue';
 import { updateColumn, Column } from './deck-store';
-import XTimeline from '@/components/timeline.vue';
+import XTimeline from '@/components/MkTimeline.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/ui/deck/mentions-column.vue b/packages/client/src/ui/deck/mentions-column.vue
index 0b6ca3a23..18055215d 100644
--- a/packages/client/src/ui/deck/mentions-column.vue
+++ b/packages/client/src/ui/deck/mentions-column.vue
@@ -9,7 +9,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import XColumn from './column.vue';
-import XNotes from '@/components/notes.vue';
+import XNotes from '@/components/MkNotes.vue';
 import { Column } from './deck-store';
 
 defineProps<{
diff --git a/packages/client/src/ui/deck/notifications-column.vue b/packages/client/src/ui/deck/notifications-column.vue
index 34132f2e9..b02118ee5 100644
--- a/packages/client/src/ui/deck/notifications-column.vue
+++ b/packages/client/src/ui/deck/notifications-column.vue
@@ -10,7 +10,7 @@
 import { defineAsyncComponent } from 'vue';
 import XColumn from './column.vue';
 import { updateColumn , Column } from './deck-store';
-import XNotifications from '@/components/notifications.vue';
+import XNotifications from '@/components/MkNotifications.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 
@@ -24,7 +24,7 @@ const emit = defineEmits<{
 }>();
 
 function func() {
-	os.popup(defineAsyncComponent(() => import('@/components/notification-setting-window.vue')), {
+	os.popup(defineAsyncComponent(() => import('@/components/MkNotificationSettingWindow.vue')), {
 		includingTypes: props.column.includingTypes,
 	}, {
 		done: async (res) => {
diff --git a/packages/client/src/ui/deck/tl-column.vue b/packages/client/src/ui/deck/tl-column.vue
index 6ea8e1a8a..a6e4ec5d5 100644
--- a/packages/client/src/ui/deck/tl-column.vue
+++ b/packages/client/src/ui/deck/tl-column.vue
@@ -23,7 +23,7 @@
 import { onMounted } from 'vue';
 import XColumn from './column.vue';
 import { removeColumn, updateColumn, Column } from './deck-store';
-import XTimeline from '@/components/timeline.vue';
+import XTimeline from '@/components/MkTimeline.vue';
 import * as os from '@/os';
 import { $i } from '@/account';
 import { instance } from '@/instance';
diff --git a/packages/client/src/ui/deck/widgets-column.vue b/packages/client/src/ui/deck/widgets-column.vue
index 3661dda59..2c97009b3 100644
--- a/packages/client/src/ui/deck/widgets-column.vue
+++ b/packages/client/src/ui/deck/widgets-column.vue
@@ -13,7 +13,7 @@
 import { } from 'vue';
 import XColumn from './column.vue';
 import { addColumnWidget, Column, removeColumnWidget, setColumnWidgets, updateColumnWidget } from './deck-store';
-import XWidgets from '@/components/widgets.vue';
+import XWidgets from '@/components/MkWidgets.vue';
 import { i18n } from '@/i18n';
 
 const props = defineProps<{
diff --git a/packages/client/src/ui/universal.widgets.vue b/packages/client/src/ui/universal.widgets.vue
index 7aed08388..179f8a6ba 100644
--- a/packages/client/src/ui/universal.widgets.vue
+++ b/packages/client/src/ui/universal.widgets.vue
@@ -9,7 +9,7 @@
 
 <script lang="ts" setup>
 import { onMounted } from 'vue';
-import XWidgets from '@/components/widgets.vue';
+import XWidgets from '@/components/MkWidgets.vue';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
 
diff --git a/packages/client/src/ui/visitor/b.vue b/packages/client/src/ui/visitor/b.vue
index 09be12d68..07f105374 100644
--- a/packages/client/src/ui/visitor/b.vue
+++ b/packages/client/src/ui/visitor/b.vue
@@ -53,8 +53,8 @@ import { host, instanceName } from '@/config';
 import { search } from '@/scripts/search';
 import * as os from '@/os';
 import MkPagination from '@/components/ui/pagination.vue';
-import XSigninDialog from '@/components/signin-dialog.vue';
-import XSignupDialog from '@/components/signup-dialog.vue';
+import XSigninDialog from '@/components/MkSigninDialog.vue';
+import XSignupDialog from '@/components/MkSignupDialog.vue';
 import MkButton from '@/components/ui/button.vue';
 import { ColdDeviceStorage, defaultStore } from '@/store';
 import { mainRouter } from '@/router';
diff --git a/packages/client/src/ui/visitor/header.vue b/packages/client/src/ui/visitor/header.vue
index c39dc6577..e2b903485 100644
--- a/packages/client/src/ui/visitor/header.vue
+++ b/packages/client/src/ui/visitor/header.vue
@@ -41,8 +41,8 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import XSigninDialog from '@/components/signin-dialog.vue';
-import XSignupDialog from '@/components/signup-dialog.vue';
+import XSigninDialog from '@/components/MkSigninDialog.vue';
+import XSignupDialog from '@/components/MkSignupDialog.vue';
 import * as os from '@/os';
 import { search } from '@/scripts/search';
 
diff --git a/packages/client/src/ui/visitor/kanban.vue b/packages/client/src/ui/visitor/kanban.vue
index 44b555725..30c2fbc6c 100644
--- a/packages/client/src/ui/visitor/kanban.vue
+++ b/packages/client/src/ui/visitor/kanban.vue
@@ -42,8 +42,8 @@ import { defineComponent, defineAsyncComponent } from 'vue';
 import { host, instanceName } from '@/config';
 import * as os from '@/os';
 import MkPagination from '@/components/ui/pagination.vue';
-import XSigninDialog from '@/components/signin-dialog.vue';
-import XSignupDialog from '@/components/signup-dialog.vue';
+import XSigninDialog from '@/components/MkSigninDialog.vue';
+import XSignupDialog from '@/components/MkSignupDialog.vue';
 import MkButton from '@/components/ui/button.vue';
 
 export default defineComponent({
diff --git a/packages/client/src/widgets/clock.vue b/packages/client/src/widgets/clock.vue
index 7d78b05f8..660a1f0ec 100644
--- a/packages/client/src/widgets/clock.vue
+++ b/packages/client/src/widgets/clock.vue
@@ -21,8 +21,8 @@ import { } from 'vue';
 import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
 import { GetFormResultType } from '@/scripts/form';
 import MkContainer from '@/components/ui/container.vue';
-import MkAnalogClock from '@/components/analog-clock.vue';
-import MkDigitalClock from '@/components/digital-clock.vue';
+import MkAnalogClock from '@/components/MkAnalogClock.vue';
+import MkDigitalClock from '@/components/MkDigitalClock.vue';
 import { timezones } from '@/scripts/timezones';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/widgets/digital-clock.vue b/packages/client/src/widgets/digital-clock.vue
index 387fad9b6..d2bfd523f 100644
--- a/packages/client/src/widgets/digital-clock.vue
+++ b/packages/client/src/widgets/digital-clock.vue
@@ -13,7 +13,7 @@ import { onUnmounted, ref, watch } from 'vue';
 import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
 import { GetFormResultType } from '@/scripts/form';
 import { timezones } from '@/scripts/timezones';
-import MkDigitalClock from '@/components/digital-clock.vue';
+import MkDigitalClock from '@/components/MkDigitalClock.vue';
 
 const name = 'digitalClock';
 
diff --git a/packages/client/src/widgets/federation.vue b/packages/client/src/widgets/federation.vue
index 9619aa53e..ec46a0ccb 100644
--- a/packages/client/src/widgets/federation.vue
+++ b/packages/client/src/widgets/federation.vue
@@ -23,7 +23,7 @@ import { onMounted, onUnmounted, ref } from 'vue';
 import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
 import { GetFormResultType } from '@/scripts/form';
 import MkContainer from '@/components/ui/container.vue';
-import MkMiniChart from '@/components/mini-chart.vue';
+import MkMiniChart from '@/components/MkMiniChart.vue';
 import * as os from '@/os';
 import { useInterval } from '@/scripts/use-interval';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/widgets/instance-cloud.vue b/packages/client/src/widgets/instance-cloud.vue
index 597ce0e82..03fda4c74 100644
--- a/packages/client/src/widgets/instance-cloud.vue
+++ b/packages/client/src/widgets/instance-cloud.vue
@@ -17,7 +17,7 @@ import { } from 'vue';
 import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
 import { GetFormResultType } from '@/scripts/form';
 import MkContainer from '@/components/ui/container.vue';
-import MkTagCloud from '@/components/tag-cloud.vue';
+import MkTagCloud from '@/components/MkTagCloud.vue';
 import * as os from '@/os';
 import { useInterval } from '@/scripts/use-interval';
 
diff --git a/packages/client/src/widgets/notifications.vue b/packages/client/src/widgets/notifications.vue
index 05b24e5cb..a46b7e739 100644
--- a/packages/client/src/widgets/notifications.vue
+++ b/packages/client/src/widgets/notifications.vue
@@ -14,7 +14,7 @@ import { defineAsyncComponent } from 'vue';
 import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
 import { GetFormResultType } from '@/scripts/form';
 import MkContainer from '@/components/ui/container.vue';
-import XNotifications from '@/components/notifications.vue';
+import XNotifications from '@/components/MkNotifications.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 
@@ -51,7 +51,7 @@ const { widgetProps, configure, save } = useWidgetPropsManager(name,
 );
 
 const configureNotification = () => {
-	os.popup(defineAsyncComponent(() => import('@/components/notification-setting-window.vue')), {
+	os.popup(defineAsyncComponent(() => import('@/components/MkNotificationSettingWindow.vue')), {
 		includingTypes: widgetProps.includingTypes,
 	}, {
 		done: async (res) => {
diff --git a/packages/client/src/widgets/post-form.vue b/packages/client/src/widgets/post-form.vue
index b54291335..f1708775b 100644
--- a/packages/client/src/widgets/post-form.vue
+++ b/packages/client/src/widgets/post-form.vue
@@ -6,7 +6,7 @@
 import { } from 'vue';
 import { GetFormResultType } from '@/scripts/form';
 import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import XPostForm from '@/components/post-form.vue';
+import XPostForm from '@/components/MkPostForm.vue';
 
 const name = 'postForm';
 
diff --git a/packages/client/src/widgets/rss-ticker.vue b/packages/client/src/widgets/rss-ticker.vue
index c692c0c4f..6e5924b6b 100644
--- a/packages/client/src/widgets/rss-ticker.vue
+++ b/packages/client/src/widgets/rss-ticker.vue
@@ -21,7 +21,7 @@
 <script lang="ts" setup>
 import { onMounted, onUnmounted, ref, watch } from 'vue';
 import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import MarqueeText from '@/components/marquee.vue';
+import MarqueeText from '@/components/MkMarquee.vue';
 import { GetFormResultType } from '@/scripts/form';
 import * as os from '@/os';
 import MkContainer from '@/components/ui/container.vue';
diff --git a/packages/client/src/widgets/timeline.vue b/packages/client/src/widgets/timeline.vue
index 3bcad1ae2..5042632cf 100644
--- a/packages/client/src/widgets/timeline.vue
+++ b/packages/client/src/widgets/timeline.vue
@@ -25,7 +25,7 @@ import { GetFormResultType } from '@/scripts/form';
 import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
 import * as os from '@/os';
 import MkContainer from '@/components/ui/container.vue';
-import XTimeline from '@/components/timeline.vue';
+import XTimeline from '@/components/MkTimeline.vue';
 import { $i } from '@/account';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/widgets/trends.vue b/packages/client/src/widgets/trends.vue
index 8d11b69cb..53ae4019d 100644
--- a/packages/client/src/widgets/trends.vue
+++ b/packages/client/src/widgets/trends.vue
@@ -22,7 +22,7 @@ import { onMounted, onUnmounted, ref } from 'vue';
 import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
 import { GetFormResultType } from '@/scripts/form';
 import MkContainer from '@/components/ui/container.vue';
-import MkMiniChart from '@/components/mini-chart.vue';
+import MkMiniChart from '@/components/MkMiniChart.vue';
 import * as os from '@/os';
 import { useInterval } from '@/scripts/use-interval';
 import { i18n } from '@/i18n';

From 2d8e7b4da759b23800d517ee5979fa83484faf00 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 31 Aug 2022 02:19:25 +0900
Subject: [PATCH 128/245] enhance(client): improve analog-clock

---
 packages/client/src/components/MkAnalogClock.vue | 12 +++++++++---
 packages/client/src/widgets/clock.vue            | 12 ++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/MkAnalogClock.vue b/packages/client/src/components/MkAnalogClock.vue
index b709a2254..40ef626ae 100644
--- a/packages/client/src/components/MkAnalogClock.vue
+++ b/packages/client/src/components/MkAnalogClock.vue
@@ -40,7 +40,7 @@
 
 	<line
 		class="s"
-		:class="{ animate: !disableSAnimate }"
+		:class="{ animate: !disableSAnimate && sAnimation !== 'none', elastic: sAnimation === 'elastic', easeOut: sAnimation === 'easeOut' }"
 		:x1="5 - (0 * (sHandLengthRatio * handsTailLength))"
 		:y1="5 + (1 * (sHandLengthRatio * handsTailLength))"
 		:x2="5 + (0 * ((sHandLengthRatio * 5) - handsPadding))"
@@ -99,6 +99,7 @@ const props = withDefaults(defineProps<{
 	twentyfour?: boolean;
 	graduations?: 'none' | 'dots' | 'numbers';
 	fadeGraduations?: boolean;
+	sAnimation?: 'none' | 'elastic' | 'easeOut';
 }>(), {
 	numbers: false,
 	thickness: 0.1,
@@ -106,6 +107,7 @@ const props = withDefaults(defineProps<{
 	twentyfour: false,
 	graduations: 'dots',
 	fadeGraduations: true,
+	sAnimation: 'elastic',
 });
 
 const graduationsMajor = computed(() => {
@@ -161,7 +163,7 @@ function tick() {
 					disableSAnimate = false;
 				}, 100);
 			}, 100);
-		}, 500);
+		}, 700);
 	} else {
 		sAngle = Math.PI * s / 30;
 	}
@@ -211,9 +213,13 @@ onBeforeUnmount(() => {
 		will-change: transform;
 		transform-origin: 50% 50%;
 
-		&.animate {
+		&.animate.elastic {
 			transition: transform .2s cubic-bezier(.4,2.08,.55,.44);
 		}
+
+		&.animate.easeOut {
+			transition: transform .7s cubic-bezier(0,.7,.3,1);
+		}
 	}
 }
 </style>
diff --git a/packages/client/src/widgets/clock.vue b/packages/client/src/widgets/clock.vue
index 660a1f0ec..51d48b30a 100644
--- a/packages/client/src/widgets/clock.vue
+++ b/packages/client/src/widgets/clock.vue
@@ -9,6 +9,7 @@
 			:graduations="widgetProps.graduations"
 			:fade-graduations="widgetProps.fadeGraduations"
 			:twentyfour="widgetProps.twentyFour"
+			:s-animation="widgetProps.sAnimation"
 		/>
 		<MkDigitalClock v-if="widgetProps.label === 'time' || widgetProps.label === 'timeAndTz'" class="_monospace label c time" :show-s="false" :offset="tzOffset"/>
 		<div v-if="widgetProps.label === 'tz' || widgetProps.label === 'timeAndTz'" class="_monospace label d offset">{{ tzOffsetLabel }}</div>
@@ -70,6 +71,17 @@ const widgetPropsDef = {
 		type: 'boolean' as const,
 		default: true,
 	},
+	sAnimation: {
+		type: 'radio' as const,
+		default: 'elastic',
+		options: [{
+			value: 'none', label: 'None',
+		}, {
+			value: 'elastic', label: 'Elastic',
+		}, {
+			value: 'easeOut', label: 'Ease out',
+		}],
+	},
 	twentyFour: {
 		type: 'boolean' as const,
 		default: false,

From 2c2c7d49668a6a5f2ea4d2bc9b81532fd39e1806 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 31 Aug 2022 18:24:39 +0900
Subject: [PATCH 129/245] Update .gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 9928d93aa..189f36370 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,9 @@ report.*.json
 cypress/screenshots
 cypress/videos
 
+# Coverage
+coverage
+
 # config
 /.config/*
 !/.config/example.yml

From d9ff2dd471cb2dc4eef9c992a216731dfc244213 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 31 Aug 2022 23:12:22 +0900
Subject: [PATCH 130/245] refactor(client): use setup syntax

---
 .../src/components/MkGalleryPostPreview.vue   |  21 +--
 .../client/src/components/global/MkAd.vue     | 154 ++++++++----------
 .../client/src/components/global/MkUrl.vue    |  65 +++-----
 packages/client/src/components/ui/hr.vue      |  17 --
 packages/client/src/pages/user/clips.vue      |  44 ++---
 5 files changed, 110 insertions(+), 191 deletions(-)
 delete mode 100644 packages/client/src/components/ui/hr.vue

diff --git a/packages/client/src/components/MkGalleryPostPreview.vue b/packages/client/src/components/MkGalleryPostPreview.vue
index cef9b2a39..a133f6431 100644
--- a/packages/client/src/components/MkGalleryPostPreview.vue
+++ b/packages/client/src/components/MkGalleryPostPreview.vue
@@ -14,26 +14,15 @@
 </MkA>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { } from 'vue';
 import { userName } from '@/filters/user';
 import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
 import * as os from '@/os';
 
-export default defineComponent({
-	components: {
-		ImgWithBlurhash,
-	},
-	props: {
-		post: {
-			type: Object,
-			required: true,
-		},
-	},
-	methods: {
-		userName,
-	},
-});
+const props = defineProps<{
+	post: any;
+}>();
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/components/global/MkAd.vue b/packages/client/src/components/global/MkAd.vue
index 7725f776a..e1b7ae6af 100644
--- a/packages/client/src/components/global/MkAd.vue
+++ b/packages/client/src/components/global/MkAd.vue
@@ -1,8 +1,8 @@
 <template>
-<div v-if="ad" class="qiivuoyo">
-	<div v-if="!showMenu" class="main" :class="ad.place">
-		<a :href="ad.url" target="_blank">
-			<img :src="ad.imageUrl">
+<div v-if="chosen" class="qiivuoyo">
+	<div v-if="!showMenu" class="main" :class="chosen.place">
+		<a :href="chosen.url" target="_blank">
+			<img :src="chosen.imageUrl">
 			<button class="_button menu" @click.prevent.stop="toggleMenu"><span class="fas fa-info-circle info-circle"></span></button>
 		</a>
 	</div>
@@ -10,7 +10,7 @@
 		<div class="body">
 			<div>Ads by {{ host }}</div>
 			<!--<MkButton class="button" primary>{{ $ts._ad.like }}</MkButton>-->
-			<MkButton v-if="ad.ratio !== 0" class="button" @click="reduceFrequency">{{ $ts._ad.reduceFrequencyOfThisAd }}</MkButton>
+			<MkButton v-if="chosen.ratio !== 0" class="button" @click="reduceFrequency">{{ $ts._ad.reduceFrequencyOfThisAd }}</MkButton>
 			<button class="_textButton" @click="toggleMenu">{{ $ts._ad.back }}</button>
 		</div>
 	</div>
@@ -18,98 +18,78 @@
 <div v-else></div>
 </template>
 
-<script lang="ts">
-import { defineComponent, ref } from 'vue';
+<script lang="ts" setup>
+import { ref } from 'vue';
 import { instance } from '@/instance';
 import { host } from '@/config';
 import MkButton from '@/components/ui/button.vue';
 import { defaultStore } from '@/store';
 import * as os from '@/os';
 
-export default defineComponent({
-	components: {
-		MkButton
-	},
+type Ad = (typeof instance)['ads'][number];
 
-	props: {
-		prefer: {
-			type: Array,
-			required: true
-		},
-		specify: {
-			type: Object,
-			required: false
-		},
-	},
+const props = defineProps<{
+	prefer: string[];
+	specify?: Ad;
+}>();
 
-	setup(props) {
-		const showMenu = ref(false);
-		const toggleMenu = () => {
-			showMenu.value = !showMenu.value;
-		};
+const showMenu = ref(false);
+const toggleMenu = (): void => {
+	showMenu.value = !showMenu.value;
+};
 
-		const choseAd = (): (typeof instance)['ads'][number] | null => {
-			if (props.specify) {
-				return props.specify as (typeof instance)['ads'][number];
-			}
-
-			const allAds = instance.ads.map(ad => defaultStore.state.mutedAds.includes(ad.id) ? {
-				...ad,
-				ratio: 0
-			} : ad);
-
-			let ads = allAds.filter(ad => props.prefer.includes(ad.place));
-
-			if (ads.length === 0) {
-				ads = allAds.filter(ad => ad.place === 'square');
-			}
-
-			const lowPriorityAds = ads.filter(ad => ad.ratio === 0);
-			ads = ads.filter(ad => ad.ratio !== 0);
-
-			if (ads.length === 0) {
-				if (lowPriorityAds.length !== 0) {
-					return lowPriorityAds[Math.floor(Math.random() * lowPriorityAds.length)];
-				} else {
-					return null;
-				}
-			}
-
-			const totalFactor = ads.reduce((a, b) => a + b.ratio, 0);
-			const r = Math.random() * totalFactor;
-
-			let stackedFactor = 0;
-			for (const ad of ads) {
-				if (r >= stackedFactor && r <= stackedFactor + ad.ratio) {
-					return ad;
-				} else {
-					stackedFactor += ad.ratio;
-				}
-			}
-
-			return null;
-		};
-
-		const chosen = ref(choseAd());
-
-		const reduceFrequency = () => {
-			if (chosen.value == null) return;
-			if (defaultStore.state.mutedAds.includes(chosen.value.id)) return;
-			defaultStore.push('mutedAds', chosen.value.id);
-			os.success();
-			chosen.value = choseAd();
-			showMenu.value = false;
-		};
-
-		return {
-			ad: chosen,
-			showMenu,
-			toggleMenu,
-			host,
-			reduceFrequency,
-		};
+const choseAd = (): Ad | null => {
+	if (props.specify) {
+		return props.specify;
 	}
-});
+
+	const allAds = instance.ads.map(ad => defaultStore.state.mutedAds.includes(ad.id) ? {
+		...ad,
+		ratio: 0,
+	} : ad);
+
+	let ads = allAds.filter(ad => props.prefer.includes(ad.place));
+
+	if (ads.length === 0) {
+		ads = allAds.filter(ad => ad.place === 'square');
+	}
+
+	const lowPriorityAds = ads.filter(ad => ad.ratio === 0);
+	ads = ads.filter(ad => ad.ratio !== 0);
+
+	if (ads.length === 0) {
+		if (lowPriorityAds.length !== 0) {
+			return lowPriorityAds[Math.floor(Math.random() * lowPriorityAds.length)];
+		} else {
+			return null;
+		}
+	}
+
+	const totalFactor = ads.reduce((a, b) => a + b.ratio, 0);
+	const r = Math.random() * totalFactor;
+
+	let stackedFactor = 0;
+	for (const ad of ads) {
+		if (r >= stackedFactor && r <= stackedFactor + ad.ratio) {
+			return ad;
+		} else {
+			stackedFactor += ad.ratio;
+		}
+	}
+
+	return null;
+};
+
+const chosen = ref(choseAd());
+
+function reduceFrequency(): void {
+	if (chosen.value == null) return;
+	if (defaultStore.state.mutedAds.includes(chosen.value.id)) return;
+	defaultStore.push('mutedAds', chosen.value.id);
+	os.success();
+	chosen.value = choseAd();
+	showMenu.value = false;
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/components/global/MkUrl.vue b/packages/client/src/components/global/MkUrl.vue
index d002727d5..37c0212ea 100644
--- a/packages/client/src/components/global/MkUrl.vue
+++ b/packages/client/src/components/global/MkUrl.vue
@@ -18,54 +18,39 @@
 </component>
 </template>
 
-<script lang="ts">
-import { defineAsyncComponent, defineComponent, ref } from 'vue';
+<script lang="ts" setup>
+import { defineAsyncComponent, ref } from 'vue';
 import { toUnicode as decodePunycode } from 'punycode/';
 import { url as local } from '@/config';
 import * as os from '@/os';
 import { useTooltip } from '@/scripts/use-tooltip';
 import { safeURIDecode } from '@/scripts/safe-uri-decode';
 
-export default defineComponent({
-	props: {
-		url: {
-			type: String,
-			required: true,
-		},
-		rel: {
-			type: String,
-			required: false,
-			default: null,
-		},
-	},
-	setup(props) {
-		const self = props.url.startsWith(local);
-		const url = new URL(props.url);
-		const el = ref();
-		
-		useTooltip(el, (showing) => {
-			os.popup(defineAsyncComponent(() => import('@/components/MkUrlPreviewPopup.vue')), {
-				showing,
-				url: props.url,
-				source: el.value,
-			}, {}, 'closed');
-		});
+const props = defineProps<{
+	url: string;
+	rel?: string;
+}>();
 
-		return {
-			local,
-			schema: url.protocol,
-			hostname: decodePunycode(url.hostname),
-			port: url.port,
-			pathname: safeURIDecode(url.pathname),
-			query: safeURIDecode(url.search),
-			hash: safeURIDecode(url.hash),
-			self: self,
-			attr: self ? 'to' : 'href',
-			target: self ? null : '_blank',
-			el,
-		};
-	},
+const self = props.url.startsWith(local);
+const url = new URL(props.url);
+const el = ref();
+
+useTooltip(el, (showing) => {
+	os.popup(defineAsyncComponent(() => import('@/components/MkUrlPreviewPopup.vue')), {
+		showing,
+		url: props.url,
+		source: el.value,
+	}, {}, 'closed');
 });
+
+const schema = url.protocol;
+const hostname = decodePunycode(url.hostname);
+const port = url.port;
+const pathname = safeURIDecode(url.pathname);
+const query = safeURIDecode(url.search);
+const hash = safeURIDecode(url.hash);
+const attr = self ? 'to' : 'href';
+const target = self ? null : '_blank';
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/components/ui/hr.vue b/packages/client/src/components/ui/hr.vue
deleted file mode 100644
index 0cb5b4887..000000000
--- a/packages/client/src/components/ui/hr.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-<div class="evrzpitu"></div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import * as os from '@/os';
-
-export default defineComponent({});
-</script>
-
-<style lang="scss" scoped>
-.evrzpitu
-	margin 16px 0
-	border-bottom solid var(--lineWidth) var(--faceDivider)
-
-</style>
diff --git a/packages/client/src/pages/user/clips.vue b/packages/client/src/pages/user/clips.vue
index 870e6f717..f3fafc693 100644
--- a/packages/client/src/pages/user/clips.vue
+++ b/packages/client/src/pages/user/clips.vue
@@ -9,40 +9,22 @@
 </div>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { computed } from 'vue';
+import * as misskey from 'misskey-js';
 import MkPagination from '@/components/ui/pagination.vue';
 
-export default defineComponent({
-	components: {
-		MkPagination,
-	},
+const props = defineProps<{
+	user: misskey.entities.User;
+}>();
 
-	props: {
-		user: {
-			type: Object,
-			required: true
-		},
-	},
-
-	data() {
-		return {
-			pagination: {
-				endpoint: 'users/clips' as const,
-				limit: 20,
-				params: {
-					userId: this.user.id,
-				}
-			},
-		};
-	},
-
-	watch: {
-		user() {
-			this.$refs.list.reload();
-		}
-	},
-});
+const pagination = {
+	endpoint: 'users/clips' as const,
+	limit: 20,
+	params: computed(() => ({
+		userId: props.user.id,
+	})),
+};
 </script>
 
 <style lang="scss" scoped>

From 25f4c8688abdd23b93038bf8339ac0eca0f63330 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 2 Sep 2022 00:22:31 +0900
Subject: [PATCH 131/245] refactor(client): use setup syntax

---
 packages/client/src/components/MkRipple.vue | 99 ++++++++++-----------
 packages/client/src/pages/follow.vue        | 93 +++++++++----------
 packages/client/src/ui/deck/tl-column.vue   | 16 ----
 3 files changed, 90 insertions(+), 118 deletions(-)

diff --git a/packages/client/src/components/MkRipple.vue b/packages/client/src/components/MkRipple.vue
index 401e78e30..9d93211d5 100644
--- a/packages/client/src/components/MkRipple.vue
+++ b/packages/client/src/components/MkRipple.vue
@@ -1,8 +1,9 @@
 <template>
-<div class="vswabwbm" :style="{ zIndex, top: `${y - 64}px`, left: `${x - 64}px` }" :class="{ active }">
+<div class="vswabwbm" :style="{ zIndex, top: `${y - 64}px`, left: `${x - 64}px` }">
 	<svg width="128" height="128" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg">
 		<circle fill="none" cx="64" cy="64">
-			<animate attributeName="r"
+			<animate
+				attributeName="r"
 				begin="0s" dur="0.5s"
 				values="4; 32"
 				calcMode="spline"
@@ -10,7 +11,8 @@
 				keySplines="0.165, 0.84, 0.44, 1"
 				repeatCount="1"
 			/>
-			<animate attributeName="stroke-width"
+			<animate
+				attributeName="stroke-width"
 				begin="0s" dur="0.5s"
 				values="16; 0"
 				calcMode="spline"
@@ -21,7 +23,8 @@
 		</circle>
 		<g fill="none" fill-rule="evenodd">
 			<circle v-for="(particle, i) in particles" :key="i" :fill="particle.color">
-				<animate attributeName="r"
+				<animate
+					attributeName="r"
 					begin="0s" dur="0.8s"
 					:values="`${particle.size}; 0`"
 					calcMode="spline"
@@ -29,7 +32,8 @@
 					keySplines="0.165, 0.84, 0.44, 1"
 					repeatCount="1"
 				/>
-				<animate attributeName="cx"
+				<animate
+					attributeName="cx"
 					begin="0s" dur="0.8s"
 					:values="`${particle.xA}; ${particle.xB}`"
 					calcMode="spline"
@@ -37,7 +41,8 @@
 					keySplines="0.3, 0.61, 0.355, 1"
 					repeatCount="1"
 				/>
-				<animate attributeName="cy"
+				<animate
+					attributeName="cy"
 					begin="0s" dur="0.8s"
 					:values="`${particle.yA}; ${particle.yB}`"
 					calcMode="spline"
@@ -51,59 +56,47 @@
 </div>
 </template>
 
-<script lang="ts">
-import { defineComponent, onMounted } from 'vue';
+<script lang="ts" setup>
+import { onMounted } from 'vue';
 import * as os from '@/os';
 
-export default defineComponent({
-	props: {
-		x: {
-			type: Number,
-			required: true
-		},
-		y: {
-			type: Number,
-			required: true
-		},
-		particle: {
-			type: Boolean,
-			required: false,
-			default: true,
-		}
-	},
-	emits: ['end'],
-	setup(props, context) {
-		const particles = [];
-		const origin = 64;
-		const colors = ['#FF1493', '#00FFFF', '#FFE202'];
+const props = withDefaults(defineProps<{
+	x: number;
+	y: number;
+	particle?: boolean;
+}>(), {
+	particle: true,
+});
 
-		if (props.particle) {
-			for (let i = 0; i < 12; i++) {
-				const angle = Math.random() * (Math.PI * 2);
-				const pos = Math.random() * 16;
-				const velocity = 16 + (Math.random() * 48);
-				particles.push({
-					size: 4 + (Math.random() * 8),
-					xA: origin + (Math.sin(angle) * pos),
-					yA: origin + (Math.cos(angle) * pos),
-					xB: origin + (Math.sin(angle) * (pos + velocity)),
-					yB: origin + (Math.cos(angle) * (pos + velocity)),
-					color: colors[Math.floor(Math.random() * colors.length)]
-				});
-			}
-		}
+const emit = defineEmits<{
+	(ev: 'end'): void;
+}>();
 
-		onMounted(() => {
-			window.setTimeout(() => {
-				context.emit('end');
-			}, 1100);
+const particles = [];
+const origin = 64;
+const colors = ['#FF1493', '#00FFFF', '#FFE202'];
+const zIndex = os.claimZIndex('high');
+
+if (props.particle) {
+	for (let i = 0; i < 12; i++) {
+		const angle = Math.random() * (Math.PI * 2);
+		const pos = Math.random() * 16;
+		const velocity = 16 + (Math.random() * 48);
+		particles.push({
+			size: 4 + (Math.random() * 8),
+			xA: origin + (Math.sin(angle) * pos),
+			yA: origin + (Math.cos(angle) * pos),
+			xB: origin + (Math.sin(angle) * (pos + velocity)),
+			yB: origin + (Math.cos(angle) * (pos + velocity)),
+			color: colors[Math.floor(Math.random() * colors.length)],
 		});
+	}
+}
 
-		return {
-			particles,
-			zIndex: os.claimZIndex('high'),
-		};
-	},
+onMounted(() => {
+	window.setTimeout(() => {
+		emit('end');
+	}, 1100);
 });
 </script>
 
diff --git a/packages/client/src/pages/follow.vue b/packages/client/src/pages/follow.vue
index 0c1cb7733..f44d355aa 100644
--- a/packages/client/src/pages/follow.vue
+++ b/packages/client/src/pages/follow.vue
@@ -3,63 +3,58 @@
 </div>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { } from 'vue';
 import * as Acct from 'misskey-js/built/acct';
 import * as os from '@/os';
 import { mainRouter } from '@/router';
+import { i18n } from '@/i18n';
 
-export default defineComponent({
-	created() {
-		const acct = new URL(location.href).searchParams.get('acct');
-		if (acct == null) return;
+async function follow(user): Promise<void> {
+	const { canceled } = await os.confirm({
+		type: 'question',
+		text: i18n.t('followConfirm', { name: user.name || user.username }),
+	});
 
-		let promise;
+	if (canceled) {
+		window.close();
+		return;
+	}
+	
+	os.apiWithDialog('following/create', {
+		userId: user.id,
+	});
+}
 
-		if (acct.startsWith('https://')) {
-			promise = os.api('ap/show', {
-				uri: acct,
-			});
-			promise.then(res => {
-				if (res.type === 'User') {
-					this.follow(res.object);
-				} else if (res.type === 'Note') {
-					mainRouter.push(`/notes/${res.object.id}`);
-				} else {
-					os.alert({
-						type: 'error',
-						text: 'Not a user',
-					}).then(() => {
-						window.close();
-					});
-				}
-			});
+const acct = new URL(location.href).searchParams.get('acct');
+if (acct == null) return;
+
+let promise;
+
+if (acct.startsWith('https://')) {
+	promise = os.api('ap/show', {
+		uri: acct,
+	});
+	promise.then(res => {
+		if (res.type === 'User') {
+			follow(res.object);
+		} else if (res.type === 'Note') {
+			mainRouter.push(`/notes/${res.object.id}`);
 		} else {
-			promise = os.api('users/show', Acct.parse(acct));
-			promise.then(user => {
-				this.follow(user);
+			os.alert({
+				type: 'error',
+				text: 'Not a user',
+			}).then(() => {
+				window.close();
 			});
 		}
+	});
+} else {
+	promise = os.api('users/show', Acct.parse(acct));
+	promise.then(user => {
+		follow(user);
+	});
+}
 
-		os.promiseDialog(promise, null, null, this.$ts.fetchingAsApObject);
-	},
-
-	methods: {
-		async follow(user) {
-			const { canceled } = await os.confirm({
-				type: 'question',
-				text: this.$t('followConfirm', { name: user.name || user.username }),
-			});
-
-			if (canceled) {
-				window.close();
-				return;
-			}
-			
-			os.apiWithDialog('following/create', {
-				userId: user.id,
-			});
-		},
-	},
-});
+os.promiseDialog(promise, null, null, i18n.ts.fetchingAsApObject);
 </script>
diff --git a/packages/client/src/ui/deck/tl-column.vue b/packages/client/src/ui/deck/tl-column.vue
index a6e4ec5d5..e64ed852b 100644
--- a/packages/client/src/ui/deck/tl-column.vue
+++ b/packages/client/src/ui/deck/tl-column.vue
@@ -102,22 +102,6 @@ const menu = [{
 	text: i18n.ts.timeline,
 	action: setType,
 }];
-
-/*
-export default defineComponent({
-	watch: {
-		mediaOnly() {
-			(this.$refs.timeline as any).reload();
-		}
-	},
-
-	methods: {
-		focus() {
-			(this.$refs.timeline as any).focus();
-		}
-	}
-});
-*/
 </script>
 
 <style lang="scss" scoped>

From e41810f1423f454c7d9a54c3999a6af66a78680c Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 3 Sep 2022 16:16:00 +0900
Subject: [PATCH 132/245] fix(client): fix syntax error of pages/follow.vue

---
 packages/client/src/pages/follow.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/pages/follow.vue b/packages/client/src/pages/follow.vue
index f44d355aa..828246d67 100644
--- a/packages/client/src/pages/follow.vue
+++ b/packages/client/src/pages/follow.vue
@@ -27,7 +27,9 @@ async function follow(user): Promise<void> {
 }
 
 const acct = new URL(location.href).searchParams.get('acct');
-if (acct == null) return;
+if (acct == null) {
+	throw new Error('acct required');
+}
 
 let promise;
 

From f337459c6e3a1f8a08f69c7b7959dbf21242823e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 5 Sep 2022 18:24:46 +0900
Subject: [PATCH 133/245] refactor(client): use setup syntax

---
 .../client/src/components/MkUserPreview.vue   | 94 ++++++++-----------
 1 file changed, 37 insertions(+), 57 deletions(-)

diff --git a/packages/client/src/components/MkUserPreview.vue b/packages/client/src/components/MkUserPreview.vue
index 427e46ef1..4de2e8baa 100644
--- a/packages/client/src/components/MkUserPreview.vue
+++ b/packages/client/src/components/MkUserPreview.vue
@@ -1,7 +1,7 @@
 <template>
-<transition :name="$store.state.animation ? 'popup' : ''" appear @after-leave="$emit('closed')">
-	<div v-if="showing" class="fxxzrfni _popup _shadow" :style="{ zIndex, top: top + 'px', left: left + 'px' }" @mouseover="() => { $emit('mouseover'); }" @mouseleave="() => { $emit('mouseleave'); }">
-		<div v-if="fetched" class="info">
+<transition :name="$store.state.animation ? 'popup' : ''" appear @after-leave="emit('closed')">
+	<div v-if="showing" class="fxxzrfni _popup _shadow" :style="{ zIndex, top: top + 'px', left: left + 'px' }" @mouseover="() => { emit('mouseover'); }" @mouseleave="() => { emit('mouseleave'); }">
+		<div v-if="user != null" class="info">
 			<div class="banner" :style="user.bannerUrl ? `background-image: url(${user.bannerUrl})` : ''">
 				<span v-if="$i && $i.id != user.id && user.isFollowed" class="followed">{{ $ts.followsYou }}</span>
 			</div>
@@ -33,71 +33,51 @@
 </transition>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { onMounted } from 'vue';
 import * as Acct from 'misskey-js/built/acct';
+import * as misskey from 'misskey-js';
 import MkFollowButton from '@/components/MkFollowButton.vue';
 import { userPage } from '@/filters/user';
 import * as os from '@/os';
 
-export default defineComponent({
-	components: {
-		MkFollowButton,
-	},
+const props = defineProps<{
+	showing: boolean;
+	q: string;
+	source: HTMLElement;
+}>();
 
-	props: {
-		showing: {
-			type: Boolean,
-			required: true,
-		},
-		q: {
-			type: String,
-			required: true,
-		},
-		source: {
-			required: true,
-		},
-	},
+const emit = defineEmits<{
+	(ev: 'closed'): void;
+	(ev: 'mouseover'): void;
+	(ev: 'mouseleave'): void;
+}>();
 
-	emits: ['closed', 'mouseover', 'mouseleave'],
+const zIndex = os.claimZIndex('middle');
+let user = $ref<misskey.entities.UserDetailed | null>(null);
+let top = $ref(0);
+let left = $ref(0);
 
-	data() {
-		return {
-			user: null,
-			fetched: false,
-			top: 0,
-			left: 0,
-			zIndex: os.claimZIndex('middle'),
-		};
-	},
+onMounted(() => {
+	if (typeof props.q === 'object') {
+		user = props.q;
+	} else {
+		const query = props.q.startsWith('@') ?
+			Acct.parse(props.q.substr(1)) :
+			{ userId: props.q };
 
-	mounted() {
-		if (typeof this.q === 'object') {
-			this.user = this.q;
-			this.fetched = true;
-		} else {
-			const query = this.q.startsWith('@') ?
-				Acct.parse(this.q.substr(1)) :
-				{ userId: this.q };
+		os.api('users/show', query).then(res => {
+			if (!props.showing) return;
+			user = res;
+		});
+	}
 
-			os.api('users/show', query).then(user => {
-				if (!this.showing) return;
-				this.user = user;
-				this.fetched = true;
-			});
-		}
+	const rect = props.source.getBoundingClientRect();
+	const x = ((rect.left + (props.source.offsetWidth / 2)) - (300 / 2)) + window.pageXOffset;
+	const y = rect.top + props.source.offsetHeight + window.pageYOffset;
 
-		const rect = this.source.getBoundingClientRect();
-		const x = ((rect.left + (this.source.offsetWidth / 2)) - (300 / 2)) + window.pageXOffset;
-		const y = rect.top + this.source.offsetHeight + window.pageYOffset;
-
-		this.top = y;
-		this.left = x;
-	},
-
-	methods: {
-		userPage,
-	},
+	top = y;
+	left = x;
 });
 </script>
 

From 4c3d094a458e2229072cbf785115e2f7280fcae9 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 5 Sep 2022 18:34:59 +0900
Subject: [PATCH 134/245] refactor(client): use setup syntax

---
 .../src/components/MkTokenGenerateWindow.vue  | 139 +++++++-----------
 1 file changed, 56 insertions(+), 83 deletions(-)

diff --git a/packages/client/src/components/MkTokenGenerateWindow.vue b/packages/client/src/components/MkTokenGenerateWindow.vue
index bf5775d4d..789218a8c 100644
--- a/packages/client/src/components/MkTokenGenerateWindow.vue
+++ b/packages/client/src/components/MkTokenGenerateWindow.vue
@@ -1,11 +1,12 @@
 <template>
-<XModalWindow ref="dialog"
+<XModalWindow
+	ref="dialog"
 	:width="400"
 	:height="450"
 	:with-ok-button="true"
 	:ok-button-disabled="false"
 	:can-close="false"
-	@close="$refs.dialog.close()"
+	@close="dialog.close()"
 	@closed="$emit('closed')"
 	@ok="ok()"
 >
@@ -27,91 +28,63 @@
 </XModalWindow>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { permissions } from 'misskey-js';
-import XModalWindow from '@/components/ui/modal-window.vue';
+<script lang="ts" setup>
+import { } from 'vue';
+import { permissions as kinds } from 'misskey-js';
 import MkInput from './form/input.vue';
-import MkTextarea from './form/textarea.vue';
 import MkSwitch from './form/switch.vue';
 import MkButton from './ui/button.vue';
 import MkInfo from './ui/info.vue';
+import XModalWindow from '@/components/ui/modal-window.vue';
 
-export default defineComponent({
-	components: {
-		XModalWindow,
-		MkInput,
-		MkTextarea,
-		MkSwitch,
-		MkButton,
-		MkInfo,
-	},
-
-	props: {
-		title: {
-			type: String,
-			required: false,
-			default: null
-		},
-		information: {
-			type: String,
-			required: false,
-			default: null
-		},
-		initialName: {
-			type: String,
-			required: false,
-			default: null
-		},
-		initialPermissions: {
-			type: Array,
-			required: false,
-			default: null
-		}
-	},
-
-	emits: ['done', 'closed'],
-
-	data() {
-		return {
-			name: this.initialName,
-			permissions: {},
-			kinds: permissions
-		};
-	},
-
-	created() {
-		if (this.initialPermissions) {
-			for (const kind of this.initialPermissions) {
-				this.permissions[kind] = true;
-			}
-		} else {
-			for (const kind of this.kinds) {
-				this.permissions[kind] = false;
-			}
-		}
-	},
-
-	methods: {
-		ok() {
-			this.$emit('done', {
-				name: this.name,
-				permissions: Object.keys(this.permissions).filter(p => this.permissions[p])
-			});
-			this.$refs.dialog.close();
-		},
-
-		disableAll() {
-			for (const p in this.permissions) {
-				this.permissions[p] = false;
-			}
-		},
-
-		enableAll() {
-			for (const p in this.permissions) {
-				this.permissions[p] = true;
-			}
-		}
-	}
+const props = withDefaults(defineProps<{
+	title?: string | null;
+	information?: string | null;
+	initialName?: string | null;
+	initialPermissions?: string[] | null;
+}>(), {
+	title: null,
+	information: null,
+	initialName: null,
+	initialPermissions: null,
 });
+
+const emit = defineEmits<{
+	(ev: 'closed'): void;
+	(ev: 'done', result: { name: string | null, permissions: string[] }): void;
+}>();
+
+const dialog = $ref<InstanceType<typeof XModalWindow>>();
+let name = $ref(props.initialName);
+let permissions = $ref({});
+
+if (props.initialPermissions) {
+	for (const kind of props.initialPermissions) {
+		permissions[kind] = true;
+	}
+} else {
+	for (const kind of kinds) {
+		permissions[kind] = false;
+	}
+}
+
+function ok(): void {
+	emit('done', {
+		name: name,
+		permissions: Object.keys(permissions).filter(p => permissions[p]),
+	});
+	dialog.close();
+}
+
+function disableAll(): void {
+	for (const p in permissions) {
+		permissions[p] = false;
+	}
+}
+
+function enableAll(): void {
+	for (const p in permissions) {
+		permissions[p] = true;
+	}
+}
 </script>

From 9132c7254550da8d3f8d7f75bbee48a54ffd2680 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 5 Sep 2022 18:37:41 +0900
Subject: [PATCH 135/245] refactor(client): use setup syntax

---
 .../src/components/MkUrlPreviewPopup.vue      | 55 +++++++------------
 1 file changed, 20 insertions(+), 35 deletions(-)

diff --git a/packages/client/src/components/MkUrlPreviewPopup.vue b/packages/client/src/components/MkUrlPreviewPopup.vue
index 2f0ffaa38..f343c6d8a 100644
--- a/packages/client/src/components/MkUrlPreviewPopup.vue
+++ b/packages/client/src/components/MkUrlPreviewPopup.vue
@@ -1,52 +1,37 @@
 <template>
 <div class="fgmtyycl" :style="{ zIndex, top: top + 'px', left: left + 'px' }">
-	<transition :name="$store.state.animation ? 'zoom' : ''" @after-leave="$emit('closed')">
+	<transition :name="$store.state.animation ? 'zoom' : ''" @after-leave="emit('closed')">
 		<MkUrlPreview v-if="showing" class="_popup _shadow" :url="url"/>
 	</transition>
 </div>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { onMounted } from 'vue';
 import MkUrlPreview from '@/components/MkUrlPreview.vue';
 import * as os from '@/os';
 
-export default defineComponent({
-	components: {
-		MkUrlPreview,
-	},
+const props = defineProps<{
+	showing: boolean;
+	url: string;
+	source: HTMLElement;
+}>();
 
-	props: {
-		url: {
-			type: String,
-			required: true,
-		},
-		source: {
-			required: true,
-		},
-		showing: {
-			type: Boolean,
-			required: true,
-		},
-	},
+const emit = defineEmits<{
+	(ev: 'closed'): void;
+}>();
 
-	data() {
-		return {
-			u: null,
-			top: 0,
-			left: 0,
-			zIndex: os.claimZIndex('middle'),
-		};
-	},
+const zIndex = os.claimZIndex('middle');
+let top = $ref(0);
+let left = $ref(0);
 
-	mounted() {
-		const rect = this.source.getBoundingClientRect();
-		const x = Math.max((rect.left + (this.source.offsetWidth / 2)) - (300 / 2), 6) + window.pageXOffset;
-		const y = rect.top + this.source.offsetHeight + window.pageYOffset;
+onMounted(() => {
+	const rect = props.source.getBoundingClientRect();
+	const x = Math.max((rect.left + (props.source.offsetWidth / 2)) - (300 / 2), 6) + window.pageXOffset;
+	const y = rect.top + props.source.offsetHeight + window.pageYOffset;
 
-		this.top = y;
-		this.left = x;
-	},
+	top = y;
+	left = x;
 });
 </script>
 

From 9db2380c20a8d4a1a58da232a137c0aa31f68e0c Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 5 Sep 2022 18:51:23 +0900
Subject: [PATCH 136/245] refactor(client): use setup syntax

---
 packages/client/src/components/form/slot.vue  |  10 +-
 packages/client/src/components/global/i18n.ts |   4 +-
 .../client/src/pages/user/index.photos.vue    | 101 ++++++++----------
 3 files changed, 54 insertions(+), 61 deletions(-)

diff --git a/packages/client/src/components/form/slot.vue b/packages/client/src/components/form/slot.vue
index d031b2eff..79ce8fe51 100644
--- a/packages/client/src/components/form/slot.vue
+++ b/packages/client/src/components/form/slot.vue
@@ -8,12 +8,12 @@
 </div>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { } from 'vue';
 
-export default defineComponent({
-
-});
+function focus() {
+	// TODO
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/components/global/i18n.ts b/packages/client/src/components/global/i18n.ts
index abf0c9685..1fd293ba1 100644
--- a/packages/client/src/components/global/i18n.ts
+++ b/packages/client/src/components/global/i18n.ts
@@ -30,7 +30,7 @@ export default defineComponent({
 			} else {
 				if (nextBracketOpen > 0) parsed.push(str.substr(0, nextBracketOpen));
 				parsed.push({
-					arg: str.substring(nextBracketOpen + 1, nextBracketClose)
+					arg: str.substring(nextBracketOpen + 1, nextBracketClose),
 				});
 			}
 
@@ -38,5 +38,5 @@ export default defineComponent({
 		}
 
 		return h(this.tag, parsed.map(x => typeof x === 'string' ? (this.textTag ? h(this.textTag, x) : x) : this.$slots[x.arg]()));
-	}
+	},
 });
diff --git a/packages/client/src/pages/user/index.photos.vue b/packages/client/src/pages/user/index.photos.vue
index 2a58b49f6..df733849f 100644
--- a/packages/client/src/pages/user/index.photos.vue
+++ b/packages/client/src/pages/user/index.photos.vue
@@ -4,12 +4,13 @@
 	<div class="ujigsodd">
 		<MkLoading v-if="fetching"/>
 		<div v-if="!fetching && images.length > 0" class="stream">
-			<MkA v-for="image in images"
-				:key="image.id"
+			<MkA
+				v-for="image in images"
+				:key="image.note.id + image.file.id"
 				class="img"
 				:to="notePage(image.note)"
 			>
-				<ImgWithBlurhash :hash="image.blurhash" :src="thumbnail(image.file)" :alt="image.name" :title="image.name"/>
+				<ImgWithBlurhash :hash="image.file.blurhash" :src="thumbnail(image.file)" :title="image.file.name"/>
 			</MkA>
 		</div>
 		<p v-if="!fetching && images.length == 0" class="empty">{{ $ts.nothing }}</p>
@@ -17,64 +18,56 @@
 </MkContainer>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { onMounted } from 'vue';
+import * as misskey from 'misskey-js';
 import { getStaticImageUrl } from '@/scripts/get-static-image-url';
 import { notePage } from '@/filters/note';
 import * as os from '@/os';
 import MkContainer from '@/components/ui/container.vue';
 import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
+import { defaultStore } from '@/store';
 
-export default defineComponent({
-	components: {
-		MkContainer,
-		ImgWithBlurhash,
-	},
-	props: {
-		user: {
-			type: Object,
-			required: true
-		},
-	},
-	data() {
-		return {
-			fetching: true,
-			images: [],
-		};
-	},
-	mounted() {
-		const image = [
-			'image/jpeg',
-			'image/png',
-			'image/gif',
-			'image/apng',
-			'image/vnd.mozilla.apng',
-		];
-		os.api('users/notes', {
-			userId: this.user.id,
-			fileType: image,
-			excludeNsfw: this.$store.state.nsfw !== 'ignore',
-			limit: 10,
-		}).then(notes => {
-			for (const note of notes) {
-				for (const file of note.files) {
-					this.images.push({
-						note,
-						file
-					});
-				}
+const props = defineProps<{
+	user: misskey.entities.UserDetailed;
+}>();
+
+let fetching = $ref(true);
+let images = $ref<{
+	note: misskey.entities.Note;
+	file: misskey.entities.DriveFile;
+}[]>([]);
+
+function thumbnail(image: misskey.entities.DriveFile): string {
+	return defaultStore.state.disableShowingAnimatedImages
+		? getStaticImageUrl(image.thumbnailUrl)
+		: image.thumbnailUrl;
+}
+
+onMounted(() => {
+	const image = [
+		'image/jpeg',
+		'image/png',
+		'image/gif',
+		'image/apng',
+		'image/vnd.mozilla.apng',
+	];
+	os.api('users/notes', {
+		userId: props.user.id,
+		fileType: image,
+		excludeNsfw: defaultStore.state.nsfw !== 'ignore',
+		limit: 10,
+	}).then(notes => {
+		for (const note of notes) {
+			for (const file of note.files) {
+				images.push({
+					note,
+					file,
+				});
 			}
-			this.fetching = false;
-		});
-	},
-	methods: {
-		thumbnail(image: any): string {
-			return this.$store.state.disableShowingAnimatedImages
-				? getStaticImageUrl(image.thumbnailUrl)
-				: image.thumbnailUrl;
-		},
-		notePage
-	},
+		}
+		fetching = false;
+	});
 });
 </script>
 

From 4dc706a91acc7387b78802aa279ad55febb7885f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 5 Sep 2022 14:53:48 -0700
Subject: [PATCH 137/245] chore: :arrow_up: Upgrade TypeORM

---
 packages/backend/package.json |   2 +-
 yarn.lock                     | 489 ++++++++++++++++++++++------------
 2 files changed, 322 insertions(+), 169 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index e6fbf71ed..3adc6c2fb 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -113,7 +113,7 @@
 		"tsc-alias": "1.7.0",
 		"tsconfig-paths": "4.1.0",
 		"twemoji-parser": "14.0.0",
-		"typeorm": "0.3.8",
+		"typeorm": "^0.3.9",
 		"ulid": "2.3.0",
 		"unzipper": "0.10.11",
 		"uuid": "8.3.2",
diff --git a/yarn.lock b/yarn.lock
index 4b6b0f8cf..e225d9873 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -321,6 +321,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@eslint/eslintrc@npm:^1.3.1":
+  version: 1.3.1
+  resolution: "@eslint/eslintrc@npm:1.3.1"
+  dependencies:
+    ajv: ^6.12.4
+    debug: ^4.3.2
+    espree: ^9.4.0
+    globals: ^13.15.0
+    ignore: ^5.2.0
+    import-fresh: ^3.2.1
+    js-yaml: ^4.1.0
+    minimatch: ^3.1.2
+    strip-json-comments: ^3.1.1
+  checksum: 9844dcc58a44399649926d5a17a2d53d529b80d3e8c3e9d0964ae198bac77ee6bb1cf44940f30cd9c2e300f7568ec82500be42ace6cacefb08aebf9905fe208e
+  languageName: node
+  linkType: hard
+
 "@fortawesome/fontawesome-free@npm:6.1.2":
   version: 6.1.2
   resolution: "@fortawesome/fontawesome-free@npm:6.1.2"
@@ -369,6 +386,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@humanwhocodes/module-importer@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@humanwhocodes/module-importer@npm:1.0.1"
+  checksum: 0fd22007db8034a2cdf2c764b140d37d9020bbfce8a49d3ec5c05290e77d4b0263b1b972b752df8c89e5eaa94073408f2b7d977aed131faf6cf396ebb5d7fb61
+  languageName: node
+  linkType: hard
+
 "@humanwhocodes/object-schema@npm:^1.2.1":
   version: 1.2.1
   resolution: "@humanwhocodes/object-schema@npm:1.2.1"
@@ -668,7 +692,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@redocly/ajv@npm:^8.6.4":
+"@redocly/ajv@npm:^8.6.5":
   version: 8.6.5
   resolution: "@redocly/ajv@npm:8.6.5"
   dependencies:
@@ -680,11 +704,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@redocly/openapi-core@npm:1.0.0-beta.106":
-  version: 1.0.0-beta.106
-  resolution: "@redocly/openapi-core@npm:1.0.0-beta.106"
+"@redocly/openapi-core@npm:1.0.0-beta.108":
+  version: 1.0.0-beta.108
+  resolution: "@redocly/openapi-core@npm:1.0.0-beta.108"
   dependencies:
-    "@redocly/ajv": ^8.6.4
+    "@redocly/ajv": ^8.6.5
     "@types/node": ^14.11.8
     colorette: ^1.2.0
     js-levenshtein: ^1.1.6
@@ -694,7 +718,7 @@ __metadata:
     node-fetch: ^2.6.1
     pluralize: ^8.0.0
     yaml-ast-parser: 0.0.43
-  checksum: 5b4038eca81a71adee2d548b7c5a42c3c6faeef9770ce3040caf97ed733f73dcd1cbb7420a2c0714582ba1db7766cba80ba137bbf2bf8bf8a3561145c1925243
+  checksum: 1a8c39f768b7a6f0572eef3fbc509fdf15934662808175af48f94b8f777f396f8743e1596b3467059ff1e09b7c4fb07a6ec0eb2c0ba70438c6664662c63b7a4b
   languageName: node
   linkType: hard
 
@@ -1015,6 +1039,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tensorflow/tfjs-backend-cpu@npm:3.20.0":
+  version: 3.20.0
+  resolution: "@tensorflow/tfjs-backend-cpu@npm:3.20.0"
+  dependencies:
+    "@types/seedrandom": ^2.4.28
+    seedrandom: ^3.0.5
+  peerDependencies:
+    "@tensorflow/tfjs-core": 3.20.0
+  checksum: f01084890bd2e2218286919efcacbac4f4b3ff59178cd78813ae53fcbecc9429acbc670f96e1db0dceadb3cdf599e3c684c29aefaad662e2b9ae35790ee6076c
+  languageName: node
+  linkType: hard
+
 "@tensorflow/tfjs-backend-webgl@npm:3.19.0":
   version: 3.19.0
   resolution: "@tensorflow/tfjs-backend-webgl@npm:3.19.0"
@@ -1031,6 +1067,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tensorflow/tfjs-backend-webgl@npm:3.20.0":
+  version: 3.20.0
+  resolution: "@tensorflow/tfjs-backend-webgl@npm:3.20.0"
+  dependencies:
+    "@tensorflow/tfjs-backend-cpu": 3.20.0
+    "@types/offscreencanvas": ~2019.3.0
+    "@types/seedrandom": ^2.4.28
+    "@types/webgl-ext": 0.0.30
+    "@types/webgl2": 0.0.6
+    seedrandom: ^3.0.5
+  peerDependencies:
+    "@tensorflow/tfjs-core": 3.20.0
+  checksum: ccdfa5e506c2cfe4cb7a148b57d31d2ea4666f32ed982a368beda29a77d05e0725409f96f8f8e9682fbb9737bede5cd57a018509cc120646ca04a0d4e41c44ac
+  languageName: node
+  linkType: hard
+
 "@tensorflow/tfjs-converter@npm:3.19.0":
   version: 3.19.0
   resolution: "@tensorflow/tfjs-converter@npm:3.19.0"
@@ -1040,6 +1092,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tensorflow/tfjs-converter@npm:3.20.0":
+  version: 3.20.0
+  resolution: "@tensorflow/tfjs-converter@npm:3.20.0"
+  peerDependencies:
+    "@tensorflow/tfjs-core": 3.20.0
+  checksum: 1ce51c1c6ca88563fbecca2587ff1e084a7ff7b78065c90140c90086ea957df0bc80cdd1645ca8ad15f6c445ce8de912cf151f4336040b8dcd6f5a08d49b08f1
+  languageName: node
+  linkType: hard
+
 "@tensorflow/tfjs-core@npm:3.19.0":
   version: 3.19.0
   resolution: "@tensorflow/tfjs-core@npm:3.19.0"
@@ -1056,6 +1117,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tensorflow/tfjs-core@npm:3.20.0":
+  version: 3.20.0
+  resolution: "@tensorflow/tfjs-core@npm:3.20.0"
+  dependencies:
+    "@types/long": ^4.0.1
+    "@types/offscreencanvas": ~2019.3.0
+    "@types/seedrandom": ^2.4.28
+    "@types/webgl-ext": 0.0.30
+    "@webgpu/types": 0.1.16
+    long: 4.0.0
+    node-fetch: ~2.6.1
+    seedrandom: ^3.0.5
+  checksum: fc95440498574466a70605e1845fd4be16708940606458d853074c0fab010c795b2a2b32a4436414cb44160c0ee96513e81f27e34b311b3f719f7326c0b250db
+  languageName: node
+  linkType: hard
+
 "@tensorflow/tfjs-data@npm:3.19.0":
   version: 3.19.0
   resolution: "@tensorflow/tfjs-data@npm:3.19.0"
@@ -1070,6 +1147,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tensorflow/tfjs-data@npm:3.20.0":
+  version: 3.20.0
+  resolution: "@tensorflow/tfjs-data@npm:3.20.0"
+  dependencies:
+    "@types/node-fetch": ^2.1.2
+    node-fetch: ~2.6.1
+    string_decoder: ^1.3.0
+  peerDependencies:
+    "@tensorflow/tfjs-core": 3.20.0
+    seedrandom: ^3.0.5
+  checksum: 5476a03892c21849309275538ca3273df9e0b89ff238ae76c2c4ffd5eab26279d7570541762dc088c075de3a62b5a3afa9272429abcd8e4a935a7ba9b0cd1d8e
+  languageName: node
+  linkType: hard
+
 "@tensorflow/tfjs-layers@npm:3.19.0":
   version: 3.19.0
   resolution: "@tensorflow/tfjs-layers@npm:3.19.0"
@@ -1079,23 +1170,53 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tensorflow/tfjs-node@npm:3.19.0":
-  version: 3.19.0
-  resolution: "@tensorflow/tfjs-node@npm:3.19.0"
+"@tensorflow/tfjs-layers@npm:3.20.0":
+  version: 3.20.0
+  resolution: "@tensorflow/tfjs-layers@npm:3.20.0"
+  peerDependencies:
+    "@tensorflow/tfjs-core": 3.20.0
+  checksum: 900f00050e2e069650bd14574e50248d72ea79ee31a5fc3de075875d9efef70ca676ba1d39dd2ec2b9c4e43deed77ce286e7b6e87939479ffe6cae79bc069bcc
+  languageName: node
+  linkType: hard
+
+"@tensorflow/tfjs-node@npm:3.20.0":
+  version: 3.20.0
+  resolution: "@tensorflow/tfjs-node@npm:3.20.0"
   dependencies:
     "@mapbox/node-pre-gyp": 1.0.9
-    "@tensorflow/tfjs": 3.19.0
+    "@tensorflow/tfjs": 3.20.0
     adm-zip: ^0.5.2
     google-protobuf: ^3.9.2
     https-proxy-agent: ^2.2.1
     progress: ^2.0.0
     rimraf: ^2.6.2
     tar: ^4.4.6
-  checksum: 5be4c55838e251c7aef497f5d3b1739c47afc567d611d3197347265a6032ee18a62545485c3c6902e0c35c8d48a9fefc78d40363be99b889971b260dd7bd39a6
+  checksum: a5c6a5e985b566614f89c8c2b3b5fa05ec179735a720f1e17613673e427856091e4438e9dc7ff5bdc46216ea989326d98cbf35f5664897a425a1c7d5d16f7928
   languageName: node
   linkType: hard
 
-"@tensorflow/tfjs@npm:3.19.0, @tensorflow/tfjs@npm:^3.18.0":
+"@tensorflow/tfjs@npm:3.20.0":
+  version: 3.20.0
+  resolution: "@tensorflow/tfjs@npm:3.20.0"
+  dependencies:
+    "@tensorflow/tfjs-backend-cpu": 3.20.0
+    "@tensorflow/tfjs-backend-webgl": 3.20.0
+    "@tensorflow/tfjs-converter": 3.20.0
+    "@tensorflow/tfjs-core": 3.20.0
+    "@tensorflow/tfjs-data": 3.20.0
+    "@tensorflow/tfjs-layers": 3.20.0
+    argparse: ^1.0.10
+    chalk: ^4.1.0
+    core-js: 3
+    regenerator-runtime: ^0.13.5
+    yargs: ^16.0.3
+  bin:
+    tfjs-custom-module: dist/tools/custom_module/cli.js
+  checksum: 75f2c62d87008f781b17c7249a1d5246d464de8e4c29afa2dcd575756adf6759b7762c7fe35039df1504f058172a7d4f87384564faf8cdb5f57ed4ee1b408d41
+  languageName: node
+  linkType: hard
+
+"@tensorflow/tfjs@npm:^3.18.0":
   version: 3.19.0
   resolution: "@tensorflow/tfjs@npm:3.19.0"
   dependencies:
@@ -1651,10 +1772,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:18.7.2":
-  version: 18.7.2
-  resolution: "@types/node@npm:18.7.2"
-  checksum: 422cf95dea09959d0e809d24280b76948f60ea805e20d38f07bf9eeafeb413513b9cc365404766f7752bef9cafb8301a882d9d097f780e13f2bedf507459ebc5
+"@types/node@npm:18.7.13":
+  version: 18.7.13
+  resolution: "@types/node@npm:18.7.13"
+  checksum: 45431e7e89ecaf85c7d2c180d801c132a7c59e2f8ad578726b6d71cc74e3267c18f9ccdcad738bc0479790c078f0c79efb0e58da2c6be535c15995dbb19050c9
   languageName: node
   linkType: hard
 
@@ -1711,12 +1832,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/qrcode@npm:1.4.2":
-  version: 1.4.2
-  resolution: "@types/qrcode@npm:1.4.2"
+"@types/qrcode@npm:1.5.0":
+  version: 1.5.0
+  resolution: "@types/qrcode@npm:1.5.0"
   dependencies:
     "@types/node": "*"
-  checksum: 7ac58687aacc688b83dde43dc349dc42106c6c382b62eb1256e35c6cb7de45e79ef8e917e05b02a81272cd0c1ff21147307244fd57401ba19314851f30636283
+  checksum: b0ece3834ca5ba6171132928fd1ef764772dc619b45cb4123461ee05e377ad15553a330d234c69db0d0028c6639a99429e88d99192fbba9c5ee97c23f278c48b
   languageName: node
   linkType: hard
 
@@ -1985,13 +2106,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:5.33.0":
-  version: 5.33.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:5.33.0"
+"@typescript-eslint/eslint-plugin@npm:5.35.1":
+  version: 5.35.1
+  resolution: "@typescript-eslint/eslint-plugin@npm:5.35.1"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.33.0
-    "@typescript-eslint/type-utils": 5.33.0
-    "@typescript-eslint/utils": 5.33.0
+    "@typescript-eslint/scope-manager": 5.35.1
+    "@typescript-eslint/type-utils": 5.35.1
+    "@typescript-eslint/utils": 5.35.1
     debug: ^4.3.4
     functional-red-black-tree: ^1.0.1
     ignore: ^5.2.0
@@ -2004,42 +2125,42 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: d408f3f474b34fefde8ee65d98deb126949fd7d8e211a7f95c5cc2b507dedbf8eb239f3895e0c37aa6338989531e37c5f35c2e0de36a126c52f0846e89605487
+  checksum: 073f4dffd863881f1c87e1c217ac13bda44aaa2db12ef260032b5e8eb6ffd6b9cf6f62c85132dbf84152f353c435c66dd4f75c3bcb86eb23e926737aa4fb66fa
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:5.33.0":
-  version: 5.33.0
-  resolution: "@typescript-eslint/parser@npm:5.33.0"
+"@typescript-eslint/parser@npm:5.35.1":
+  version: 5.35.1
+  resolution: "@typescript-eslint/parser@npm:5.35.1"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.33.0
-    "@typescript-eslint/types": 5.33.0
-    "@typescript-eslint/typescript-estree": 5.33.0
+    "@typescript-eslint/scope-manager": 5.35.1
+    "@typescript-eslint/types": 5.35.1
+    "@typescript-eslint/typescript-estree": 5.35.1
     debug: ^4.3.4
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 2617aba987a70ee6b16ecc6afa6d245422df33a9d056018ff2e316159e667a0ab9d9c15fcea95e0ba65832661e71cc2753a221e77f0b0fab278e52c4497b8278
+  checksum: 57ea1a1da60b370f8d5c11c86155f7339359a90f2c59e34c89f626f1a79cb440248f07bd307a27ebbbcc997d2731cb9754cdbc37639770940521a938dd89870c
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:5.33.0":
-  version: 5.33.0
-  resolution: "@typescript-eslint/scope-manager@npm:5.33.0"
+"@typescript-eslint/scope-manager@npm:5.35.1":
+  version: 5.35.1
+  resolution: "@typescript-eslint/scope-manager@npm:5.35.1"
   dependencies:
-    "@typescript-eslint/types": 5.33.0
-    "@typescript-eslint/visitor-keys": 5.33.0
-  checksum: b2cbea9abd528d01a5acb2d68a2a5be51ec6827760d3869bdd70920cf6c3a4f9f96d87c77177f8313009d9db71253e4a75f8393f38651e2abaf91ef28e60fb9d
+    "@typescript-eslint/types": 5.35.1
+    "@typescript-eslint/visitor-keys": 5.35.1
+  checksum: 5a969a081309bac5962f99ee6dfdfd9c68ea677bc79d9796592dce82a36217f67aa55c7bf421b2c97b46c5149d6a9401bb4c57829595e8c19f47cfa9e8c2dd86
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:5.33.0":
-  version: 5.33.0
-  resolution: "@typescript-eslint/type-utils@npm:5.33.0"
+"@typescript-eslint/type-utils@npm:5.35.1":
+  version: 5.35.1
+  resolution: "@typescript-eslint/type-utils@npm:5.35.1"
   dependencies:
-    "@typescript-eslint/utils": 5.33.0
+    "@typescript-eslint/utils": 5.35.1
     debug: ^4.3.4
     tsutils: ^3.21.0
   peerDependencies:
@@ -2047,23 +2168,23 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: a1d1ffb42fe96bfc2339cc2875e218aa82fa9391be04c1a266bb11da1eca6835555687e81cde75477c60e6702049cd4dde7d2638e7e9b9d8cf4b7b2242353a6e
+  checksum: af317ba156f2767f76a7f97193873a00468370e157fdcc6ac19f664bc6c4c0a6836bd25028d17fdd54d339b6842fda68b82f1ce4142a222de6953625ea6c0a9c
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:5.33.0":
-  version: 5.33.0
-  resolution: "@typescript-eslint/types@npm:5.33.0"
-  checksum: 8bbddda84cb3adf5c659b0d42547a2d6ab87f4eea574aca5dd63a3bd85169f32796ecbddad3b27f18a609070f6b1d18a54018d488bad746ae0f6ea5c02206109
+"@typescript-eslint/types@npm:5.35.1":
+  version: 5.35.1
+  resolution: "@typescript-eslint/types@npm:5.35.1"
+  checksum: a4e1001867f43f3364b109fc5a07b91ae7a34b78ab191c6c5c4695dac9bb2b80b0a602651c0b807c1c7c1fc3656d2bbd47c637afa08a09e7b1c39eae3c489e00
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:5.33.0":
-  version: 5.33.0
-  resolution: "@typescript-eslint/typescript-estree@npm:5.33.0"
+"@typescript-eslint/typescript-estree@npm:5.35.1":
+  version: 5.35.1
+  resolution: "@typescript-eslint/typescript-estree@npm:5.35.1"
   dependencies:
-    "@typescript-eslint/types": 5.33.0
-    "@typescript-eslint/visitor-keys": 5.33.0
+    "@typescript-eslint/types": 5.35.1
+    "@typescript-eslint/visitor-keys": 5.35.1
     debug: ^4.3.4
     globby: ^11.1.0
     is-glob: ^4.0.3
@@ -2072,33 +2193,33 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 26f9005cdfb14654125a33d90d872b926820e560dff8970c4629fd5f6f47ad2a31e4c63161564d21bb42a8fc3ced0033994854ee37336ae07d90ccf6300d702b
+  checksum: a917ca4753a3f92c8d8555c96f5414383a9742761625476fa36a019401543aa74996159afa0f7fc7fae05fe0f904e3c6f4153a55412070c8a94e8171e81084c7
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:5.33.0":
-  version: 5.33.0
-  resolution: "@typescript-eslint/utils@npm:5.33.0"
+"@typescript-eslint/utils@npm:5.35.1":
+  version: 5.35.1
+  resolution: "@typescript-eslint/utils@npm:5.35.1"
   dependencies:
     "@types/json-schema": ^7.0.9
-    "@typescript-eslint/scope-manager": 5.33.0
-    "@typescript-eslint/types": 5.33.0
-    "@typescript-eslint/typescript-estree": 5.33.0
+    "@typescript-eslint/scope-manager": 5.35.1
+    "@typescript-eslint/types": 5.35.1
+    "@typescript-eslint/typescript-estree": 5.35.1
     eslint-scope: ^5.1.1
     eslint-utils: ^3.0.0
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: 6ce5ee5eabeb6d73538b24e6487f811ecb0ef3467bd366cbd15bf30d904bdedb73fc6f48cf2e2e742dda462b42999ea505e8b59255545825ec9db86f3d423ea7
+  checksum: 2b04092583c3139dd090727c24fb9d7fdb1fb9f20f2e3f0141cab5b98b6a1934b0fc8cab948f7faae55588385b0f1fb7bbf91f52c705ce4528036a527c3119c6
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:5.33.0":
-  version: 5.33.0
-  resolution: "@typescript-eslint/visitor-keys@npm:5.33.0"
+"@typescript-eslint/visitor-keys@npm:5.35.1":
+  version: 5.35.1
+  resolution: "@typescript-eslint/visitor-keys@npm:5.35.1"
   dependencies:
-    "@typescript-eslint/types": 5.33.0
+    "@typescript-eslint/types": 5.35.1
     eslint-visitor-keys: ^3.3.0
-  checksum: d7e3653de6bac6841e6fcc54226b93ad6bdca4aa76ebe7d83459c016c3eebcc50d4f65ee713174bc267d765295b642d1927a778c5de707b8389e3fcc052aa4a1
+  checksum: ef3c8377aac89935b5cc2fcf37bb3e42aa5f98848e7c22bdcbe5bb06c0fe8a1373a6897fd21109be8929b4708ad06c8874d2ef7bba17ff64911964203457330d
   languageName: node
   linkType: hard
 
@@ -2943,9 +3064,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aws-sdk@npm:2.1194.0":
-  version: 2.1194.0
-  resolution: "aws-sdk@npm:2.1194.0"
+"aws-sdk@npm:2.1204.0":
+  version: 2.1204.0
+  resolution: "aws-sdk@npm:2.1204.0"
   dependencies:
     buffer: 4.9.2
     events: 1.1.1
@@ -2957,7 +3078,7 @@ __metadata:
     util: ^0.12.4
     uuid: 8.0.0
     xml2js: 0.4.19
-  checksum: 793330b75cad4665b5d4f6617e85537990147190c927a0b6173b55a687f13e4b9bb0b4680d53a6afaed17701912bf8dc6dd4385d55c31acb83b798a16464ccd3
+  checksum: aba204f852853a8da6e6e42d823571adc827c540de542e980e0b629c2ecfd4ba961ed8a700adc18794af7c95f47f87f7722a6cb19ad43ec38cdfa8f6f02a8c91
   languageName: node
   linkType: hard
 
@@ -3030,10 +3151,10 @@ __metadata:
     "@koa/multer": 3.0.0
     "@koa/router": 9.0.1
     "@peertube/http-signature": 1.7.0
-    "@redocly/openapi-core": 1.0.0-beta.106
+    "@redocly/openapi-core": 1.0.0-beta.108
     "@sinonjs/fake-timers": 9.1.2
     "@syuilo/aiscript": 0.11.1
-    "@tensorflow/tfjs-node": 3.19.0
+    "@tensorflow/tfjs-node": 3.20.0
     "@types/bcryptjs": 2.4.2
     "@types/bull": 3.15.9
     "@types/cbor": 6.0.0
@@ -3055,13 +3176,13 @@ __metadata:
     "@types/koa__multer": 2.0.4
     "@types/koa__router": 8.0.11
     "@types/mocha": 9.1.1
-    "@types/node": 18.7.2
+    "@types/node": 18.7.13
     "@types/node-fetch": 3.0.3
     "@types/nodemailer": 6.4.5
     "@types/oauth": 0.9.1
     "@types/pug": 2.0.6
     "@types/punycode": 2.1.0
-    "@types/qrcode": 1.4.2
+    "@types/qrcode": 1.5.0
     "@types/random-seed": 0.3.3
     "@types/ratelimiter": 3.4.3
     "@types/redis": 4.0.11
@@ -3077,13 +3198,13 @@ __metadata:
     "@types/web-push": 3.3.2
     "@types/websocket": 1.0.5
     "@types/ws": 8.5.3
-    "@typescript-eslint/eslint-plugin": 5.33.0
-    "@typescript-eslint/parser": 5.33.0
+    "@typescript-eslint/eslint-plugin": 5.35.1
+    "@typescript-eslint/parser": 5.35.1
     ajv: 8.11.0
     archiver: 5.3.1
     autobind-decorator: 2.4.0
     autwh: 0.1.0
-    aws-sdk: 2.1194.0
+    aws-sdk: 2.1204.0
     bcryptjs: 2.4.3
     blurhash: 1.1.5
     bull: 4.8.5
@@ -3096,10 +3217,10 @@ __metadata:
     color-convert: 2.0.1
     content-disposition: 0.5.4
     cross-env: 7.0.3
-    date-fns: 2.29.1
+    date-fns: 2.29.2
     deep-email-validator: 0.1.21
     escape-regexp: 0.0.1
-    eslint: 8.21.0
+    eslint: 8.23.0
     eslint-plugin-import: 2.26.0
     execa: 6.1.0
     feed: 4.2.2
@@ -3116,7 +3237,7 @@ __metadata:
     json5: 2.2.1
     json5-loader: 4.0.1
     jsonld: 6.0.0
-    jsrsasign: 10.5.26
+    jsrsasign: 10.5.27
     koa: 2.13.4
     koa-bodyparser: 4.3.0
     koa-favicon: 2.1.0
@@ -3138,7 +3259,7 @@ __metadata:
     oauth: ^0.9.15
     os-utils: 0.0.14
     parse5: 7.0.0
-    pg: 8.7.3
+    pg: 8.8.0
     private-ip: 2.3.4
     probe-image-size: 7.2.3
     promise-limit: 2.7.0
@@ -3163,7 +3284,7 @@ __metadata:
     stringz: 2.1.0
     summaly: 2.7.0
     syslog-pro: 1.0.0
-    systeminformation: 5.12.5
+    systeminformation: 5.12.6
     tinycolor2: 1.4.2
     tmp: 0.2.1
     ts-loader: 9.3.1
@@ -3171,8 +3292,8 @@ __metadata:
     tsc-alias: 1.7.0
     tsconfig-paths: 4.1.0
     twemoji-parser: 14.0.0
-    typeorm: 0.3.7
-    typescript: 4.7.4
+    typeorm: ^0.3.9
+    typescript: 4.8.2
     ulid: 2.3.0
     unzipper: 0.10.11
     uuid: 8.3.2
@@ -3666,9 +3787,9 @@ __metadata:
     "@tensorflow/tfjs": ^3.18.0
     "@types/gulp": 4.0.9
     "@types/gulp-rename": 2.0.1
-    "@typescript-eslint/parser": 5.33.0
+    "@typescript-eslint/parser": 5.35.1
     cross-env: 7.0.3
-    cypress: 10.4.0
+    cypress: 10.6.0
     eslint: ^8.20.0
     execa: 5.1.1
     gulp: 4.0.2
@@ -3680,7 +3801,7 @@ __metadata:
     long: ^5.2.0
     seedrandom: ^3.0.5
     start-server-and-test: 1.14.0
-    typescript: 4.7.4
+    typescript: 4.8.2
     unplugin-swc: ^1.3.2
     vue-eslint-parser: ^9.0.2
   languageName: unknown
@@ -3877,12 +3998,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chartjs-plugin-gradient@npm:0.5.0":
-  version: 0.5.0
-  resolution: "chartjs-plugin-gradient@npm:0.5.0"
+"chartjs-plugin-gradient@npm:0.5.1":
+  version: 0.5.1
+  resolution: "chartjs-plugin-gradient@npm:0.5.1"
   peerDependencies:
     chart.js: ">=2.6.0"
-  checksum: e6bef93d01547e2a61683d0e81d51d944d5ad7ae59d5a5c1e4a0583acf436a583b3e9791201759936f627f52fbf0865de1c69296c4097f05b5b5979c23097451
+  checksum: 981101d6300bc433752068e235eb33f7de15774cfad5730ebbadc91f94da282c1dfb2584c3bed579ee0d38a80e31fa1441ea9a9bad636c67bb70f2312a8d66e0
   languageName: node
   linkType: hard
 
@@ -4065,8 +4186,8 @@ __metadata:
     "@types/throttle-debounce": 5.0.0
     "@types/tinycolor2": 1.4.3
     "@types/uuid": 8.3.4
-    "@typescript-eslint/eslint-plugin": 5.33.0
-    "@typescript-eslint/parser": 5.33.0
+    "@typescript-eslint/eslint-plugin": 5.35.1
+    "@typescript-eslint/parser": 5.35.1
     "@vitejs/plugin-vue": 3.0.3
     "@vue/compiler-sfc": 3.2.37
     autobind-decorator: 2.4.0
@@ -4076,17 +4197,17 @@ __metadata:
     browser-image-resizer: "https://github.com/misskey-dev/browser-image-resizer"
     chart.js: 3.9.1
     chartjs-adapter-date-fns: 2.0.0
-    chartjs-plugin-gradient: 0.5.0
+    chartjs-plugin-gradient: 0.5.1
     chartjs-plugin-zoom: 1.2.1
-    compare-versions: 4.1.3
+    compare-versions: 5.0.1
     cropperjs: 2.0.0-beta
     cross-env: 7.0.3
-    cypress: 10.4.0
-    date-fns: 2.29.1
+    cypress: 10.6.0
+    date-fns: 2.29.2
     escape-regexp: 0.0.1
-    eslint: 8.21.0
+    eslint: 8.23.0
     eslint-plugin-import: 2.26.0
-    eslint-plugin-vue: 9.3.0
+    eslint-plugin-vue: 9.4.0
     eventemitter3: 4.0.7
     idb-keyval: 6.2.0
     insert-text-at-cursor: 0.3.0
@@ -4096,13 +4217,13 @@ __metadata:
     mfm-js: 0.23.0
     misskey-js: 0.0.14
     photoswipe: 5.3.0
-    prismjs: 1.28.0
+    prismjs: 1.29.0
     punycode: 2.1.1
     querystring: 0.2.1
     rndstr: 1.0.0
-    rollup: 2.77.3
+    rollup: 2.78.1
     s-age: 1.1.2
-    sass: 1.54.4
+    sass: 1.54.5
     seedrandom: 3.0.5
     start-server-and-test: 1.14.0
     strict-event-emitter-types: 2.0.0
@@ -4117,10 +4238,10 @@ __metadata:
     tsc-alias: 1.7.0
     tsconfig-paths: 4.1.0
     twemoji-parser: 14.0.0
-    typescript: 4.7.4
+    typescript: 4.8.2
     uuid: 8.3.2
     vanilla-tilt: 1.7.2
-    vite: 3.0.7
+    vite: 3.0.9
     vue: 3.2.37
     vue-plyr: ^7.0.0
     vue-prism-editor: 2.0.0-alpha.2
@@ -4449,10 +4570,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"compare-versions@npm:4.1.3":
-  version: 4.1.3
-  resolution: "compare-versions@npm:4.1.3"
-  checksum: 54460756ab2d62f8a9d672db249b248fec7ca41c3e8ed242925e2f2257793ad3e83cecb2cdfd60b46a3aabc962a3a4cbf37a4b928c8f30517822d2bde937a3d1
+"compare-versions@npm:5.0.1":
+  version: 5.0.1
+  resolution: "compare-versions@npm:5.0.1"
+  checksum: 302a4e46224b47b9280cf894c6c87d8df912671fa391dcdbf0e63438d9b0a69fe20dd747fb439e8d54c43af016ff4eaaf0a4c9d8e7ca358bcd12dadf4ad2935e
   languageName: node
   linkType: hard
 
@@ -4832,9 +4953,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cypress@npm:10.4.0":
-  version: 10.4.0
-  resolution: "cypress@npm:10.4.0"
+"cypress@npm:10.6.0":
+  version: 10.6.0
+  resolution: "cypress@npm:10.6.0"
   dependencies:
     "@cypress/request": ^2.88.10
     "@cypress/xvfb": ^1.2.4
@@ -4880,7 +5001,7 @@ __metadata:
     yauzl: ^2.10.0
   bin:
     cypress: bin/cypress
-  checksum: 3f7385e076ac936683d1d1d104a7183f2e61ad0f4c901aff07146ae2e10197e8314019dcdfb6c188312fbf1be05484291f1cf8d49c4c37cf6485103c4ac5303e
+  checksum: 53993d2d712222df13ef4802db051fee8a7ac59b180ed11b22e6f10d36f5d9b2c2622f1bbfa012f61c7756139287a976abd075275ddd37191b13f40ec8deaa85
   languageName: node
   linkType: hard
 
@@ -4928,7 +5049,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"date-fns@npm:2.29.1, date-fns@npm:^2.28.0":
+"date-fns@npm:2.29.2":
+  version: 2.29.2
+  resolution: "date-fns@npm:2.29.2"
+  checksum: 08bebcceb0a5dbadae4c55e6592b9d5c07dbd7833433c7e9a1d4a424300db32589b8b48e5979b32863c9b00a48d9bab6663e580c2a4f9f203d46cbf9113b5664
+  languageName: node
+  linkType: hard
+
+"date-fns@npm:^2.28.0":
   version: 2.29.1
   resolution: "date-fns@npm:2.29.1"
   checksum: 9d07f77dffc1eb8c213391bde39f2963ffe7c0019d9edde14487882d627224f3a39b963e6e99d0cc58afff220a6a1a7e8864d2789958f4eaa77714de94d4d076
@@ -6030,9 +6158,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-vue@npm:9.3.0":
-  version: 9.3.0
-  resolution: "eslint-plugin-vue@npm:9.3.0"
+"eslint-plugin-vue@npm:9.4.0":
+  version: 9.4.0
+  resolution: "eslint-plugin-vue@npm:9.4.0"
   dependencies:
     eslint-utils: ^3.0.0
     natural-compare: ^1.4.0
@@ -6043,7 +6171,7 @@ __metadata:
     xml-name-validator: ^4.0.0
   peerDependencies:
     eslint: ^6.2.0 || ^7.0.0 || ^8.0.0
-  checksum: 3a1819749fb9a617f3647a58ee21595e811a9bcbf2a5eb1c2105da24c41c7b91a58e4473d751d6ab78cc0bb140dc7e11aac09337fc2c7d44401564a11ec92100
+  checksum: 1eb085e7d52285eff05e4a3f0f4d65619e943eb7e976b0ef59c3adc75bf4a089df8e8cdba223cf27e2623c0fc6b306e3b1ca460d0ce27cc421ca91b7880eb0d8
   languageName: node
   linkType: hard
 
@@ -6092,13 +6220,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:8.21.0":
-  version: 8.21.0
-  resolution: "eslint@npm:8.21.0"
+"eslint@npm:8.23.0":
+  version: 8.23.0
+  resolution: "eslint@npm:8.23.0"
   dependencies:
-    "@eslint/eslintrc": ^1.3.0
+    "@eslint/eslintrc": ^1.3.1
     "@humanwhocodes/config-array": ^0.10.4
     "@humanwhocodes/gitignore-to-minimatch": ^1.0.2
+    "@humanwhocodes/module-importer": ^1.0.1
     ajv: ^6.10.0
     chalk: ^4.0.0
     cross-spawn: ^7.0.2
@@ -6108,7 +6237,7 @@ __metadata:
     eslint-scope: ^7.1.1
     eslint-utils: ^3.0.0
     eslint-visitor-keys: ^3.3.0
-    espree: ^9.3.3
+    espree: ^9.4.0
     esquery: ^1.4.0
     esutils: ^2.0.2
     fast-deep-equal: ^3.1.3
@@ -6134,10 +6263,9 @@ __metadata:
     strip-ansi: ^6.0.1
     strip-json-comments: ^3.1.0
     text-table: ^0.2.0
-    v8-compile-cache: ^2.0.3
   bin:
     eslint: bin/eslint.js
-  checksum: 1d39ddb08772ea230cb7d74f7f81f85b9d46965d3600725c7eb39a27bcdaf28cb2a780dacf6cfa1cfbf2da606b57a5e7e3ab373ab474cbcf0ba042076821f501
+  checksum: ff6075daa28d817a7ac4508f31bc108a04d9ab5056608c8651b5bf9cfea5d708ca16dea6cdab2c3c0ae99b0bf0e726af8504eaa8e17c8e12e242cb68237ead64
   languageName: node
   linkType: hard
 
@@ -6201,6 +6329,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"espree@npm:^9.4.0":
+  version: 9.4.0
+  resolution: "espree@npm:9.4.0"
+  dependencies:
+    acorn: ^8.8.0
+    acorn-jsx: ^5.3.2
+    eslint-visitor-keys: ^3.3.0
+  checksum: 2e3020dde67892d2ba3632413b44d0dc31d92c29ce72267d7ec24216a562f0a6494d3696e2fa39a3ec8c0e0088d773947ab2925fbb716801a11eb8dd313ac89c
+  languageName: node
+  linkType: hard
+
 "esprima@npm:^2.6.0":
   version: 2.7.3
   resolution: "esprima@npm:2.7.3"
@@ -9193,10 +9332,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsrsasign@npm:10.5.26":
-  version: 10.5.26
-  resolution: "jsrsasign@npm:10.5.26"
-  checksum: 1d717c7a0d2e4e745f4c819b0291a2f7a3c200001fce00c112fb9566d8f7bce108a86721a6eba804ca56f67885cfbf23167e592df1e568ca6f9855ca1f050682
+"jsrsasign@npm:10.5.27":
+  version: 10.5.27
+  resolution: "jsrsasign@npm:10.5.27"
+  checksum: 77ebac65d39399e7702002ed75a39f6af9bfe0f839f19c65a878e6f2d5a96fb19433628509c344e25531794d84c913dbd7b1c522188883c5258fd531fb992e17
   languageName: node
   linkType: hard
 
@@ -11564,12 +11703,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pg-pool@npm:^3.5.1":
-  version: 3.5.1
-  resolution: "pg-pool@npm:3.5.1"
+"pg-pool@npm:^3.5.2":
+  version: 3.5.2
+  resolution: "pg-pool@npm:3.5.2"
   peerDependencies:
     pg: ">=8.0"
-  checksum: 42833c25f18fee41a1b2d955978f1403e93164762a7e57d3a870429103d302f1899b393ab021bb8144272037eb3f13bdb9f16a4c4afaa3efd3d2c3689738038f
+  checksum: a5d029200257671f0c17ca54b9ab6213e2060e64e5cc792b78edd50ab471a26cd364890d05d546d9296949e079e943821cf2ceb4d488f4e6a6789fb781a628bf
   languageName: node
   linkType: hard
 
@@ -11593,23 +11732,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pg@npm:8.7.3":
-  version: 8.7.3
-  resolution: "pg@npm:8.7.3"
+"pg@npm:8.8.0":
+  version: 8.8.0
+  resolution: "pg@npm:8.8.0"
   dependencies:
     buffer-writer: 2.0.0
     packet-reader: 1.0.0
     pg-connection-string: ^2.5.0
-    pg-pool: ^3.5.1
+    pg-pool: ^3.5.2
     pg-protocol: ^1.5.0
     pg-types: ^2.1.0
     pgpass: 1.x
   peerDependencies:
-    pg-native: ">=2.0.0"
+    pg-native: ">=3.0.1"
   peerDependenciesMeta:
     pg-native:
       optional: true
-  checksum: d0e7040967779b9ccea16897f099510bcaf6bc86f77a6d8fa7e293c24d8bd2fd2ec46d99d6d1adc9be4cc8f254aa909361346b693088c1ba4501414f7afb2fe3
+  checksum: fa30a85814dd7238b582c3bc6c0b9e2b0ae38dd0a6bb485ef480e64bb5ce589de6cb873ce4d3cd10c37a3e0a1e1281ba75dc7d80b1a68bae91999cd5b70d398b
   languageName: node
   linkType: hard
 
@@ -12179,10 +12318,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prismjs@npm:1.28.0":
-  version: 1.28.0
-  resolution: "prismjs@npm:1.28.0"
-  checksum: bde93fb2beb45b7243219fc53855f59ee54b3fa179f315e8f9d66244d756ef984462e10561bbdc6713d3d7e051852472d7c284f5794a8791eeaefea2fb910b16
+"prismjs@npm:1.29.0":
+  version: 1.29.0
+  resolution: "prismjs@npm:1.29.0"
+  checksum: 007a8869d4456ff8049dc59404e32d5666a07d99c3b0e30a18bd3b7676dfa07d1daae9d0f407f20983865fd8da56de91d09cb08e6aa61f5bc420a27c0beeaf93
   languageName: node
   linkType: hard
 
@@ -13208,7 +13347,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup@npm:2.77.3, rollup@npm:>=2.75.6 <2.77.0 || ~2.77.0":
+"rollup@npm:2.78.1":
+  version: 2.78.1
+  resolution: "rollup@npm:2.78.1"
+  dependencies:
+    fsevents: ~2.3.2
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  bin:
+    rollup: dist/bin/rollup
+  checksum: 9034814383ca5bdb4bea6d499270aeb31cdb0bb884f81b0c6a1d19c63cc973f040e6ee09b7af8a7169dd231c090f4b44ef8b99c4bfdf884aceeb3dcefb8cfa14
+  languageName: node
+  linkType: hard
+
+"rollup@npm:>=2.75.6 <2.77.0 || ~2.77.0":
   version: 2.77.3
   resolution: "rollup@npm:2.77.3"
   dependencies:
@@ -13324,16 +13477,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass@npm:1.54.4":
-  version: 1.54.4
-  resolution: "sass@npm:1.54.4"
+"sass@npm:1.54.5":
+  version: 1.54.5
+  resolution: "sass@npm:1.54.5"
   dependencies:
     chokidar: ">=3.0.0 <4.0.0"
     immutable: ^4.0.0
     source-map-js: ">=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: bb6aead09764de450a02b9a66e4ee538f0ba6bc8f2fc3905c71b2c302b5f47e089b510b86cfa7ef2d4139c210c8abf99fe157e7a5bd356c057f10d29e6c4b44c
+  checksum: ba7a65aa7508419468547c8de4d59e537bec874f52823f501663dc98d80dfd2d374e8ea73a31200db7f510b8816c925edf89728c9b36889f4e6673d3e94ec100
   languageName: node
   linkType: hard
 
@@ -14307,12 +14460,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"systeminformation@npm:5.12.5":
-  version: 5.12.5
-  resolution: "systeminformation@npm:5.12.5"
+"systeminformation@npm:5.12.6":
+  version: 5.12.6
+  resolution: "systeminformation@npm:5.12.6"
   bin:
     systeminformation: lib/cli.js
-  checksum: 41b26420ea25a2f6068e6b63e7ea6ca5e090b815a70008f66a8c867f1b7320a3707f918142f91a642f720095e17b8ce691a46cd76e877ed7f6ae30b3b2a330dd
+  checksum: ae112148530bc31c4c43c4966b8f56822c874caa93daa1f146ea2372ec32738b315f10c58fb968611d082d9614bac054a9a3740b7e7df1201a2a581c73f3306c
   conditions: (os=darwin | os=linux | os=win32 | os=freebsd | os=openbsd | os=netbsd | os=sunos | os=android)
   languageName: node
   linkType: hard
@@ -14934,9 +15087,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typeorm@npm:0.3.7":
-  version: 0.3.7
-  resolution: "typeorm@npm:0.3.7"
+"typeorm@npm:^0.3.9":
+  version: 0.3.9
+  resolution: "typeorm@npm:0.3.9"
   dependencies:
     "@sqltools/formatter": ^1.2.2
     app-root-path: ^3.0.0
@@ -15012,27 +15165,27 @@ __metadata:
     typeorm: cli.js
     typeorm-ts-node-commonjs: cli-ts-node-commonjs.js
     typeorm-ts-node-esm: cli-ts-node-esm.js
-  checksum: b9a709fa1c103c98340ff055419f5de7fde478e35f246b2f6b212ad6c8954085f347c5a97ed2d94634cf9d51577035d8d71c4c4ccfd58b5f7a9579f434e71802
+  checksum: 5de1e5ac352640ea0b4c41cdfc4da2d3715709e8d0899dc7ec74a81a879dd22d0f99bd8244be3fc6353c2574e6657d3d863b4e4f0337278bb098e81afdacc473
   languageName: node
   linkType: hard
 
-"typescript@npm:4.7.4":
-  version: 4.7.4
-  resolution: "typescript@npm:4.7.4"
+"typescript@npm:4.8.2":
+  version: 4.8.2
+  resolution: "typescript@npm:4.8.2"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 5750181b1cd7e6482c4195825547e70f944114fb47e58e4aa7553e62f11b3f3173766aef9c281783edfd881f7b8299cf35e3ca8caebe73d8464528c907a164df
+  checksum: 7f5b81d0d558c9067f952c7af52ab7f19c2e70a916817929e4a5b256c93990bf3178eccb1ac8a850bc75df35f6781b6f4cb3370ce20d8b1ded92ed462348f628
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@4.7.4#~builtin<compat/typescript>":
-  version: 4.7.4
-  resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin<compat/typescript>::version=4.7.4&hash=f456af"
+"typescript@patch:typescript@4.8.2#~builtin<compat/typescript>":
+  version: 4.8.2
+  resolution: "typescript@patch:typescript@npm%3A4.8.2#~builtin<compat/typescript>::version=4.8.2&hash=f456af"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 9096d8f6c16cb80ef3bf96fcbbd055bf1c4a43bd14f3b7be45a9fbe7ada46ec977f604d5feed3263b4f2aa7d4c7477ce5f9cd87de0d6feedec69a983f3a4f93e
+  checksum: 6f49363af8af2fe480da1d5fa68712644438785208b06690a3cbe5e7365fd652c3a0f1e587bc8684d78fb69de3dde4de185c0bad7bb4f3664ddfc813ce8caad6
   languageName: node
   linkType: hard
 
@@ -15500,9 +15653,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:3.0.7":
-  version: 3.0.7
-  resolution: "vite@npm:3.0.7"
+"vite@npm:3.0.9":
+  version: 3.0.9
+  resolution: "vite@npm:3.0.9"
   dependencies:
     esbuild: ^0.14.47
     fsevents: ~2.3.2
@@ -15528,7 +15681,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 3cdcb68e16433b9addee61c117c379692e4d12d44ee7011da99ed9516b8c37ce76f1bb1728eab0e3a28957c9d2dc839024e1607c2ad03f38089e3be55d7dd456
+  checksum: 6341aa43579ae45f8a383bdc0c5041dea3dff98f14e0a546d6d884a864134b00082246a28d1de8adff0ce0dd92b468c7ade8f972ffe1ed97258671d63e0f16f7
   languageName: node
   linkType: hard
 

From fcc5c7e5e9bdb64b04f8c12b884e5439c1e54be2 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 5 Sep 2022 15:01:35 -0700
Subject: [PATCH 138/245] chore: :twisted_rightwards_arrows: Merge upstream


From 2451dc0c235cdc2381145be3bfe7a8a2af6a3bcd Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 5 Sep 2022 15:05:45 -0700
Subject: [PATCH 139/245] .4

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

diff --git a/CALCKEY.md b/CALCKEY.md
index ed0dfc54d..d6af1b131 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -6,6 +6,7 @@
 - Classic mode make instance icon bring up new context menu
 - Like/star button
 - Backfill remote users
+- User "choices" (recommended users) like Mastodon and Soapbox
 - Option to publicize instance blocks
 - Better intro/onboarding
 - Fully revamp non-logged-in screen
diff --git a/package.json b/package.json
index 9feea3fa9..458dc21b7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-beta.2-rc.3",
+	"version": "12.118.1-calc.2-beta.2-rc.4",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 37b7c4485c88fc92d516b488f08decfb86790934 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 5 Sep 2022 15:55:28 -0700
Subject: [PATCH 140/245] fix: :ambulance: fix ref

---
 package.json                           | 2 +-
 packages/client/src/pages/timeline.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 458dc21b7..23c5ae5e9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-beta.2-rc.4",
+	"version": "12.118.1-calc.2-beta.2-rc.5",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index f7387e184..65e2501c1 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -64,7 +64,7 @@
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, computed, watch } from 'vue';
+import { defineAsyncComponent, computed, watch, ref } from 'vue';
 import { Pagination, Virtual } from 'swiper';
 import { Swiper, SwiperSlide } from 'swiper/vue';
 import XTimeline from '@/components/MkTimeline.vue';

From e4861bcf0b932b1953b524a6f7a9b49b9cb1809f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 5 Sep 2022 18:13:17 -0700
Subject: [PATCH 141/245] refactor: :sparkles: Swiper, no swiping! :fox:

Swiper everywhere, attempt to sync to header bar
---
 package.json                           |  2 +-
 packages/client/src/pages/timeline.vue | 25 +++++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 23c5ae5e9..c756c57bf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-beta.2-rc.5",
+	"version": "12.118.1-calc.2-beta.2-rc.6",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 65e2501c1..f65106982 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -25,7 +25,7 @@
 					{{ i18n.ts.newNoteRecived }}
 				</button>
 			</div>
-			<div v-if="!isMobile" class="tl _block">
+			<!-- <div v-if="!isMobile" class="tl _block">
 				<XTimeline
 					ref="tl"
 					:key="src"
@@ -34,13 +34,14 @@
 					:sound="true"
 					@queue="queueUpdated"
 				/>
-			</div>
-			<div v-else class="tl _block">
+			</div> *v-else on next div* -->
+			<div class="tl _block">
 				<swiper
 					:modules="[Pagination, Virtual]"
 					:space-between="20"
 					:virtual="true"
 					@swiper="setSwiperRef"
+					@slide-change="onSlideChange"
 				>
 					<swiper-slide
 						v-for="index in timelines"
@@ -79,7 +80,7 @@ import { definePageMetadata } from '@/scripts/page-metadata';
 import { deviceKind } from '@/scripts/device-kind';
 import 'swiper/scss';
 import 'swiper/scss/pagination';
-import 'swiper/css/virtual';
+import 'swiper/scss/virtual';
 
 const XTutorial = defineAsyncComponent(() => import('./timeline.tutorial.vue'));
 
@@ -148,7 +149,7 @@ async function chooseAntenna(ev: MouseEvent): Promise<void> {
 }
 
 function saveSrc(
-	newSrc: 'home' | 'local' | 'recommended' | 'social' | 'global'
+	newSrc: 'home' | 'local' | 'recommended' | 'social' | 'global',
 ): void {
 	defaultStore.set('tl', {
 		...defaultStore.state.tl,
@@ -271,13 +272,17 @@ if (isGlobalTimelineAvailable) {
 
 let swiperRef = null;
 
-const setSwiperRef = (swiper) => {
+function setSwiperRef(swiper) {
 	swiperRef = swiper;
-};
+}
 
-const slideTo = (index) => {
-	swiperRef.slideTo(index - 1, 0);
-};
+function onSlideChange() {
+	if (swiperRef) {
+		const index = swiperRef.activeIndex;
+		saveSrc(timelines[swiperRef.activeIndex]);
+		swiperRef.slideTo(index - 1, 0);
+	}
+}
 
 </script>
 

From c89d8c7ef70692dba542b3ddb3f31112a9f646e9 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 5 Sep 2022 18:27:32 -0700
Subject: [PATCH 142/245] .7

---
 package.json                           | 2 +-
 packages/client/src/pages/timeline.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index c756c57bf..b3a908410 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-beta.2-rc.6",
+	"version": "12.118.1-calc.2-beta.2-rc.7",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index f65106982..ac4922c85 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -50,9 +50,9 @@
 					>
 						<XTimeline
 							ref="tl"
-							:key="index"
+							:key="src"
 							class="tl"
-							:src="index"
+							:src="src"
 							:sound="true"
 							@queue="queueUpdated"
 						/>

From e3e95e86fa4571a45ad036bcc213413624f7bdd7 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 5 Sep 2022 18:34:48 -0700
Subject: [PATCH 143/245] lfg

---
 package.json                           |  2 +-
 packages/client/src/pages/timeline.vue | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index b3a908410..bc45cab21 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-beta.2-rc.7",
+	"version": "12.118.1-calc.2-beta.2-rc.8",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index ac4922c85..7e0694675 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -114,7 +114,11 @@ const rootEl = $ref<HTMLElement>();
 let queue = $ref(0);
 const src = $computed({
 	get: () => defaultStore.reactiveState.tl.value.src,
-	set: (x) => saveSrc(x),
+	set: (x) => {
+		saveSrc(x);
+		console.log('set src', x);
+		syncSlide(x);
+	},
 });
 
 watch($$(src), () => (queue = 0));
@@ -277,11 +281,11 @@ function setSwiperRef(swiper) {
 }
 
 function onSlideChange() {
-	if (swiperRef) {
-		const index = swiperRef.activeIndex;
-		saveSrc(timelines[swiperRef.activeIndex]);
-		swiperRef.slideTo(index - 1, 0);
-	}
+	saveSrc(timelines[swiperRef.activeIndex]);
+}
+
+function syncSlide(index) {
+	swiperRef.slideTo(index);
 }
 
 </script>

From 60fb59c878a017e0579ce2687e5267f856682f1c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 5 Sep 2022 18:42:01 -0700
Subject: [PATCH 144/245] fix: :bug: sync fixed

---
 package.json                           |  2 +-
 packages/client/src/pages/timeline.vue | 33 +++++++++++++-------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index bc45cab21..a44247979 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-beta.2-rc.8",
+	"version": "12.118.1-calc.2-beta.2-rc.9",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 7e0694675..e7faf7d39 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -97,6 +97,21 @@ const keymap = {
 	t: focus,
 };
 
+let timelines = ['home'];
+
+if (isLocalTimelineAvailable) {
+	timelines.push('local');
+}
+if (isRecommendedTimelineAvailable) {
+	timelines.push('recommended');
+}
+if (isLocalTimelineAvailable) {
+	timelines.push('social');
+}
+if (isGlobalTimelineAvailable) {
+	timelines.push('global');
+}
+
 const MOBILE_THRESHOLD = 500;
 
 // デスクトップでウィンドウを狭くしたときモバイルUIが表示されて欲しいことはあるので deviceKind === 'desktop' の判定は行わない
@@ -116,8 +131,7 @@ const src = $computed({
 	get: () => defaultStore.reactiveState.tl.value.src,
 	set: (x) => {
 		saveSrc(x);
-		console.log('set src', x);
-		syncSlide(x);
+		syncSlide(timelines.indexOf(x));
 	},
 });
 
@@ -259,21 +273,6 @@ definePageMetadata(
 	})),
 );
 
-let timelines = ['home'];
-
-if (isLocalTimelineAvailable) {
-	timelines.push('local');
-}
-if (isRecommendedTimelineAvailable) {
-	timelines.push('recommended');
-}
-if (isLocalTimelineAvailable) {
-	timelines.push('social');
-}
-if (isGlobalTimelineAvailable) {
-	timelines.push('global');
-}
-
 let swiperRef = null;
 
 function setSwiperRef(swiper) {

From 057d1642c86d920a3896f62687d24e3cdd4be6fd Mon Sep 17 00:00:00 2001
From: Takuya Yoshida <hawaiianphoto@geekhost.net>
Date: Tue, 6 Sep 2022 14:57:46 +0900
Subject: [PATCH 145/245] Update typeorm to 0.3.9 (#9083)

---
 packages/backend/package.json | 2 +-
 packages/backend/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 61adf788a..61189e812 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -113,7 +113,7 @@
 		"tsc-alias": "1.7.0",
 		"tsconfig-paths": "4.1.0",
 		"twemoji-parser": "14.0.0",
-		"typeorm": "0.3.8",
+		"typeorm": "0.3.9",
 		"ulid": "2.3.0",
 		"unzipper": "0.10.11",
 		"uuid": "8.3.2",
diff --git a/packages/backend/yarn.lock b/packages/backend/yarn.lock
index 48dcf05c2..7d27016de 100644
--- a/packages/backend/yarn.lock
+++ b/packages/backend/yarn.lock
@@ -7582,10 +7582,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typeorm@0.3.8:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.3.8.tgz#134ab0736592da5d5ca66d4eb8cea5999e34d5f9"
-  integrity sha512-77PNamypfwieZlhwbUAjMudX2T+5F6JCoNR18RdKenJ5Uu+9gc9AWa1kmz/2hH84MU23lGqPCu8u2lKnlfsN2g==
+typeorm@0.3.9:
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.3.9.tgz#ad0f525d81c081fd11006f97030f47a55978ac81"
+  integrity sha512-xNcE44D4hn74n7pjuMog9hRgep+BiO3IBpjEaQZ8fb56zsDz7xHT1GAeWwmGuuU+4nDEELp2mIqgSCR+zxR7Jw==
   dependencies:
     "@sqltools/formatter" "^1.2.2"
     app-root-path "^3.0.0"

From eff9cdd8a7d51a4562264d83f5b0340f22be0d23 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 6 Sep 2022 17:37:58 +0900
Subject: [PATCH 146/245] refactor(client): use setup syntax

---
 packages/client/src/components/ui/button.vue | 171 ++++++++-----------
 packages/client/src/pages/welcome.setup.vue  |  57 +++----
 packages/client/src/ui/deck/column-core.vue  |  10 --
 packages/client/src/ui/deck/list-column.vue  |  14 --
 4 files changed, 89 insertions(+), 163 deletions(-)

diff --git a/packages/client/src/components/ui/button.vue b/packages/client/src/components/ui/button.vue
index 350629bf0..a052f8f7a 100644
--- a/packages/client/src/components/ui/button.vue
+++ b/packages/client/src/components/ui/button.vue
@@ -3,7 +3,7 @@
 	v-if="!link" class="bghgjjyj _button"
 	:class="{ inline, primary, gradate, danger, rounded, full }"
 	:type="type"
-	@click="$emit('click', $event)"
+	@click="emit('click', $event)"
 	@mousedown="onMousedown"
 >
 	<div ref="ripples" class="ripples"></div>
@@ -24,114 +24,77 @@
 </MkA>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { nextTick, onMounted } from 'vue';
 
-export default defineComponent({
-	props: {
-		type: {
-			type: String,
-			required: false,
-		},
-		primary: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-		gradate: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-		rounded: {
-			type: Boolean,
-			required: false,
-			default: true,
-		},
-		inline: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-		link: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-		to: {
-			type: String,
-			required: false,
-		},
-		autofocus: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-		wait: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-		danger: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-		full: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-	},
-	emits: ['click'],
-	mounted() {
-		if (this.autofocus) {
-			this.$nextTick(() => {
-				this.$el.focus();
-			});
-		}
-	},
-	methods: {
-		onMousedown(evt: MouseEvent) {
-			function distance(p, q) {
-				return Math.hypot(p.x - q.x, p.y - q.y);
-			}
+const props = defineProps<{
+	type?: 'button' | 'submit' | 'reset';
+	primary?: boolean;
+	gradate?: boolean;
+	rounded?: boolean;
+	inline?: boolean;
+	link?: boolean;
+	to?: string;
+	autofocus?: boolean;
+	wait?: boolean;
+	danger?: boolean;
+	full?: boolean;
+}>();
 
-			function calcCircleScale(boxW, boxH, circleCenterX, circleCenterY) {
-				const origin = { x: circleCenterX, y: circleCenterY };
-				const dist1 = distance({ x: 0, y: 0 }, origin);
-				const dist2 = distance({ x: boxW, y: 0 }, origin);
-				const dist3 = distance({ x: 0, y: boxH }, origin);
-				const dist4 = distance({ x: boxW, y: boxH }, origin);
-				return Math.max(dist1, dist2, dist3, dist4) * 2;
-			}
+const emit = defineEmits<{
+	(ev: 'click', payload: MouseEvent): void;
+}>();
 
-			const rect = evt.target.getBoundingClientRect();
+let el = $ref<HTMLElement | null>(null);
+let ripples = $ref<HTMLElement | null>(null);
 
-			const ripple = document.createElement('div');
-			ripple.style.top = (evt.clientY - rect.top - 1).toString() + 'px';
-			ripple.style.left = (evt.clientX - rect.left - 1).toString() + 'px';
-
-			this.$refs.ripples.appendChild(ripple);
-
-			const circleCenterX = evt.clientX - rect.left;
-			const circleCenterY = evt.clientY - rect.top;
-
-			const scale = calcCircleScale(evt.target.clientWidth, evt.target.clientHeight, circleCenterX, circleCenterY);
-
-			window.setTimeout(() => {
-				ripple.style.transform = 'scale(' + (scale / 2) + ')';
-			}, 1);
-			window.setTimeout(() => {
-				ripple.style.transition = 'all 1s ease';
-				ripple.style.opacity = '0';
-			}, 1000);
-			window.setTimeout(() => {
-				if (this.$refs.ripples) this.$refs.ripples.removeChild(ripple);
-			}, 2000);
-		},
-	},
+onMounted(() => {
+	if (props.autofocus) {
+		nextTick(() => {
+			el!.focus();
+		});
+	}
 });
+
+function distance(p, q): number {
+	return Math.hypot(p.x - q.x, p.y - q.y);
+}
+
+function calcCircleScale(boxW, boxH, circleCenterX, circleCenterY): number {
+	const origin = { x: circleCenterX, y: circleCenterY };
+	const dist1 = distance({ x: 0, y: 0 }, origin);
+	const dist2 = distance({ x: boxW, y: 0 }, origin);
+	const dist3 = distance({ x: 0, y: boxH }, origin);
+	const dist4 = distance({ x: boxW, y: boxH }, origin);
+	return Math.max(dist1, dist2, dist3, dist4) * 2;
+}
+
+function onMousedown(evt: MouseEvent): void {
+	const target = evt.target! as HTMLElement;
+	const rect = target.getBoundingClientRect();
+
+	const ripple = document.createElement('div');
+	ripple.style.top = (evt.clientY - rect.top - 1).toString() + 'px';
+	ripple.style.left = (evt.clientX - rect.left - 1).toString() + 'px';
+
+	ripples!.appendChild(ripple);
+
+	const circleCenterX = evt.clientX - rect.left;
+	const circleCenterY = evt.clientY - rect.top;
+
+	const scale = calcCircleScale(target.clientWidth, target.clientHeight, circleCenterX, circleCenterY);
+
+	window.setTimeout(() => {
+		ripple.style.transform = 'scale(' + (scale / 2) + ')';
+	}, 1);
+	window.setTimeout(() => {
+		ripple.style.transition = 'all 1s ease';
+		ripple.style.opacity = '0';
+	}, 1000);
+	window.setTimeout(() => {
+		if (ripples) ripples.removeChild(ripple);
+	}, 2000);
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/pages/welcome.setup.vue b/packages/client/src/pages/welcome.setup.vue
index 4892ab6ea..eb6e29eb7 100644
--- a/packages/client/src/pages/welcome.setup.vue
+++ b/packages/client/src/pages/welcome.setup.vue
@@ -21,50 +21,37 @@
 </form>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { } from 'vue';
 import MkButton from '@/components/ui/button.vue';
 import MkInput from '@/components/form/input.vue';
 import { host } from '@/config';
 import * as os from '@/os';
 import { login } from '@/account';
+import { i18n } from '@/i18n';
 
-export default defineComponent({
-	components: {
-		MkButton,
-		MkInput,
-	},
+let username = $ref('');
+let password = $ref('');
+let submitting = $ref(false);
 
-	data() {
-		return {
-			username: '',
-			password: '',
-			submitting: false,
-			host,
-		};
-	},
+function submit() {
+	if (submitting) return;
+	submitting = true;
 
-	methods: {
-		submit() {
-			if (this.submitting) return;
-			this.submitting = true;
+	os.api('admin/accounts/create', {
+		username: username,
+		password: password,
+	}).then(res => {
+		return login(res.token);
+	}).catch(() => {
+		submitting = false;
 
-			os.api('admin/accounts/create', {
-				username: this.username,
-				password: this.password,
-			}).then(res => {
-				return login(res.token);
-			}).catch(() => {
-				this.submitting = false;
-
-				os.alert({
-					type: 'error',
-					text: this.$ts.somethingHappened
-				});
-			});
-		}
-	}
-});
+		os.alert({
+			type: 'error',
+			text: i18n.ts.somethingHappened,
+		});
+	});
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/ui/deck/column-core.vue b/packages/client/src/ui/deck/column-core.vue
index 2667b6d74..30c0dc5e1 100644
--- a/packages/client/src/ui/deck/column-core.vue
+++ b/packages/client/src/ui/deck/column-core.vue
@@ -31,14 +31,4 @@ defineProps<{
 const emit = defineEmits<{
 	(ev: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
 }>();
-
-/*
-export default defineComponent({
-	methods: {
-		focus() {
-			this.$children[0].focus();
-		}
-	}
-});
-*/
 </script>
diff --git a/packages/client/src/ui/deck/list-column.vue b/packages/client/src/ui/deck/list-column.vue
index 9a1fb5b44..8fdf19cab 100644
--- a/packages/client/src/ui/deck/list-column.vue
+++ b/packages/client/src/ui/deck/list-column.vue
@@ -52,20 +52,6 @@ const menu = [{
 	text: i18n.ts.selectList,
 	action: setList,
 }];
-
-/*
-function focus() {
-	timeline.focus();
-}
-
-export default defineComponent({
-	watch: {
-		mediaOnly() {
-			(this.$refs.timeline as any).reload();
-		}
-	}
-});
-*/
 </script>
 
 <style lang="scss" scoped>

From 0b99ffa8f92a06eac2e4c53b37bc242d3b7aea1d Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 6 Sep 2022 18:09:17 +0900
Subject: [PATCH 147/245] refactor(client): use setup syntax

---
 packages/client/src/components/ui/info.vue | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/packages/client/src/components/ui/info.vue b/packages/client/src/components/ui/info.vue
index 8f5986baf..4fdfc5c5e 100644
--- a/packages/client/src/components/ui/info.vue
+++ b/packages/client/src/components/ui/info.vue
@@ -6,23 +6,12 @@
 </div>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
-import * as os from '@/os';
+<script lang="ts" setup>
+import { } from 'vue';
 
-export default defineComponent({
-	props: {
-		warn: {
-			type: Boolean,
-			required: false,
-			default: false
-		},
-	},
-	data() {
-		return {
-		};
-	}
-});
+const props = defineProps<{
+	warn?: boolean;
+}>();
 </script>
 
 <style lang="scss" scoped>

From a9e13693a593ff1fb4b2ed1f2e1cb90a8ef7bd3b Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 6 Sep 2022 18:21:49 +0900
Subject: [PATCH 148/245] refactor(client): refactor file name and directory
 structure

---
 packages/client/src/components/MkAbuseReport.vue     |  2 +-
 .../client/src/components/MkAbuseReportWindow.vue    |  4 ++--
 .../src/components/{ui/button.vue => MkButton.vue}   |  0
 packages/client/src/components/MkChartTooltip.vue    |  2 +-
 .../components/{ui/container.vue => MkContainer.vue} |  0
 .../{ui/context-menu.vue => MkContextMenu.vue}       |  2 +-
 packages/client/src/components/MkCropperDialog.vue   |  2 +-
 packages/client/src/components/MkDialog.vue          |  4 ++--
 packages/client/src/components/MkDrive.vue           |  2 +-
 .../client/src/components/MkDriveSelectDialog.vue    |  2 +-
 packages/client/src/components/MkDriveWindow.vue     |  2 +-
 .../client/src/components/MkEmojiPickerDialog.vue    |  2 +-
 .../client/src/components/MkEmojiPickerWindow.vue    |  2 +-
 .../client/src/components/MkFileListForAdmin.vue     |  2 +-
 .../src/components/{ui/folder.vue => MkFolder.vue}   |  0
 packages/client/src/components/MkForgotPassword.vue  |  4 ++--
 packages/client/src/components/MkFormDialog.vue      |  4 ++--
 packages/client/src/components/MkImageViewer.vue     |  2 +-
 .../src/components/{ui/info.vue => MkInfo.vue}       |  0
 packages/client/src/components/MkLaunchPad.vue       |  2 +-
 packages/client/src/components/MkMediaCaption.vue    |  4 ++--
 .../{ui/menu.child.vue => MkMenu.child.vue}          |  2 +-
 .../src/components/{ui/menu.vue => MkMenu.vue}       |  2 +-
 .../src/components/{ui/modal.vue => MkModal.vue}     |  0
 packages/client/src/components/MkModalPageWindow.vue |  2 +-
 .../{ui/modal-window.vue => MkModalWindow.vue}       |  2 +-
 packages/client/src/components/MkNotes.vue           |  2 +-
 .../src/components/MkNotificationSettingWindow.vue   |  6 +++---
 packages/client/src/components/MkNotifications.vue   |  2 +-
 packages/client/src/components/MkPageWindow.vue      |  2 +-
 .../{ui/pagination.vue => MkPagination.vue}          |  2 +-
 packages/client/src/components/MkPollEditor.vue      |  2 +-
 .../{ui/popup-menu.vue => MkPopupMenu.vue}           |  4 ++--
 packages/client/src/components/MkPostForm.vue        |  2 +-
 packages/client/src/components/MkPostFormDialog.vue  |  2 +-
 packages/client/src/components/MkReactionTooltip.vue |  2 +-
 .../src/components/MkReactionsViewer.details.vue     |  2 +-
 packages/client/src/components/MkSample.vue          |  2 +-
 packages/client/src/components/MkSignin.vue          |  4 ++--
 packages/client/src/components/MkSigninDialog.vue    |  2 +-
 packages/client/src/components/MkSignup.vue          |  2 +-
 packages/client/src/components/MkSignupDialog.vue    |  2 +-
 .../{ui/super-menu.vue => MkSuperMenu.vue}           |  0
 .../client/src/components/MkTokenGenerateWindow.vue  |  6 +++---
 .../src/components/{ui/tooltip.vue => MkTooltip.vue} |  0
 packages/client/src/components/MkUpdated.vue         |  4 ++--
 packages/client/src/components/MkUserList.vue        |  2 +-
 .../client/src/components/MkUserSelectDialog.vue     |  2 +-
 packages/client/src/components/MkUsersTooltip.vue    |  2 +-
 .../client/src/components/MkVisibilityPicker.vue     |  2 +-
 packages/client/src/components/MkWaitingDialog.vue   |  2 +-
 packages/client/src/components/MkWidgets.vue         |  2 +-
 .../src/components/{ui/window.vue => MkWindow.vue}   |  0
 packages/client/src/components/form/input.vue        |  2 +-
 packages/client/src/components/form/range.vue        |  2 +-
 packages/client/src/components/form/select.vue       |  2 +-
 packages/client/src/components/form/suspense.vue     |  2 +-
 packages/client/src/components/form/textarea.vue     |  2 +-
 packages/client/src/components/global/MkAd.vue       |  2 +-
 packages/client/src/components/global/MkError.vue    |  2 +-
 packages/client/src/components/page/page.button.vue  |  2 +-
 packages/client/src/components/page/page.counter.vue |  2 +-
 packages/client/src/components/page/page.post.vue    |  2 +-
 packages/client/src/directives/tooltip.ts            |  2 +-
 packages/client/src/os.ts                            |  4 ++--
 packages/client/src/pages/_error_.vue                |  2 +-
 packages/client/src/pages/about-misskey.vue          |  2 +-
 packages/client/src/pages/about.emojis.vue           | 12 ++++++------
 packages/client/src/pages/about.federation.vue       |  4 ++--
 packages/client/src/pages/admin-file.vue             |  4 ++--
 packages/client/src/pages/admin/_header_.vue         |  2 +-
 packages/client/src/pages/admin/abuses.vue           |  2 +-
 packages/client/src/pages/admin/ads.vue              |  2 +-
 packages/client/src/pages/admin/announcements.vue    |  2 +-
 packages/client/src/pages/admin/bot-protection.vue   |  2 +-
 packages/client/src/pages/admin/email-settings.vue   |  2 +-
 .../client/src/pages/admin/emoji-edit-dialog.vue     |  4 ++--
 packages/client/src/pages/admin/emojis.vue           |  4 ++--
 packages/client/src/pages/admin/files.vue            |  2 +-
 packages/client/src/pages/admin/index.vue            |  4 ++--
 packages/client/src/pages/admin/instance-block.vue   |  2 +-
 .../client/src/pages/admin/integrations.discord.vue  |  4 ++--
 .../client/src/pages/admin/integrations.github.vue   |  4 ++--
 .../client/src/pages/admin/integrations.twitter.vue  |  4 ++--
 packages/client/src/pages/admin/metrics.vue          |  6 +++---
 packages/client/src/pages/admin/proxy-account.vue    |  4 ++--
 packages/client/src/pages/admin/queue.vue            |  2 +-
 packages/client/src/pages/admin/relays.vue           |  2 +-
 packages/client/src/pages/admin/security.vue         |  4 ++--
 packages/client/src/pages/admin/settings.vue         |  2 +-
 packages/client/src/pages/admin/users.vue            |  2 +-
 packages/client/src/pages/announcements.vue          |  4 ++--
 packages/client/src/pages/api-console.vue            |  2 +-
 packages/client/src/pages/auth.form.vue              |  2 +-
 packages/client/src/pages/channel-editor.vue         |  2 +-
 packages/client/src/pages/channel.vue                |  2 +-
 packages/client/src/pages/channels.vue               |  4 ++--
 packages/client/src/pages/explore.users.vue          |  2 +-
 packages/client/src/pages/explore.vue                |  2 +-
 packages/client/src/pages/favorites.vue              |  2 +-
 packages/client/src/pages/follow-requests.vue        |  2 +-
 packages/client/src/pages/gallery/edit.vue           |  2 +-
 packages/client/src/pages/gallery/index.vue          |  6 +++---
 packages/client/src/pages/gallery/post.vue           |  6 +++---
 packages/client/src/pages/instance-info.vue          |  4 ++--
 packages/client/src/pages/messaging/index.vue        |  2 +-
 .../client/src/pages/messaging/messaging-room.vue    |  2 +-
 packages/client/src/pages/miauth.vue                 |  2 +-
 packages/client/src/pages/my-antennas/editor.vue     |  2 +-
 packages/client/src/pages/my-antennas/index.vue      |  4 ++--
 packages/client/src/pages/my-clips/index.vue         |  4 ++--
 packages/client/src/pages/my-lists/index.vue         |  4 ++--
 packages/client/src/pages/my-lists/list.vue          |  2 +-
 packages/client/src/pages/note.vue                   |  2 +-
 .../client/src/pages/page-editor/page-editor.vue     |  2 +-
 packages/client/src/pages/page.vue                   |  6 +++---
 packages/client/src/pages/pages.vue                  |  4 ++--
 packages/client/src/pages/registry.keys.vue          |  2 +-
 packages/client/src/pages/registry.value.vue         |  4 ++--
 packages/client/src/pages/registry.vue               |  2 +-
 packages/client/src/pages/reset-password.vue         |  2 +-
 packages/client/src/pages/scratchpad.vue             |  4 ++--
 packages/client/src/pages/settings/2fa.vue           |  4 ++--
 packages/client/src/pages/settings/accounts.vue      |  2 +-
 packages/client/src/pages/settings/api.vue           |  2 +-
 packages/client/src/pages/settings/apps.vue          |  2 +-
 packages/client/src/pages/settings/custom-css.vue    |  2 +-
 .../client/src/pages/settings/delete-account.vue     |  4 ++--
 packages/client/src/pages/settings/import-export.vue |  2 +-
 packages/client/src/pages/settings/index.vue         |  4 ++--
 packages/client/src/pages/settings/instance-mute.vue |  4 ++--
 packages/client/src/pages/settings/integration.vue   |  2 +-
 packages/client/src/pages/settings/mute-block.vue    |  4 ++--
 packages/client/src/pages/settings/navbar.vue        |  2 +-
 packages/client/src/pages/settings/notifications.vue |  2 +-
 .../client/src/pages/settings/plugin.install.vue     |  4 ++--
 packages/client/src/pages/settings/plugin.vue        |  2 +-
 .../src/pages/settings/preferences-backups.vue       |  4 ++--
 packages/client/src/pages/settings/profile.vue       |  2 +-
 packages/client/src/pages/settings/reaction.vue      |  2 +-
 packages/client/src/pages/settings/security.vue      |  4 ++--
 packages/client/src/pages/settings/sounds.vue        |  2 +-
 .../src/pages/settings/statusbar.statusbar.vue       |  2 +-
 packages/client/src/pages/settings/statusbar.vue     |  2 +-
 packages/client/src/pages/settings/theme.install.vue |  2 +-
 packages/client/src/pages/settings/theme.manage.vue  |  2 +-
 packages/client/src/pages/settings/theme.vue         |  2 +-
 packages/client/src/pages/settings/webhook.edit.vue  |  2 +-
 packages/client/src/pages/settings/webhook.new.vue   |  2 +-
 packages/client/src/pages/settings/webhook.vue       |  2 +-
 packages/client/src/pages/settings/word-mute.vue     |  4 ++--
 packages/client/src/pages/share.vue                  |  2 +-
 packages/client/src/pages/theme-editor.vue           |  2 +-
 packages/client/src/pages/timeline.tutorial.vue      |  2 +-
 packages/client/src/pages/user-info.vue              |  4 ++--
 packages/client/src/pages/user/clips.vue             |  2 +-
 packages/client/src/pages/user/follow-list.vue       |  2 +-
 packages/client/src/pages/user/gallery.vue           |  2 +-
 packages/client/src/pages/user/home.vue              |  6 +++---
 packages/client/src/pages/user/index.activity.vue    |  2 +-
 packages/client/src/pages/user/index.photos.vue      |  2 +-
 packages/client/src/pages/user/pages.vue             |  2 +-
 packages/client/src/pages/user/reactions.vue         |  2 +-
 packages/client/src/pages/welcome.entrance.a.vue     |  2 +-
 packages/client/src/pages/welcome.entrance.b.vue     |  2 +-
 packages/client/src/pages/welcome.entrance.c.vue     |  2 +-
 packages/client/src/pages/welcome.setup.vue          |  2 +-
 packages/client/src/ui/classic.header.vue            |  2 +-
 packages/client/src/ui/classic.sidebar.vue           |  2 +-
 packages/client/src/ui/deck.vue                      |  2 +-
 packages/client/src/ui/visitor/a.vue                 |  4 ++--
 packages/client/src/ui/visitor/b.vue                 |  4 ++--
 packages/client/src/ui/visitor/kanban.vue            | 12 ++++++------
 packages/client/src/widgets/activity.vue             |  2 +-
 packages/client/src/widgets/aiscript.vue             |  2 +-
 packages/client/src/widgets/button.vue               | 10 +++++-----
 packages/client/src/widgets/clock.vue                |  2 +-
 packages/client/src/widgets/federation.vue           |  2 +-
 packages/client/src/widgets/instance-cloud.vue       |  2 +-
 packages/client/src/widgets/memo.vue                 |  2 +-
 packages/client/src/widgets/notifications.vue        |  2 +-
 packages/client/src/widgets/photos.vue               |  2 +-
 packages/client/src/widgets/rss-ticker.vue           |  2 +-
 packages/client/src/widgets/rss.vue                  |  2 +-
 packages/client/src/widgets/server-metric/index.vue  |  2 +-
 packages/client/src/widgets/timeline.vue             |  2 +-
 packages/client/src/widgets/trends.vue               |  2 +-
 187 files changed, 247 insertions(+), 247 deletions(-)
 rename packages/client/src/components/{ui/button.vue => MkButton.vue} (100%)
 rename packages/client/src/components/{ui/container.vue => MkContainer.vue} (100%)
 rename packages/client/src/components/{ui/context-menu.vue => MkContextMenu.vue} (98%)
 rename packages/client/src/components/{ui/folder.vue => MkFolder.vue} (100%)
 rename packages/client/src/components/{ui/info.vue => MkInfo.vue} (100%)
 rename packages/client/src/components/{ui/menu.child.vue => MkMenu.child.vue} (97%)
 rename packages/client/src/components/{ui/menu.vue => MkMenu.vue} (99%)
 rename packages/client/src/components/{ui/modal.vue => MkModal.vue} (100%)
 rename packages/client/src/components/{ui/modal-window.vue => MkModalWindow.vue} (98%)
 rename packages/client/src/components/{ui/pagination.vue => MkPagination.vue} (99%)
 rename packages/client/src/components/{ui/popup-menu.vue => MkPopupMenu.vue} (92%)
 rename packages/client/src/components/{ui/super-menu.vue => MkSuperMenu.vue} (100%)
 rename packages/client/src/components/{ui/tooltip.vue => MkTooltip.vue} (100%)
 rename packages/client/src/components/{ui/window.vue => MkWindow.vue} (100%)

diff --git a/packages/client/src/components/MkAbuseReport.vue b/packages/client/src/components/MkAbuseReport.vue
index 42bd1af3f..9a3464b64 100644
--- a/packages/client/src/components/MkAbuseReport.vue
+++ b/packages/client/src/components/MkAbuseReport.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script lang="ts" setup>
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkSwitch from '@/components/form/switch.vue';
 import MkKeyValue from '@/components/MkKeyValue.vue';
 import { acct, userPage } from '@/filters/user';
diff --git a/packages/client/src/components/MkAbuseReportWindow.vue b/packages/client/src/components/MkAbuseReportWindow.vue
index 6b8e36c4d..1862d0a0e 100644
--- a/packages/client/src/components/MkAbuseReportWindow.vue
+++ b/packages/client/src/components/MkAbuseReportWindow.vue
@@ -25,9 +25,9 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import * as Misskey from 'misskey-js';
-import XWindow from '@/components/ui/window.vue';
+import XWindow from '@/components/MkWindow.vue';
 import MkTextarea from '@/components/form/textarea.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/components/ui/button.vue b/packages/client/src/components/MkButton.vue
similarity index 100%
rename from packages/client/src/components/ui/button.vue
rename to packages/client/src/components/MkButton.vue
diff --git a/packages/client/src/components/MkChartTooltip.vue b/packages/client/src/components/MkChartTooltip.vue
index 9b57a1b3d..a92dd36b6 100644
--- a/packages/client/src/components/MkChartTooltip.vue
+++ b/packages/client/src/components/MkChartTooltip.vue
@@ -14,7 +14,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import MkTooltip from './ui/tooltip.vue';
+import MkTooltip from './MkTooltip.vue';
 
 const props = defineProps<{
 	showing: boolean;
diff --git a/packages/client/src/components/ui/container.vue b/packages/client/src/components/MkContainer.vue
similarity index 100%
rename from packages/client/src/components/ui/container.vue
rename to packages/client/src/components/MkContainer.vue
diff --git a/packages/client/src/components/ui/context-menu.vue b/packages/client/src/components/MkContextMenu.vue
similarity index 98%
rename from packages/client/src/components/ui/context-menu.vue
rename to packages/client/src/components/MkContextMenu.vue
index 165c3db46..cfc9502b4 100644
--- a/packages/client/src/components/ui/context-menu.vue
+++ b/packages/client/src/components/MkContextMenu.vue
@@ -8,7 +8,7 @@
 
 <script lang="ts" setup>
 import { onMounted, onBeforeUnmount } from 'vue';
-import MkMenu from './menu.vue';
+import MkMenu from './MkMenu.vue';
 import { MenuItem } from './types/menu.vue';
 import contains from '@/scripts/contains';
 import * as os from '@/os';
diff --git a/packages/client/src/components/MkCropperDialog.vue b/packages/client/src/components/MkCropperDialog.vue
index c320b21d7..9a09834bf 100644
--- a/packages/client/src/components/MkCropperDialog.vue
+++ b/packages/client/src/components/MkCropperDialog.vue
@@ -30,7 +30,7 @@ import { nextTick, onMounted } from 'vue';
 import * as misskey from 'misskey-js';
 import Cropper from 'cropperjs';
 import tinycolor from 'tinycolor2';
-import XModalWindow from '@/components/ui/modal-window.vue';
+import XModalWindow from '@/components/MkModalWindow.vue';
 import * as os from '@/os';
 import { $i } from '@/account';
 import { defaultStore } from '@/store';
diff --git a/packages/client/src/components/MkDialog.vue b/packages/client/src/components/MkDialog.vue
index b090f3cb4..155473cd7 100644
--- a/packages/client/src/components/MkDialog.vue
+++ b/packages/client/src/components/MkDialog.vue
@@ -40,8 +40,8 @@
 
 <script lang="ts" setup>
 import { onBeforeUnmount, onMounted, ref } from 'vue';
-import MkModal from '@/components/ui/modal.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkModal from '@/components/MkModal.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/form/input.vue';
 import MkSelect from '@/components/form/select.vue';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/components/MkDrive.vue b/packages/client/src/components/MkDrive.vue
index 9f0016adc..002ca58d0 100644
--- a/packages/client/src/components/MkDrive.vue
+++ b/packages/client/src/components/MkDrive.vue
@@ -90,7 +90,7 @@
 <script lang="ts" setup>
 import { markRaw, nextTick, onActivated, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 import * as Misskey from 'misskey-js';
-import MkButton from './ui/button.vue';
+import MkButton from './MkButton.vue';
 import XNavFolder from '@/components/MkDrive.navFolder.vue';
 import XFolder from '@/components/MkDrive.folder.vue';
 import XFile from '@/components/MkDrive.file.vue';
diff --git a/packages/client/src/components/MkDriveSelectDialog.vue b/packages/client/src/components/MkDriveSelectDialog.vue
index 95a9a6fdb..baab7f132 100644
--- a/packages/client/src/components/MkDriveSelectDialog.vue
+++ b/packages/client/src/components/MkDriveSelectDialog.vue
@@ -22,7 +22,7 @@
 import { ref } from 'vue';
 import * as Misskey from 'misskey-js';
 import XDrive from '@/components/MkDrive.vue';
-import XModalWindow from '@/components/ui/modal-window.vue';
+import XModalWindow from '@/components/MkModalWindow.vue';
 import number from '@/filters/number';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/components/MkDriveWindow.vue b/packages/client/src/components/MkDriveWindow.vue
index 113aabb9f..617200321 100644
--- a/packages/client/src/components/MkDriveWindow.vue
+++ b/packages/client/src/components/MkDriveWindow.vue
@@ -17,7 +17,7 @@
 import { } from 'vue';
 import * as Misskey from 'misskey-js';
 import XDrive from '@/components/MkDrive.vue';
-import XWindow from '@/components/ui/window.vue';
+import XWindow from '@/components/MkWindow.vue';
 import { i18n } from '@/i18n';
 
 defineProps<{
diff --git a/packages/client/src/components/MkEmojiPickerDialog.vue b/packages/client/src/components/MkEmojiPickerDialog.vue
index 94e66b971..3b41f9d75 100644
--- a/packages/client/src/components/MkEmojiPickerDialog.vue
+++ b/packages/client/src/components/MkEmojiPickerDialog.vue
@@ -27,7 +27,7 @@
 
 <script lang="ts" setup>
 import { ref } from 'vue';
-import MkModal from '@/components/ui/modal.vue';
+import MkModal from '@/components/MkModal.vue';
 import MkEmojiPicker from '@/components/MkEmojiPicker.vue';
 import { defaultStore } from '@/store';
 
diff --git a/packages/client/src/components/MkEmojiPickerWindow.vue b/packages/client/src/components/MkEmojiPickerWindow.vue
index a1a2fd932..523e4ba69 100644
--- a/packages/client/src/components/MkEmojiPickerWindow.vue
+++ b/packages/client/src/components/MkEmojiPickerWindow.vue
@@ -13,7 +13,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import MkWindow from '@/components/ui/window.vue';
+import MkWindow from '@/components/MkWindow.vue';
 import MkEmojiPicker from '@/components/MkEmojiPicker.vue';
 
 withDefaults(defineProps<{
diff --git a/packages/client/src/components/MkFileListForAdmin.vue b/packages/client/src/components/MkFileListForAdmin.vue
index e03b8b94d..b6429eaf8 100644
--- a/packages/client/src/components/MkFileListForAdmin.vue
+++ b/packages/client/src/components/MkFileListForAdmin.vue
@@ -35,7 +35,7 @@
 import { computed } from 'vue';
 import * as Acct from 'misskey-js/built/acct';
 import MkSwitch from '@/components/ui/switch.vue';
-import MkPagination from '@/components/ui/pagination.vue';
+import MkPagination from '@/components/MkPagination.vue';
 import MkDriveFileThumbnail from '@/components/MkDriveFileThumbnail.vue';
 import bytes from '@/filters/bytes';
 import * as os from '@/os';
diff --git a/packages/client/src/components/ui/folder.vue b/packages/client/src/components/MkFolder.vue
similarity index 100%
rename from packages/client/src/components/ui/folder.vue
rename to packages/client/src/components/MkFolder.vue
diff --git a/packages/client/src/components/MkForgotPassword.vue b/packages/client/src/components/MkForgotPassword.vue
index 6ed89d45d..1b55451c9 100644
--- a/packages/client/src/components/MkForgotPassword.vue
+++ b/packages/client/src/components/MkForgotPassword.vue
@@ -33,8 +33,8 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import XModalWindow from '@/components/ui/modal-window.vue';
-import MkButton from '@/components/ui/button.vue';
+import XModalWindow from '@/components/MkModalWindow.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/form/input.vue';
 import * as os from '@/os';
 import { instance } from '@/instance';
diff --git a/packages/client/src/components/MkFormDialog.vue b/packages/client/src/components/MkFormDialog.vue
index f05dde16f..b2bf76a8c 100644
--- a/packages/client/src/components/MkFormDialog.vue
+++ b/packages/client/src/components/MkFormDialog.vue
@@ -61,9 +61,9 @@ import FormTextarea from './form/textarea.vue';
 import FormSwitch from './form/switch.vue';
 import FormSelect from './form/select.vue';
 import FormRange from './form/range.vue';
-import MkButton from './ui/button.vue';
+import MkButton from './MkButton.vue';
 import FormRadios from './form/radios.vue';
-import XModalWindow from '@/components/ui/modal-window.vue';
+import XModalWindow from '@/components/MkModalWindow.vue';
 
 export default defineComponent({
 	components: {
diff --git a/packages/client/src/components/MkImageViewer.vue b/packages/client/src/components/MkImageViewer.vue
index 7bc88399e..f074b1a2f 100644
--- a/packages/client/src/components/MkImageViewer.vue
+++ b/packages/client/src/components/MkImageViewer.vue
@@ -17,7 +17,7 @@ import { } from 'vue';
 import * as misskey from 'misskey-js';
 import bytes from '@/filters/bytes';
 import number from '@/filters/number';
-import MkModal from '@/components/ui/modal.vue';
+import MkModal from '@/components/MkModal.vue';
 
 const props = withDefaults(defineProps<{
 	image: misskey.entities.DriveFile;
diff --git a/packages/client/src/components/ui/info.vue b/packages/client/src/components/MkInfo.vue
similarity index 100%
rename from packages/client/src/components/ui/info.vue
rename to packages/client/src/components/MkInfo.vue
diff --git a/packages/client/src/components/MkLaunchPad.vue b/packages/client/src/components/MkLaunchPad.vue
index 7891f61bf..19283178c 100644
--- a/packages/client/src/components/MkLaunchPad.vue
+++ b/packages/client/src/components/MkLaunchPad.vue
@@ -21,7 +21,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import MkModal from '@/components/ui/modal.vue';
+import MkModal from '@/components/MkModal.vue';
 import { navbarItemDef } from '@/navbar';
 import { instanceName } from '@/config';
 import { defaultStore } from '@/store';
diff --git a/packages/client/src/components/MkMediaCaption.vue b/packages/client/src/components/MkMediaCaption.vue
index feed3854f..c25755d76 100644
--- a/packages/client/src/components/MkMediaCaption.vue
+++ b/packages/client/src/components/MkMediaCaption.vue
@@ -30,8 +30,8 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { length } from 'stringz';
-import MkModal from '@/components/ui/modal.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkModal from '@/components/MkModal.vue';
+import MkButton from '@/components/MkButton.vue';
 import bytes from '@/filters/bytes';
 import number from '@/filters/number';
 
diff --git a/packages/client/src/components/ui/menu.child.vue b/packages/client/src/components/MkMenu.child.vue
similarity index 97%
rename from packages/client/src/components/ui/menu.child.vue
rename to packages/client/src/components/MkMenu.child.vue
index b67224d3e..3ada4afbd 100644
--- a/packages/client/src/components/ui/menu.child.vue
+++ b/packages/client/src/components/MkMenu.child.vue
@@ -7,7 +7,7 @@
 <script lang="ts" setup>
 import { on } from 'events';
 import { nextTick, onBeforeUnmount, onMounted, onUnmounted, ref, watch } from 'vue';
-import MkMenu from './menu.vue';
+import MkMenu from './MkMenu.vue';
 import { MenuItem } from '@/types/menu';
 import * as os from '@/os';
 
diff --git a/packages/client/src/components/ui/menu.vue b/packages/client/src/components/MkMenu.vue
similarity index 99%
rename from packages/client/src/components/ui/menu.vue
rename to packages/client/src/components/MkMenu.vue
index 60b68954d..578e736c8 100644
--- a/packages/client/src/components/ui/menu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -63,7 +63,7 @@ import { MenuItem, InnerMenuItem, MenuPending, MenuAction } from '@/types/menu';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 
-const XChild = defineAsyncComponent(() => import('./menu.child.vue'));
+const XChild = defineAsyncComponent(() => import('./MkMenu.child.vue'));
 
 const props = defineProps<{
 	items: MenuItem[];
diff --git a/packages/client/src/components/ui/modal.vue b/packages/client/src/components/MkModal.vue
similarity index 100%
rename from packages/client/src/components/ui/modal.vue
rename to packages/client/src/components/MkModal.vue
diff --git a/packages/client/src/components/MkModalPageWindow.vue b/packages/client/src/components/MkModalPageWindow.vue
index 2fed0d35e..cc3f4c96c 100644
--- a/packages/client/src/components/MkModalPageWindow.vue
+++ b/packages/client/src/components/MkModalPageWindow.vue
@@ -22,7 +22,7 @@
 
 <script lang="ts" setup>
 import { ComputedRef, provide } from 'vue';
-import MkModal from '@/components/ui/modal.vue';
+import MkModal from '@/components/MkModal.vue';
 import { popout as _popout } from '@/scripts/popout';
 import copyToClipboard from '@/scripts/copy-to-clipboard';
 import { url } from '@/config';
diff --git a/packages/client/src/components/ui/modal-window.vue b/packages/client/src/components/MkModalWindow.vue
similarity index 98%
rename from packages/client/src/components/ui/modal-window.vue
rename to packages/client/src/components/MkModalWindow.vue
index b29ea4fd8..5acd8c921 100644
--- a/packages/client/src/components/ui/modal-window.vue
+++ b/packages/client/src/components/MkModalWindow.vue
@@ -18,7 +18,7 @@
 
 <script lang="ts" setup>
 import { onMounted, onUnmounted } from 'vue';
-import MkModal from './modal.vue';
+import MkModal from './MkModal.vue';
 
 const props = withDefaults(defineProps<{
 	withOkButton: boolean;
diff --git a/packages/client/src/components/MkNotes.vue b/packages/client/src/components/MkNotes.vue
index 67e894a09..5abcdc229 100644
--- a/packages/client/src/components/MkNotes.vue
+++ b/packages/client/src/components/MkNotes.vue
@@ -21,7 +21,7 @@
 import { ref } from 'vue';
 import XNote from '@/components/MkNote.vue';
 import XList from '@/components/MkDateSeparatedList.vue';
-import MkPagination, { Paging } from '@/components/ui/pagination.vue';
+import MkPagination, { Paging } from '@/components/MkPagination.vue';
 import { i18n } from '@/i18n';
 
 const props = defineProps<{
diff --git a/packages/client/src/components/MkNotificationSettingWindow.vue b/packages/client/src/components/MkNotificationSettingWindow.vue
index bf0a148f5..75bea2976 100644
--- a/packages/client/src/components/MkNotificationSettingWindow.vue
+++ b/packages/client/src/components/MkNotificationSettingWindow.vue
@@ -31,9 +31,9 @@
 import { } from 'vue';
 import { notificationTypes } from 'misskey-js';
 import MkSwitch from './form/switch.vue';
-import MkInfo from './ui/info.vue';
-import MkButton from './ui/button.vue';
-import XModalWindow from '@/components/ui/modal-window.vue';
+import MkInfo from './MkInfo.vue';
+import MkButton from './MkButton.vue';
+import XModalWindow from '@/components/MkModalWindow.vue';
 import { i18n } from '@/i18n';
 
 const emit = defineEmits<{
diff --git a/packages/client/src/components/MkNotifications.vue b/packages/client/src/components/MkNotifications.vue
index 1ee091a22..0e1cc0674 100644
--- a/packages/client/src/components/MkNotifications.vue
+++ b/packages/client/src/components/MkNotifications.vue
@@ -19,7 +19,7 @@
 <script lang="ts" setup>
 import { defineComponent, markRaw, onUnmounted, onMounted, computed, ref } from 'vue';
 import { notificationTypes } from 'misskey-js';
-import MkPagination, { Paging } from '@/components/ui/pagination.vue';
+import MkPagination, { Paging } from '@/components/MkPagination.vue';
 import XNotification from '@/components/MkNotification.vue';
 import XList from '@/components/MkDateSeparatedList.vue';
 import XNote from '@/components/MkNote.vue';
diff --git a/packages/client/src/components/MkPageWindow.vue b/packages/client/src/components/MkPageWindow.vue
index 76eb77825..d58b91403 100644
--- a/packages/client/src/components/MkPageWindow.vue
+++ b/packages/client/src/components/MkPageWindow.vue
@@ -26,7 +26,7 @@
 <script lang="ts" setup>
 import { ComputedRef, inject, provide } from 'vue';
 import RouterView from '@/components/global/RouterView.vue';
-import XWindow from '@/components/ui/window.vue';
+import XWindow from '@/components/MkWindow.vue';
 import { popout as _popout } from '@/scripts/popout';
 import copyToClipboard from '@/scripts/copy-to-clipboard';
 import { url } from '@/config';
diff --git a/packages/client/src/components/ui/pagination.vue b/packages/client/src/components/MkPagination.vue
similarity index 99%
rename from packages/client/src/components/ui/pagination.vue
rename to packages/client/src/components/MkPagination.vue
index 7650c5b33..291409171 100644
--- a/packages/client/src/components/ui/pagination.vue
+++ b/packages/client/src/components/MkPagination.vue
@@ -36,7 +36,7 @@ import { computed, ComputedRef, isRef, markRaw, onActivated, onDeactivated, Ref,
 import * as misskey from 'misskey-js';
 import * as os from '@/os';
 import { onScrollTop, isTopVisible, getScrollPosition, getScrollContainer } from '@/scripts/scroll';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import { i18n } from '@/i18n';
 
 const SECOND_FETCH_LIMIT = 30;
diff --git a/packages/client/src/components/MkPollEditor.vue b/packages/client/src/components/MkPollEditor.vue
index 6c1a4cc89..3b08a6353 100644
--- a/packages/client/src/components/MkPollEditor.vue
+++ b/packages/client/src/components/MkPollEditor.vue
@@ -52,7 +52,7 @@ import { ref, watch } from 'vue';
 import MkInput from './form/input.vue';
 import MkSelect from './form/select.vue';
 import MkSwitch from './form/switch.vue';
-import MkButton from './ui/button.vue';
+import MkButton from './MkButton.vue';
 import { formatDateTimeString } from '@/scripts/format-time-string';
 import { addTime } from '@/scripts/time';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/components/ui/popup-menu.vue b/packages/client/src/components/MkPopupMenu.vue
similarity index 92%
rename from packages/client/src/components/ui/popup-menu.vue
rename to packages/client/src/components/MkPopupMenu.vue
index c29aff45e..f04c7f561 100644
--- a/packages/client/src/components/ui/popup-menu.vue
+++ b/packages/client/src/components/MkPopupMenu.vue
@@ -6,8 +6,8 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import MkModal from './modal.vue';
-import MkMenu from './menu.vue';
+import MkModal from './MkModal.vue';
+import MkMenu from './MkMenu.vue';
 import { MenuItem } from '@/types/menu';
 
 defineProps<{
diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index a499a62dd..0c57a5a57 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -84,7 +84,7 @@ import * as os from '@/os';
 import { stream } from '@/stream';
 import { selectFiles } from '@/scripts/select-file';
 import { defaultStore, notePostInterruptors, postFormActions } from '@/store';
-import MkInfo from '@/components/ui/info.vue';
+import MkInfo from '@/components/MkInfo.vue';
 import { i18n } from '@/i18n';
 import { instance } from '@/instance';
 import { $i, getAccounts, openAccountMenu as openAccountMenu_ } from '@/account';
diff --git a/packages/client/src/components/MkPostFormDialog.vue b/packages/client/src/components/MkPostFormDialog.vue
index 90b281d2c..6dabb1db1 100644
--- a/packages/client/src/components/MkPostFormDialog.vue
+++ b/packages/client/src/components/MkPostFormDialog.vue
@@ -6,7 +6,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import MkModal from '@/components/ui/modal.vue';
+import MkModal from '@/components/MkModal.vue';
 import MkPostForm from '@/components/MkPostForm.vue';
 
 export default defineComponent({
diff --git a/packages/client/src/components/MkReactionTooltip.vue b/packages/client/src/components/MkReactionTooltip.vue
index 44f268170..2da97cf4f 100644
--- a/packages/client/src/components/MkReactionTooltip.vue
+++ b/packages/client/src/components/MkReactionTooltip.vue
@@ -9,7 +9,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import MkTooltip from './ui/tooltip.vue';
+import MkTooltip from './MkTooltip.vue';
 import XReactionIcon from '@/components/MkReactionIcon.vue';
 
 const props = defineProps<{
diff --git a/packages/client/src/components/MkReactionsViewer.details.vue b/packages/client/src/components/MkReactionsViewer.details.vue
index e886ff502..8c423807b 100644
--- a/packages/client/src/components/MkReactionsViewer.details.vue
+++ b/packages/client/src/components/MkReactionsViewer.details.vue
@@ -18,7 +18,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import MkTooltip from './ui/tooltip.vue';
+import MkTooltip from './MkTooltip.vue';
 import XReactionIcon from '@/components/MkReactionIcon.vue';
 
 const props = defineProps<{
diff --git a/packages/client/src/components/MkSample.vue b/packages/client/src/components/MkSample.vue
index f80b9c96b..1169654d0 100644
--- a/packages/client/src/components/MkSample.vue
+++ b/packages/client/src/components/MkSample.vue
@@ -29,7 +29,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/form/input.vue';
 import MkSwitch from '@/components/form/switch.vue';
 import MkTextarea from '@/components/form/textarea.vue';
diff --git a/packages/client/src/components/MkSignin.vue b/packages/client/src/components/MkSignin.vue
index e84163171..5613e5cf0 100644
--- a/packages/client/src/components/MkSignin.vue
+++ b/packages/client/src/components/MkSignin.vue
@@ -51,9 +51,9 @@
 <script lang="ts" setup>
 import { defineAsyncComponent } from 'vue';
 import { toUnicode } from 'punycode/';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/form/input.vue';
-import MkInfo from '@/components/ui/info.vue';
+import MkInfo from '@/components/MkInfo.vue';
 import { apiUrl, host as configHost } from '@/config';
 import { byteify, hexify } from '@/scripts/2fa';
 import * as os from '@/os';
diff --git a/packages/client/src/components/MkSigninDialog.vue b/packages/client/src/components/MkSigninDialog.vue
index 19b82b36d..fd2724451 100644
--- a/packages/client/src/components/MkSigninDialog.vue
+++ b/packages/client/src/components/MkSigninDialog.vue
@@ -15,7 +15,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import MkSignin from '@/components/MkSignin.vue';
-import XModalWindow from '@/components/ui/modal-window.vue';
+import XModalWindow from '@/components/MkModalWindow.vue';
 import { i18n } from '@/i18n';
 
 const props = withDefaults(defineProps<{
diff --git a/packages/client/src/components/MkSignup.vue b/packages/client/src/components/MkSignup.vue
index dbd332ce6..a324bb6f5 100644
--- a/packages/client/src/components/MkSignup.vue
+++ b/packages/client/src/components/MkSignup.vue
@@ -67,7 +67,7 @@
 import { } from 'vue';
 import getPasswordStrength from 'syuilo-password-strength';
 import { toUnicode } from 'punycode/';
-import MkButton from './ui/button.vue';
+import MkButton from './MkButton.vue';
 import MkInput from './form/input.vue';
 import MkSwitch from './form/switch.vue';
 import MkCaptcha from '@/components/MkCaptcha.vue';
diff --git a/packages/client/src/components/MkSignupDialog.vue b/packages/client/src/components/MkSignupDialog.vue
index 3e989fcb7..d6d4553bc 100644
--- a/packages/client/src/components/MkSignupDialog.vue
+++ b/packages/client/src/components/MkSignupDialog.vue
@@ -19,7 +19,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import XSignup from '@/components/MkSignup.vue';
-import XModalWindow from '@/components/ui/modal-window.vue';
+import XModalWindow from '@/components/MkModalWindow.vue';
 import { i18n } from '@/i18n';
 
 const props = withDefaults(defineProps<{
diff --git a/packages/client/src/components/ui/super-menu.vue b/packages/client/src/components/MkSuperMenu.vue
similarity index 100%
rename from packages/client/src/components/ui/super-menu.vue
rename to packages/client/src/components/MkSuperMenu.vue
diff --git a/packages/client/src/components/MkTokenGenerateWindow.vue b/packages/client/src/components/MkTokenGenerateWindow.vue
index 789218a8c..b846034a2 100644
--- a/packages/client/src/components/MkTokenGenerateWindow.vue
+++ b/packages/client/src/components/MkTokenGenerateWindow.vue
@@ -33,9 +33,9 @@ import { } from 'vue';
 import { permissions as kinds } from 'misskey-js';
 import MkInput from './form/input.vue';
 import MkSwitch from './form/switch.vue';
-import MkButton from './ui/button.vue';
-import MkInfo from './ui/info.vue';
-import XModalWindow from '@/components/ui/modal-window.vue';
+import MkButton from './MkButton.vue';
+import MkInfo from './MkInfo.vue';
+import XModalWindow from '@/components/MkModalWindow.vue';
 
 const props = withDefaults(defineProps<{
 	title?: string | null;
diff --git a/packages/client/src/components/ui/tooltip.vue b/packages/client/src/components/MkTooltip.vue
similarity index 100%
rename from packages/client/src/components/ui/tooltip.vue
rename to packages/client/src/components/MkTooltip.vue
diff --git a/packages/client/src/components/MkUpdated.vue b/packages/client/src/components/MkUpdated.vue
index f3ce2731b..48aeb3022 100644
--- a/packages/client/src/components/MkUpdated.vue
+++ b/packages/client/src/components/MkUpdated.vue
@@ -11,8 +11,8 @@
 
 <script lang="ts" setup>
 import { ref } from 'vue';
-import MkModal from '@/components/ui/modal.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkModal from '@/components/MkModal.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkSparkle from '@/components/MkSparkle.vue';
 import { version } from '@/config';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/components/MkUserList.vue b/packages/client/src/components/MkUserList.vue
index d8e28e17d..e1f47c767 100644
--- a/packages/client/src/components/MkUserList.vue
+++ b/packages/client/src/components/MkUserList.vue
@@ -18,7 +18,7 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import MkUserInfo from '@/components/MkUserInfo.vue';
-import MkPagination, { Paging } from '@/components/ui/pagination.vue';
+import MkPagination, { Paging } from '@/components/MkPagination.vue';
 import { userPage } from '@/filters/user';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/components/MkUserSelectDialog.vue b/packages/client/src/components/MkUserSelectDialog.vue
index 4d8e427a7..07caedfe3 100644
--- a/packages/client/src/components/MkUserSelectDialog.vue
+++ b/packages/client/src/components/MkUserSelectDialog.vue
@@ -56,7 +56,7 @@ import { nextTick, onMounted } from 'vue';
 import * as misskey from 'misskey-js';
 import MkInput from '@/components/form/input.vue';
 import FormSplit from '@/components/form/split.vue';
-import XModalWindow from '@/components/ui/modal-window.vue';
+import XModalWindow from '@/components/MkModalWindow.vue';
 import * as os from '@/os';
 import { defaultStore } from '@/store';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/components/MkUsersTooltip.vue b/packages/client/src/components/MkUsersTooltip.vue
index 2df19bcd3..4ccc44b47 100644
--- a/packages/client/src/components/MkUsersTooltip.vue
+++ b/packages/client/src/components/MkUsersTooltip.vue
@@ -12,7 +12,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import MkTooltip from './ui/tooltip.vue';
+import MkTooltip from './MkTooltip.vue';
 
 const props = defineProps<{
 	users: any[]; // TODO
diff --git a/packages/client/src/components/MkVisibilityPicker.vue b/packages/client/src/components/MkVisibilityPicker.vue
index f4830cd2c..ecc022eca 100644
--- a/packages/client/src/components/MkVisibilityPicker.vue
+++ b/packages/client/src/components/MkVisibilityPicker.vue
@@ -45,7 +45,7 @@
 <script lang="ts" setup>
 import { nextTick, watch } from 'vue';
 import * as misskey from 'misskey-js';
-import MkModal from '@/components/ui/modal.vue';
+import MkModal from '@/components/MkModal.vue';
 import { i18n } from '@/i18n';
 
 const modal = $ref<InstanceType<typeof MkModal>>();
diff --git a/packages/client/src/components/MkWaitingDialog.vue b/packages/client/src/components/MkWaitingDialog.vue
index 9e631b55b..77b664d3b 100644
--- a/packages/client/src/components/MkWaitingDialog.vue
+++ b/packages/client/src/components/MkWaitingDialog.vue
@@ -10,7 +10,7 @@
 
 <script lang="ts" setup>
 import { watch, ref } from 'vue';
-import MkModal from '@/components/ui/modal.vue';
+import MkModal from '@/components/MkModal.vue';
 
 const modal = ref<InstanceType<typeof MkModal>>();
 
diff --git a/packages/client/src/components/MkWidgets.vue b/packages/client/src/components/MkWidgets.vue
index 54d4c57af..fcb0d11af 100644
--- a/packages/client/src/components/MkWidgets.vue
+++ b/packages/client/src/components/MkWidgets.vue
@@ -34,7 +34,7 @@
 import { defineAsyncComponent, reactive, ref, computed } from 'vue';
 import { v4 as uuid } from 'uuid';
 import MkSelect from '@/components/form/select.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import { widgets as widgetDefs } from '@/widgets';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/components/ui/window.vue b/packages/client/src/components/MkWindow.vue
similarity index 100%
rename from packages/client/src/components/ui/window.vue
rename to packages/client/src/components/MkWindow.vue
diff --git a/packages/client/src/components/form/input.vue b/packages/client/src/components/form/input.vue
index 1c9fee8c7..382b2ed52 100644
--- a/packages/client/src/components/form/input.vue
+++ b/packages/client/src/components/form/input.vue
@@ -36,7 +36,7 @@
 <script lang="ts" setup>
 import { onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs } from 'vue';
 import { debounce } from 'throttle-debounce';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import { useInterval } from '@/scripts/use-interval';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/components/form/range.vue b/packages/client/src/components/form/range.vue
index 8301d2783..c0fc8c651 100644
--- a/packages/client/src/components/form/range.vue
+++ b/packages/client/src/components/form/range.vue
@@ -96,7 +96,7 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => {
 	ev.preventDefault();
 
 	const tooltipShowing = ref(true);
-	os.popup(defineAsyncComponent(() => import('@/components/ui/tooltip.vue')), {
+	os.popup(defineAsyncComponent(() => import('@/components/MkTooltip.vue')), {
 		showing: tooltipShowing,
 		text: computed(() => {
 			return props.textConverter(finalValue.value);
diff --git a/packages/client/src/components/form/select.vue b/packages/client/src/components/form/select.vue
index 70db2dbae..313ba41cd 100644
--- a/packages/client/src/components/form/select.vue
+++ b/packages/client/src/components/form/select.vue
@@ -28,7 +28,7 @@
 
 <script lang="ts" setup>
 import { onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs, VNode, useSlots } from 'vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 import { useInterval } from '@/scripts/use-interval';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/components/form/suspense.vue b/packages/client/src/components/form/suspense.vue
index 2ad55daca..132eafd13 100644
--- a/packages/client/src/components/form/suspense.vue
+++ b/packages/client/src/components/form/suspense.vue
@@ -17,7 +17,7 @@
 
 <script lang="ts">
 import { defineComponent, PropType, ref, watch } from 'vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 
 export default defineComponent({
 	components: {
diff --git a/packages/client/src/components/form/textarea.vue b/packages/client/src/components/form/textarea.vue
index 73633399d..ca57aa62a 100644
--- a/packages/client/src/components/form/textarea.vue
+++ b/packages/client/src/components/form/textarea.vue
@@ -29,7 +29,7 @@
 <script lang="ts">
 import { defineComponent, onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs } from 'vue';
 import { debounce } from 'throttle-debounce';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import { i18n } from '@/i18n';
 
 export default defineComponent({
diff --git a/packages/client/src/components/global/MkAd.vue b/packages/client/src/components/global/MkAd.vue
index e1b7ae6af..8161ef379 100644
--- a/packages/client/src/components/global/MkAd.vue
+++ b/packages/client/src/components/global/MkAd.vue
@@ -22,7 +22,7 @@
 import { ref } from 'vue';
 import { instance } from '@/instance';
 import { host } from '@/config';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import { defaultStore } from '@/store';
 import * as os from '@/os';
 
diff --git a/packages/client/src/components/global/MkError.vue b/packages/client/src/components/global/MkError.vue
index 4e2ba07d3..6e75a69ec 100644
--- a/packages/client/src/components/global/MkError.vue
+++ b/packages/client/src/components/global/MkError.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script lang="ts" setup>
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import { i18n } from '@/i18n';
 </script>
 
diff --git a/packages/client/src/components/page/page.button.vue b/packages/client/src/components/page/page.button.vue
index a87f6e9f0..e8878df8d 100644
--- a/packages/client/src/components/page/page.button.vue
+++ b/packages/client/src/components/page/page.button.vue
@@ -6,7 +6,7 @@
 
 <script lang="ts">
 import { defineComponent, PropType, unref } from 'vue';
-import MkButton from '../ui/button.vue';
+import MkButton from '../MkButton.vue';
 import * as os from '@/os';
 import { ButtonBlock } from '@/scripts/hpml/block';
 import { Hpml } from '@/scripts/hpml/evaluator';
diff --git a/packages/client/src/components/page/page.counter.vue b/packages/client/src/components/page/page.counter.vue
index b1af8954b..6eeef7143 100644
--- a/packages/client/src/components/page/page.counter.vue
+++ b/packages/client/src/components/page/page.counter.vue
@@ -6,7 +6,7 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType } from 'vue';
-import MkButton from '../ui/button.vue';
+import MkButton from '../MkButton.vue';
 import * as os from '@/os';
 import { CounterVarBlock } from '@/scripts/hpml/block';
 import { Hpml } from '@/scripts/hpml/evaluator';
diff --git a/packages/client/src/components/page/page.post.vue b/packages/client/src/components/page/page.post.vue
index 3401f945b..f65519635 100644
--- a/packages/client/src/components/page/page.post.vue
+++ b/packages/client/src/components/page/page.post.vue
@@ -11,7 +11,7 @@
 <script lang="ts">
 import { defineComponent, PropType } from 'vue';
 import MkTextarea from '../form/textarea.vue';
-import MkButton from '../ui/button.vue';
+import MkButton from '../MkButton.vue';
 import { apiUrl } from '@/config';
 import * as os from '@/os';
 import { PostBlock } from '@/scripts/hpml/block';
diff --git a/packages/client/src/directives/tooltip.ts b/packages/client/src/directives/tooltip.ts
index 8b68771ca..5d13497b5 100644
--- a/packages/client/src/directives/tooltip.ts
+++ b/packages/client/src/directives/tooltip.ts
@@ -46,7 +46,7 @@ export default {
 			if (self.text == null) return;
 
 			const showing = ref(true);
-			popup(defineAsyncComponent(() => import('@/components/ui/tooltip.vue')), {
+			popup(defineAsyncComponent(() => import('@/components/MkTooltip.vue')), {
 				showing,
 				text: self.text,
 				asMfm: binding.modifiers.mfm,
diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts
index e014eb529..515fc4781 100644
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@@ -514,7 +514,7 @@ export function popupMenu(items: MenuItem[] | Ref<MenuItem[]>, src?: HTMLElement
 }) {
 	return new Promise((resolve, reject) => {
 		let dispose;
-		popup(defineAsyncComponent(() => import('@/components/ui/popup-menu.vue')), {
+		popup(defineAsyncComponent(() => import('@/components/MkPopupMenu.vue')), {
 			items,
 			src,
 			width: options?.width,
@@ -535,7 +535,7 @@ export function contextMenu(items: MenuItem[] | Ref<MenuItem[]>, ev: MouseEvent)
 	ev.preventDefault();
 	return new Promise((resolve, reject) => {
 		let dispose;
-		popup(defineAsyncComponent(() => import('@/components/ui/context-menu.vue')), {
+		popup(defineAsyncComponent(() => import('@/components/MkContextMenu.vue')), {
 			items,
 			ev,
 		}, {
diff --git a/packages/client/src/pages/_error_.vue b/packages/client/src/pages/_error_.vue
index 6ac1f4297..a90a023cb 100644
--- a/packages/client/src/pages/_error_.vue
+++ b/packages/client/src/pages/_error_.vue
@@ -20,7 +20,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import * as misskey from 'misskey-js';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import { version } from '@/config';
 import * as os from '@/os';
 import { unisonReload } from '@/scripts/unison-reload';
diff --git a/packages/client/src/pages/about-misskey.vue b/packages/client/src/pages/about-misskey.vue
index 06c016116..7bcccea98 100644
--- a/packages/client/src/pages/about-misskey.vue
+++ b/packages/client/src/pages/about-misskey.vue
@@ -67,7 +67,7 @@ import { nextTick, onBeforeUnmount } from 'vue';
 import { version } from '@/config';
 import FormLink from '@/components/form/link.vue';
 import FormSection from '@/components/form/section.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkLink from '@/components/MkLink.vue';
 import { physics } from '@/scripts/physics';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/about.emojis.vue b/packages/client/src/pages/about.emojis.vue
index 8049975da..df64378c0 100644
--- a/packages/client/src/pages/about.emojis.vue
+++ b/packages/client/src/pages/about.emojis.vue
@@ -30,14 +30,14 @@
 
 <script lang="ts">
 import { defineComponent, computed } from 'vue';
-import MkButton from '@/components/ui/button.vue';
+import XEmoji from './emojis.emoji.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/form/input.vue';
 import MkSelect from '@/components/form/select.vue';
-import MkFolder from '@/components/ui/folder.vue';
+import MkFolder from '@/components/MkFolder.vue';
 import MkTab from '@/components/MkTab.vue';
 import * as os from '@/os';
 import { emojiCategories, emojiTags } from '@/instance';
-import XEmoji from './emojis.emoji.vue';
 
 export default defineComponent({
 	components: {
@@ -66,7 +66,7 @@ export default defineComponent({
 			handler() {
 				this.search();
 			},
-			deep: true
+			deep: true,
 		},
 	},
 
@@ -90,8 +90,8 @@ export default defineComponent({
 			} else {
 				this.selectedTags.add(tag);
 			}
-		}
-	}
+		},
+	},
 });
 </script>
 
diff --git a/packages/client/src/pages/about.federation.vue b/packages/client/src/pages/about.federation.vue
index 51a49ba59..c501a7758 100644
--- a/packages/client/src/pages/about.federation.vue
+++ b/packages/client/src/pages/about.federation.vue
@@ -48,10 +48,10 @@
 
 <script lang="ts" setup>
 import { computed } from 'vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/form/input.vue';
 import MkSelect from '@/components/form/select.vue';
-import MkPagination from '@/components/ui/pagination.vue';
+import MkPagination from '@/components/MkPagination.vue';
 import MkInstanceCardMini from '@/components/MkInstanceCardMini.vue';
 import FormSplit from '@/components/form/split.vue';
 import * as os from '@/os';
diff --git a/packages/client/src/pages/admin-file.vue b/packages/client/src/pages/admin-file.vue
index dfdbb1f0d..a62e0f630 100644
--- a/packages/client/src/pages/admin-file.vue
+++ b/packages/client/src/pages/admin-file.vue
@@ -63,14 +63,14 @@
 
 <script lang="ts" setup>
 import { computed } from 'vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkSwitch from '@/components/form/switch.vue';
 import MkObjectView from '@/components/MkObjectView.vue';
 import MkDriveFileThumbnail from '@/components/MkDriveFileThumbnail.vue';
 import MkKeyValue from '@/components/MkKeyValue.vue';
 import FormSection from '@/components/form/section.vue';
 import MkUserCardMini from '@/components/MkUserCardMini.vue';
-import MkInfo from '@/components/ui/info.vue';
+import MkInfo from '@/components/MkInfo.vue';
 import bytes from '@/filters/bytes';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/admin/_header_.vue b/packages/client/src/pages/admin/_header_.vue
index b2c33fdc9..bdb41b2d2 100644
--- a/packages/client/src/pages/admin/_header_.vue
+++ b/packages/client/src/pages/admin/_header_.vue
@@ -33,7 +33,7 @@ import tinycolor from 'tinycolor2';
 import { popupMenu } from '@/os';
 import { url } from '@/config';
 import { scrollToTop } from '@/scripts/scroll';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import { i18n } from '@/i18n';
 import { globalEvents } from '@/events';
 import { injectPageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/client/src/pages/admin/abuses.vue b/packages/client/src/pages/admin/abuses.vue
index 25fd8bcb6..9907d4d23 100644
--- a/packages/client/src/pages/admin/abuses.vue
+++ b/packages/client/src/pages/admin/abuses.vue
@@ -52,7 +52,7 @@ import { computed } from 'vue';
 import XHeader from './_header_.vue';
 import MkInput from '@/components/form/input.vue';
 import MkSelect from '@/components/form/select.vue';
-import MkPagination from '@/components/ui/pagination.vue';
+import MkPagination from '@/components/MkPagination.vue';
 import XAbuseReport from '@/components/MkAbuseReport.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/admin/ads.vue b/packages/client/src/pages/admin/ads.vue
index 21feafc0b..9a28d2ad6 100644
--- a/packages/client/src/pages/admin/ads.vue
+++ b/packages/client/src/pages/admin/ads.vue
@@ -49,7 +49,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import XHeader from './_header_.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/form/input.vue';
 import MkTextarea from '@/components/form/textarea.vue';
 import FormRadios from '@/components/form/radios.vue';
diff --git a/packages/client/src/pages/admin/announcements.vue b/packages/client/src/pages/admin/announcements.vue
index 5107c2f30..f10693314 100644
--- a/packages/client/src/pages/admin/announcements.vue
+++ b/packages/client/src/pages/admin/announcements.vue
@@ -29,7 +29,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import XHeader from './_header_.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/form/input.vue';
 import MkTextarea from '@/components/form/textarea.vue';
 import * as os from '@/os';
diff --git a/packages/client/src/pages/admin/bot-protection.vue b/packages/client/src/pages/admin/bot-protection.vue
index 2c404380a..72d5e379d 100644
--- a/packages/client/src/pages/admin/bot-protection.vue
+++ b/packages/client/src/pages/admin/bot-protection.vue
@@ -47,7 +47,7 @@
 import { defineAsyncComponent } from 'vue';
 import FormRadios from '@/components/form/radios.vue';
 import FormInput from '@/components/form/input.vue';
-import FormButton from '@/components/ui/button.vue';
+import FormButton from '@/components/MkButton.vue';
 import FormSuspense from '@/components/form/suspense.vue';
 import FormSlot from '@/components/form/slot.vue';
 import * as os from '@/os';
diff --git a/packages/client/src/pages/admin/email-settings.vue b/packages/client/src/pages/admin/email-settings.vue
index 46cfd3db7..64137f0c3 100644
--- a/packages/client/src/pages/admin/email-settings.vue
+++ b/packages/client/src/pages/admin/email-settings.vue
@@ -50,7 +50,7 @@ import { } from 'vue';
 import XHeader from './_header_.vue';
 import FormSwitch from '@/components/form/switch.vue';
 import FormInput from '@/components/form/input.vue';
-import FormInfo from '@/components/ui/info.vue';
+import FormInfo from '@/components/MkInfo.vue';
 import FormSuspense from '@/components/form/suspense.vue';
 import FormSplit from '@/components/form/split.vue';
 import FormSection from '@/components/form/section.vue';
diff --git a/packages/client/src/pages/admin/emoji-edit-dialog.vue b/packages/client/src/pages/admin/emoji-edit-dialog.vue
index af91044e7..090dd9afc 100644
--- a/packages/client/src/pages/admin/emoji-edit-dialog.vue
+++ b/packages/client/src/pages/admin/emoji-edit-dialog.vue
@@ -30,8 +30,8 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import XModalWindow from '@/components/ui/modal-window.vue';
-import MkButton from '@/components/ui/button.vue';
+import XModalWindow from '@/components/MkModalWindow.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/form/input.vue';
 import * as os from '@/os';
 import { unique } from '@/scripts/array';
diff --git a/packages/client/src/pages/admin/emojis.vue b/packages/client/src/pages/admin/emojis.vue
index cb886ee37..94f152d7d 100644
--- a/packages/client/src/pages/admin/emojis.vue
+++ b/packages/client/src/pages/admin/emojis.vue
@@ -70,9 +70,9 @@
 <script lang="ts" setup>
 import { computed, defineAsyncComponent, defineComponent, ref, toRef } from 'vue';
 import XHeader from './_header_.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/form/input.vue';
-import MkPagination from '@/components/ui/pagination.vue';
+import MkPagination from '@/components/MkPagination.vue';
 import MkTab from '@/components/MkTab.vue';
 import MkSwitch from '@/components/form/switch.vue';
 import FormSplit from '@/components/form/split.vue';
diff --git a/packages/client/src/pages/admin/files.vue b/packages/client/src/pages/admin/files.vue
index f919571ce..2e3a807ba 100644
--- a/packages/client/src/pages/admin/files.vue
+++ b/packages/client/src/pages/admin/files.vue
@@ -36,7 +36,7 @@
 import { computed, defineAsyncComponent } from 'vue';
 import * as Acct from 'misskey-js/built/acct';
 import XHeader from './_header_.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/form/input.vue';
 import MkSelect from '@/components/form/select.vue';
 import MkFileListForAdmin from '@/components/MkFileListForAdmin.vue';
diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue
index 154b85480..9200b5d54 100644
--- a/packages/client/src/pages/admin/index.vue
+++ b/packages/client/src/pages/admin/index.vue
@@ -25,8 +25,8 @@
 <script lang="ts" setup>
 import { defineAsyncComponent, inject, nextTick, onMounted, onUnmounted, provide, watch } from 'vue';
 import { i18n } from '@/i18n';
-import MkSuperMenu from '@/components/ui/super-menu.vue';
-import MkInfo from '@/components/ui/info.vue';
+import MkSuperMenu from '@/components/MkSuperMenu.vue';
+import MkInfo from '@/components/MkInfo.vue';
 import { scroll } from '@/scripts/scroll';
 import { instance } from '@/instance';
 import * as os from '@/os';
diff --git a/packages/client/src/pages/admin/instance-block.vue b/packages/client/src/pages/admin/instance-block.vue
index 6d479e8f0..94b740a4d 100644
--- a/packages/client/src/pages/admin/instance-block.vue
+++ b/packages/client/src/pages/admin/instance-block.vue
@@ -17,7 +17,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import XHeader from './_header_.vue';
-import FormButton from '@/components/ui/button.vue';
+import FormButton from '@/components/MkButton.vue';
 import FormTextarea from '@/components/form/textarea.vue';
 import FormSuspense from '@/components/form/suspense.vue';
 import * as os from '@/os';
diff --git a/packages/client/src/pages/admin/integrations.discord.vue b/packages/client/src/pages/admin/integrations.discord.vue
index eff318dc1..0ab6ecbb4 100644
--- a/packages/client/src/pages/admin/integrations.discord.vue
+++ b/packages/client/src/pages/admin/integrations.discord.vue
@@ -28,8 +28,8 @@
 import { } from 'vue';
 import FormSwitch from '@/components/form/switch.vue';
 import FormInput from '@/components/form/input.vue';
-import FormButton from '@/components/ui/button.vue';
-import FormInfo from '@/components/ui/info.vue';
+import FormButton from '@/components/MkButton.vue';
+import FormInfo from '@/components/MkInfo.vue';
 import FormSuspense from '@/components/form/suspense.vue';
 import * as os from '@/os';
 import { fetchInstance } from '@/instance';
diff --git a/packages/client/src/pages/admin/integrations.github.vue b/packages/client/src/pages/admin/integrations.github.vue
index f6e56e1ed..34761e9a7 100644
--- a/packages/client/src/pages/admin/integrations.github.vue
+++ b/packages/client/src/pages/admin/integrations.github.vue
@@ -28,8 +28,8 @@
 import { } from 'vue';
 import FormSwitch from '@/components/form/switch.vue';
 import FormInput from '@/components/form/input.vue';
-import FormButton from '@/components/ui/button.vue';
-import FormInfo from '@/components/ui/info.vue';
+import FormButton from '@/components/MkButton.vue';
+import FormInfo from '@/components/MkInfo.vue';
 import FormSuspense from '@/components/form/suspense.vue';
 import * as os from '@/os';
 import { fetchInstance } from '@/instance';
diff --git a/packages/client/src/pages/admin/integrations.twitter.vue b/packages/client/src/pages/admin/integrations.twitter.vue
index 48da4648f..a870d76a4 100644
--- a/packages/client/src/pages/admin/integrations.twitter.vue
+++ b/packages/client/src/pages/admin/integrations.twitter.vue
@@ -28,8 +28,8 @@
 import { defineComponent } from 'vue';
 import FormSwitch from '@/components/form/switch.vue';
 import FormInput from '@/components/form/input.vue';
-import FormButton from '@/components/ui/button.vue';
-import FormInfo from '@/components/ui/info.vue';
+import FormButton from '@/components/MkButton.vue';
+import FormInfo from '@/components/MkInfo.vue';
 import FormSuspense from '@/components/form/suspense.vue';
 import * as os from '@/os';
 import { fetchInstance } from '@/instance';
diff --git a/packages/client/src/pages/admin/metrics.vue b/packages/client/src/pages/admin/metrics.vue
index 7e5f5bb09..e0e47e667 100644
--- a/packages/client/src/pages/admin/metrics.vue
+++ b/packages/client/src/pages/admin/metrics.vue
@@ -67,11 +67,11 @@ import {
   Tooltip,
   SubTitle
 } from 'chart.js';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkSelect from '@/components/form/select.vue';
 import MkInput from '@/components/form/input.vue';
-import MkContainer from '@/components/ui/container.vue';
-import MkFolder from '@/components/ui/folder.vue';
+import MkContainer from '@/components/MkContainer.vue';
+import MkFolder from '@/components/MkFolder.vue';
 import MkwFederation from '../../widgets/federation.vue';
 import { version, url } from '@/config';
 import bytes from '@/filters/bytes';
diff --git a/packages/client/src/pages/admin/proxy-account.vue b/packages/client/src/pages/admin/proxy-account.vue
index 71f35bf0f..fe61909e8 100644
--- a/packages/client/src/pages/admin/proxy-account.vue
+++ b/packages/client/src/pages/admin/proxy-account.vue
@@ -16,8 +16,8 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import MkKeyValue from '@/components/MkKeyValue.vue';
-import FormButton from '@/components/ui/button.vue';
-import MkInfo from '@/components/ui/info.vue';
+import FormButton from '@/components/MkButton.vue';
+import MkInfo from '@/components/MkInfo.vue';
 import FormSuspense from '@/components/form/suspense.vue';
 import * as os from '@/os';
 import { fetchInstance } from '@/instance';
diff --git a/packages/client/src/pages/admin/queue.vue b/packages/client/src/pages/admin/queue.vue
index 6ccb464d1..a6fc75aea 100644
--- a/packages/client/src/pages/admin/queue.vue
+++ b/packages/client/src/pages/admin/queue.vue
@@ -12,7 +12,7 @@
 import { markRaw, onMounted, onBeforeUnmount, nextTick } from 'vue';
 import XQueue from './queue.chart.vue';
 import XHeader from './_header_.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 import * as config from '@/config';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/admin/relays.vue b/packages/client/src/pages/admin/relays.vue
index 42347c0e7..e6f7f4ead 100644
--- a/packages/client/src/pages/admin/relays.vue
+++ b/packages/client/src/pages/admin/relays.vue
@@ -19,7 +19,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import XHeader from './_header_.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/client/src/pages/admin/security.vue b/packages/client/src/pages/admin/security.vue
index 07ee412f3..c36cedb31 100644
--- a/packages/client/src/pages/admin/security.vue
+++ b/packages/client/src/pages/admin/security.vue
@@ -107,11 +107,11 @@ import XHeader from './_header_.vue';
 import FormFolder from '@/components/form/folder.vue';
 import FormRadios from '@/components/form/radios.vue';
 import FormSwitch from '@/components/form/switch.vue';
-import FormInfo from '@/components/ui/info.vue';
+import FormInfo from '@/components/MkInfo.vue';
 import FormSuspense from '@/components/form/suspense.vue';
 import FormRange from '@/components/form/range.vue';
 import FormInput from '@/components/form/input.vue';
-import FormButton from '@/components/ui/button.vue';
+import FormButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 import { fetchInstance } from '@/instance';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/admin/settings.vue b/packages/client/src/pages/admin/settings.vue
index 496eb46ea..cf6b1f17e 100644
--- a/packages/client/src/pages/admin/settings.vue
+++ b/packages/client/src/pages/admin/settings.vue
@@ -153,7 +153,7 @@ import XHeader from './_header_.vue';
 import FormSwitch from '@/components/form/switch.vue';
 import FormInput from '@/components/form/input.vue';
 import FormTextarea from '@/components/form/textarea.vue';
-import FormInfo from '@/components/ui/info.vue';
+import FormInfo from '@/components/MkInfo.vue';
 import FormSection from '@/components/form/section.vue';
 import FormSplit from '@/components/form/split.vue';
 import FormSuspense from '@/components/form/suspense.vue';
diff --git a/packages/client/src/pages/admin/users.vue b/packages/client/src/pages/admin/users.vue
index 9cdb6d8be..eeb335a43 100644
--- a/packages/client/src/pages/admin/users.vue
+++ b/packages/client/src/pages/admin/users.vue
@@ -57,7 +57,7 @@ import { computed } from 'vue';
 import XHeader from './_header_.vue';
 import MkInput from '@/components/form/input.vue';
 import MkSelect from '@/components/form/select.vue';
-import MkPagination from '@/components/ui/pagination.vue';
+import MkPagination from '@/components/MkPagination.vue';
 import * as os from '@/os';
 import { lookupUser } from '@/scripts/lookup-user';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/announcements.vue b/packages/client/src/pages/announcements.vue
index aeb85b655..5f6659699 100644
--- a/packages/client/src/pages/announcements.vue
+++ b/packages/client/src/pages/announcements.vue
@@ -20,8 +20,8 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import MkPagination from '@/components/ui/pagination.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkPagination from '@/components/MkPagination.vue';
+import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/client/src/pages/api-console.vue b/packages/client/src/pages/api-console.vue
index 2f8eeadff..0064e4c3f 100644
--- a/packages/client/src/pages/api-console.vue
+++ b/packages/client/src/pages/api-console.vue
@@ -32,7 +32,7 @@
 import { ref } from 'vue';
 import JSON5 from 'json5';
 import { Endpoints } from 'misskey-js';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/form/input.vue';
 import MkTextarea from '@/components/form/textarea.vue';
 import MkSwitch from '@/components/form/switch.vue';
diff --git a/packages/client/src/pages/auth.form.vue b/packages/client/src/pages/auth.form.vue
index 5feff0149..024a7a2c5 100644
--- a/packages/client/src/pages/auth.form.vue
+++ b/packages/client/src/pages/auth.form.vue
@@ -21,7 +21,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 
 export default defineComponent({
diff --git a/packages/client/src/pages/channel-editor.vue b/packages/client/src/pages/channel-editor.vue
index 5b5d0454f..3e94b5f04 100644
--- a/packages/client/src/pages/channel-editor.vue
+++ b/packages/client/src/pages/channel-editor.vue
@@ -29,7 +29,7 @@
 <script lang="ts" setup>
 import { computed, inject, watch } from 'vue';
 import MkTextarea from '@/components/form/textarea.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/form/input.vue';
 import { selectFile } from '@/scripts/select-file';
 import * as os from '@/os';
diff --git a/packages/client/src/pages/channel.vue b/packages/client/src/pages/channel.vue
index 04c302f4d..380c3efc8 100644
--- a/packages/client/src/pages/channel.vue
+++ b/packages/client/src/pages/channel.vue
@@ -33,7 +33,7 @@
 
 <script lang="ts" setup>
 import { computed, inject, watch } from 'vue';
-import MkContainer from '@/components/ui/container.vue';
+import MkContainer from '@/components/MkContainer.vue';
 import XPostForm from '@/components/MkPostForm.vue';
 import XTimeline from '@/components/MkTimeline.vue';
 import XChannelFollowButton from '@/components/MkChannelFollowButton.vue';
diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue
index fbc17b689..56ea98d15 100644
--- a/packages/client/src/pages/channels.vue
+++ b/packages/client/src/pages/channels.vue
@@ -25,8 +25,8 @@
 <script lang="ts" setup>
 import { computed, defineComponent, inject } from 'vue';
 import MkChannelPreview from '@/components/MkChannelPreview.vue';
-import MkPagination from '@/components/ui/pagination.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkPagination from '@/components/MkPagination.vue';
+import MkButton from '@/components/MkButton.vue';
 import { useRouter } from '@/router';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/explore.users.vue b/packages/client/src/pages/explore.users.vue
index f25015620..e16e40b8e 100644
--- a/packages/client/src/pages/explore.users.vue
+++ b/packages/client/src/pages/explore.users.vue
@@ -60,7 +60,7 @@
 <script lang="ts" setup>
 import { computed, watch } from 'vue';
 import XUserList from '@/components/MkUserList.vue';
-import MkFolder from '@/components/ui/folder.vue';
+import MkFolder from '@/components/MkFolder.vue';
 import MkTab from '@/components/MkTab.vue';
 import number from '@/filters/number';
 import * as os from '@/os';
diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index 1fac32c03..279960d13 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -33,7 +33,7 @@
 import { computed, watch } from 'vue';
 import XFeatured from './explore.featured.vue';
 import XUsers from './explore.users.vue';
-import MkFolder from '@/components/ui/folder.vue';
+import MkFolder from '@/components/MkFolder.vue';
 import MkInput from '@/components/form/input.vue';
 import MkRadios from '@/components/form/radios.vue';
 import number from '@/filters/number';
diff --git a/packages/client/src/pages/favorites.vue b/packages/client/src/pages/favorites.vue
index 1501484cc..32a1dbf59 100644
--- a/packages/client/src/pages/favorites.vue
+++ b/packages/client/src/pages/favorites.vue
@@ -22,7 +22,7 @@
 
 <script lang="ts" setup>
 import { ref } from 'vue';
-import MkPagination from '@/components/ui/pagination.vue';
+import MkPagination from '@/components/MkPagination.vue';
 import XNote from '@/components/MkNote.vue';
 import XList from '@/components/MkDateSeparatedList.vue';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/follow-requests.vue b/packages/client/src/pages/follow-requests.vue
index f87bcbf24..82d716426 100644
--- a/packages/client/src/pages/follow-requests.vue
+++ b/packages/client/src/pages/follow-requests.vue
@@ -36,7 +36,7 @@
 
 <script lang="ts" setup>
 import { ref, computed } from 'vue';
-import MkPagination from '@/components/ui/pagination.vue';
+import MkPagination from '@/components/MkPagination.vue';
 import { userPage, acct } from '@/filters/user';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/gallery/edit.vue b/packages/client/src/pages/gallery/edit.vue
index 2e0e5063e..8f716d9eb 100644
--- a/packages/client/src/pages/gallery/edit.vue
+++ b/packages/client/src/pages/gallery/edit.vue
@@ -32,7 +32,7 @@
 
 <script lang="ts" setup>
 import { computed, inject, watch } from 'vue';
-import FormButton from '@/components/ui/button.vue';
+import FormButton from '@/components/MkButton.vue';
 import FormInput from '@/components/form/input.vue';
 import FormTextarea from '@/components/form/textarea.vue';
 import FormSwitch from '@/components/form/switch.vue';
diff --git a/packages/client/src/pages/gallery/index.vue b/packages/client/src/pages/gallery/index.vue
index 1dfedb4a6..598383217 100644
--- a/packages/client/src/pages/gallery/index.vue
+++ b/packages/client/src/pages/gallery/index.vue
@@ -44,11 +44,11 @@
 <script lang="ts" setup>
 import { computed, defineComponent, watch } from 'vue';
 import XUserList from '@/components/MkUserList.vue';
-import MkFolder from '@/components/ui/folder.vue';
+import MkFolder from '@/components/MkFolder.vue';
 import MkInput from '@/components/form/input.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkTab from '@/components/MkTab.vue';
-import MkPagination from '@/components/ui/pagination.vue';
+import MkPagination from '@/components/MkPagination.vue';
 import MkGalleryPostPreview from '@/components/MkGalleryPostPreview.vue';
 import number from '@/filters/number';
 import * as os from '@/os';
diff --git a/packages/client/src/pages/gallery/post.vue b/packages/client/src/pages/gallery/post.vue
index 1e7a99716..3804bcdcf 100644
--- a/packages/client/src/pages/gallery/post.vue
+++ b/packages/client/src/pages/gallery/post.vue
@@ -56,11 +56,11 @@
 
 <script lang="ts" setup>
 import { computed, defineComponent, inject, watch } from 'vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os';
-import MkContainer from '@/components/ui/container.vue';
+import MkContainer from '@/components/MkContainer.vue';
 import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
-import MkPagination from '@/components/ui/pagination.vue';
+import MkPagination from '@/components/MkPagination.vue';
 import MkGalleryPostPreview from '@/components/MkGalleryPostPreview.vue';
 import MkFollowButton from '@/components/MkFollowButton.vue';
 import { url } from '@/config';
diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue
index a4d462f82..6e8560ef4 100644
--- a/packages/client/src/pages/instance-info.vue
+++ b/packages/client/src/pages/instance-info.vue
@@ -121,7 +121,7 @@ import MkChart from '@/components/MkChart.vue';
 import MkObjectView from '@/components/MkObjectView.vue';
 import FormLink from '@/components/form/link.vue';
 import MkLink from '@/components/MkLink.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import FormSection from '@/components/form/section.vue';
 import MkKeyValue from '@/components/MkKeyValue.vue';
 import MkSelect from '@/components/form/select.vue';
@@ -133,7 +133,7 @@ import { iAmModerator } from '@/account';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { i18n } from '@/i18n';
 import MkUserCardMini from '@/components/MkUserCardMini.vue';
-import MkPagination from '@/components/ui/pagination.vue';
+import MkPagination from '@/components/MkPagination.vue';
 
 const props = defineProps<{
 	host: string;
diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index 7df4c846f..56d852fe3 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -45,7 +45,7 @@
 <script lang="ts" setup>
 import { defineAsyncComponent, defineComponent, inject, markRaw, onMounted, onUnmounted } from 'vue';
 import * as Acct from 'misskey-js/built/acct';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import { acct } from '@/filters/user';
 import * as os from '@/os';
 import { stream } from '@/stream';
diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
index b91cba7ec..a9da89ed9 100644
--- a/packages/client/src/pages/messaging/messaging-room.vue
+++ b/packages/client/src/pages/messaging/messaging-room.vue
@@ -56,7 +56,7 @@ import * as Acct from 'misskey-js/built/acct';
 import XMessage from './messaging-room.message.vue';
 import XForm from './messaging-room.form.vue';
 import XList from '@/components/MkDateSeparatedList.vue';
-import MkPagination, { Paging } from '@/components/ui/pagination.vue';
+import MkPagination, { Paging } from '@/components/MkPagination.vue';
 import { isBottomVisible, onScrollBottom, scrollToBottom } from '@/scripts/scroll';
 import * as os from '@/os';
 import { stream } from '@/stream';
diff --git a/packages/client/src/pages/miauth.vue b/packages/client/src/pages/miauth.vue
index 5a890c7b3..5de072cbf 100644
--- a/packages/client/src/pages/miauth.vue
+++ b/packages/client/src/pages/miauth.vue
@@ -41,7 +41,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import MkSignin from '@/components/MkSignin.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 import { $i, login } from '@/account';
 import { appendQuery, query } from '@/scripts/url';
diff --git a/packages/client/src/pages/my-antennas/editor.vue b/packages/client/src/pages/my-antennas/editor.vue
index 32027846c..054053fbf 100644
--- a/packages/client/src/pages/my-antennas/editor.vue
+++ b/packages/client/src/pages/my-antennas/editor.vue
@@ -47,7 +47,7 @@
 <script lang="ts" setup>
 import { watch } from 'vue';
 import * as Acct from 'misskey-js/built/acct';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/form/input.vue';
 import MkTextarea from '@/components/form/textarea.vue';
 import MkSelect from '@/components/form/select.vue';
diff --git a/packages/client/src/pages/my-antennas/index.vue b/packages/client/src/pages/my-antennas/index.vue
index 70e444da5..dc73ba674 100644
--- a/packages/client/src/pages/my-antennas/index.vue
+++ b/packages/client/src/pages/my-antennas/index.vue
@@ -17,8 +17,8 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import MkPagination from '@/components/ui/pagination.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkPagination from '@/components/MkPagination.vue';
+import MkButton from '@/components/MkButton.vue';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 
diff --git a/packages/client/src/pages/my-clips/index.vue b/packages/client/src/pages/my-clips/index.vue
index 5e5454b72..68330d6db 100644
--- a/packages/client/src/pages/my-clips/index.vue
+++ b/packages/client/src/pages/my-clips/index.vue
@@ -18,8 +18,8 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import MkPagination from '@/components/ui/pagination.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkPagination from '@/components/MkPagination.vue';
+import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/client/src/pages/my-lists/index.vue b/packages/client/src/pages/my-lists/index.vue
index 7dc5b3e90..9af7c0d10 100644
--- a/packages/client/src/pages/my-lists/index.vue
+++ b/packages/client/src/pages/my-lists/index.vue
@@ -18,8 +18,8 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import MkPagination from '@/components/ui/pagination.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkPagination from '@/components/MkPagination.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkAvatars from '@/components/MkAvatars.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/my-lists/list.vue b/packages/client/src/pages/my-lists/list.vue
index 8b23c667d..d90453526 100644
--- a/packages/client/src/pages/my-lists/list.vue
+++ b/packages/client/src/pages/my-lists/list.vue
@@ -39,7 +39,7 @@
 
 <script lang="ts" setup>
 import { computed, watch } from 'vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 import { mainRouter } from '@/router';
 import { definePageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue
index ba05a7b88..6509cb306 100644
--- a/packages/client/src/pages/note.vue
+++ b/packages/client/src/pages/note.vue
@@ -47,7 +47,7 @@ import XNote from '@/components/MkNote.vue';
 import XNoteDetailed from '@/components/MkNoteDetailed.vue';
 import XNotes from '@/components/MkNotes.vue';
 import MkRemoteCaution from '@/components/MkRemoteCaution.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/page-editor/page-editor.vue b/packages/client/src/pages/page-editor/page-editor.vue
index aaa61e6e3..591d13053 100644
--- a/packages/client/src/pages/page-editor/page-editor.vue
+++ b/packages/client/src/pages/page-editor/page-editor.vue
@@ -93,7 +93,7 @@ import { v4 as uuid } from 'uuid';
 import XVariable from './page-editor.script-block.vue';
 import XBlocks from './page-editor.blocks.vue';
 import MkTextarea from '@/components/form/textarea.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkSelect from '@/components/form/select.vue';
 import MkSwitch from '@/components/form/switch.vue';
 import MkInput from '@/components/form/input.vue';
diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue
index 48d62a954..fb0e6a491 100644
--- a/packages/client/src/pages/page.vue
+++ b/packages/client/src/pages/page.vue
@@ -65,12 +65,12 @@
 <script lang="ts" setup>
 import { computed, watch } from 'vue';
 import XPage from '@/components/page/page.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 import { url } from '@/config';
 import MkFollowButton from '@/components/MkFollowButton.vue';
-import MkContainer from '@/components/ui/container.vue';
-import MkPagination from '@/components/ui/pagination.vue';
+import MkContainer from '@/components/MkContainer.vue';
+import MkPagination from '@/components/MkPagination.vue';
 import MkPagePreview from '@/components/MkPagePreview.vue';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/client/src/pages/pages.vue b/packages/client/src/pages/pages.vue
index 6e71d9c83..02b05c57b 100644
--- a/packages/client/src/pages/pages.vue
+++ b/packages/client/src/pages/pages.vue
@@ -27,8 +27,8 @@
 <script lang="ts" setup>
 import { computed, inject } from 'vue';
 import MkPagePreview from '@/components/MkPagePreview.vue';
-import MkPagination from '@/components/ui/pagination.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkPagination from '@/components/MkPagination.vue';
+import MkButton from '@/components/MkButton.vue';
 import { useRouter } from '@/router';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/client/src/pages/registry.keys.vue b/packages/client/src/pages/registry.keys.vue
index 372b5faa4..ac586b4e7 100644
--- a/packages/client/src/pages/registry.keys.vue
+++ b/packages/client/src/pages/registry.keys.vue
@@ -33,7 +33,7 @@ import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import FormLink from '@/components/form/link.vue';
 import FormSection from '@/components/form/section.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkKeyValue from '@/components/MkKeyValue.vue';
 import FormSplit from '@/components/form/split.vue';
 
diff --git a/packages/client/src/pages/registry.value.vue b/packages/client/src/pages/registry.value.vue
index 9fac7f990..b6f3d73bb 100644
--- a/packages/client/src/pages/registry.value.vue
+++ b/packages/client/src/pages/registry.value.vue
@@ -45,11 +45,11 @@ import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import FormLink from '@/components/form/link.vue';
 import FormSection from '@/components/form/section.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkKeyValue from '@/components/MkKeyValue.vue';
 import FormTextarea from '@/components/form/textarea.vue';
 import FormSplit from '@/components/form/split.vue';
-import FormInfo from '@/components/ui/info.vue';
+import FormInfo from '@/components/MkInfo.vue';
 
 const props = defineProps<{
 	path: string;
diff --git a/packages/client/src/pages/registry.vue b/packages/client/src/pages/registry.vue
index f022a0d68..80a44d558 100644
--- a/packages/client/src/pages/registry.vue
+++ b/packages/client/src/pages/registry.vue
@@ -22,7 +22,7 @@ import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import FormLink from '@/components/form/link.vue';
 import FormSection from '@/components/form/section.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 
 let scopes = $ref(null);
 
diff --git a/packages/client/src/pages/reset-password.vue b/packages/client/src/pages/reset-password.vue
index 4c4cdb810..38f2cf289 100644
--- a/packages/client/src/pages/reset-password.vue
+++ b/packages/client/src/pages/reset-password.vue
@@ -17,7 +17,7 @@
 <script lang="ts" setup>
 import { defineAsyncComponent, onMounted } from 'vue';
 import FormInput from '@/components/form/input.vue';
-import FormButton from '@/components/ui/button.vue';
+import FormButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { mainRouter } from '@/router';
diff --git a/packages/client/src/pages/scratchpad.vue b/packages/client/src/pages/scratchpad.vue
index d43760147..12b5d78b2 100644
--- a/packages/client/src/pages/scratchpad.vue
+++ b/packages/client/src/pages/scratchpad.vue
@@ -28,8 +28,8 @@ import 'prismjs/themes/prism-okaidia.css';
 import { PrismEditor } from 'vue-prism-editor';
 import 'vue-prism-editor/dist/prismeditor.min.css';
 import { AiScript, parse, utils } from '@syuilo/aiscript';
-import MkContainer from '@/components/ui/container.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkContainer from '@/components/MkContainer.vue';
+import MkButton from '@/components/MkButton.vue';
 import { createAiScriptEnv } from '@/scripts/aiscript/api';
 import * as os from '@/os';
 import { $i } from '@/account';
diff --git a/packages/client/src/pages/settings/2fa.vue b/packages/client/src/pages/settings/2fa.vue
index d72d3e206..89d8178dc 100644
--- a/packages/client/src/pages/settings/2fa.vue
+++ b/packages/client/src/pages/settings/2fa.vue
@@ -68,8 +68,8 @@
 import { ref } from 'vue';
 import { hostname } from '@/config';
 import { byteify, hexify, stringify } from '@/scripts/2fa';
-import MkButton from '@/components/ui/button.vue';
-import MkInfo from '@/components/ui/info.vue';
+import MkButton from '@/components/MkButton.vue';
+import MkInfo from '@/components/MkInfo.vue';
 import MkInput from '@/components/form/input.vue';
 import MkSwitch from '@/components/form/switch.vue';
 import * as os from '@/os';
diff --git a/packages/client/src/pages/settings/accounts.vue b/packages/client/src/pages/settings/accounts.vue
index 33a0fcc32..e16931a9c 100644
--- a/packages/client/src/pages/settings/accounts.vue
+++ b/packages/client/src/pages/settings/accounts.vue
@@ -23,7 +23,7 @@
 <script lang="ts" setup>
 import { defineAsyncComponent, ref } from 'vue';
 import FormSuspense from '@/components/form/suspense.vue';
-import FormButton from '@/components/ui/button.vue';
+import FormButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 import { getAccounts, addAccount as addAccounts, removeAccount as _removeAccount, login, $i } from '@/account';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/settings/api.vue b/packages/client/src/pages/settings/api.vue
index b0a787fc4..7165089e3 100644
--- a/packages/client/src/pages/settings/api.vue
+++ b/packages/client/src/pages/settings/api.vue
@@ -9,7 +9,7 @@
 <script lang="ts" setup>
 import { defineAsyncComponent, ref } from 'vue';
 import FormLink from '@/components/form/link.vue';
-import FormButton from '@/components/ui/button.vue';
+import FormButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/client/src/pages/settings/apps.vue b/packages/client/src/pages/settings/apps.vue
index 10ecbc795..8b345c8e9 100644
--- a/packages/client/src/pages/settings/apps.vue
+++ b/packages/client/src/pages/settings/apps.vue
@@ -39,7 +39,7 @@
 
 <script lang="ts" setup>
 import { ref } from 'vue';
-import FormPagination from '@/components/ui/pagination.vue';
+import FormPagination from '@/components/MkPagination.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/client/src/pages/settings/custom-css.vue b/packages/client/src/pages/settings/custom-css.vue
index d5000d397..2992906e6 100644
--- a/packages/client/src/pages/settings/custom-css.vue
+++ b/packages/client/src/pages/settings/custom-css.vue
@@ -11,7 +11,7 @@
 <script lang="ts" setup>
 import { ref, watch } from 'vue';
 import FormTextarea from '@/components/form/textarea.vue';
-import FormInfo from '@/components/ui/info.vue';
+import FormInfo from '@/components/MkInfo.vue';
 import * as os from '@/os';
 import { unisonReload } from '@/scripts/unison-reload';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/settings/delete-account.vue b/packages/client/src/pages/settings/delete-account.vue
index 3c4ea716c..851a857fe 100644
--- a/packages/client/src/pages/settings/delete-account.vue
+++ b/packages/client/src/pages/settings/delete-account.vue
@@ -8,8 +8,8 @@
 </template>
 
 <script lang="ts" setup>
-import FormInfo from '@/components/ui/info.vue';
-import FormButton from '@/components/ui/button.vue';
+import FormInfo from '@/components/MkInfo.vue';
+import FormButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 import { signout } from '@/account';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/settings/import-export.vue b/packages/client/src/pages/settings/import-export.vue
index 13c2b7fc8..d3d155894 100644
--- a/packages/client/src/pages/settings/import-export.vue
+++ b/packages/client/src/pages/settings/import-export.vue
@@ -71,7 +71,7 @@
 
 <script lang="ts" setup>
 import { ref } from 'vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import FormSection from '@/components/form/section.vue';
 import FormFolder from '@/components/form/folder.vue';
 import FormSwitch from '@/components/form/switch.vue';
diff --git a/packages/client/src/pages/settings/index.vue b/packages/client/src/pages/settings/index.vue
index 862435eb3..73407ff5f 100644
--- a/packages/client/src/pages/settings/index.vue
+++ b/packages/client/src/pages/settings/index.vue
@@ -24,8 +24,8 @@
 <script setup lang="ts">
 import { computed, defineAsyncComponent, inject, nextTick, onActivated, onMounted, onUnmounted, provide, ref, watch } from 'vue';
 import { i18n } from '@/i18n';
-import MkInfo from '@/components/ui/info.vue';
-import MkSuperMenu from '@/components/ui/super-menu.vue';
+import MkInfo from '@/components/MkInfo.vue';
+import MkSuperMenu from '@/components/MkSuperMenu.vue';
 import { scroll } from '@/scripts/scroll';
 import { signout , $i } from '@/account';
 import { unisonReload } from '@/scripts/unison-reload';
diff --git a/packages/client/src/pages/settings/instance-mute.vue b/packages/client/src/pages/settings/instance-mute.vue
index d0ca85adc..5a0d48b82 100644
--- a/packages/client/src/pages/settings/instance-mute.vue
+++ b/packages/client/src/pages/settings/instance-mute.vue
@@ -12,8 +12,8 @@
 <script lang="ts" setup>
 import { ref, watch } from 'vue';
 import FormTextarea from '@/components/form/textarea.vue';
-import MkInfo from '@/components/ui/info.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkInfo from '@/components/MkInfo.vue';
+import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 import { $i } from '@/account';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/settings/integration.vue b/packages/client/src/pages/settings/integration.vue
index ccb02e08a..c8219519f 100644
--- a/packages/client/src/pages/settings/integration.vue
+++ b/packages/client/src/pages/settings/integration.vue
@@ -27,7 +27,7 @@
 import { computed, onMounted, ref, watch } from 'vue';
 import { apiUrl } from '@/config';
 import FormSection from '@/components/form/section.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import { $i } from '@/account';
 import { instance } from '@/instance';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/settings/mute-block.vue b/packages/client/src/pages/settings/mute-block.vue
index 28c215a04..3832933cf 100644
--- a/packages/client/src/pages/settings/mute-block.vue
+++ b/packages/client/src/pages/settings/mute-block.vue
@@ -29,9 +29,9 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import MkPagination from '@/components/ui/pagination.vue';
+import MkPagination from '@/components/MkPagination.vue';
 import MkTab from '@/components/MkTab.vue';
-import FormInfo from '@/components/ui/info.vue';
+import FormInfo from '@/components/MkInfo.vue';
 import FormLink from '@/components/form/link.vue';
 import { userPage } from '@/filters/user';
 import * as os from '@/os';
diff --git a/packages/client/src/pages/settings/navbar.vue b/packages/client/src/pages/settings/navbar.vue
index 534112c3e..6c501e9f2 100644
--- a/packages/client/src/pages/settings/navbar.vue
+++ b/packages/client/src/pages/settings/navbar.vue
@@ -21,7 +21,7 @@
 import { computed, ref, watch } from 'vue';
 import FormTextarea from '@/components/form/textarea.vue';
 import FormRadios from '@/components/form/radios.vue';
-import FormButton from '@/components/ui/button.vue';
+import FormButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 import { navbarItemDef } from '@/navbar';
 import { defaultStore } from '@/store';
diff --git a/packages/client/src/pages/settings/notifications.vue b/packages/client/src/pages/settings/notifications.vue
index 47c51e600..5703e0c6b 100644
--- a/packages/client/src/pages/settings/notifications.vue
+++ b/packages/client/src/pages/settings/notifications.vue
@@ -12,7 +12,7 @@
 <script lang="ts" setup>
 import { defineAsyncComponent } from 'vue';
 import { notificationTypes } from 'misskey-js';
-import FormButton from '@/components/ui/button.vue';
+import FormButton from '@/components/MkButton.vue';
 import FormLink from '@/components/form/link.vue';
 import FormSection from '@/components/form/section.vue';
 import * as os from '@/os';
diff --git a/packages/client/src/pages/settings/plugin.install.vue b/packages/client/src/pages/settings/plugin.install.vue
index 4940f3b5f..e259bbeb3 100644
--- a/packages/client/src/pages/settings/plugin.install.vue
+++ b/packages/client/src/pages/settings/plugin.install.vue
@@ -18,8 +18,8 @@ import { AiScript, parse } from '@syuilo/aiscript';
 import { serialize } from '@syuilo/aiscript/built/serializer';
 import { v4 as uuid } from 'uuid';
 import FormTextarea from '@/components/form/textarea.vue';
-import FormButton from '@/components/ui/button.vue';
-import FormInfo from '@/components/ui/info.vue';
+import FormButton from '@/components/MkButton.vue';
+import FormInfo from '@/components/MkInfo.vue';
 import * as os from '@/os';
 import { ColdDeviceStorage } from '@/store';
 import { unisonReload } from '@/scripts/unison-reload';
diff --git a/packages/client/src/pages/settings/plugin.vue b/packages/client/src/pages/settings/plugin.vue
index b557bd538..8ce6fe444 100644
--- a/packages/client/src/pages/settings/plugin.vue
+++ b/packages/client/src/pages/settings/plugin.vue
@@ -36,7 +36,7 @@ import { nextTick, ref } from 'vue';
 import FormLink from '@/components/form/link.vue';
 import FormSwitch from '@/components/form/switch.vue';
 import FormSection from '@/components/form/section.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkKeyValue from '@/components/MkKeyValue.vue';
 import * as os from '@/os';
 import { ColdDeviceStorage } from '@/store';
diff --git a/packages/client/src/pages/settings/preferences-backups.vue b/packages/client/src/pages/settings/preferences-backups.vue
index 991bb7902..fac67185b 100644
--- a/packages/client/src/pages/settings/preferences-backups.vue
+++ b/packages/client/src/pages/settings/preferences-backups.vue
@@ -33,8 +33,8 @@
 import { computed, onMounted, onUnmounted, useCssModule } from 'vue';
 import { v4 as uuid } from 'uuid';
 import FormSection from '@/components/form/section.vue';
-import MkButton from '@/components/ui/button.vue';
-import MkInfo from '@/components/ui/info.vue';
+import MkButton from '@/components/MkButton.vue';
+import MkInfo from '@/components/MkInfo.vue';
 import * as os from '@/os';
 import { ColdDeviceStorage, defaultStore } from '@/store';
 import { unisonReload } from '@/scripts/unison-reload';
diff --git a/packages/client/src/pages/settings/profile.vue b/packages/client/src/pages/settings/profile.vue
index 5bb3273b3..aaf60c8d5 100644
--- a/packages/client/src/pages/settings/profile.vue
+++ b/packages/client/src/pages/settings/profile.vue
@@ -61,7 +61,7 @@
 
 <script lang="ts" setup>
 import { reactive, watch } from 'vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import FormInput from '@/components/form/input.vue';
 import FormTextarea from '@/components/form/textarea.vue';
 import FormSwitch from '@/components/form/switch.vue';
diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue
index eae95c1e9..c23c1c237 100644
--- a/packages/client/src/pages/settings/reaction.vue
+++ b/packages/client/src/pages/settings/reaction.vue
@@ -59,7 +59,7 @@ import XDraggable from 'vuedraggable';
 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/ui/button.vue';
+import FormButton from '@/components/MkButton.vue';
 import FormSection from '@/components/form/section.vue';
 import FormSwitch from '@/components/form/switch.vue';
 import * as os from '@/os';
diff --git a/packages/client/src/pages/settings/security.vue b/packages/client/src/pages/settings/security.vue
index d926acce5..d109a4ba7 100644
--- a/packages/client/src/pages/settings/security.vue
+++ b/packages/client/src/pages/settings/security.vue
@@ -41,8 +41,8 @@
 import X2fa from './2fa.vue';
 import FormSection from '@/components/form/section.vue';
 import FormSlot from '@/components/form/slot.vue';
-import FormButton from '@/components/ui/button.vue';
-import MkPagination from '@/components/ui/pagination.vue';
+import FormButton from '@/components/MkButton.vue';
+import MkPagination from '@/components/MkPagination.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/client/src/pages/settings/sounds.vue b/packages/client/src/pages/settings/sounds.vue
index 2d2b5a0a0..272960952 100644
--- a/packages/client/src/pages/settings/sounds.vue
+++ b/packages/client/src/pages/settings/sounds.vue
@@ -20,7 +20,7 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
 import FormRange from '@/components/form/range.vue';
-import FormButton from '@/components/ui/button.vue';
+import FormButton from '@/components/MkButton.vue';
 import FormLink from '@/components/form/link.vue';
 import FormSection from '@/components/form/section.vue';
 import * as os from '@/os';
diff --git a/packages/client/src/pages/settings/statusbar.statusbar.vue b/packages/client/src/pages/settings/statusbar.statusbar.vue
index 2f0c6fc1e..98a1825b9 100644
--- a/packages/client/src/pages/settings/statusbar.statusbar.vue
+++ b/packages/client/src/pages/settings/statusbar.statusbar.vue
@@ -86,7 +86,7 @@ import FormSelect from '@/components/form/select.vue';
 import MkInput from '@/components/form/input.vue';
 import MkSwitch from '@/components/form/switch.vue';
 import FormRadios from '@/components/form/radios.vue';
-import FormButton from '@/components/ui/button.vue';
+import FormButton from '@/components/MkButton.vue';
 import FormRange from '@/components/form/range.vue';
 import * as os from '@/os';
 import { defaultStore } from '@/store';
diff --git a/packages/client/src/pages/settings/statusbar.vue b/packages/client/src/pages/settings/statusbar.vue
index 3f23ed470..9dbf18214 100644
--- a/packages/client/src/pages/settings/statusbar.vue
+++ b/packages/client/src/pages/settings/statusbar.vue
@@ -15,7 +15,7 @@ import { v4 as uuid } from 'uuid';
 import XStatusbar from './statusbar.statusbar.vue';
 import FormRadios from '@/components/form/radios.vue';
 import FormFolder from '@/components/form/folder.vue';
-import FormButton from '@/components/ui/button.vue';
+import FormButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 import { defaultStore } from '@/store';
 import { unisonReload } from '@/scripts/unison-reload';
diff --git a/packages/client/src/pages/settings/theme.install.vue b/packages/client/src/pages/settings/theme.install.vue
index 2994d8fb1..34f8384d8 100644
--- a/packages/client/src/pages/settings/theme.install.vue
+++ b/packages/client/src/pages/settings/theme.install.vue
@@ -15,7 +15,7 @@
 import { } from 'vue';
 import JSON5 from 'json5';
 import FormTextarea from '@/components/form/textarea.vue';
-import FormButton from '@/components/ui/button.vue';
+import FormButton from '@/components/MkButton.vue';
 import { applyTheme, validateTheme } from '@/scripts/theme';
 import * as os from '@/os';
 import { addTheme, getThemes } from '@/theme-store';
diff --git a/packages/client/src/pages/settings/theme.manage.vue b/packages/client/src/pages/settings/theme.manage.vue
index 9d28b4a31..792bb15e5 100644
--- a/packages/client/src/pages/settings/theme.manage.vue
+++ b/packages/client/src/pages/settings/theme.manage.vue
@@ -31,7 +31,7 @@ import JSON5 from 'json5';
 import FormTextarea from '@/components/form/textarea.vue';
 import FormSelect from '@/components/form/select.vue';
 import FormInput from '@/components/form/input.vue';
-import FormButton from '@/components/ui/button.vue';
+import FormButton from '@/components/MkButton.vue';
 import { Theme, getBuiltinThemesRef } from '@/scripts/theme';
 import copyToClipboard from '@/scripts/copy-to-clipboard';
 import * as os from '@/os';
diff --git a/packages/client/src/pages/settings/theme.vue b/packages/client/src/pages/settings/theme.vue
index cc869699a..6571a881a 100644
--- a/packages/client/src/pages/settings/theme.vue
+++ b/packages/client/src/pages/settings/theme.vue
@@ -72,7 +72,7 @@ import FormSwitch from '@/components/form/switch.vue';
 import FormSelect from '@/components/form/select.vue';
 import FormSection from '@/components/form/section.vue';
 import FormLink from '@/components/form/link.vue';
-import FormButton from '@/components/ui/button.vue';
+import FormButton from '@/components/MkButton.vue';
 import { getBuiltinThemesRef } from '@/scripts/theme';
 import { selectFile } from '@/scripts/select-file';
 import { isDeviceDarkmode } from '@/scripts/is-device-darkmode';
diff --git a/packages/client/src/pages/settings/webhook.edit.vue b/packages/client/src/pages/settings/webhook.edit.vue
index e36e1d754..35f3cb1da 100644
--- a/packages/client/src/pages/settings/webhook.edit.vue
+++ b/packages/client/src/pages/settings/webhook.edit.vue
@@ -38,7 +38,7 @@ import { } from 'vue';
 import FormInput from '@/components/form/input.vue';
 import FormSection from '@/components/form/section.vue';
 import FormSwitch from '@/components/form/switch.vue';
-import FormButton from '@/components/ui/button.vue';
+import FormButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/client/src/pages/settings/webhook.new.vue b/packages/client/src/pages/settings/webhook.new.vue
index fa96c5fa4..fcf1329ff 100644
--- a/packages/client/src/pages/settings/webhook.new.vue
+++ b/packages/client/src/pages/settings/webhook.new.vue
@@ -36,7 +36,7 @@ import { } from 'vue';
 import FormInput from '@/components/form/input.vue';
 import FormSection from '@/components/form/section.vue';
 import FormSwitch from '@/components/form/switch.vue';
-import FormButton from '@/components/ui/button.vue';
+import FormButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/client/src/pages/settings/webhook.vue b/packages/client/src/pages/settings/webhook.vue
index 868d273ce..1a7e73940 100644
--- a/packages/client/src/pages/settings/webhook.vue
+++ b/packages/client/src/pages/settings/webhook.vue
@@ -29,7 +29,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import MkPagination from '@/components/ui/pagination.vue';
+import MkPagination from '@/components/MkPagination.vue';
 import FormSection from '@/components/form/section.vue';
 import FormLink from '@/components/form/link.vue';
 import { userPage } from '@/filters/user';
diff --git a/packages/client/src/pages/settings/word-mute.vue b/packages/client/src/pages/settings/word-mute.vue
index daa2a4804..e29737956 100644
--- a/packages/client/src/pages/settings/word-mute.vue
+++ b/packages/client/src/pages/settings/word-mute.vue
@@ -32,8 +32,8 @@
 import { ref, watch } from 'vue';
 import FormTextarea from '@/components/form/textarea.vue';
 import MkKeyValue from '@/components/MkKeyValue.vue';
-import MkButton from '@/components/ui/button.vue';
-import MkInfo from '@/components/ui/info.vue';
+import MkButton from '@/components/MkButton.vue';
+import MkInfo from '@/components/MkInfo.vue';
 import MkTab from '@/components/MkTab.vue';
 import * as os from '@/os';
 import number from '@/filters/number';
diff --git a/packages/client/src/pages/share.vue b/packages/client/src/pages/share.vue
index d41a701a7..69d22ed63 100644
--- a/packages/client/src/pages/share.vue
+++ b/packages/client/src/pages/share.vue
@@ -28,7 +28,7 @@ import { } from 'vue';
 import { noteVisibilities } from 'misskey-js';
 import * as Acct from 'misskey-js/built/acct';
 import * as Misskey from 'misskey-js';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import XPostForm from '@/components/MkPostForm.vue';
 import * as os from '@/os';
 import { mainRouter } from '@/router';
diff --git a/packages/client/src/pages/theme-editor.vue b/packages/client/src/pages/theme-editor.vue
index 548e60614..7dfeee16e 100644
--- a/packages/client/src/pages/theme-editor.vue
+++ b/packages/client/src/pages/theme-editor.vue
@@ -74,7 +74,7 @@ import tinycolor from 'tinycolor2';
 import { v4 as uuid } from 'uuid';
 import JSON5 from 'json5';
 
-import FormButton from '@/components/ui/button.vue';
+import FormButton from '@/components/MkButton.vue';
 import FormTextarea from '@/components/form/textarea.vue';
 import FormFolder from '@/components/form/folder.vue';
 
diff --git a/packages/client/src/pages/timeline.tutorial.vue b/packages/client/src/pages/timeline.tutorial.vue
index f69bf5810..7f08ccc2a 100644
--- a/packages/client/src/pages/timeline.tutorial.vue
+++ b/packages/client/src/pages/timeline.tutorial.vue
@@ -67,7 +67,7 @@
 
 <script lang="ts" setup>
 import { computed } from 'vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import { defaultStore } from '@/store';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/pages/user-info.vue b/packages/client/src/pages/user-info.vue
index 316a3975c..d376f11c5 100644
--- a/packages/client/src/pages/user-info.vue
+++ b/packages/client/src/pages/user-info.vue
@@ -160,7 +160,7 @@ import FormTextarea from '@/components/form/textarea.vue';
 import FormSwitch from '@/components/form/switch.vue';
 import FormLink from '@/components/form/link.vue';
 import FormSection from '@/components/form/section.vue';
-import FormButton from '@/components/ui/button.vue';
+import FormButton from '@/components/MkButton.vue';
 import FormInput from '@/components/form/input.vue';
 import FormSplit from '@/components/form/split.vue';
 import FormFolder from '@/components/form/folder.vue';
@@ -168,7 +168,7 @@ import MkKeyValue from '@/components/MkKeyValue.vue';
 import MkSelect from '@/components/form/select.vue';
 import FormSuspense from '@/components/form/suspense.vue';
 import MkFileListForAdmin from '@/components/MkFileListForAdmin.vue';
-import MkInfo from '@/components/ui/info.vue';
+import MkInfo from '@/components/MkInfo.vue';
 import * as os from '@/os';
 import number from '@/filters/number';
 import bytes from '@/filters/bytes';
diff --git a/packages/client/src/pages/user/clips.vue b/packages/client/src/pages/user/clips.vue
index f3fafc693..50a5d4b81 100644
--- a/packages/client/src/pages/user/clips.vue
+++ b/packages/client/src/pages/user/clips.vue
@@ -12,7 +12,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import * as misskey from 'misskey-js';
-import MkPagination from '@/components/ui/pagination.vue';
+import MkPagination from '@/components/MkPagination.vue';
 
 const props = defineProps<{
 	user: misskey.entities.User;
diff --git a/packages/client/src/pages/user/follow-list.vue b/packages/client/src/pages/user/follow-list.vue
index 6ee395f28..d42acd838 100644
--- a/packages/client/src/pages/user/follow-list.vue
+++ b/packages/client/src/pages/user/follow-list.vue
@@ -12,7 +12,7 @@
 import { computed } from 'vue';
 import * as misskey from 'misskey-js';
 import MkUserInfo from '@/components/MkUserInfo.vue';
-import MkPagination from '@/components/ui/pagination.vue';
+import MkPagination from '@/components/MkPagination.vue';
 
 const props = defineProps<{
 	user: misskey.entities.User;
diff --git a/packages/client/src/pages/user/gallery.vue b/packages/client/src/pages/user/gallery.vue
index 786268497..3b6768e64 100644
--- a/packages/client/src/pages/user/gallery.vue
+++ b/packages/client/src/pages/user/gallery.vue
@@ -12,7 +12,7 @@
 import { computed } from 'vue';
 import * as misskey from 'misskey-js';
 import MkGalleryPostPreview from '@/components/MkGalleryPostPreview.vue';
-import MkPagination from '@/components/ui/pagination.vue';
+import MkPagination from '@/components/MkPagination.vue';
 
 const props = withDefaults(defineProps<{
 	user: misskey.entities.User;
diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index 7ab363efe..352db4616 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -114,11 +114,11 @@ import * as misskey from 'misskey-js';
 import XUserTimeline from './index.timeline.vue';
 import XNote from '@/components/MkNote.vue';
 import MkFollowButton from '@/components/MkFollowButton.vue';
-import MkContainer from '@/components/ui/container.vue';
-import MkFolder from '@/components/ui/folder.vue';
+import MkContainer from '@/components/MkContainer.vue';
+import MkFolder from '@/components/MkFolder.vue';
 import MkRemoteCaution from '@/components/MkRemoteCaution.vue';
 import MkTab from '@/components/MkTab.vue';
-import MkInfo from '@/components/ui/info.vue';
+import MkInfo from '@/components/MkInfo.vue';
 import { getScrollPosition } from '@/scripts/scroll';
 import { getUserMenu } from '@/scripts/get-user-menu';
 import number from '@/filters/number';
diff --git a/packages/client/src/pages/user/index.activity.vue b/packages/client/src/pages/user/index.activity.vue
index 30e5a56f3..43c2ed8b0 100644
--- a/packages/client/src/pages/user/index.activity.vue
+++ b/packages/client/src/pages/user/index.activity.vue
@@ -16,7 +16,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import * as misskey from 'misskey-js';
-import MkContainer from '@/components/ui/container.vue';
+import MkContainer from '@/components/MkContainer.vue';
 import MkChart from '@/components/MkChart.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/user/index.photos.vue b/packages/client/src/pages/user/index.photos.vue
index df733849f..5c9a73dcb 100644
--- a/packages/client/src/pages/user/index.photos.vue
+++ b/packages/client/src/pages/user/index.photos.vue
@@ -24,7 +24,7 @@ import * as misskey from 'misskey-js';
 import { getStaticImageUrl } from '@/scripts/get-static-image-url';
 import { notePage } from '@/filters/note';
 import * as os from '@/os';
-import MkContainer from '@/components/ui/container.vue';
+import MkContainer from '@/components/MkContainer.vue';
 import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
 import { defaultStore } from '@/store';
 
diff --git a/packages/client/src/pages/user/pages.vue b/packages/client/src/pages/user/pages.vue
index 69bf926eb..bd16c4668 100644
--- a/packages/client/src/pages/user/pages.vue
+++ b/packages/client/src/pages/user/pages.vue
@@ -10,7 +10,7 @@
 import { computed } from 'vue';
 import * as misskey from 'misskey-js';
 import MkPagePreview from '@/components/MkPagePreview.vue';
-import MkPagination from '@/components/ui/pagination.vue';
+import MkPagination from '@/components/MkPagination.vue';
 
 const props = defineProps<{
 	user: misskey.entities.User;
diff --git a/packages/client/src/pages/user/reactions.vue b/packages/client/src/pages/user/reactions.vue
index f1e8f61b0..7e84e100a 100644
--- a/packages/client/src/pages/user/reactions.vue
+++ b/packages/client/src/pages/user/reactions.vue
@@ -16,7 +16,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import * as misskey from 'misskey-js';
-import MkPagination from '@/components/ui/pagination.vue';
+import MkPagination from '@/components/MkPagination.vue';
 import MkNote from '@/components/MkNote.vue';
 import MkReactionIcon from '@/components/MkReactionIcon.vue';
 
diff --git a/packages/client/src/pages/welcome.entrance.a.vue b/packages/client/src/pages/welcome.entrance.a.vue
index 6452280f5..827162a0c 100644
--- a/packages/client/src/pages/welcome.entrance.a.vue
+++ b/packages/client/src/pages/welcome.entrance.a.vue
@@ -52,7 +52,7 @@ import XTimeline from './welcome.timeline.vue';
 import MarqueeText from '@/components/MkMarquee.vue';
 import XSigninDialog from '@/components/MkSigninDialog.vue';
 import XSignupDialog from '@/components/MkSignupDialog.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import XNote from '@/components/MkNote.vue';
 import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue';
 import { host, instanceName } from '@/config';
diff --git a/packages/client/src/pages/welcome.entrance.b.vue b/packages/client/src/pages/welcome.entrance.b.vue
index 46cf8c228..4bf117590 100644
--- a/packages/client/src/pages/welcome.entrance.b.vue
+++ b/packages/client/src/pages/welcome.entrance.b.vue
@@ -40,7 +40,7 @@ import { defineComponent } from 'vue';
 import { toUnicode } from 'punycode/';
 import XSigninDialog from '@/components/MkSigninDialog.vue';
 import XSignupDialog from '@/components/MkSignupDialog.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import XNote from '@/components/MkNote.vue';
 import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue';
 import XTimeline from './welcome.timeline.vue';
diff --git a/packages/client/src/pages/welcome.entrance.c.vue b/packages/client/src/pages/welcome.entrance.c.vue
index 6422d2923..a590834a4 100644
--- a/packages/client/src/pages/welcome.entrance.c.vue
+++ b/packages/client/src/pages/welcome.entrance.c.vue
@@ -60,7 +60,7 @@ import { defineComponent } from 'vue';
 import { toUnicode } from 'punycode/';
 import XSigninDialog from '@/components/MkSigninDialog.vue';
 import XSignupDialog from '@/components/MkSignupDialog.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import XNote from '@/components/MkNote.vue';
 import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue';
 import XTimeline from './welcome.timeline.vue';
diff --git a/packages/client/src/pages/welcome.setup.vue b/packages/client/src/pages/welcome.setup.vue
index eb6e29eb7..d25651e2a 100644
--- a/packages/client/src/pages/welcome.setup.vue
+++ b/packages/client/src/pages/welcome.setup.vue
@@ -23,7 +23,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/form/input.vue';
 import { host } from '@/config';
 import * as os from '@/os';
diff --git a/packages/client/src/ui/classic.header.vue b/packages/client/src/ui/classic.header.vue
index 34248486c..306d32c59 100644
--- a/packages/client/src/ui/classic.header.vue
+++ b/packages/client/src/ui/classic.header.vue
@@ -45,7 +45,7 @@ import { search } from '@/scripts/search';
 import * as os from '@/os';
 import { navbarItemDef } from '@/navbar';
 import { openAccountMenu } from '@/account';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 
 export default defineComponent({
 	components: {
diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue
index 3d15f5fcb..7479c1c9c 100644
--- a/packages/client/src/ui/classic.sidebar.vue
+++ b/packages/client/src/ui/classic.sidebar.vue
@@ -47,7 +47,7 @@ import { search } from '@/scripts/search';
 import * as os from '@/os';
 import { navbarItemDef } from '@/navbar';
 import { openAccountMenu } from '@/account';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import { StickySidebar } from '@/scripts/sticky-sidebar';
 //import MisskeyLogo from '@assets/client/misskey.svg';
 
diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue
index f8263b1b9..3c0c2a44b 100644
--- a/packages/client/src/ui/deck.vue
+++ b/packages/client/src/ui/deck.vue
@@ -79,7 +79,7 @@ import { deckStore, addColumn as addColumnToStore, loadDeck, getProfiles, delete
 import DeckColumnCore from '@/ui/deck/column-core.vue';
 import XSidebar from '@/ui/_common_/navbar.vue';
 import XDrawerMenu from '@/ui/_common_/navbar-for-mobile.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import { getScrollContainer } from '@/scripts/scroll';
 import * as os from '@/os';
 import { navbarItemDef } from '@/navbar';
diff --git a/packages/client/src/ui/visitor/a.vue b/packages/client/src/ui/visitor/a.vue
index 2473af549..f8db7a9d0 100644
--- a/packages/client/src/ui/visitor/a.vue
+++ b/packages/client/src/ui/visitor/a.vue
@@ -42,8 +42,8 @@ import XHeader from './header.vue';
 import { host, instanceName } from '@/config';
 import { search } from '@/scripts/search';
 import * as os from '@/os';
-import MkPagination from '@/components/ui/pagination.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkPagination from '@/components/MkPagination.vue';
+import MkButton from '@/components/MkButton.vue';
 import { ColdDeviceStorage } from '@/store';
 import { mainRouter } from '@/router';
 
diff --git a/packages/client/src/ui/visitor/b.vue b/packages/client/src/ui/visitor/b.vue
index 07f105374..3c308cfe5 100644
--- a/packages/client/src/ui/visitor/b.vue
+++ b/packages/client/src/ui/visitor/b.vue
@@ -52,10 +52,10 @@ import XKanban from './kanban.vue';
 import { host, instanceName } from '@/config';
 import { search } from '@/scripts/search';
 import * as os from '@/os';
-import MkPagination from '@/components/ui/pagination.vue';
+import MkPagination from '@/components/MkPagination.vue';
 import XSigninDialog from '@/components/MkSigninDialog.vue';
 import XSignupDialog from '@/components/MkSignupDialog.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 import { ColdDeviceStorage, defaultStore } from '@/store';
 import { mainRouter } from '@/router';
 import { PageMetadata, provideMetadataReceiver, setPageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/client/src/ui/visitor/kanban.vue b/packages/client/src/ui/visitor/kanban.vue
index 30c2fbc6c..51e47f277 100644
--- a/packages/client/src/ui/visitor/kanban.vue
+++ b/packages/client/src/ui/visitor/kanban.vue
@@ -41,10 +41,10 @@
 import { defineComponent, defineAsyncComponent } from 'vue';
 import { host, instanceName } from '@/config';
 import * as os from '@/os';
-import MkPagination from '@/components/ui/pagination.vue';
+import MkPagination from '@/components/MkPagination.vue';
 import XSigninDialog from '@/components/MkSigninDialog.vue';
 import XSignupDialog from '@/components/MkSignupDialog.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 
 export default defineComponent({
 	components: {
@@ -93,16 +93,16 @@ export default defineComponent({
 	methods: {
 		signin() {
 			os.popup(XSigninDialog, {
-				autoSet: true
+				autoSet: true,
 			}, {}, 'closed');
 		},
 
 		signup() {
 			os.popup(XSignupDialog, {
-				autoSet: true
+				autoSet: true,
 			}, {}, 'closed');
-		}
-	}
+		},
+	},
 });
 </script>
 
diff --git a/packages/client/src/widgets/activity.vue b/packages/client/src/widgets/activity.vue
index 97e354e1b..acca21bff 100644
--- a/packages/client/src/widgets/activity.vue
+++ b/packages/client/src/widgets/activity.vue
@@ -20,7 +20,7 @@ import XCalendar from './activity.calendar.vue';
 import XChart from './activity.chart.vue';
 import { GetFormResultType } from '@/scripts/form';
 import * as os from '@/os';
-import MkContainer from '@/components/ui/container.vue';
+import MkContainer from '@/components/MkContainer.vue';
 import { $i } from '@/account';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/widgets/aiscript.vue b/packages/client/src/widgets/aiscript.vue
index 6ae1a9877..cb6d29cd9 100644
--- a/packages/client/src/widgets/aiscript.vue
+++ b/packages/client/src/widgets/aiscript.vue
@@ -18,7 +18,7 @@ import { AiScript, parse, utils } from '@syuilo/aiscript';
 import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
 import { GetFormResultType } from '@/scripts/form';
 import * as os from '@/os';
-import MkContainer from '@/components/ui/container.vue';
+import MkContainer from '@/components/MkContainer.vue';
 import { createAiScriptEnv } from '@/scripts/aiscript/api';
 import { $i } from '@/account';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/widgets/button.vue b/packages/client/src/widgets/button.vue
index ee4e9c642..f0148d7f4 100644
--- a/packages/client/src/widgets/button.vue
+++ b/packages/client/src/widgets/button.vue
@@ -8,13 +8,13 @@
 
 <script lang="ts" setup>
 import { onMounted, onUnmounted, ref, watch } from 'vue';
-import { GetFormResultType } from '@/scripts/form';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import * as os from '@/os';
 import { AiScript, parse, utils } from '@syuilo/aiscript';
+import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
+import { GetFormResultType } from '@/scripts/form';
+import * as os from '@/os';
 import { createAiScriptEnv } from '@/scripts/aiscript/api';
 import { $i } from '@/account';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@/components/MkButton.vue';
 
 const name = 'button';
 
@@ -67,7 +67,7 @@ const run = async () => {
 		},
 		log: (type, params) => {
 			// nop
-		}
+		},
 	});
 
 	let ast;
diff --git a/packages/client/src/widgets/clock.vue b/packages/client/src/widgets/clock.vue
index 51d48b30a..dc99b6631 100644
--- a/packages/client/src/widgets/clock.vue
+++ b/packages/client/src/widgets/clock.vue
@@ -21,7 +21,7 @@
 import { } from 'vue';
 import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
 import { GetFormResultType } from '@/scripts/form';
-import MkContainer from '@/components/ui/container.vue';
+import MkContainer from '@/components/MkContainer.vue';
 import MkAnalogClock from '@/components/MkAnalogClock.vue';
 import MkDigitalClock from '@/components/MkDigitalClock.vue';
 import { timezones } from '@/scripts/timezones';
diff --git a/packages/client/src/widgets/federation.vue b/packages/client/src/widgets/federation.vue
index ec46a0ccb..e07cab5bf 100644
--- a/packages/client/src/widgets/federation.vue
+++ b/packages/client/src/widgets/federation.vue
@@ -22,7 +22,7 @@
 import { onMounted, onUnmounted, ref } from 'vue';
 import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
 import { GetFormResultType } from '@/scripts/form';
-import MkContainer from '@/components/ui/container.vue';
+import MkContainer from '@/components/MkContainer.vue';
 import MkMiniChart from '@/components/MkMiniChart.vue';
 import * as os from '@/os';
 import { useInterval } from '@/scripts/use-interval';
diff --git a/packages/client/src/widgets/instance-cloud.vue b/packages/client/src/widgets/instance-cloud.vue
index 03fda4c74..f8e463ee3 100644
--- a/packages/client/src/widgets/instance-cloud.vue
+++ b/packages/client/src/widgets/instance-cloud.vue
@@ -16,7 +16,7 @@
 import { } from 'vue';
 import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
 import { GetFormResultType } from '@/scripts/form';
-import MkContainer from '@/components/ui/container.vue';
+import MkContainer from '@/components/MkContainer.vue';
 import MkTagCloud from '@/components/MkTagCloud.vue';
 import * as os from '@/os';
 import { useInterval } from '@/scripts/use-interval';
diff --git a/packages/client/src/widgets/memo.vue b/packages/client/src/widgets/memo.vue
index 14cc2a4e4..92c4168ff 100644
--- a/packages/client/src/widgets/memo.vue
+++ b/packages/client/src/widgets/memo.vue
@@ -14,7 +14,7 @@ import { onMounted, onUnmounted, reactive, ref, watch } from 'vue';
 import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
 import { GetFormResultType } from '@/scripts/form';
 import * as os from '@/os';
-import MkContainer from '@/components/ui/container.vue';
+import MkContainer from '@/components/MkContainer.vue';
 import { defaultStore } from '@/store';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/widgets/notifications.vue b/packages/client/src/widgets/notifications.vue
index a46b7e739..2729c310a 100644
--- a/packages/client/src/widgets/notifications.vue
+++ b/packages/client/src/widgets/notifications.vue
@@ -13,7 +13,7 @@
 import { defineAsyncComponent } from 'vue';
 import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
 import { GetFormResultType } from '@/scripts/form';
-import MkContainer from '@/components/ui/container.vue';
+import MkContainer from '@/components/MkContainer.vue';
 import XNotifications from '@/components/MkNotifications.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/widgets/photos.vue b/packages/client/src/widgets/photos.vue
index 41bec5dc5..e891bd6a7 100644
--- a/packages/client/src/widgets/photos.vue
+++ b/packages/client/src/widgets/photos.vue
@@ -22,7 +22,7 @@ import { GetFormResultType } from '@/scripts/form';
 import { stream } from '@/stream';
 import { getStaticImageUrl } from '@/scripts/get-static-image-url';
 import * as os from '@/os';
-import MkContainer from '@/components/ui/container.vue';
+import MkContainer from '@/components/MkContainer.vue';
 import { defaultStore } from '@/store';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/widgets/rss-ticker.vue b/packages/client/src/widgets/rss-ticker.vue
index 6e5924b6b..58c16983c 100644
--- a/packages/client/src/widgets/rss-ticker.vue
+++ b/packages/client/src/widgets/rss-ticker.vue
@@ -24,7 +24,7 @@ import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExp
 import MarqueeText from '@/components/MkMarquee.vue';
 import { GetFormResultType } from '@/scripts/form';
 import * as os from '@/os';
-import MkContainer from '@/components/ui/container.vue';
+import MkContainer from '@/components/MkContainer.vue';
 import { useInterval } from '@/scripts/use-interval';
 import { shuffle } from '@/scripts/shuffle';
 
diff --git a/packages/client/src/widgets/rss.vue b/packages/client/src/widgets/rss.vue
index 72f624982..3258b6c02 100644
--- a/packages/client/src/widgets/rss.vue
+++ b/packages/client/src/widgets/rss.vue
@@ -17,7 +17,7 @@ import { onMounted, onUnmounted, ref, watch } from 'vue';
 import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
 import { GetFormResultType } from '@/scripts/form';
 import * as os from '@/os';
-import MkContainer from '@/components/ui/container.vue';
+import MkContainer from '@/components/MkContainer.vue';
 import { useInterval } from '@/scripts/use-interval';
 
 const name = 'rss';
diff --git a/packages/client/src/widgets/server-metric/index.vue b/packages/client/src/widgets/server-metric/index.vue
index 3350620ad..cf4accfa2 100644
--- a/packages/client/src/widgets/server-metric/index.vue
+++ b/packages/client/src/widgets/server-metric/index.vue
@@ -21,7 +21,7 @@ import XNet from './net.vue';
 import XCpu from './cpu.vue';
 import XMemory from './mem.vue';
 import XDisk from './disk.vue';
-import MkContainer from '@/components/ui/container.vue';
+import MkContainer from '@/components/MkContainer.vue';
 import { GetFormResultType } from '@/scripts/form';
 import * as os from '@/os';
 import { stream } from '@/stream';
diff --git a/packages/client/src/widgets/timeline.vue b/packages/client/src/widgets/timeline.vue
index 5042632cf..718162667 100644
--- a/packages/client/src/widgets/timeline.vue
+++ b/packages/client/src/widgets/timeline.vue
@@ -24,7 +24,7 @@ import { onMounted, onUnmounted, reactive, ref, watch } from 'vue';
 import { GetFormResultType } from '@/scripts/form';
 import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
 import * as os from '@/os';
-import MkContainer from '@/components/ui/container.vue';
+import MkContainer from '@/components/MkContainer.vue';
 import XTimeline from '@/components/MkTimeline.vue';
 import { $i } from '@/account';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/widgets/trends.vue b/packages/client/src/widgets/trends.vue
index 53ae4019d..a783c0421 100644
--- a/packages/client/src/widgets/trends.vue
+++ b/packages/client/src/widgets/trends.vue
@@ -21,7 +21,7 @@
 import { onMounted, onUnmounted, ref } from 'vue';
 import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
 import { GetFormResultType } from '@/scripts/form';
-import MkContainer from '@/components/ui/container.vue';
+import MkContainer from '@/components/MkContainer.vue';
 import MkMiniChart from '@/components/MkMiniChart.vue';
 import * as os from '@/os';
 import { useInterval } from '@/scripts/use-interval';

From 1b014bc3e5b11cf153207df461a5cf0095ab5ea7 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 6 Sep 2022 20:54:49 +0900
Subject: [PATCH 149/245] =?UTF-8?q?fix(server):=20=E4=BB=96=E4=BA=BA?=
 =?UTF-8?q?=E3=81=AE=E9=80=9A=E7=9F=A5=E3=82=92=E6=97=A2=E8=AA=AD=E3=81=AB?=
 =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=82=8B=E5=8F=AF=E8=83=BD=E6=80=A7=E3=81=8C?=
 =?UTF-8?q?=E3=81=82=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                               | 3 +++
 .../backend/src/server/api/common/read-notification.ts     | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34ec7a642..383eff769 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,9 @@ You should also include the user name that made the change.
 ### Improvements
 - Client: Add following badge to user preview popup @nvisser
 
+### Bugfixes
+- Server: 他人の通知を既読にできる可能性があるのを修正 @syuilo
+
 ## 12.118.1 (2022/08/08)
 
 ### Bugfixes
diff --git a/packages/backend/src/server/api/common/read-notification.ts b/packages/backend/src/server/api/common/read-notification.ts
index cf993ade3..b0d38a9e3 100644
--- a/packages/backend/src/server/api/common/read-notification.ts
+++ b/packages/backend/src/server/api/common/read-notification.ts
@@ -1,18 +1,19 @@
+import { In } from 'typeorm';
 import { publishMainStream } from '@/services/stream.js';
 import { pushNotification } from '@/services/push-notification.js';
 import { User } from '@/models/entities/user.js';
 import { Notification } from '@/models/entities/notification.js';
 import { Notifications, Users } from '@/models/index.js';
-import { In } from 'typeorm';
 
 export async function readNotification(
 	userId: User['id'],
-	notificationIds: Notification['id'][]
+	notificationIds: Notification['id'][],
 ) {
 	if (notificationIds.length === 0) return;
 
 	// Update documents
 	const result = await Notifications.update({
+		notifieeId: userId,
 		id: In(notificationIds),
 		isRead: false,
 	}, {
@@ -27,7 +28,7 @@ export async function readNotification(
 
 export async function readNotificationByQuery(
 	userId: User['id'],
-	query: Record<string, any>
+	query: Record<string, any>,
 ) {
 	const notificationIds = await Notifications.findBy({
 		...query,

From 788708262298c6fc626c1c067a5c37fa7bf231f6 Mon Sep 17 00:00:00 2001
From: nullobsi <me@nullob.si>
Date: Mon, 19 Jul 2021 15:41:23 -0700
Subject: [PATCH 150/245] Add migration for allowedHosts, secureMode,
 privateMode

---
 .../1626733991004-allowlist-secure-mode.js      | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 packages/backend/migration/1626733991004-allowlist-secure-mode.js

diff --git a/packages/backend/migration/1626733991004-allowlist-secure-mode.js b/packages/backend/migration/1626733991004-allowlist-secure-mode.js
new file mode 100644
index 000000000..aa3fcf875
--- /dev/null
+++ b/packages/backend/migration/1626733991004-allowlist-secure-mode.js
@@ -0,0 +1,17 @@
+
+
+export class allowlistSecureMode1626733991004  {
+	name = 'allowlistSecureMode1626733991004';
+	async up(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "meta" ADD "allowedHosts" character varying(256) [] default '{}'`);
+		await queryRunner.query(`ALTER TABLE "meta" ADD "secureMode" bool default false`);
+		await queryRunner.query(`ALTER TABLE "meta" ADD "privateMode" bool default false`);
+	}
+
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "allowedHosts"`);
+		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "secureMode"`);
+		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "privateMode"`);
+	}
+}
+

From a03f13fb3f7e5f6ce8eddfc53330c707cd5e8aef Mon Sep 17 00:00:00 2001
From: nullobsi <me@nullob.si>
Date: Tue, 20 Jul 2021 09:45:41 -0700
Subject: [PATCH 151/245] Add Secure Mode and Private Mode - Add instance actor
 - Add private mode, which uses an allowlist - Add Secure Mode, restricts
 access to blocked instances

---
 packages/backend/src/models/entities/meta.ts  |  15 +++
 .../backend/src/queue/processors/deliver.ts   |   4 +
 .../backend/src/queue/processors/inbox.ts     |   5 +
 .../src/remote/activitypub/check-fetch.ts     |  73 ++++++++++
 .../src/remote/activitypub/resolver.ts        |   4 +
 packages/backend/src/server/activitypub.ts    | 127 ++++++++++++++++--
 .../src/server/activitypub/featured.ts        |  16 ++-
 .../src/server/activitypub/followers.ts       |  15 ++-
 .../src/server/activitypub/following.ts       |  15 ++-
 .../backend/src/server/activitypub/outbox.ts  |  16 ++-
 .../backend/src/server/api/endpoints/meta.ts  |  12 +-
 11 files changed, 289 insertions(+), 13 deletions(-)
 create mode 100644 packages/backend/src/remote/activitypub/check-fetch.ts

diff --git a/packages/backend/src/models/entities/meta.ts b/packages/backend/src/models/entities/meta.ts
index d33ff2519..42c763d27 100644
--- a/packages/backend/src/models/entities/meta.ts
+++ b/packages/backend/src/models/entities/meta.ts
@@ -77,6 +77,21 @@ export class Meta {
 	})
 	public blockedHosts: string[];
 
+	@Column('boolean', {
+		default: false
+	})
+	public secureMode: boolean;
+
+	@Column('boolean', {
+		default: false
+	})
+	public privateMode: boolean;
+
+	@Column('varchar', {
+		length: 256, array: true, default: '{}'
+	})
+	public allowedHosts: string[];
+
 	@Column('varchar', {
 		length: 512, array: true, default: '{/featured,/channels,/explore,/pages,/about-misskey}',
 	})
diff --git a/packages/backend/src/queue/processors/deliver.ts b/packages/backend/src/queue/processors/deliver.ts
index 291c05766..01ba4381a 100644
--- a/packages/backend/src/queue/processors/deliver.ts
+++ b/packages/backend/src/queue/processors/deliver.ts
@@ -28,6 +28,10 @@ export default async (job: Bull.Job<DeliverJobData>) => {
 		return 'skip (blocked)';
 	}
 
+	if (meta.privateMode && !meta.allowedHosts.includes(toPuny(host))) {
+		return 'skip (not allowed)';
+	}
+
 	// isSuspendedなら中断
 	let suspendedHosts = suspendedHostsCache.get(null);
 	if (suspendedHosts == null) {
diff --git a/packages/backend/src/queue/processors/inbox.ts b/packages/backend/src/queue/processors/inbox.ts
index 198dde605..422632059 100644
--- a/packages/backend/src/queue/processors/inbox.ts
+++ b/packages/backend/src/queue/processors/inbox.ts
@@ -39,6 +39,11 @@ export default async (job: Bull.Job<InboxJobData>): Promise<string> => {
 		return `Blocked request: ${host}`;
 	}
 
+	// 非公開モードなら許可なインスタンスのみ
+	if (meta.privateMode && !meta.allowedHosts.includes(host)) {
+		return `Blocked request: ${host}`;
+	}
+
 	const keyIdLower = signature.keyId.toLowerCase();
 	if (keyIdLower.startsWith('acct:')) {
 		return `Old keyId is no longer supported. ${keyIdLower}`;
diff --git a/packages/backend/src/remote/activitypub/check-fetch.ts b/packages/backend/src/remote/activitypub/check-fetch.ts
new file mode 100644
index 000000000..8a53396b6
--- /dev/null
+++ b/packages/backend/src/remote/activitypub/check-fetch.ts
@@ -0,0 +1,73 @@
+import config from '@/config/index.js';
+import { IncomingMessage } from 'http';
+import { fetchMeta } from '@/misc/fetch-meta.js';
+import httpSignature from '@peertube/http-signature';
+import { URL } from 'url';
+import { toPuny } from '@/misc/convert-host.js';
+import DbResolver from '@/remote/activitypub/db-resolver.js';
+import { getApId } from '@/remote/activitypub/type.js';
+
+
+export default async function checkFetch(req: IncomingMessage): Promise<number> {
+	const meta = await fetchMeta();
+	if (meta.secureMode || meta.privateMode) {
+		let signature;
+
+		try {
+			signature = httpSignature.parseRequest(req, { 'headers': [] });
+		} catch (e) {
+			return 401;
+		}
+
+		const keyId = new URL(signature.keyId);
+		const host = toPuny(keyId.hostname);
+
+		if (meta.blockedHosts.includes(host)) {
+			return 403;
+		}
+
+		if (meta.privateMode && host !== config.host && !meta.allowedHosts.includes(host)) {
+			return 403;
+		}
+
+		const keyIdLower = signature.keyId.toLowerCase();
+		if (keyIdLower.startsWith('acct:')) {
+			// Old keyId is no longer supported.
+			return 401;
+		}
+
+		const dbResolver = new DbResolver();
+
+		// HTTP-Signature keyIdを元にDBから取得
+		let authUser = await dbResolver.getAuthUserFromKeyId(signature.keyId);
+
+		// keyIdでわからなければ、resolveしてみる
+		if (authUser == null) {
+			try {
+				keyId.hash = '';
+				authUser = await dbResolver.getAuthUserFromApId(getApId(keyId.toString()));
+			} catch (e) {
+				// できなければ駄目
+				return 403;
+			}
+		}
+
+		// publicKey がなくても終了
+		if (authUser?.key == null) {
+			return 403;
+		}
+
+		// もう一回チェック
+		if (authUser.user.host !== host) {
+			return 403;
+		}
+
+		// HTTP-Signatureの検証
+		const httpSignatureValidated = httpSignature.verifySignature(signature, authUser.key.keyPem);
+
+		if (!httpSignatureValidated) {
+			return 403;
+		}
+	}
+	return 200;
+}
diff --git a/packages/backend/src/remote/activitypub/resolver.ts b/packages/backend/src/remote/activitypub/resolver.ts
index 2f9af43c0..e89a7b21a 100644
--- a/packages/backend/src/remote/activitypub/resolver.ts
+++ b/packages/backend/src/remote/activitypub/resolver.ts
@@ -72,6 +72,10 @@ export default class Resolver {
 			throw new Error('Instance is blocked');
 		}
 
+		if (meta.privateMode && config.host !== host && !meta.allowedHosts.includes(host)) {
+			throw new Error('Instance is not allowed');
+		}
+
 		if (config.signToActivityPubGet && !this.user) {
 			this.user = await getInstanceActor();
 		}
diff --git a/packages/backend/src/server/activitypub.ts b/packages/backend/src/server/activitypub.ts
index cd5f917c4..250a39bf0 100644
--- a/packages/backend/src/server/activitypub.ts
+++ b/packages/backend/src/server/activitypub.ts
@@ -12,12 +12,15 @@ import Followers from './activitypub/followers.js';
 import Following from './activitypub/following.js';
 import Featured from './activitypub/featured.js';
 import { inbox as processInbox } from '@/queue/index.js';
-import { isSelfHost } from '@/misc/convert-host.js';
+import { isSelfHost, toPuny } from '@/misc/convert-host.js';
 import { Notes, Users, Emojis, NoteReactions } from '@/models/index.js';
 import { ILocalUser, User } from '@/models/entities/user.js';
 import { In, IsNull, Not } from 'typeorm';
 import { renderLike } from '@/remote/activitypub/renderer/like.js';
 import { getUserKeypair } from '@/misc/keypair-store.js';
+import checkFetch from '@/remote/activitypub/check-fetch.js';
+import { getInstanceActor } from '@/services/instance-actor.js';
+import { fetchMeta } from '@/misc/fetch-meta.js';
 import renderFollow from '@/remote/activitypub/renderer/follow.js';
 
 // Init router
@@ -66,6 +69,12 @@ router.post('/users/:user/inbox', json(), inbox);
 router.get('/notes/:note', async (ctx, next) => {
 	if (!isActivityPubReq(ctx)) return await next();
 
+	const verify = await checkFetch(ctx.req);
+	if (verify != 200) {
+		ctx.status = verify;
+		return;
+	}
+
 	const note = await Notes.findOneBy({
 		id: ctx.params.note,
 		visibility: In(['public' as const, 'home' as const]),
@@ -88,12 +97,24 @@ router.get('/notes/:note', async (ctx, next) => {
 	}
 
 	ctx.body = renderActivity(await renderNote(note, false));
-	ctx.set('Cache-Control', 'public, max-age=180');
+
+	const meta = await fetchMeta();
+	if (meta.secureMode || meta.privateMode) {
+		ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
+	} else {
+		ctx.set('Cache-Control', 'public, max-age=180');
+	}
 	setResponseType(ctx);
 });
 
 // note activity
 router.get('/notes/:note/activity', async ctx => {
+	const verify = await checkFetch(ctx.req);
+	if (verify != 200) {
+		ctx.status = verify;
+		return;
+	}
+
 	const note = await Notes.findOneBy({
 		id: ctx.params.note,
 		userHost: IsNull(),
@@ -107,7 +128,12 @@ router.get('/notes/:note/activity', async ctx => {
 	}
 
 	ctx.body = renderActivity(await packActivity(note));
-	ctx.set('Cache-Control', 'public, max-age=180');
+	const meta = await fetchMeta();
+	if (meta.secureMode || meta.privateMode) {
+		ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
+	} else {
+		ctx.set('Cache-Control', 'public, max-age=180');
+	}
 	setResponseType(ctx);
 });
 
@@ -125,6 +151,20 @@ router.get('/users/:user/collections/featured', Featured);
 
 // publickey
 router.get('/users/:user/publickey', async ctx => {
+	const instanceActor = await getInstanceActor();
+	if (ctx.params.user === instanceActor.id) {
+		ctx.body = renderActivity(renderKey(instanceActor, await getUserKeypair(instanceActor.id)));
+		ctx.set('Cache-Control', 'public, max-age=180');
+		setResponseType(ctx);
+		return;
+	}
+
+	const verify = await checkFetch(ctx.req);
+	if (verify != 200) {
+		ctx.status = verify;
+		return;
+	}
+
 	const userId = ctx.params.user;
 
 	const user = await Users.findOneBy({
@@ -141,7 +181,12 @@ router.get('/users/:user/publickey', async ctx => {
 
 	if (Users.isLocalUser(user)) {
 		ctx.body = renderActivity(renderKey(user, keypair));
-		ctx.set('Cache-Control', 'public, max-age=180');
+		const meta = await fetchMeta();
+		if (meta.secureMode || meta.privateMode) {
+			ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
+		} else {
+			ctx.set('Cache-Control', 'public, max-age=180');
+		}
 		setResponseType(ctx);
 	} else {
 		ctx.status = 400;
@@ -156,13 +201,30 @@ async function userInfo(ctx: Router.RouterContext, user: User | null) {
 	}
 
 	ctx.body = renderActivity(await renderPerson(user as ILocalUser));
-	ctx.set('Cache-Control', 'public, max-age=180');
+	const meta = await fetchMeta();
+	if (meta.secureMode || meta.privateMode) {
+		ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
+	} else {
+		ctx.set('Cache-Control', 'public, max-age=180');
+	}
 	setResponseType(ctx);
 }
 
 router.get('/users/:user', async (ctx, next) => {
 	if (!isActivityPubReq(ctx)) return await next();
 
+	const instanceActor = await getInstanceActor();
+	if (ctx.params.user === instanceActor.id) {
+		await userInfo(ctx, instanceActor);
+		return;
+	}
+
+	const verify = await checkFetch(ctx.req);
+	if (verify != 200) {
+		ctx.status = verify;
+		return;
+	}
+
 	const userId = ctx.params.user;
 
 	const user = await Users.findOneBy({
@@ -177,6 +239,18 @@ router.get('/users/:user', async (ctx, next) => {
 router.get('/@:user', async (ctx, next) => {
 	if (!isActivityPubReq(ctx)) return await next();
 
+	if (ctx.params.user === 'instance.actor') {
+		const instanceActor = await getInstanceActor();
+		await userInfo(ctx, instanceActor);
+		return;
+	}
+
+	const verify = await checkFetch(ctx.req);
+	if (verify != 200) {
+		ctx.status = verify;
+		return;
+	}
+
 	const user = await Users.findOneBy({
 		usernameLower: ctx.params.user.toLowerCase(),
 		host: IsNull(),
@@ -185,10 +259,21 @@ router.get('/@:user', async (ctx, next) => {
 
 	await userInfo(ctx, user);
 });
+
+router.get('/actor', async (ctx, next) => {
+	const instanceActor = await getInstanceActor();
+	await userInfo(ctx, instanceActor);
+});
 //#endregion
 
 // emoji
 router.get('/emojis/:emoji', async ctx => {
+	const verify = await checkFetch(ctx.req);
+	if (verify != 200) {
+		ctx.status = verify;
+		return;
+	}
+
 	const emoji = await Emojis.findOneBy({
 		host: IsNull(),
 		name: ctx.params.emoji,
@@ -200,12 +285,23 @@ router.get('/emojis/:emoji', async ctx => {
 	}
 
 	ctx.body = renderActivity(await renderEmoji(emoji));
-	ctx.set('Cache-Control', 'public, max-age=180');
+	const meta = await fetchMeta();
+	if (meta.secureMode || meta.privateMode) {
+		ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
+	} else {
+		ctx.set('Cache-Control', 'public, max-age=180');
+	}
 	setResponseType(ctx);
 });
 
 // like
 router.get('/likes/:like', async ctx => {
+	const verify = await checkFetch(ctx.req);
+	if (verify != 200) {
+		ctx.status = verify;
+		return;
+	}
+
 	const reaction = await NoteReactions.findOneBy({ id: ctx.params.like });
 
 	if (reaction == null) {
@@ -221,12 +317,22 @@ router.get('/likes/:like', async ctx => {
 	}
 
 	ctx.body = renderActivity(await renderLike(reaction, note));
-	ctx.set('Cache-Control', 'public, max-age=180');
+	const meta = await fetchMeta();
+	if (meta.secureMode || meta.privateMode) {
+		ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
+	} else {
+		ctx.set('Cache-Control', 'public, max-age=180');
+	}
 	setResponseType(ctx);
 });
 
 // follow
 router.get('/follows/:follower/:followee', async ctx => {
+	const verify = await checkFetch(ctx.req);
+	if (verify != 200) {
+		ctx.status = verify;
+		return;
+	}
 	// This may be used before the follow is completed, so we do not
 	// check if the following exists.
 
@@ -247,7 +353,12 @@ router.get('/follows/:follower/:followee', async ctx => {
 	}
 
 	ctx.body = renderActivity(renderFollow(follower, followee));
-	ctx.set('Cache-Control', 'public, max-age=180');
+	const meta = await fetchMeta();
+	if (meta.secureMode || meta.privateMode) {
+		ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
+	} else {
+		ctx.set('Cache-Control', 'public, max-age=180');
+	}
 	setResponseType(ctx);
 });
 
diff --git a/packages/backend/src/server/activitypub/featured.ts b/packages/backend/src/server/activitypub/featured.ts
index c03fd1049..87e4f8320 100644
--- a/packages/backend/src/server/activitypub/featured.ts
+++ b/packages/backend/src/server/activitypub/featured.ts
@@ -6,8 +6,16 @@ import { setResponseType } from '../activitypub.js';
 import renderNote from '@/remote/activitypub/renderer/note.js';
 import { Users, Notes, UserNotePinings } from '@/models/index.js';
 import { IsNull } from 'typeorm';
+import checkFetch from '@/remote/activitypub/check-fetch.js';
+import { fetchMeta } from '@/misc/fetch-meta.js';
 
 export default async (ctx: Router.RouterContext) => {
+	const verify = await checkFetch(ctx.req);
+	if (verify != 200) {
+		ctx.status = verify;
+		return;
+	}
+
 	const userId = ctx.params.user;
 
 	const user = await Users.findOneBy({
@@ -36,6 +44,12 @@ export default async (ctx: Router.RouterContext) => {
 	);
 
 	ctx.body = renderActivity(rendered);
-	ctx.set('Cache-Control', 'public, max-age=180');
+
+	const meta = await fetchMeta();
+	if (meta.secureMode || meta.privateMode) {
+		ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
+	} else {
+		ctx.set('Cache-Control', 'public, max-age=180');
+	}
 	setResponseType(ctx);
 };
diff --git a/packages/backend/src/server/activitypub/followers.ts b/packages/backend/src/server/activitypub/followers.ts
index beb48713a..833f0e77f 100644
--- a/packages/backend/src/server/activitypub/followers.ts
+++ b/packages/backend/src/server/activitypub/followers.ts
@@ -9,8 +9,16 @@ import renderFollowUser from '@/remote/activitypub/renderer/follow-user.js';
 import { Users, Followings, UserProfiles } from '@/models/index.js';
 import { Following } from '@/models/entities/following.js';
 import { setResponseType } from '../activitypub.js';
+import checkFetch from '@/remote/activitypub/check-fetch.js';
+import { fetchMeta } from '@/misc/fetch-meta.js';
 
 export default async (ctx: Router.RouterContext) => {
+	const verify = await checkFetch(ctx.req);
+	if (verify != 200) {
+		ctx.status = verify;
+		return;
+	}
+
 	const userId = ctx.params.user;
 
 	const cursor = ctx.request.query.cursor;
@@ -89,7 +97,12 @@ export default async (ctx: Router.RouterContext) => {
 		// index page
 		const rendered = renderOrderedCollection(partOf, user.followersCount, `${partOf}?page=true`);
 		ctx.body = renderActivity(rendered);
-		ctx.set('Cache-Control', 'public, max-age=180');
 		setResponseType(ctx);
 	}
+	const meta = await fetchMeta();
+	if (meta.secureMode || meta.privateMode) {
+		ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
+	} else {
+		ctx.set('Cache-Control', 'public, max-age=180');
+	}
 };
diff --git a/packages/backend/src/server/activitypub/following.ts b/packages/backend/src/server/activitypub/following.ts
index 3a25a6316..f843d79f0 100644
--- a/packages/backend/src/server/activitypub/following.ts
+++ b/packages/backend/src/server/activitypub/following.ts
@@ -9,8 +9,16 @@ import renderFollowUser from '@/remote/activitypub/renderer/follow-user.js';
 import { Users, Followings, UserProfiles } from '@/models/index.js';
 import { Following } from '@/models/entities/following.js';
 import { setResponseType } from '../activitypub.js';
+import checkFetch from '@/remote/activitypub/check-fetch.js';
+import { fetchMeta } from '@/misc/fetch-meta.js';
 
 export default async (ctx: Router.RouterContext) => {
+	const verify = await checkFetch(ctx.req);
+	if (verify != 200) {
+		ctx.status = verify;
+		return;
+	}
+
 	const userId = ctx.params.user;
 
 	const cursor = ctx.request.query.cursor;
@@ -89,7 +97,12 @@ export default async (ctx: Router.RouterContext) => {
 		// index page
 		const rendered = renderOrderedCollection(partOf, user.followingCount, `${partOf}?page=true`);
 		ctx.body = renderActivity(rendered);
-		ctx.set('Cache-Control', 'public, max-age=180');
 		setResponseType(ctx);
 	}
+	const meta = await fetchMeta();
+	if (meta.secureMode || meta.privateMode) {
+		ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
+	} else {
+		ctx.set('Cache-Control', 'public, max-age=180');
+	}
 };
diff --git a/packages/backend/src/server/activitypub/outbox.ts b/packages/backend/src/server/activitypub/outbox.ts
index 7a2586998..4a6b5caff 100644
--- a/packages/backend/src/server/activitypub/outbox.ts
+++ b/packages/backend/src/server/activitypub/outbox.ts
@@ -13,8 +13,16 @@ import { Users, Notes } from '@/models/index.js';
 import { Note } from '@/models/entities/note.js';
 import { makePaginationQuery } from '../api/common/make-pagination-query.js';
 import { setResponseType } from '../activitypub.js';
+import checkFetch from '@/remote/activitypub/check-fetch.js';
+import { fetchMeta } from '@/misc/fetch-meta.js';
 
 export default async (ctx: Router.RouterContext) => {
+	const verify = await checkFetch(ctx.req);
+	if (verify != 200) {
+		ctx.status = verify;
+		return;
+	}
+
 	const userId = ctx.params.user;
 
 	const sinceId = ctx.request.query.since_id;
@@ -89,9 +97,15 @@ export default async (ctx: Router.RouterContext) => {
 			`${partOf}?page=true&since_id=000000000000000000000000`,
 		);
 		ctx.body = renderActivity(rendered);
-		ctx.set('Cache-Control', 'public, max-age=180');
+
 		setResponseType(ctx);
 	}
+	const meta = await fetchMeta();
+	if (meta.secureMode || meta.privateMode) {
+		ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
+	} else {
+		ctx.set('Cache-Control', 'public, max-age=180');
+	}
 };
 
 /**
diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index 5b624842c..ca6b471d5 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -291,6 +291,16 @@ export const meta = {
 					},
 				},
 			},
+			secureMode: {
+				type: 'boolean',
+				optional: true, nullable: false,
+				default: false,
+			},
+			privateMode: {
+				type: 'boolean',
+				optional: true, nullable: false,
+				default: false,
+			},
 		},
 	},
 } as const;
@@ -326,7 +336,7 @@ export default define(meta, paramDef, async (ps, me) => {
 			expiresAt: MoreThan(new Date()),
 		},
 	});
-
+	// TODO: add secure mode, etc
 	const response: any = {
 		maintainerName: instance.maintainerName,
 		maintainerEmail: instance.maintainerEmail,

From 26f0483094c208fafda580c57244ba4cccb1b526 Mon Sep 17 00:00:00 2001
From: nullobsi <me@nullob.si>
Date: Tue, 20 Jul 2021 11:51:59 -0700
Subject: [PATCH 152/245] In private mode, block access to many public APIs

---
 packages/backend/src/server/api/call.ts       | 13 ++++++++++++
 packages/backend/src/server/api/endpoints.ts  |  6 ++++++
 .../src/server/api/endpoints/announcements.ts |  1 +
 .../server/api/endpoints/channels/featured.ts |  1 +
 .../src/server/api/endpoints/channels/show.ts |  1 +
 .../server/api/endpoints/channels/timeline.ts |  1 +
 .../api/endpoints/charts/active-users.ts      |  1 +
 .../server/api/endpoints/charts/ap-request.ts |  1 +
 .../src/server/api/endpoints/charts/drive.ts  |  1 +
 .../server/api/endpoints/charts/federation.ts |  1 +
 .../server/api/endpoints/charts/hashtag.ts    |  1 +
 .../server/api/endpoints/charts/instance.ts   |  1 +
 .../src/server/api/endpoints/charts/notes.ts  |  1 +
 .../server/api/endpoints/charts/user/drive.ts |  1 +
 .../api/endpoints/charts/user/following.ts    |  1 +
 .../server/api/endpoints/charts/user/notes.ts |  1 +
 .../api/endpoints/charts/user/reactions.ts    |  1 +
 .../src/server/api/endpoints/charts/users.ts  |  1 +
 .../src/server/api/endpoints/clips/notes.ts   |  1 +
 .../src/server/api/endpoints/clips/show.ts    |  1 +
 .../api/endpoints/federation/followers.ts     |  1 +
 .../api/endpoints/federation/following.ts     |  1 +
 .../api/endpoints/federation/instances.ts     |  1 +
 .../api/endpoints/federation/show-instance.ts |  1 +
 .../server/api/endpoints/federation/users.ts  |  1 +
 .../server/api/endpoints/gallery/featured.ts  |  1 +
 .../server/api/endpoints/gallery/popular.ts   |  1 +
 .../src/server/api/endpoints/gallery/posts.ts |  1 +
 .../api/endpoints/gallery/posts/show.ts       |  1 +
 .../api/endpoints/get-online-users-count.ts   |  1 +
 .../src/server/api/endpoints/hashtags/list.ts |  1 +
 .../server/api/endpoints/hashtags/search.ts   |  1 +
 .../src/server/api/endpoints/hashtags/show.ts |  1 +
 .../server/api/endpoints/hashtags/trend.ts    |  1 +
 .../server/api/endpoints/hashtags/users.ts    |  1 +
 .../backend/src/server/api/endpoints/meta.ts  | 20 ++++++++++++-------
 .../backend/src/server/api/endpoints/notes.ts |  1 +
 .../server/api/endpoints/notes/children.ts    |  3 ++-
 .../src/server/api/endpoints/notes/clips.ts   |  1 +
 .../api/endpoints/notes/conversation.ts       |  1 +
 .../server/api/endpoints/notes/featured.ts    |  1 +
 .../api/endpoints/notes/global-timeline.ts    |  1 +
 .../api/endpoints/notes/local-timeline.ts     |  1 +
 .../server/api/endpoints/notes/reactions.ts   |  1 +
 .../src/server/api/endpoints/notes/renotes.ts |  1 +
 .../src/server/api/endpoints/notes/replies.ts |  1 +
 .../api/endpoints/notes/search-by-tag.ts      |  1 +
 .../src/server/api/endpoints/notes/search.ts  |  1 +
 .../src/server/api/endpoints/notes/show.ts    |  1 +
 .../server/api/endpoints/notes/translate.ts   |  1 +
 .../server/api/endpoints/pages/featured.ts    |  1 +
 .../src/server/api/endpoints/pages/show.ts    |  1 +
 .../src/server/api/endpoints/pinned-users.ts  |  1 +
 .../src/server/api/endpoints/server-info.ts   |  1 +
 .../backend/src/server/api/endpoints/stats.ts |  1 +
 .../backend/src/server/api/endpoints/users.ts |  1 +
 .../src/server/api/endpoints/users/clips.ts   |  1 +
 .../server/api/endpoints/users/followers.ts   |  1 +
 .../server/api/endpoints/users/following.ts   |  1 +
 .../api/endpoints/users/gallery/posts.ts      |  1 +
 .../users/get-frequently-replied-users.ts     |  1 +
 .../src/server/api/endpoints/users/notes.ts   |  1 +
 .../src/server/api/endpoints/users/pages.ts   |  1 +
 .../server/api/endpoints/users/reactions.ts   |  1 +
 .../users/search-by-username-and-host.ts      |  1 +
 .../src/server/api/endpoints/users/search.ts  |  1 +
 .../src/server/api/endpoints/users/show.ts    |  1 +
 .../src/server/api/endpoints/users/stats.ts   |  1 +
 68 files changed, 98 insertions(+), 8 deletions(-)

diff --git a/packages/backend/src/server/api/call.ts b/packages/backend/src/server/api/call.ts
index aa130459a..9458d15fe 100644
--- a/packages/backend/src/server/api/call.ts
+++ b/packages/backend/src/server/api/call.ts
@@ -7,6 +7,8 @@ import { limiter } from './limiter.js';
 import endpoints, { IEndpointMeta } from './endpoints.js';
 import { ApiError } from './error.js';
 import { apiLogger } from './logger.js';
+import { AccessToken } from '@/models/entities/access-token.js';
+import { fetchMeta } from '@/misc/fetch-meta.js';
 
 const accessDenied = {
 	message: 'Access denied.',
@@ -93,6 +95,17 @@ export default async (endpoint: string, user: CacheableLocalUser | null | undefi
 		});
 	}
 
+	// private mode
+	const meta = await fetchMeta();
+	if (meta.privateMode && ep.meta.requireCredentialPrivateMode && user == null) {
+		throw new ApiError({
+			message: 'Credential required.',
+			code: 'CREDENTIAL_REQUIRED',
+			id: '1384574d-a912-4b81-8601-c7b1c4085df1',
+			httpStatusCode: 401
+		});
+	}
+
 	// Cast non JSON input
 	if ((ep.meta.requireFile || ctx?.method === 'GET') && ep.params.properties) {
 		for (const k of Object.keys(ep.params.properties)) {
diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index 4644f34d9..d7fcc32d3 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -706,6 +706,12 @@ export interface IEndpointMeta {
 	 */
 	readonly secure?: boolean;
 
+	/**
+	 * プライベートモードでなら、このエンドポイントにリクエストするときにユーザー情報が必要か否か
+	 * 省略した場合は false として解釈されます
+	 */
+	readonly requireCredentialPrivateMode?: boolean;
+
 	/**
 	 * エンドポイントの種類
 	 * パーミッションの実現に利用されます。
diff --git a/packages/backend/src/server/api/endpoints/announcements.ts b/packages/backend/src/server/api/endpoints/announcements.ts
index 23cb93c9a..189de042b 100644
--- a/packages/backend/src/server/api/endpoints/announcements.ts
+++ b/packages/backend/src/server/api/endpoints/announcements.ts
@@ -6,6 +6,7 @@ export const meta = {
 	tags: ['meta'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/channels/featured.ts b/packages/backend/src/server/api/endpoints/channels/featured.ts
index 73980c0fa..13ad6ca7d 100644
--- a/packages/backend/src/server/api/endpoints/channels/featured.ts
+++ b/packages/backend/src/server/api/endpoints/channels/featured.ts
@@ -5,6 +5,7 @@ export const meta = {
 	tags: ['channels'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/channels/show.ts b/packages/backend/src/server/api/endpoints/channels/show.ts
index 87665a986..1c8461af4 100644
--- a/packages/backend/src/server/api/endpoints/channels/show.ts
+++ b/packages/backend/src/server/api/endpoints/channels/show.ts
@@ -6,6 +6,7 @@ export const meta = {
 	tags: ['channels'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'object',
diff --git a/packages/backend/src/server/api/endpoints/channels/timeline.ts b/packages/backend/src/server/api/endpoints/channels/timeline.ts
index deaa29901..18ba6b2e3 100644
--- a/packages/backend/src/server/api/endpoints/channels/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/channels/timeline.ts
@@ -8,6 +8,7 @@ export const meta = {
 	tags: ['notes', 'channels'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/charts/active-users.ts b/packages/backend/src/server/api/endpoints/charts/active-users.ts
index ea2379429..216676020 100644
--- a/packages/backend/src/server/api/endpoints/charts/active-users.ts
+++ b/packages/backend/src/server/api/endpoints/charts/active-users.ts
@@ -4,6 +4,7 @@ import define from '../../define.js';
 
 export const meta = {
 	tags: ['charts', 'users'],
+	requireCredentialPrivateMode: true,
 
 	res: getJsonSchema(activeUsersChart.schema),
 
diff --git a/packages/backend/src/server/api/endpoints/charts/ap-request.ts b/packages/backend/src/server/api/endpoints/charts/ap-request.ts
index 06dee250e..a8f6e4564 100644
--- a/packages/backend/src/server/api/endpoints/charts/ap-request.ts
+++ b/packages/backend/src/server/api/endpoints/charts/ap-request.ts
@@ -4,6 +4,7 @@ import define from '../../define.js';
 
 export const meta = {
 	tags: ['charts'],
+	requireCredentialPrivateMode: true,
 
 	res: getJsonSchema(apRequestChart.schema),
 
diff --git a/packages/backend/src/server/api/endpoints/charts/drive.ts b/packages/backend/src/server/api/endpoints/charts/drive.ts
index dd2c2d683..14f82e39d 100644
--- a/packages/backend/src/server/api/endpoints/charts/drive.ts
+++ b/packages/backend/src/server/api/endpoints/charts/drive.ts
@@ -4,6 +4,7 @@ import define from '../../define.js';
 
 export const meta = {
 	tags: ['charts', 'drive'],
+	requireCredentialPrivateMode: true,
 
 	res: getJsonSchema(driveChart.schema),
 
diff --git a/packages/backend/src/server/api/endpoints/charts/federation.ts b/packages/backend/src/server/api/endpoints/charts/federation.ts
index 8c35b3c46..141e005ee 100644
--- a/packages/backend/src/server/api/endpoints/charts/federation.ts
+++ b/packages/backend/src/server/api/endpoints/charts/federation.ts
@@ -4,6 +4,7 @@ import define from '../../define.js';
 
 export const meta = {
 	tags: ['charts'],
+	requireCredentialPrivateMode: true,
 
 	res: getJsonSchema(federationChart.schema),
 
diff --git a/packages/backend/src/server/api/endpoints/charts/hashtag.ts b/packages/backend/src/server/api/endpoints/charts/hashtag.ts
index 77e24a62c..d34153bc1 100644
--- a/packages/backend/src/server/api/endpoints/charts/hashtag.ts
+++ b/packages/backend/src/server/api/endpoints/charts/hashtag.ts
@@ -4,6 +4,7 @@ import define from '../../define.js';
 
 export const meta = {
 	tags: ['charts', 'hashtags'],
+	requireCredentialPrivateMode: true,
 
 	res: getJsonSchema(hashtagChart.schema),
 
diff --git a/packages/backend/src/server/api/endpoints/charts/instance.ts b/packages/backend/src/server/api/endpoints/charts/instance.ts
index 817d51ad0..3d9619d24 100644
--- a/packages/backend/src/server/api/endpoints/charts/instance.ts
+++ b/packages/backend/src/server/api/endpoints/charts/instance.ts
@@ -4,6 +4,7 @@ import define from '../../define.js';
 
 export const meta = {
 	tags: ['charts'],
+	requireCredentialPrivateMode: true,
 
 	res: getJsonSchema(instanceChart.schema),
 
diff --git a/packages/backend/src/server/api/endpoints/charts/notes.ts b/packages/backend/src/server/api/endpoints/charts/notes.ts
index 951adf540..42befed27 100644
--- a/packages/backend/src/server/api/endpoints/charts/notes.ts
+++ b/packages/backend/src/server/api/endpoints/charts/notes.ts
@@ -4,6 +4,7 @@ import define from '../../define.js';
 
 export const meta = {
 	tags: ['charts', 'notes'],
+	requireCredentialPrivateMode: true,
 
 	res: getJsonSchema(notesChart.schema),
 
diff --git a/packages/backend/src/server/api/endpoints/charts/user/drive.ts b/packages/backend/src/server/api/endpoints/charts/user/drive.ts
index f165b4022..cb73b4ac9 100644
--- a/packages/backend/src/server/api/endpoints/charts/user/drive.ts
+++ b/packages/backend/src/server/api/endpoints/charts/user/drive.ts
@@ -4,6 +4,7 @@ import define from '../../../define.js';
 
 export const meta = {
 	tags: ['charts', 'drive', 'users'],
+	requireCredentialPrivateMode: true,
 
 	res: getJsonSchema(perUserDriveChart.schema),
 
diff --git a/packages/backend/src/server/api/endpoints/charts/user/following.ts b/packages/backend/src/server/api/endpoints/charts/user/following.ts
index f5d42e21c..697a5f37a 100644
--- a/packages/backend/src/server/api/endpoints/charts/user/following.ts
+++ b/packages/backend/src/server/api/endpoints/charts/user/following.ts
@@ -4,6 +4,7 @@ import { perUserFollowingChart } from '@/services/chart/index.js';
 
 export const meta = {
 	tags: ['charts', 'users', 'following'],
+	requireCredentialPrivateMode: true,
 
 	res: getJsonSchema(perUserFollowingChart.schema),
 
diff --git a/packages/backend/src/server/api/endpoints/charts/user/notes.ts b/packages/backend/src/server/api/endpoints/charts/user/notes.ts
index aefe550d4..5b576754d 100644
--- a/packages/backend/src/server/api/endpoints/charts/user/notes.ts
+++ b/packages/backend/src/server/api/endpoints/charts/user/notes.ts
@@ -4,6 +4,7 @@ import define from '../../../define.js';
 
 export const meta = {
 	tags: ['charts', 'users', 'notes'],
+	requireCredentialPrivateMode: true,
 
 	res: getJsonSchema(perUserNotesChart.schema),
 
diff --git a/packages/backend/src/server/api/endpoints/charts/user/reactions.ts b/packages/backend/src/server/api/endpoints/charts/user/reactions.ts
index 6bc6b56bf..61c4527b9 100644
--- a/packages/backend/src/server/api/endpoints/charts/user/reactions.ts
+++ b/packages/backend/src/server/api/endpoints/charts/user/reactions.ts
@@ -4,6 +4,7 @@ import define from '../../../define.js';
 
 export const meta = {
 	tags: ['charts', 'users', 'reactions'],
+	requireCredentialPrivateMode: true,
 
 	res: getJsonSchema(perUserReactionsChart.schema),
 
diff --git a/packages/backend/src/server/api/endpoints/charts/users.ts b/packages/backend/src/server/api/endpoints/charts/users.ts
index 338e8fd33..0c799287c 100644
--- a/packages/backend/src/server/api/endpoints/charts/users.ts
+++ b/packages/backend/src/server/api/endpoints/charts/users.ts
@@ -4,6 +4,7 @@ import define from '../../define.js';
 
 export const meta = {
 	tags: ['charts', 'users'],
+	requireCredentialPrivateMode: true,
 
 	res: getJsonSchema(usersChart.schema),
 
diff --git a/packages/backend/src/server/api/endpoints/clips/notes.ts b/packages/backend/src/server/api/endpoints/clips/notes.ts
index 4ace747ef..eea6f0a0d 100644
--- a/packages/backend/src/server/api/endpoints/clips/notes.ts
+++ b/packages/backend/src/server/api/endpoints/clips/notes.ts
@@ -10,6 +10,7 @@ export const meta = {
 	tags: ['account', 'notes', 'clips'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	kind: 'read:account',
 
diff --git a/packages/backend/src/server/api/endpoints/clips/show.ts b/packages/backend/src/server/api/endpoints/clips/show.ts
index c3d73c168..aec4c1253 100644
--- a/packages/backend/src/server/api/endpoints/clips/show.ts
+++ b/packages/backend/src/server/api/endpoints/clips/show.ts
@@ -6,6 +6,7 @@ export const meta = {
 	tags: ['clips', 'account'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	kind: 'read:account',
 
diff --git a/packages/backend/src/server/api/endpoints/federation/followers.ts b/packages/backend/src/server/api/endpoints/federation/followers.ts
index 7b1197d1e..8a04df2d5 100644
--- a/packages/backend/src/server/api/endpoints/federation/followers.ts
+++ b/packages/backend/src/server/api/endpoints/federation/followers.ts
@@ -6,6 +6,7 @@ export const meta = {
 	tags: ['federation'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/federation/following.ts b/packages/backend/src/server/api/endpoints/federation/following.ts
index ed1f142d8..fe41eefa4 100644
--- a/packages/backend/src/server/api/endpoints/federation/following.ts
+++ b/packages/backend/src/server/api/endpoints/federation/following.ts
@@ -6,6 +6,7 @@ export const meta = {
 	tags: ['federation'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts
index 07e5c07c6..41750f13e 100644
--- a/packages/backend/src/server/api/endpoints/federation/instances.ts
+++ b/packages/backend/src/server/api/endpoints/federation/instances.ts
@@ -7,6 +7,7 @@ export const meta = {
 	tags: ['federation'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/federation/show-instance.ts b/packages/backend/src/server/api/endpoints/federation/show-instance.ts
index 2fbb8a15c..92298f672 100644
--- a/packages/backend/src/server/api/endpoints/federation/show-instance.ts
+++ b/packages/backend/src/server/api/endpoints/federation/show-instance.ts
@@ -6,6 +6,7 @@ export const meta = {
 	tags: ['federation'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		oneOf: [{
diff --git a/packages/backend/src/server/api/endpoints/federation/users.ts b/packages/backend/src/server/api/endpoints/federation/users.ts
index 65ad9f88d..a9b3f3a8c 100644
--- a/packages/backend/src/server/api/endpoints/federation/users.ts
+++ b/packages/backend/src/server/api/endpoints/federation/users.ts
@@ -6,6 +6,7 @@ export const meta = {
 	tags: ['federation'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/gallery/featured.ts b/packages/backend/src/server/api/endpoints/gallery/featured.ts
index e6acd3691..52232c5cc 100644
--- a/packages/backend/src/server/api/endpoints/gallery/featured.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/featured.ts
@@ -5,6 +5,7 @@ export const meta = {
 	tags: ['gallery'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/gallery/popular.ts b/packages/backend/src/server/api/endpoints/gallery/popular.ts
index c4c8982fc..5286dcd8b 100644
--- a/packages/backend/src/server/api/endpoints/gallery/popular.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/popular.ts
@@ -5,6 +5,7 @@ export const meta = {
 	tags: ['gallery'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/gallery/posts.ts b/packages/backend/src/server/api/endpoints/gallery/posts.ts
index 428ba9cc7..f556ec513 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts.ts
@@ -4,6 +4,7 @@ import { GalleryPosts } from '@/models/index.js';
 
 export const meta = {
 	tags: ['gallery'],
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/show.ts b/packages/backend/src/server/api/endpoints/gallery/posts/show.ts
index 4f6dafd7c..48468f410 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/show.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/show.ts
@@ -6,6 +6,7 @@ export const meta = {
 	tags: ['gallery'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	errors: {
 		noSuchPost: {
diff --git a/packages/backend/src/server/api/endpoints/get-online-users-count.ts b/packages/backend/src/server/api/endpoints/get-online-users-count.ts
index 56c550297..a8febe05b 100644
--- a/packages/backend/src/server/api/endpoints/get-online-users-count.ts
+++ b/packages/backend/src/server/api/endpoints/get-online-users-count.ts
@@ -7,6 +7,7 @@ export const meta = {
 	tags: ['meta'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 } as const;
 
 export const paramDef = {
diff --git a/packages/backend/src/server/api/endpoints/hashtags/list.ts b/packages/backend/src/server/api/endpoints/hashtags/list.ts
index 50e36386c..4b18cb76a 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/list.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/list.ts
@@ -5,6 +5,7 @@ export const meta = {
 	tags: ['hashtags'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/hashtags/search.ts b/packages/backend/src/server/api/endpoints/hashtags/search.ts
index c28984477..ed1abf1a1 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/search.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/search.ts
@@ -5,6 +5,7 @@ export const meta = {
 	tags: ['hashtags'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/hashtags/show.ts b/packages/backend/src/server/api/endpoints/hashtags/show.ts
index 5b78f6ac7..409233c24 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/show.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/show.ts
@@ -7,6 +7,7 @@ export const meta = {
 	tags: ['hashtags'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'object',
diff --git a/packages/backend/src/server/api/endpoints/hashtags/trend.ts b/packages/backend/src/server/api/endpoints/hashtags/trend.ts
index 9cdbc8941..8795927e6 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/trend.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/trend.ts
@@ -24,6 +24,7 @@ export const meta = {
 	tags: ['hashtags'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/hashtags/users.ts b/packages/backend/src/server/api/endpoints/hashtags/users.ts
index a5df21a7e..1d18a9ce7 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/users.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/users.ts
@@ -4,6 +4,7 @@ import { normalizeForSearch } from '@/misc/normalize-for-search.js';
 
 export const meta = {
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	tags: ['hashtags', 'users'],
 
diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index ca6b471d5..d93d399e4 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -336,7 +336,7 @@ export default define(meta, paramDef, async (ps, me) => {
 			expiresAt: MoreThan(new Date()),
 		},
 	});
-	// TODO: add secure mode, etc
+
 	const response: any = {
 		maintainerName: instance.maintainerName,
 		maintainerEmail: instance.maintainerEmail,
@@ -350,6 +350,10 @@ export default define(meta, paramDef, async (ps, me) => {
 		tosUrl: instance.ToSUrl,
 		repositoryUrl: instance.repositoryUrl,
 		feedbackUrl: instance.feedbackUrl,
+
+		secureMode: instance.secureMode,
+		privateMode: instance.privateMode,
+
 		disableRegistration: instance.disableRegistration,
 		disableLocalTimeline: instance.disableLocalTimeline,
 		disableGlobalTimeline: instance.disableGlobalTimeline,
@@ -369,10 +373,10 @@ export default define(meta, paramDef, async (ps, me) => {
 		backgroundImageUrl: instance.backgroundImageUrl,
 		logoImageUrl: instance.logoImageUrl,
 		maxNoteTextLength: MAX_NOTE_TEXT_LENGTH, // 後方互換性のため
-		emojis: await Emojis.packMany(emojis),
+		emojis: instance.privateMode && !me ? [] : await Emojis.packMany(emojis),
 		defaultLightTheme: instance.defaultLightTheme,
 		defaultDarkTheme: instance.defaultDarkTheme,
-		ads: ads.map(ad => ({
+		ads: instance.privateMode && !me ? [] : ads.map(ad => ({
 			id: ad.id,
 			url: ad.url,
 			place: ad.place,
@@ -390,8 +394,8 @@ export default define(meta, paramDef, async (ps, me) => {
 		translatorAvailable: instance.deeplAuthKey != null,
 
 		...(ps.detail ? {
-			pinnedPages: instance.pinnedPages,
-			pinnedClipId: instance.pinnedClipId,
+			pinnedPages: instance.privateMode && !me ? [] : instance.pinnedPages,
+			pinnedClipId: instance.privateMode && !me ? [] : instance.pinnedClipId,
 			cacheRemoteFiles: instance.cacheRemoteFiles,
 			requireSetup: (await Users.countBy({
 				host: IsNull(),
@@ -400,9 +404,11 @@ export default define(meta, paramDef, async (ps, me) => {
 	};
 
 	if (ps.detail) {
-		const proxyAccount = instance.proxyAccountId ? await Users.pack(instance.proxyAccountId).catch(() => null) : null;
+		if (!instance.privateMode || me) {
+			const proxyAccount = instance.proxyAccountId ? await Users.pack(instance.proxyAccountId).catch(() => null) : null;
+			response.proxyAccountName = proxyAccount ? proxyAccount.username : null;
+		}
 
-		response.proxyAccountName = proxyAccount ? proxyAccount.username : null;
 		response.features = {
 			registration: !instance.disableRegistration,
 			localTimeLine: !instance.disableLocalTimeline,
diff --git a/packages/backend/src/server/api/endpoints/notes.ts b/packages/backend/src/server/api/endpoints/notes.ts
index 015b0338e..fc2bc3741 100644
--- a/packages/backend/src/server/api/endpoints/notes.ts
+++ b/packages/backend/src/server/api/endpoints/notes.ts
@@ -5,6 +5,7 @@ import { makePaginationQuery } from '../common/make-pagination-query.js';
 export const meta = {
 	tags: ['notes'],
 
+	requireCredentialPrivateMode: true,
 	res: {
 		type: 'array',
 		optional: false, nullable: false,
diff --git a/packages/backend/src/server/api/endpoints/notes/children.ts b/packages/backend/src/server/api/endpoints/notes/children.ts
index efc109105..d27bbaefa 100644
--- a/packages/backend/src/server/api/endpoints/notes/children.ts
+++ b/packages/backend/src/server/api/endpoints/notes/children.ts
@@ -10,6 +10,7 @@ export const meta = {
 	tags: ['notes'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
@@ -20,7 +21,7 @@ export const meta = {
 			ref: 'Note',
 		},
 	},
-} as const;
+};
 
 export const paramDef = {
 	type: 'object',
diff --git a/packages/backend/src/server/api/endpoints/notes/clips.ts b/packages/backend/src/server/api/endpoints/notes/clips.ts
index e79f8563e..5a4420a68 100644
--- a/packages/backend/src/server/api/endpoints/notes/clips.ts
+++ b/packages/backend/src/server/api/endpoints/notes/clips.ts
@@ -8,6 +8,7 @@ export const meta = {
 	tags: ['clips', 'notes'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/notes/conversation.ts b/packages/backend/src/server/api/endpoints/notes/conversation.ts
index b731d1824..28613962a 100644
--- a/packages/backend/src/server/api/endpoints/notes/conversation.ts
+++ b/packages/backend/src/server/api/endpoints/notes/conversation.ts
@@ -8,6 +8,7 @@ export const meta = {
 	tags: ['notes'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/notes/featured.ts b/packages/backend/src/server/api/endpoints/notes/featured.ts
index dd9cc581a..0e4a454d7 100644
--- a/packages/backend/src/server/api/endpoints/notes/featured.ts
+++ b/packages/backend/src/server/api/endpoints/notes/featured.ts
@@ -7,6 +7,7 @@ export const meta = {
 	tags: ['notes'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
index 925318f54..6a468f198 100644
--- a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
@@ -12,6 +12,7 @@ import { generateBlockedUserQuery } from '../../common/generate-block-query.js';
 export const meta = {
 	tags: ['notes'],
 
+	requireCredentialPrivateMode: true,
 	res: {
 		type: 'array',
 		optional: false, nullable: false,
diff --git a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
index aac2a3749..3a5c458a0 100644
--- a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
@@ -14,6 +14,7 @@ import { generateBlockedUserQuery } from '../../common/generate-block-query.js';
 
 export const meta = {
 	tags: ['notes'],
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/notes/reactions.ts b/packages/backend/src/server/api/endpoints/notes/reactions.ts
index 15a62d394..be2846d25 100644
--- a/packages/backend/src/server/api/endpoints/notes/reactions.ts
+++ b/packages/backend/src/server/api/endpoints/notes/reactions.ts
@@ -8,6 +8,7 @@ export const meta = {
 	tags: ['notes', 'reactions'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	allowGet: true,
 	cacheSec: 60,
diff --git a/packages/backend/src/server/api/endpoints/notes/renotes.ts b/packages/backend/src/server/api/endpoints/notes/renotes.ts
index 28be36076..4d0cd8fc6 100644
--- a/packages/backend/src/server/api/endpoints/notes/renotes.ts
+++ b/packages/backend/src/server/api/endpoints/notes/renotes.ts
@@ -11,6 +11,7 @@ export const meta = {
 	tags: ['notes'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/notes/replies.ts b/packages/backend/src/server/api/endpoints/notes/replies.ts
index ab0018f58..b05ef5914 100644
--- a/packages/backend/src/server/api/endpoints/notes/replies.ts
+++ b/packages/backend/src/server/api/endpoints/notes/replies.ts
@@ -9,6 +9,7 @@ export const meta = {
 	tags: ['notes'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
index 777de7221..231913223 100644
--- a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
+++ b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
@@ -10,6 +10,7 @@ import { generateBlockedUserQuery } from '../../common/generate-block-query.js';
 
 export const meta = {
 	tags: ['notes', 'hashtags'],
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/notes/search.ts b/packages/backend/src/server/api/endpoints/notes/search.ts
index 4e2cdae80..cf3de47a3 100644
--- a/packages/backend/src/server/api/endpoints/notes/search.ts
+++ b/packages/backend/src/server/api/endpoints/notes/search.ts
@@ -12,6 +12,7 @@ export const meta = {
 	tags: ['notes'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/notes/show.ts b/packages/backend/src/server/api/endpoints/notes/show.ts
index 5cd74bd2c..470791b1b 100644
--- a/packages/backend/src/server/api/endpoints/notes/show.ts
+++ b/packages/backend/src/server/api/endpoints/notes/show.ts
@@ -7,6 +7,7 @@ export const meta = {
 	tags: ['notes'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'object',
diff --git a/packages/backend/src/server/api/endpoints/notes/translate.ts b/packages/backend/src/server/api/endpoints/notes/translate.ts
index 5e40e7106..ba6e262d6 100644
--- a/packages/backend/src/server/api/endpoints/notes/translate.ts
+++ b/packages/backend/src/server/api/endpoints/notes/translate.ts
@@ -12,6 +12,7 @@ export const meta = {
 	tags: ['notes'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'object',
diff --git a/packages/backend/src/server/api/endpoints/pages/featured.ts b/packages/backend/src/server/api/endpoints/pages/featured.ts
index 5a149a626..75580778b 100644
--- a/packages/backend/src/server/api/endpoints/pages/featured.ts
+++ b/packages/backend/src/server/api/endpoints/pages/featured.ts
@@ -5,6 +5,7 @@ export const meta = {
 	tags: ['pages'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/pages/show.ts b/packages/backend/src/server/api/endpoints/pages/show.ts
index 5d37e86b9..54ae43deb 100644
--- a/packages/backend/src/server/api/endpoints/pages/show.ts
+++ b/packages/backend/src/server/api/endpoints/pages/show.ts
@@ -8,6 +8,7 @@ export const meta = {
 	tags: ['pages'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'object',
diff --git a/packages/backend/src/server/api/endpoints/pinned-users.ts b/packages/backend/src/server/api/endpoints/pinned-users.ts
index 41595b47d..d2ded60a1 100644
--- a/packages/backend/src/server/api/endpoints/pinned-users.ts
+++ b/packages/backend/src/server/api/endpoints/pinned-users.ts
@@ -9,6 +9,7 @@ export const meta = {
 	tags: ['users'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/server-info.ts b/packages/backend/src/server/api/endpoints/server-info.ts
index 99f3730e9..fdfbc8a6f 100644
--- a/packages/backend/src/server/api/endpoints/server-info.ts
+++ b/packages/backend/src/server/api/endpoints/server-info.ts
@@ -4,6 +4,7 @@ import define from '../define.js';
 
 export const meta = {
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	tags: ['meta'],
 } as const;
diff --git a/packages/backend/src/server/api/endpoints/stats.ts b/packages/backend/src/server/api/endpoints/stats.ts
index cc94f8bf2..0f2fb1f41 100644
--- a/packages/backend/src/server/api/endpoints/stats.ts
+++ b/packages/backend/src/server/api/endpoints/stats.ts
@@ -5,6 +5,7 @@ import { IsNull } from 'typeorm';
 
 export const meta = {
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	tags: ['meta'],
 
diff --git a/packages/backend/src/server/api/endpoints/users.ts b/packages/backend/src/server/api/endpoints/users.ts
index 3a8211374..d2f2ddcbf 100644
--- a/packages/backend/src/server/api/endpoints/users.ts
+++ b/packages/backend/src/server/api/endpoints/users.ts
@@ -7,6 +7,7 @@ export const meta = {
 	tags: ['users'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	res: {
 		type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/users/clips.ts b/packages/backend/src/server/api/endpoints/users/clips.ts
index 09fdf27c2..becfad52d 100644
--- a/packages/backend/src/server/api/endpoints/users/clips.ts
+++ b/packages/backend/src/server/api/endpoints/users/clips.ts
@@ -4,6 +4,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query.js';
 
 export const meta = {
 	tags: ['users', 'clips'],
+	requireCredentialPrivateMode: true,
 
 	description: 'Show all clips this user owns.',
 
diff --git a/packages/backend/src/server/api/endpoints/users/followers.ts b/packages/backend/src/server/api/endpoints/users/followers.ts
index 7f9f98076..4971d21b0 100644
--- a/packages/backend/src/server/api/endpoints/users/followers.ts
+++ b/packages/backend/src/server/api/endpoints/users/followers.ts
@@ -9,6 +9,7 @@ export const meta = {
 	tags: ['users'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	description: 'Show everyone that follows this user.',
 
diff --git a/packages/backend/src/server/api/endpoints/users/following.ts b/packages/backend/src/server/api/endpoints/users/following.ts
index 0aaa810f7..043841aa4 100644
--- a/packages/backend/src/server/api/endpoints/users/following.ts
+++ b/packages/backend/src/server/api/endpoints/users/following.ts
@@ -9,6 +9,7 @@ export const meta = {
 	tags: ['users'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	description: 'Show everyone that this user is following.',
 
diff --git a/packages/backend/src/server/api/endpoints/users/gallery/posts.ts b/packages/backend/src/server/api/endpoints/users/gallery/posts.ts
index 35bf2df59..95ca77825 100644
--- a/packages/backend/src/server/api/endpoints/users/gallery/posts.ts
+++ b/packages/backend/src/server/api/endpoints/users/gallery/posts.ts
@@ -4,6 +4,7 @@ import { makePaginationQuery } from '../../../common/make-pagination-query.js';
 
 export const meta = {
 	tags: ['users', 'gallery'],
+	requireCredentialPrivateMode: true,
 
 	description: 'Show all gallery posts by the given user.',
 
diff --git a/packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts b/packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts
index 56965d306..8cf3ea040 100644
--- a/packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts
+++ b/packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts
@@ -9,6 +9,7 @@ export const meta = {
 	tags: ['users'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	description: 'Get a list of other users that the specified user frequently replies to.',
 
diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts
index 9fa56fe83..1e205eec3 100644
--- a/packages/backend/src/server/api/endpoints/users/notes.ts
+++ b/packages/backend/src/server/api/endpoints/users/notes.ts
@@ -11,6 +11,7 @@ import { generateBlockedUserQuery } from '../../common/generate-block-query.js';
 export const meta = {
 	tags: ['users', 'notes'],
 
+	requireCredentialPrivateMode: true,
 	description: 'Show all notes that this user created.',
 
 	res: {
diff --git a/packages/backend/src/server/api/endpoints/users/pages.ts b/packages/backend/src/server/api/endpoints/users/pages.ts
index b1d28af84..e1d876e6b 100644
--- a/packages/backend/src/server/api/endpoints/users/pages.ts
+++ b/packages/backend/src/server/api/endpoints/users/pages.ts
@@ -4,6 +4,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query.js';
 
 export const meta = {
 	tags: ['users', 'pages'],
+	requireCredentialPrivateMode: true,
 
 	description: 'Show all pages this user created.',
 
diff --git a/packages/backend/src/server/api/endpoints/users/reactions.ts b/packages/backend/src/server/api/endpoints/users/reactions.ts
index 9668bd21b..79cf58a41 100644
--- a/packages/backend/src/server/api/endpoints/users/reactions.ts
+++ b/packages/backend/src/server/api/endpoints/users/reactions.ts
@@ -8,6 +8,7 @@ export const meta = {
 	tags: ['users', 'reactions'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	description: 'Show all reactions this user made.',
 
diff --git a/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts b/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts
index 6e5bc46bb..fa1cb8761 100644
--- a/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts
+++ b/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts
@@ -8,6 +8,7 @@ export const meta = {
 	tags: ['users'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	description: 'Search for a user by username and/or host.',
 
diff --git a/packages/backend/src/server/api/endpoints/users/search.ts b/packages/backend/src/server/api/endpoints/users/search.ts
index 01729de66..70aaa4526 100644
--- a/packages/backend/src/server/api/endpoints/users/search.ts
+++ b/packages/backend/src/server/api/endpoints/users/search.ts
@@ -7,6 +7,7 @@ export const meta = {
 	tags: ['users'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	description: 'Search for users.',
 
diff --git a/packages/backend/src/server/api/endpoints/users/show.ts b/packages/backend/src/server/api/endpoints/users/show.ts
index 846d83b49..892e37bdf 100644
--- a/packages/backend/src/server/api/endpoints/users/show.ts
+++ b/packages/backend/src/server/api/endpoints/users/show.ts
@@ -10,6 +10,7 @@ export const meta = {
 	tags: ['users'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	description: 'Show the properties of a user.',
 
diff --git a/packages/backend/src/server/api/endpoints/users/stats.ts b/packages/backend/src/server/api/endpoints/users/stats.ts
index 47f322ee9..a68b6ea40 100644
--- a/packages/backend/src/server/api/endpoints/users/stats.ts
+++ b/packages/backend/src/server/api/endpoints/users/stats.ts
@@ -7,6 +7,7 @@ export const meta = {
 	tags: ['users'],
 
 	requireCredential: false,
+	requireCredentialPrivateMode: true,
 
 	description: 'Show statistics about a user.',
 

From 7caec25f0f0da41e9a2681bfc009d04fe9d15cbd Mon Sep 17 00:00:00 2001
From: nullobsi <me@nullob.si>
Date: Tue, 20 Jul 2021 13:08:21 -0700
Subject: [PATCH 153/245] Add secure mode settings to Security tab

---
 locales/ja-JP.yml                             |  7 ++++
 .../src/server/api/endpoints/admin/meta.ts    | 19 +++++++++
 .../server/api/endpoints/admin/update-meta.ts | 17 ++++++++
 packages/client/src/pages/admin/security.vue  | 39 +++++++++++++++++++
 4 files changed, 82 insertions(+)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index b10cce923..42d5561aa 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -780,6 +780,13 @@ middle: "中"
 low: "低"
 emailNotConfiguredWarning: "メールアドレスの設定がされていません。"
 ratio: "比率"
+secureMode: "セキュアモード (Authorized Fetch)"
+instanceSecurity: "インスタンスのセキュリティー"
+secureModeInfo: "他のインスタンスからリクエストするときに、証明を付けなければ返送しません。他のインスタンスの設定ファイルでsignToActivityPubGetはtrueにしてください。"
+privateMode: "非公開モード"
+privateModeInfo: "有効にして、許可されているインスタンスのみがリクエストできます。すべてのノートが公開に非表示にします。"
+allowedInstances: "許可されたインスタンス"
+allowedInstancesDescription: "許可したいインスタンスのホストを改行で区切って設定します。非公開モードだけで有効です。"
 previewNoteText: "本文をプレビュー"
 customCss: "カスタムCSS"
 customCssWarn: "この設定は必ず知識のある方が行ってください。不適切な設定を行うとクライアントが正常に使用できなくなる恐れがあります。"
diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts
index 874611968..8a11baf90 100644
--- a/packages/backend/src/server/api/endpoints/admin/meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -187,6 +187,22 @@ export const meta = {
 					optional: false, nullable: false,
 				},
 			},
+			allowedHosts: {
+				type: 'array',
+				optional: true, nullable: false,
+				items: {
+					type: 'string',
+					optional: false, nullable: false,
+				},
+			},
+			privateMode: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
+			secureMode: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
 			hcaptchaSecretKey: {
 				type: 'string',
 				optional: true, nullable: true,
@@ -388,6 +404,9 @@ export default define(meta, paramDef, async (ps, me) => {
 		pinnedUsers: instance.pinnedUsers,
 		hiddenTags: instance.hiddenTags,
 		blockedHosts: instance.blockedHosts,
+		allowedHosts: instance.allowedHosts,
+		privateMode: instance.privateMode,
+		secureMode: instance.secureMode,
 		hcaptchaSecretKey: instance.hcaptchaSecretKey,
 		recaptchaSecretKey: instance.recaptchaSecretKey,
 		sensitiveMediaDetection: instance.sensitiveMediaDetection,
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 f14aa4105..1fe68f261 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -27,6 +27,11 @@ export const paramDef = {
 		blockedHosts: { type: 'array', nullable: true, items: {
 			type: 'string',
 		} },
+		allowedHosts: { type: 'array', nullable: true, items: {
+			type: 'string',
+    } },
+		secureMode: { type: 'boolean', nullable: true },
+		privateMode: { type: 'boolean', nullable: true },
 		themeColor: { type: 'string', nullable: true, pattern: '^#[0-9a-fA-F]{6}$' },
 		mascotImageUrl: { type: 'string', nullable: true },
 		bannerUrl: { type: 'string', nullable: true },
@@ -142,6 +147,18 @@ export default define(meta, paramDef, async (ps, me) => {
 		set.themeColor = ps.themeColor;
 	}
 
+	if (Array.isArray(ps.allowedHosts)) {
+		set.allowedHosts = ps.allowedHosts.filter(Boolean);
+	}
+
+	if (typeof ps.privateMode === 'boolean') {
+		set.privateMode = ps.privateMode;
+	}
+
+	if (typeof ps.secureMode === 'boolean') {
+		set.secureMode = ps.secureMode;
+	}
+
 	if (ps.mascotImageUrl !== undefined) {
 		set.mascotImageUrl = ps.mascotImageUrl;
 	}
diff --git a/packages/client/src/pages/admin/security.vue b/packages/client/src/pages/admin/security.vue
index c36cedb31..a7c985031 100644
--- a/packages/client/src/pages/admin/security.vue
+++ b/packages/client/src/pages/admin/security.vue
@@ -94,6 +94,26 @@
 						<FormButton primary class="_formBlock" @click="save"><i class="fas fa-save"></i> {{ i18n.ts.save }}</FormButton>
 					</div>
 				</FormFolder>
+
+				<FormFolder class="_formBlock">
+					<template #label>{{ i18n.ts.instanceSecurity }}</template>
+
+					<div class="_formRoot">
+						<FormSwitch v-if="!privateMode" v-model="secureMode">
+							<template #label>{{ i18n.ts.secureMode }}</template>
+							<template #caption>{{ i18n.ts.secureModeInfo }}</template>
+						</FormSwitch>
+						<FormSwitch v-model="privateMode">
+							<template #label>{{ i18n.ts.privateMode }}</template>
+							<template #caption>{{ i18n.ts.privateModeInfo }}</template>
+						</FormSwitch>
+						<FormTextarea v-if="privateMode" v-model="allowedHosts">
+							<template #label>{{ i18n.ts.allowedInstances }}</template>
+							<template #caption>{{ i18n.ts.allowedInstancesDescription }}</template>
+						</FormTextarea>
+						<FormButton primary class="_formBlock" @click="saveInstance"><i class="fas fa-save"></i> {{ i18n.ts.save }}</FormButton>
+					</div>
+				</FormFolder>
 			</div>
 		</FormSuspense>
 	</MkSpacer>
@@ -112,6 +132,7 @@ import FormSuspense from '@/components/form/suspense.vue';
 import FormRange from '@/components/form/range.vue';
 import FormInput from '@/components/form/input.vue';
 import FormButton from '@/components/MkButton.vue';
+import FormTextarea from '@/components/form/textarea.vue';
 import * as os from '@/os';
 import { fetchInstance } from '@/instance';
 import { i18n } from '@/i18n';
@@ -127,6 +148,10 @@ let enableSensitiveMediaDetectionForVideos: boolean = $ref(false);
 let enableIpLogging: boolean = $ref(false);
 let enableActiveEmailValidation: boolean = $ref(false);
 
+let secureMode: boolean = $ref(false);
+let privateMode: boolean = $ref(false);
+let allowedHosts: string = $ref('');
+
 async function init() {
 	const meta = await os.api('admin/meta');
 	summalyProxy = meta.summalyProxy;
@@ -143,6 +168,10 @@ async function init() {
 	enableSensitiveMediaDetectionForVideos = meta.enableSensitiveMediaDetectionForVideos;
 	enableIpLogging = meta.enableIpLogging;
 	enableActiveEmailValidation = meta.enableActiveEmailValidation;
+
+	secureMode = meta.secureMode;
+	privateMode = meta.privateMode;
+	allowedHosts = meta.allowedHosts.join('\n');
 }
 
 function save() {
@@ -165,6 +194,16 @@ function save() {
 	});
 }
 
+function saveInstance() {
+	os.apiWithDialog('admin/update-meta', {
+		secureMode,
+		privateMode,
+		allowedHosts: allowedHosts.split('\n'),
+	}).then(() => {
+		fetchInstance();
+	});
+}
+
 const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);

From 1c7dc4a1e8173e0a785adfe7a5ad5ff494de0d74 Mon Sep 17 00:00:00 2001
From: nullobsi <me@nullob.si>
Date: Wed, 25 Aug 2021 20:48:57 -0700
Subject: [PATCH 154/245] Hide private data in pug when private mode is enabled

---
 packages/backend/src/server/web/index.ts      | 15 ++++++
 .../backend/src/server/web/views/base.pug     |  6 ++-
 .../backend/src/server/web/views/channel.pug  | 16 +++---
 .../backend/src/server/web/views/clip.pug     | 33 ++++++------
 .../src/server/web/views/gallery-post.pug     | 35 +++++++------
 .../backend/src/server/web/views/note.pug     | 51 ++++++++++---------
 .../backend/src/server/web/views/page.pug     | 33 ++++++------
 .../backend/src/server/web/views/user.pug     | 47 +++++++++--------
 8 files changed, 135 insertions(+), 101 deletions(-)

diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts
index be95becb6..0968f3271 100644
--- a/packages/backend/src/server/web/index.ts
+++ b/packages/backend/src/server/web/index.ts
@@ -218,6 +218,10 @@ router.get('/api.json', async ctx => {
 });
 
 const getFeed = async (acct: string) => {
+	const meta = await fetchMeta();
+	if (meta.privateMode) {
+		return;
+	}
 	const { username, host } = Acct.parse(acct);
 	const user = await Users.findOneBy({
 		usernameLower: username.toLowerCase(),
@@ -290,6 +294,7 @@ router.get(['/@:user', '/@:user/:sub'], async (ctx, next) => {
 			instanceName: meta.name || 'Misskey',
 			icon: meta.iconUrl,
 			themeColor: meta.themeColor,
+			privateMode: meta.privateMode,
 		});
 		ctx.set('Cache-Control', 'public, max-age=15');
 	} else {
@@ -333,6 +338,7 @@ router.get('/notes/:note', async (ctx, next) => {
 			summary: getNoteSummary(_note),
 			instanceName: meta.name || 'Misskey',
 			icon: meta.iconUrl,
+			privateMode: meta.privateMode,
 			themeColor: meta.themeColor,
 		});
 
@@ -370,6 +376,7 @@ router.get('/@:user/pages/:page', async (ctx, next) => {
 			instanceName: meta.name || 'Misskey',
 			icon: meta.iconUrl,
 			themeColor: meta.themeColor,
+			privateMode: meta.privateMode,
 		});
 
 		if (['public'].includes(page.visibility)) {
@@ -400,6 +407,7 @@ router.get('/clips/:clip', async (ctx, next) => {
 			profile,
 			avatarUrl: await Users.getAvatarUrl(await Users.findOneByOrFail({ id: clip.userId })),
 			instanceName: meta.name || 'Misskey',
+			privateMode: meta.privateMode,
 			icon: meta.iconUrl,
 			themeColor: meta.themeColor,
 		});
@@ -427,6 +435,7 @@ router.get('/gallery/:post', async (ctx, next) => {
 			instanceName: meta.name || 'Misskey',
 			icon: meta.iconUrl,
 			themeColor: meta.themeColor,
+			privateMode: meta.privateMode,
 		});
 
 		ctx.set('Cache-Control', 'public, max-age=15');
@@ -451,6 +460,7 @@ router.get('/channels/:channel', async (ctx, next) => {
 			instanceName: meta.name || 'Misskey',
 			icon: meta.iconUrl,
 			themeColor: meta.themeColor,
+			privateMode: meta.privateMode,
 		});
 
 		ctx.set('Cache-Control', 'public, max-age=15');
@@ -464,6 +474,10 @@ router.get('/channels/:channel', async (ctx, next) => {
 
 router.get('/_info_card_', async ctx => {
 	const meta = await fetchMeta(true);
+	if (meta.privateMode) {
+		ctx.status = 403;
+		return;
+	}
 
 	ctx.remove('X-Frame-Options');
 
@@ -511,6 +525,7 @@ router.get('(.*)', async ctx => {
 		desc: meta.description,
 		icon: meta.iconUrl,
 		themeColor: meta.themeColor,
+		privateMode: meta.privateMode,
 	});
 	ctx.set('Cache-Control', 'public, max-age=15');
 });
diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug
index 5bb156f0f..effa0743b 100644
--- a/packages/backend/src/server/web/views/base.pug
+++ b/packages/backend/src/server/web/views/base.pug
@@ -51,10 +51,12 @@ html
 			meta(name='description' content= desc || '✨🌎✨ A interplanetary communication platform ✨🚀✨')
 
 		block meta
+			if privateMode
+				meta(name='robots' content='noindex')
 
 		block og
-			meta(property='og:title'       content= title || 'Misskey') 
-			meta(property='og:description' content= desc || '✨🌎✨ A interplanetary communication platform ✨🚀✨') 
+			meta(property='og:title'       content= title || 'Misskey')
+			meta(property='og:description' content= desc || '✨🌎✨ A interplanetary communication platform ✨🚀✨')
 			meta(property='og:image'       content= img)
 
 		style
diff --git a/packages/backend/src/server/web/views/channel.pug b/packages/backend/src/server/web/views/channel.pug
index 486f0ecc4..c4594b766 100644
--- a/packages/backend/src/server/web/views/channel.pug
+++ b/packages/backend/src/server/web/views/channel.pug
@@ -1,18 +1,20 @@
 extends ./base
 
 block vars
-	- const title = channel.name;
+	- const title = privateMode ? instanceName : channel.name;
 	- const url = `${config.url}/channels/${channel.id}`;
 
 block title
 	= `${title} | ${instanceName}`
 
 block desc
-	meta(name='description' content= channel.description)
+	unless privateMode
+		meta(name='description' content=channel.description)
 
 block og
-	meta(property='og:type'        content='article')
-	meta(property='og:title'       content= title)
-	meta(property='og:description' content= channel.description)
-	meta(property='og:url'         content= url)
-	meta(property='og:image'       content= channel.bannerUrl)
+	unless privateMode
+		meta(property='og:type'        content='article')
+		meta(property='og:title'       content= title)
+		meta(property='og:description' content= channel.description)
+		meta(property='og:url'         content= url)
+		meta(property='og:image'       content= channel.bannerUrl)
diff --git a/packages/backend/src/server/web/views/clip.pug b/packages/backend/src/server/web/views/clip.pug
index 4c692bf59..2432470c1 100644
--- a/packages/backend/src/server/web/views/clip.pug
+++ b/packages/backend/src/server/web/views/clip.pug
@@ -2,30 +2,33 @@ extends ./base
 
 block vars
 	- const user = clip.user;
-	- const title = clip.name;
+	- const title = privateMode ? instanceName : clip.name;
 	- const url = `${config.url}/clips/${clip.id}`;
 
 block title
 	= `${title} | ${instanceName}`
 
 block desc
-	meta(name='description' content= clip.description)
+	unless privateMode
+		meta(name='description' content= clip.description)
 
 block og
-	meta(property='og:type'        content='article')
-	meta(property='og:title'       content= title)
-	meta(property='og:description' content= clip.description)
-	meta(property='og:url'         content= url)
-	meta(property='og:image'       content= avatarUrl)
+	unless privateMode
+		meta(property='og:type'        content='article')
+		meta(property='og:title'       content= title)
+		meta(property='og:description' content= clip.description)
+		meta(property='og:url'         content= url)
+		meta(property='og:image'       content= avatarUrl)
 
 block meta
-	if profile.noCrawle
-		meta(name='robots' content='noindex')
+	unless privateMode
+		if profile.noCrawle
+			meta(name='robots' content='noindex')
 
-	meta(name='misskey:user-username' content=user.username)
-	meta(name='misskey:user-id' content=user.id)
-	meta(name='misskey:clip-id' content=clip.id)
+		meta(name='misskey:user-username' content=user.username)
+		meta(name='misskey:user-id' content=user.id)
+		meta(name='misskey:clip-id' content=clip.id)
 
-	// todo
-	if user.twitter
-		meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
+		// todo
+		if user.twitter
+			meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
diff --git a/packages/backend/src/server/web/views/gallery-post.pug b/packages/backend/src/server/web/views/gallery-post.pug
index ca0663a48..1b1c2fbfb 100644
--- a/packages/backend/src/server/web/views/gallery-post.pug
+++ b/packages/backend/src/server/web/views/gallery-post.pug
@@ -2,32 +2,35 @@ extends ./base
 
 block vars
 	- const user = post.user;
-	- const title = post.title;
+	- const title = privateMode ? instanceName : post.title;
 	- const url = `${config.url}/gallery/${post.id}`;
 
 block title
 	= `${title} | ${instanceName}`
 
 block desc
-	meta(name='description' content= post.description)
+	unless privateMode
+		meta(name='description' content= post.description)
 
 block og
-	meta(property='og:type'        content='article')
-	meta(property='og:title'       content= title)
-	meta(property='og:description' content= post.description)
-	meta(property='og:url'         content= url)
-	meta(property='og:image'       content= post.files[0].thumbnailUrl)
+	unless privateMode
+		meta(property='og:type'        content='article')
+		meta(property='og:title'       content= title)
+		meta(property='og:description' content= post.description)
+		meta(property='og:url'         content= url)
+		meta(property='og:image'       content= post.files[0].thumbnailUrl)
 
 block meta
-	if user.host || profile.noCrawle
-		meta(name='robots' content='noindex')
+	unless privateMode
+		if user.host || profile.noCrawle
+			meta(name='robots' content='noindex')
 
-	meta(name='misskey:user-username' content=user.username)
-	meta(name='misskey:user-id' content=user.id)
+		meta(name='misskey:user-username' content=user.username)
+		meta(name='misskey:user-id' content=user.id)
 
-	// todo
-	if user.twitter
-		meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
+		// todo
+		if user.twitter
+			meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
 
-	if !user.host
-		link(rel='alternate' href=url type='application/activity+json')
+		if !user.host
+			link(rel='alternate' href=url type='application/activity+json')
diff --git a/packages/backend/src/server/web/views/note.pug b/packages/backend/src/server/web/views/note.pug
index 65696ea13..6b55f6ba0 100644
--- a/packages/backend/src/server/web/views/note.pug
+++ b/packages/backend/src/server/web/views/note.pug
@@ -2,7 +2,7 @@ extends ./base
 
 block vars
 	- const user = note.user;
-	- const title = user.name ? `${user.name} (@${user.username})` : `@${user.username}`;
+	- const title = privateMode ? instanceName : (user.name ? `${user.name} (@${user.username})` : `@${user.username}`);
 	- const url = `${config.url}/notes/${note.id}`;
 	- const isRenote = note.renote && note.text == null && note.fileIds.length == 0 && note.poll == null;
 
@@ -10,33 +10,36 @@ block title
 	= `${title} | ${instanceName}`
 
 block desc
-	meta(name='description' content= summary)
+	unless privateMode
+		meta(name='description' content= summary)
 
 block og
-	meta(property='og:type'        content='article')
-	meta(property='og:title'       content= title)
-	meta(property='og:description' content= summary)
-	meta(property='og:url'         content= url)
-	meta(property='og:image'       content= avatarUrl)
+	unless privateMode
+		meta(property='og:type'        content='article')
+		meta(property='og:title'       content= title)
+		meta(property='og:description' content= summary)
+		meta(property='og:url'         content= url)
+		meta(property='og:image'       content= avatarUrl)
 
 block meta
-	if user.host || isRenote || profile.noCrawle
-		meta(name='robots' content='noindex')
+	unless privateMode
+		if user.host || isRenote || profile.noCrawle
+			meta(name='robots' content='noindex')
 
-	meta(name='misskey:user-username' content=user.username)
-	meta(name='misskey:user-id' content=user.id)
-	meta(name='misskey:note-id' content=note.id)
-	
-	// todo
-	if user.twitter
-		meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
+		meta(name='misskey:user-username' content=user.username)
+		meta(name='misskey:user-id' content=user.id)
+		meta(name='misskey:note-id' content=note.id)
 
-	if note.prev
-		link(rel='prev' href=`${config.url}/notes/${note.prev}`)
-	if note.next
-		link(rel='next' href=`${config.url}/notes/${note.next}`)
+		// todo
+		if user.twitter
+			meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
 
-	if !user.host
-		link(rel='alternate' href=url type='application/activity+json')
-	if note.uri
-		link(rel='alternate' href=note.uri type='application/activity+json')
+		if note.prev
+			link(rel='prev' href=`${config.url}/notes/${note.prev}`)
+		if note.next
+			link(rel='next' href=`${config.url}/notes/${note.next}`)
+
+		if !user.host
+			link(rel='alternate' href=url type='application/activity+json')
+		if note.uri
+			link(rel='alternate' href=note.uri type='application/activity+json')
diff --git a/packages/backend/src/server/web/views/page.pug b/packages/backend/src/server/web/views/page.pug
index 4219e76a5..109528213 100644
--- a/packages/backend/src/server/web/views/page.pug
+++ b/packages/backend/src/server/web/views/page.pug
@@ -2,30 +2,33 @@ extends ./base
 
 block vars
 	- const user = page.user;
-	- const title = page.title;
+	- const title = privateMode ? instanceName : page.title;
 	- const url = `${config.url}/@${user.username}/${page.name}`;
 
 block title
 	= `${title} | ${instanceName}`
 
 block desc
-	meta(name='description' content= page.summary)
+	unless privateMode
+		meta(name='description' content= page.summary)
 
 block og
-	meta(property='og:type'        content='article')
-	meta(property='og:title'       content= title)
-	meta(property='og:description' content= page.summary)
-	meta(property='og:url'         content= url)
-	meta(property='og:image'       content= page.eyeCatchingImage ? page.eyeCatchingImage.thumbnailUrl : avatarUrl)
+	unless privateMode
+		meta(property='og:type'        content='article')
+		meta(property='og:title'       content= title)
+		meta(property='og:description' content= page.summary)
+		meta(property='og:url'         content= url)
+		meta(property='og:image'       content= page.eyeCatchingImage ? page.eyeCatchingImage.thumbnailUrl : avatarUrl)
 
 block meta
-	if profile.noCrawle
-		meta(name='robots' content='noindex')
+	unless privateMode
+		if profile.noCrawle
+			meta(name='robots' content='noindex')
 
-	meta(name='misskey:user-username' content=user.username)
-	meta(name='misskey:user-id' content=user.id)
-	meta(name='misskey:page-id' content=page.id)
+		meta(name='misskey:user-username' content=user.username)
+		meta(name='misskey:user-id' content=user.id)
+		meta(name='misskey:page-id' content=page.id)
 
-	// todo
-	if user.twitter
-		meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
+		// todo
+		if user.twitter
+			meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
diff --git a/packages/backend/src/server/web/views/user.pug b/packages/backend/src/server/web/views/user.pug
index 119993fdb..cc14dedb3 100644
--- a/packages/backend/src/server/web/views/user.pug
+++ b/packages/backend/src/server/web/views/user.pug
@@ -1,39 +1,42 @@
 extends ./base
 
 block vars
-	- const title = user.name ? `${user.name} (@${user.username})` : `@${user.username}`;
+	- const title = privateMode ? instanceName : (user.name ? `${user.name} (@${user.username})` : `@${user.username}`);
 	- const url = `${config.url}/@${(user.host ? `${user.username}@${user.host}` : user.username)}`;
 
 block title
 	= `${title} | ${instanceName}`
 
 block desc
-	meta(name='description' content= profile.description)
+	unless privateMode
+		meta(name='description' content= profile.description)
 
 block og
-	meta(property='og:type'        content='blog')
-	meta(property='og:title'       content= title)
-	meta(property='og:description' content= profile.description)
-	meta(property='og:url'         content= url)
-	meta(property='og:image'       content= avatarUrl)
+	unless privateMode
+		meta(property='og:type'        content='blog')
+		meta(property='og:title'       content= title)
+		meta(property='og:description' content= profile.description)
+		meta(property='og:url'         content= url)
+		meta(property='og:image'       content= avatarUrl)
 
 block meta
-	if user.host || profile.noCrawle
-		meta(name='robots' content='noindex')
+	unless privateMode
+		if user.host || profile.noCrawle
+			meta(name='robots' content='noindex')
 
-	meta(name='misskey:user-username' content=user.username)
-	meta(name='misskey:user-id' content=user.id)
+		meta(name='misskey:user-username' content=user.username)
+		meta(name='misskey:user-id' content=user.id)
 
-	if profile.twitter
-		meta(name='twitter:creator' content=`@${profile.twitter.screenName}`)
+		if profile.twitter
+			meta(name='twitter:creator' content=`@${profile.twitter.screenName}`)
 
-	if !sub
-		if !user.host
-			link(rel='alternate' href=`${config.url}/users/${user.id}` type='application/activity+json')
-		if user.uri
-			link(rel='alternate' href=user.uri type='application/activity+json')
-		if profile.url
-			link(rel='alternate' href=profile.url type='text/html')
+		if !sub
+			if !user.host
+				link(rel='alternate' href=`${config.url}/users/${user.id}` type='application/activity+json')
+			if user.uri
+				link(rel='alternate' href=user.uri type='application/activity+json')
+			if profile.url
+				link(rel='alternate' href=profile.url type='text/html')
 
-	each m in me
-		link(rel='me' href=`${m}`)
+		each m in me
+			link(rel='me' href=`${m}`)

From 06aeb496255ec71c57e1b5f94c610a2062aaa50b Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 7 Sep 2022 17:38:59 +0900
Subject: [PATCH 155/245] Update ROADMAP.md

---
 ROADMAP.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ROADMAP.md b/ROADMAP.md
index bd96b2c50..c68e8b321 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -14,6 +14,9 @@ This is the phase we are at now. We need to make a high-maintenance environment
   - Fix random test failures - https://github.com/misskey-dev/misskey/issues/7985 and https://github.com/misskey-dev/misskey/issues/7986
   - Add more tests
     - May need to implement a mechanism that allows for DI
+    	- https://github.com/misskey-dev/misskey/pull/9085
+	- Measure coverage
+		- https://github.com/misskey-dev/misskey/pull/9081
 - Improve documentation
 
 ## (2) Improve functionality

From 255f19bd2336ecf813bfc652014cd63389b0dafc Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 7 Sep 2022 17:39:45 +0900
Subject: [PATCH 156/245] Update ROADMAP.md

---
 ROADMAP.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index c68e8b321..9b3016cad 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -6,15 +6,15 @@ Also, the later tasks are more indefinite and are subject to change as developme
 This is the phase we are at now. We need to make a high-maintenance environment that can withstand future development.
 
 - Make the number of type errors zero (backend)
-  - Probably need to switch some libraries to others that make it difficult to reduce type errors
-    - e.g. koa to fastify https://github.com/misskey-dev/misskey/issues/7537
+	- Probably need to switch some libraries to others that make it difficult to reduce type errors
+		- e.g. koa to fastify https://github.com/misskey-dev/misskey/issues/7537
 - Improve CI
-  - Fix tests
-    - mocha, jest, etc. do not support the combination of `TypeScript + ESM + Path alias`, and the tests currently do not work.
-  - Fix random test failures - https://github.com/misskey-dev/misskey/issues/7985 and https://github.com/misskey-dev/misskey/issues/7986
-  - Add more tests
-    - May need to implement a mechanism that allows for DI
-    	- https://github.com/misskey-dev/misskey/pull/9085
+	- Fix tests
+		- mocha, jest, etc. do not support the combination of `TypeScript + ESM + Path alias`, and the tests currently do not work.
+	- Fix random test failures - https://github.com/misskey-dev/misskey/issues/7985 and https://github.com/misskey-dev/misskey/issues/7986
+	- Add more tests
+		- May need to implement a mechanism that allows for DI
+			- https://github.com/misskey-dev/misskey/pull/9085
 	- Measure coverage
 		- https://github.com/misskey-dev/misskey/pull/9081
 - Improve documentation

From 9b3ad7357610dba858f4ee2cb485dba8e1855217 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 7 Sep 2022 15:09:23 -0700
Subject: [PATCH 157/245] feat: :sparkles: Better tabs for mobile

---
 package.json                                           | 2 +-
 packages/client/src/components/global/MkPageHeader.vue | 9 +++++----
 packages/client/src/pages/about.vue                    | 1 +
 packages/client/src/pages/explore.vue                  | 1 +
 packages/client/src/pages/notifications.vue            | 6 ++++++
 packages/client/src/pages/settings/privacy.vue         | 4 ++--
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index a44247979..c5ab60481 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-beta.2-rc.9",
+	"version": "12.118.1-calc.2-beta.2-rc.10",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 5f17e61cf..b9fa06029 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -14,16 +14,17 @@
 				<div v-if="!narrow && metadata.subtitle" class="subtitle">
 					{{ metadata.subtitle }}
 				</div>
-				<div v-if="narrow && hasTabs" class="subtitle activeTab">
+				<!-- <div v-if="narrow && hasTabs" class="subtitle activeTab">
 					{{ tabs.find(tab => tab.key === props.tab)?.title }}
 					<i class="chevron fas fa-chevron-down"></i>
-				</div>
+				</div> -->
 			</div>
 		</div>
-		<div v-if="!narrow || hideTitle" class="tabs">
+		<div v-if="hideTitle" class="tabs"> <!-- v-if="!narrow || hideTitle" -->
+			<!-- eslint-disable-next-line vue/require-v-for-key -->
 			<button v-for="tab in tabs" :ref="(el) => tabRefs[tab.key] = el" v-tooltip.noDelay="tab.title" class="tab _button" :class="{ active: tab.key != null && tab.key === props.tab }" @mousedown="(ev) => onTabMousedown(tab, ev)" @click="(ev) => onTabClick(tab, ev)">
 				<i v-if="tab.icon" class="icon" :class="tab.icon"></i>
-				<span v-if="!tab.iconOnly" class="title">{{ tab.title }}</span>
+				<span v-if="!tab.iconOnly && !narrow" class="title">{{ tab.title }}</span>
 			</button>
 			<div ref="tabHighlightEl" class="highlight"></div>
 		</div>
diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue
index fc2337727..a1cbc2dc2 100644
--- a/packages/client/src/pages/about.vue
+++ b/packages/client/src/pages/about.vue
@@ -115,6 +115,7 @@ const headerActions = $computed(() => []);
 let theTabs = [{
 	key: 'overview',
 	title: i18n.ts.overview,
+	icon: 'fas fa-sitemap',
 }, {
 	key: 'emojis',
 	title: i18n.ts.customEmojis,
diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index 1fac32c03..2b170a6ee 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -77,6 +77,7 @@ const headerTabs = $computed(() => [{
 	title: i18n.ts.users,
 }, {
 	key: 'search',
+	icon: 'fas fa-magnifying-glass',
 	title: i18n.ts.search,
 }]);
 
diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index 368944135..104304ea8 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -93,17 +93,23 @@ const headerActions = $computed(() => [tab === 'all' ? {
 const headerTabs = $computed(() => [{
 	key: 'all',
 	title: i18n.ts.all,
+	icon: 'fas fa-bell',
+	iconOnly: true,
 }, {
 	key: 'unread',
 	title: i18n.ts.unread,
+	icon: 'fas fa-exclamation',
+	iconOnly: true,
 }, {
 	key: 'mentions',
 	title: i18n.ts.mentions,
 	icon: 'fas fa-at',
+	iconOnly: true,
 }, {
 	key: 'directNotes',
 	title: i18n.ts.directNotes,
 	icon: 'fas fa-envelope',
+	iconOnly: true,
 }]);
 
 definePageMetadata(computed(() => ({
diff --git a/packages/client/src/pages/settings/privacy.vue b/packages/client/src/pages/settings/privacy.vue
index 45a0358a9..fd73d86bf 100644
--- a/packages/client/src/pages/settings/privacy.vue
+++ b/packages/client/src/pages/settings/privacy.vue
@@ -7,7 +7,7 @@
 		{{ i18n.ts.makeReactionsPublic }}
 		<template #caption>{{ i18n.ts.makeReactionsPublicDescription }}</template>
 	</FormSwitch>
-		
+
 	<FormSelect v-model="ffVisibility" class="_formBlock" @update:modelValue="save()">
 		<template #label>{{ i18n.ts.ffVisibility }}</template>
 		<option value="public">{{ i18n.ts._ffVisibility.public }}</option>
@@ -15,7 +15,7 @@
 		<option value="private">{{ i18n.ts._ffVisibility.private }}</option>
 		<template #caption>{{ i18n.ts.ffVisibilityDescription }}</template>
 	</FormSelect>
-		
+
 	<FormSwitch v-model="hideOnlineStatus" class="_formBlock" @update:modelValue="save()">
 		{{ i18n.ts.hideOnlineStatus }}
 		<template #caption>{{ i18n.ts.hideOnlineStatusDescription }}</template>

From c6016501514409d83e4b9449dd83b9e705ff9207 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 7 Sep 2022 15:33:21 -0700
Subject: [PATCH 158/245] fix

---
 packages/client/src/components/global/MkPageHeader.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index b9fa06029..77ad45fc6 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -20,11 +20,10 @@
 				</div> -->
 			</div>
 		</div>
-		<div v-if="hideTitle" class="tabs"> <!-- v-if="!narrow || hideTitle" -->
-			<!-- eslint-disable-next-line vue/require-v-for-key -->
+		<div class="tabs">
 			<button v-for="tab in tabs" :ref="(el) => tabRefs[tab.key] = el" v-tooltip.noDelay="tab.title" class="tab _button" :class="{ active: tab.key != null && tab.key === props.tab }" @mousedown="(ev) => onTabMousedown(tab, ev)" @click="(ev) => onTabClick(tab, ev)">
 				<i v-if="tab.icon" class="icon" :class="tab.icon"></i>
-				<span v-if="!tab.iconOnly && !narrow" class="title">{{ tab.title }}</span>
+			<span v-if="!tab.iconOnly && !narrow" class="title">{{ tab.title }}</span>
 			</button>
 			<div ref="tabHighlightEl" class="highlight"></div>
 		</div>

From 91de043d70d059158ac2240b79c0ba7f3dcdef5e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 7 Sep 2022 15:33:24 -0700
Subject: [PATCH 159/245] .11

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

diff --git a/package.json b/package.json
index c5ab60481..658ba96ad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-beta.2-rc.10",
+	"version": "12.118.1-calc.2-beta.2-rc.11",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 045fc9e1ee1f3181c2df42c23afa520e9fd258a1 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 7 Sep 2022 15:37:04 -0700
Subject: [PATCH 160/245] fix: :bug: Don't show tab title on mobile

---
 package.json                                           | 2 +-
 packages/client/src/components/global/MkPageHeader.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 658ba96ad..af76be49b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-beta.2-rc.11",
+	"version": "12.118.1-calc.2-beta.2-rc.12",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 77ad45fc6..48e53e1a2 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -10,7 +10,7 @@
 
 			<div class="title">
 				<MkUserName v-if="metadata.userName" :user="metadata.userName" :nowrap="true" class="title"/>
-				<div v-else-if="metadata.title" class="title">{{ metadata.title }}</div>
+				<div v-else-if="!narrow && metadata.title" class="title">{{ metadata.title }}</div>
 				<div v-if="!narrow && metadata.subtitle" class="subtitle">
 					{{ metadata.subtitle }}
 				</div>
@@ -23,7 +23,7 @@
 		<div class="tabs">
 			<button v-for="tab in tabs" :ref="(el) => tabRefs[tab.key] = el" v-tooltip.noDelay="tab.title" class="tab _button" :class="{ active: tab.key != null && tab.key === props.tab }" @mousedown="(ev) => onTabMousedown(tab, ev)" @click="(ev) => onTabClick(tab, ev)">
 				<i v-if="tab.icon" class="icon" :class="tab.icon"></i>
-			<span v-if="!tab.iconOnly && !narrow" class="title">{{ tab.title }}</span>
+				<span v-if="!tab.iconOnly && !narrow" class="title">{{ tab.title }}</span>
 			</button>
 			<div ref="tabHighlightEl" class="highlight"></div>
 		</div>

From da112b181faa8d550561c2caa17a745c90261a21 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 7 Sep 2022 15:40:25 -0700
Subject: [PATCH 161/245] fix: :bug: sync tab when getting last timeline

---
 packages/client/src/pages/timeline.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index e7faf7d39..6bda935f4 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -128,7 +128,11 @@ const rootEl = $ref<HTMLElement>();
 
 let queue = $ref(0);
 const src = $computed({
-	get: () => defaultStore.reactiveState.tl.value.src,
+	get: () => {
+		const lastSrc = defaultStore.reactiveState.tl.value.src;
+		syncSlide(timelines.indexOf(lastSrc));
+		return lastSrc;
+	},
 	set: (x) => {
 		saveSrc(x);
 		syncSlide(timelines.indexOf(x));

From 7354b363eb6c233df849c67e894002bbc569fc04 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 7 Sep 2022 15:49:07 -0700
Subject: [PATCH 162/245] feat: :sparkles: Swiper in notifs

---
 package.json                                |  2 +-
 packages/client/src/pages/notifications.vue | 45 ++++++++++++++++-----
 packages/client/src/pages/timeline.vue      | 11 ++---
 3 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index af76be49b..a1d87c88f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-beta.2-rc.12",
+	"version": "12.118.1-calc.2-beta.2-rc.13",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index 104304ea8..3e3532ba1 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -9,15 +9,25 @@
 		/>
 	</template>
 	<MkSpacer :content-max="800">
-		<div v-if="tab === 'all' || tab === 'unread'">
-			<XNotifications class="notifications" :include-types="includeTypes" :unread-only="unreadOnly"/>
-		</div>
-		<div v-else-if="tab === 'mentions'">
-			<XNotes :pagination="mentionsPagination"/>
-		</div>
-		<div v-else-if="tab === 'directNotes'">
-			<XNotes :pagination="directNotesPagination"/>
-		</div>
+		<swiper
+			:modules="[Virtual]"
+			:space-between="20"
+			:virtual="true"
+			@swiper="setSwiperRef"
+		>
+			<swiper-slide>
+				<XNotifications class="notifications" :include-types="includeTypes" :unread-only="false"/>
+			</swiper-slide>
+			<swiper-slide>
+				<XNotifications class="notifications" :include-types="includeTypes" :unread-only="true"/>
+			</swiper-slide>
+			<swiper-slide>
+				<XNotes :pagination="mentionsPagination"/>
+			</swiper-slide>
+			<swiper-slide>
+				<XNotes :pagination="directNotesPagination"/>
+			</swiper-slide>
+		</swiper>
 	</MkSpacer>
 </MkStickyContainer>
 </template>
@@ -25,13 +35,16 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
 import { notificationTypes } from 'misskey-js';
+import { Virtual } from 'swiper';
+import { Swiper, SwiperSlide } from 'swiper/vue';
 import XNotifications from '@/components/MkNotifications.vue';
 import XNotes from '@/components/MkNotes.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { deviceKind } from '@/scripts/device-kind';
-
+import 'swiper/scss';
+import 'swiper/scss/virtual';
 let tab = $ref('all');
 let includeTypes = $ref<string[] | null>(null);
 let unreadOnly = $computed(() => tab === 'unread');
@@ -39,7 +52,7 @@ os.api('notifications/mark-all-as-read');
 
 const MOBILE_THRESHOLD = 500;
 const isMobile = ref(
-	deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD
+	deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD,
 );
 window.addEventListener('resize', () => {
 	isMobile.value =
@@ -112,6 +125,16 @@ const headerTabs = $computed(() => [{
 	iconOnly: true,
 }]);
 
+let swiperRef = null;
+
+function setSwiperRef(swiper) {
+	swiperRef = swiper;
+}
+
+function syncSlide(index) {
+	swiperRef.slideTo(index);
+}
+
 definePageMetadata(computed(() => ({
 	title: i18n.ts.notifications,
 	icon: 'fas fa-bell',
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 6bda935f4..adfda93c9 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -37,7 +37,7 @@
 			</div> *v-else on next div* -->
 			<div class="tl _block">
 				<swiper
-					:modules="[Pagination, Virtual]"
+					:modules="[Virtual]"
 					:space-between="20"
 					:virtual="true"
 					@swiper="setSwiperRef"
@@ -66,7 +66,7 @@
 
 <script lang="ts" setup>
 import { defineAsyncComponent, computed, watch, ref } from 'vue';
-import { Pagination, Virtual } from 'swiper';
+import { Virtual } from 'swiper';
 import { Swiper, SwiperSlide } from 'swiper/vue';
 import XTimeline from '@/components/MkTimeline.vue';
 import XPostForm from '@/components/MkPostForm.vue';
@@ -79,7 +79,6 @@ import { $i } from '@/account';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { deviceKind } from '@/scripts/device-kind';
 import 'swiper/scss';
-import 'swiper/scss/pagination';
 import 'swiper/scss/virtual';
 
 const XTutorial = defineAsyncComponent(() => import('./timeline.tutorial.vue'));
@@ -128,11 +127,7 @@ const rootEl = $ref<HTMLElement>();
 
 let queue = $ref(0);
 const src = $computed({
-	get: () => {
-		const lastSrc = defaultStore.reactiveState.tl.value.src;
-		syncSlide(timelines.indexOf(lastSrc));
-		return lastSrc;
-	},
+	get: () => defaultStore.reactiveState.tl.value.src,
 	set: (x) => {
 		saveSrc(x);
 		syncSlide(timelines.indexOf(x));

From 17dc06e47ac29972942cd52bfc043bd4770bfe0f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 7 Sep 2022 15:51:01 -0700
Subject: [PATCH 163/245] chore: :arrow_up: Upgrade Vite

---
 packages/client/package.json |   2 +-
 yarn.lock                    | 253 +++++++++++++++++++++++++++++++----
 2 files changed, 231 insertions(+), 24 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 37aab9164..458303254 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -59,7 +59,7 @@
 		"typescript": "4.8.2",
 		"uuid": "8.3.2",
 		"vanilla-tilt": "1.7.2",
-		"vite": "3.0.9",
+		"vite": "^3.1.0",
 		"vue": "3.2.37",
 		"vue-plyr": "^7.0.0",
 		"vue-prism-editor": "2.0.0-alpha.2",
diff --git a/yarn.lock b/yarn.lock
index e225d9873..6268c829d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -304,6 +304,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-loong64@npm:0.15.7":
+  version: 0.15.7
+  resolution: "@esbuild/linux-loong64@npm:0.15.7"
+  conditions: os=linux & cpu=loong64
+  languageName: node
+  linkType: hard
+
 "@eslint/eslintrc@npm:^1.3.0":
   version: 1.3.0
   resolution: "@eslint/eslintrc@npm:1.3.0"
@@ -4241,7 +4248,7 @@ __metadata:
     typescript: 4.8.2
     uuid: 8.3.2
     vanilla-tilt: 1.7.2
-    vite: 3.0.9
+    vite: ^3.1.0
     vue: 3.2.37
     vue-plyr: ^7.0.0
     vue-prism-editor: 2.0.0-alpha.2
@@ -5852,6 +5859,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-android-64@npm:0.15.7":
+  version: 0.15.7
+  resolution: "esbuild-android-64@npm:0.15.7"
+  conditions: os=android & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-android-arm64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-android-arm64@npm:0.14.54"
@@ -5859,6 +5873,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-android-arm64@npm:0.15.7":
+  version: 0.15.7
+  resolution: "esbuild-android-arm64@npm:0.15.7"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "esbuild-darwin-64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-darwin-64@npm:0.14.54"
@@ -5866,6 +5887,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-darwin-64@npm:0.15.7":
+  version: 0.15.7
+  resolution: "esbuild-darwin-64@npm:0.15.7"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-darwin-arm64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-darwin-arm64@npm:0.14.54"
@@ -5873,6 +5901,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-darwin-arm64@npm:0.15.7":
+  version: 0.15.7
+  resolution: "esbuild-darwin-arm64@npm:0.15.7"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "esbuild-freebsd-64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-freebsd-64@npm:0.14.54"
@@ -5880,6 +5915,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-freebsd-64@npm:0.15.7":
+  version: 0.15.7
+  resolution: "esbuild-freebsd-64@npm:0.15.7"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-freebsd-arm64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-freebsd-arm64@npm:0.14.54"
@@ -5887,6 +5929,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-freebsd-arm64@npm:0.15.7":
+  version: 0.15.7
+  resolution: "esbuild-freebsd-arm64@npm:0.15.7"
+  conditions: os=freebsd & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-32@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-linux-32@npm:0.14.54"
@@ -5894,6 +5943,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-32@npm:0.15.7":
+  version: 0.15.7
+  resolution: "esbuild-linux-32@npm:0.15.7"
+  conditions: os=linux & cpu=ia32
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-linux-64@npm:0.14.54"
@@ -5901,6 +5957,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-64@npm:0.15.7":
+  version: 0.15.7
+  resolution: "esbuild-linux-64@npm:0.15.7"
+  conditions: os=linux & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-arm64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-linux-arm64@npm:0.14.54"
@@ -5908,6 +5971,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-arm64@npm:0.15.7":
+  version: 0.15.7
+  resolution: "esbuild-linux-arm64@npm:0.15.7"
+  conditions: os=linux & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-arm@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-linux-arm@npm:0.14.54"
@@ -5915,6 +5985,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-arm@npm:0.15.7":
+  version: 0.15.7
+  resolution: "esbuild-linux-arm@npm:0.15.7"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-mips64le@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-linux-mips64le@npm:0.14.54"
@@ -5922,6 +5999,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-mips64le@npm:0.15.7":
+  version: 0.15.7
+  resolution: "esbuild-linux-mips64le@npm:0.15.7"
+  conditions: os=linux & cpu=mips64el
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-ppc64le@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-linux-ppc64le@npm:0.14.54"
@@ -5929,6 +6013,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-ppc64le@npm:0.15.7":
+  version: 0.15.7
+  resolution: "esbuild-linux-ppc64le@npm:0.15.7"
+  conditions: os=linux & cpu=ppc64
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-riscv64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-linux-riscv64@npm:0.14.54"
@@ -5936,6 +6027,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-riscv64@npm:0.15.7":
+  version: 0.15.7
+  resolution: "esbuild-linux-riscv64@npm:0.15.7"
+  conditions: os=linux & cpu=riscv64
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-s390x@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-linux-s390x@npm:0.14.54"
@@ -5943,6 +6041,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-s390x@npm:0.15.7":
+  version: 0.15.7
+  resolution: "esbuild-linux-s390x@npm:0.15.7"
+  conditions: os=linux & cpu=s390x
+  languageName: node
+  linkType: hard
+
 "esbuild-netbsd-64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-netbsd-64@npm:0.14.54"
@@ -5950,6 +6055,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-netbsd-64@npm:0.15.7":
+  version: 0.15.7
+  resolution: "esbuild-netbsd-64@npm:0.15.7"
+  conditions: os=netbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-openbsd-64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-openbsd-64@npm:0.14.54"
@@ -5957,6 +6069,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-openbsd-64@npm:0.15.7":
+  version: 0.15.7
+  resolution: "esbuild-openbsd-64@npm:0.15.7"
+  conditions: os=openbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-sunos-64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-sunos-64@npm:0.14.54"
@@ -5964,6 +6083,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-sunos-64@npm:0.15.7":
+  version: 0.15.7
+  resolution: "esbuild-sunos-64@npm:0.15.7"
+  conditions: os=sunos & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-windows-32@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-windows-32@npm:0.14.54"
@@ -5971,6 +6097,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-windows-32@npm:0.15.7":
+  version: 0.15.7
+  resolution: "esbuild-windows-32@npm:0.15.7"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
 "esbuild-windows-64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-windows-64@npm:0.14.54"
@@ -5978,6 +6111,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-windows-64@npm:0.15.7":
+  version: 0.15.7
+  resolution: "esbuild-windows-64@npm:0.15.7"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-windows-arm64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-windows-arm64@npm:0.14.54"
@@ -5985,7 +6125,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.14.42, esbuild@npm:^0.14.47":
+"esbuild-windows-arm64@npm:0.15.7":
+  version: 0.15.7
+  resolution: "esbuild-windows-arm64@npm:0.15.7"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"esbuild@npm:^0.14.42":
   version: 0.14.54
   resolution: "esbuild@npm:0.14.54"
   dependencies:
@@ -6059,6 +6206,80 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild@npm:^0.15.6":
+  version: 0.15.7
+  resolution: "esbuild@npm:0.15.7"
+  dependencies:
+    "@esbuild/linux-loong64": 0.15.7
+    esbuild-android-64: 0.15.7
+    esbuild-android-arm64: 0.15.7
+    esbuild-darwin-64: 0.15.7
+    esbuild-darwin-arm64: 0.15.7
+    esbuild-freebsd-64: 0.15.7
+    esbuild-freebsd-arm64: 0.15.7
+    esbuild-linux-32: 0.15.7
+    esbuild-linux-64: 0.15.7
+    esbuild-linux-arm: 0.15.7
+    esbuild-linux-arm64: 0.15.7
+    esbuild-linux-mips64le: 0.15.7
+    esbuild-linux-ppc64le: 0.15.7
+    esbuild-linux-riscv64: 0.15.7
+    esbuild-linux-s390x: 0.15.7
+    esbuild-netbsd-64: 0.15.7
+    esbuild-openbsd-64: 0.15.7
+    esbuild-sunos-64: 0.15.7
+    esbuild-windows-32: 0.15.7
+    esbuild-windows-64: 0.15.7
+    esbuild-windows-arm64: 0.15.7
+  dependenciesMeta:
+    "@esbuild/linux-loong64":
+      optional: true
+    esbuild-android-64:
+      optional: true
+    esbuild-android-arm64:
+      optional: true
+    esbuild-darwin-64:
+      optional: true
+    esbuild-darwin-arm64:
+      optional: true
+    esbuild-freebsd-64:
+      optional: true
+    esbuild-freebsd-arm64:
+      optional: true
+    esbuild-linux-32:
+      optional: true
+    esbuild-linux-64:
+      optional: true
+    esbuild-linux-arm:
+      optional: true
+    esbuild-linux-arm64:
+      optional: true
+    esbuild-linux-mips64le:
+      optional: true
+    esbuild-linux-ppc64le:
+      optional: true
+    esbuild-linux-riscv64:
+      optional: true
+    esbuild-linux-s390x:
+      optional: true
+    esbuild-netbsd-64:
+      optional: true
+    esbuild-openbsd-64:
+      optional: true
+    esbuild-sunos-64:
+      optional: true
+    esbuild-windows-32:
+      optional: true
+    esbuild-windows-64:
+      optional: true
+    esbuild-windows-arm64:
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: 54ddaa6cf96798d817861b4f68cb8d176075dc09b6e0ed511c57e5db6fd86d2c673ac2ec631ad9b11678d58ad4a77cd6b7a3853b9c6eac29b7f5c6d38e42f92e
+  languageName: node
+  linkType: hard
+
 "escalade@npm:^3.1.1":
   version: 3.1.1
   resolution: "escalade@npm:3.1.1"
@@ -13347,7 +13568,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup@npm:2.78.1":
+"rollup@npm:2.78.1, rollup@npm:~2.78.0":
   version: 2.78.1
   resolution: "rollup@npm:2.78.1"
   dependencies:
@@ -13361,20 +13582,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup@npm:>=2.75.6 <2.77.0 || ~2.77.0":
-  version: 2.77.3
-  resolution: "rollup@npm:2.77.3"
-  dependencies:
-    fsevents: ~2.3.2
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  bin:
-    rollup: dist/bin/rollup
-  checksum: b179c68249584565ddb5664a241e8e48c293b2207718d885b08ee25797d98857a383f06b544bb89819407da5a71557f4713309a278f61c4778bb32b1d3321a1c
-  languageName: node
-  linkType: hard
-
 "rss-parser@npm:3.12.0":
   version: 3.12.0
   resolution: "rss-parser@npm:3.12.0"
@@ -15653,15 +15860,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:3.0.9":
-  version: 3.0.9
-  resolution: "vite@npm:3.0.9"
+"vite@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "vite@npm:3.1.0"
   dependencies:
-    esbuild: ^0.14.47
+    esbuild: ^0.15.6
     fsevents: ~2.3.2
     postcss: ^8.4.16
     resolve: ^1.22.1
-    rollup: ">=2.75.6 <2.77.0 || ~2.77.0"
+    rollup: ~2.78.0
   peerDependencies:
     less: "*"
     sass: "*"
@@ -15681,7 +15888,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 6341aa43579ae45f8a383bdc0c5041dea3dff98f14e0a546d6d884a864134b00082246a28d1de8adff0ce0dd92b468c7ade8f972ffe1ed97258671d63e0f16f7
+  checksum: 1a343e3d46450181f79f34ff49cca5ff59bb7472de51ea2c4a042aa076f597d27d25c49f48405e82f607af7d8c1c13a9e789402ccb1b23570132382132ec3903
   languageName: node
   linkType: hard
 

From 78bd658a4f20507df36eade44376cea822ab97ca Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 7 Sep 2022 16:11:00 -0700
Subject: [PATCH 164/245] fix sync

---
 package.json                                           | 2 +-
 packages/client/src/components/global/MkPageHeader.vue | 6 +-----
 packages/client/src/pages/notifications.vue            | 8 +++++++-
 packages/client/src/store.ts                           | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index a1d87c88f..f7f1346bb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-beta.2-rc.13",
+	"version": "12.118.1-calc.2-beta.2-rc.14",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 48e53e1a2..b5c42be8d 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -14,15 +14,11 @@
 				<div v-if="!narrow && metadata.subtitle" class="subtitle">
 					{{ metadata.subtitle }}
 				</div>
-				<!-- <div v-if="narrow && hasTabs" class="subtitle activeTab">
-					{{ tabs.find(tab => tab.key === props.tab)?.title }}
-					<i class="chevron fas fa-chevron-down"></i>
-				</div> -->
 			</div>
 		</div>
 		<div class="tabs">
 			<button v-for="tab in tabs" :ref="(el) => tabRefs[tab.key] = el" v-tooltip.noDelay="tab.title" class="tab _button" :class="{ active: tab.key != null && tab.key === props.tab }" @mousedown="(ev) => onTabMousedown(tab, ev)" @click="(ev) => onTabClick(tab, ev)">
-				<i v-if="tab.icon" class="icon" :class="tab.icon"></i>
+				<i v-if="tab.icon && !narrow" class="icon" :class="tab.icon"></i>
 				<span v-if="!tab.iconOnly && !narrow" class="title">{{ tab.title }}</span>
 			</button>
 			<div ref="tabHighlightEl" class="highlight"></div>
diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index 3e3532ba1..107fb69d6 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -45,11 +45,17 @@ import { definePageMetadata } from '@/scripts/page-metadata';
 import { deviceKind } from '@/scripts/device-kind';
 import 'swiper/scss';
 import 'swiper/scss/virtual';
-let tab = $ref('all');
 let includeTypes = $ref<string[] | null>(null);
 let unreadOnly = $computed(() => tab === 'unread');
 os.api('notifications/mark-all-as-read');
 
+const tab = $computed({
+	get: () => 'all',
+	set: (x) => {
+		syncSlide(['all', 'unread', 'mentions', 'directNotes'].indexOf(x));
+	},
+});
+
 const MOBILE_THRESHOLD = 500;
 const isMobile = ref(
 	deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD,
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index 2cbd21f83..7a09d76a9 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -73,8 +73,8 @@ export const defaultStore = markRaw(new Storage('base', {
 			'notifications',,
 			'followRequests',
 			'messaging',
-			'favorites',
 			'explore',
+			'favorites',
 			'channels',
 			'search',
 		],

From c9792492cb24dec637cf28dbcc90728415a4eaaf Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 7 Sep 2022 16:18:04 -0700
Subject: [PATCH 165/245] fix: :rewind:

---
 package.json                                  |  2 +-
 .../src/components/global/MkPageHeader.vue    |  4 +-
 packages/client/src/pages/notifications.vue   | 57 ++++---------------
 3 files changed, 15 insertions(+), 48 deletions(-)

diff --git a/package.json b/package.json
index f7f1346bb..39b3c148a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-beta.2-rc.14",
+	"version": "12.118.1-calc.2-beta.2-rc.15",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index b5c42be8d..d2062afc7 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -6,7 +6,7 @@
 	<template v-if="metadata">
 		<div v-if="!hideTitle" class="titleContainer" @click="showTabsPopup">
 			<MkAvatar v-if="metadata.avatar" class="avatar" :user="metadata.avatar" :disable-preview="true" :show-indicator="true"/>
-			<i v-else-if="metadata.icon" class="icon" :class="metadata.icon"></i>
+			<i v-else-if="metadata.icon && !narrow" class="icon" :class="metadata.icon"></i>
 
 			<div class="title">
 				<MkUserName v-if="metadata.userName" :user="metadata.userName" :nowrap="true" class="title"/>
@@ -18,7 +18,7 @@
 		</div>
 		<div class="tabs">
 			<button v-for="tab in tabs" :ref="(el) => tabRefs[tab.key] = el" v-tooltip.noDelay="tab.title" class="tab _button" :class="{ active: tab.key != null && tab.key === props.tab }" @mousedown="(ev) => onTabMousedown(tab, ev)" @click="(ev) => onTabClick(tab, ev)">
-				<i v-if="tab.icon && !narrow" class="icon" :class="tab.icon"></i>
+				<i v-if="tab.icon" class="icon" :class="tab.icon"></i>
 				<span v-if="!tab.iconOnly && !narrow" class="title">{{ tab.title }}</span>
 			</button>
 			<div ref="tabHighlightEl" class="highlight"></div>
diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index 107fb69d6..c99a88ba1 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -9,25 +9,15 @@
 		/>
 	</template>
 	<MkSpacer :content-max="800">
-		<swiper
-			:modules="[Virtual]"
-			:space-between="20"
-			:virtual="true"
-			@swiper="setSwiperRef"
-		>
-			<swiper-slide>
-				<XNotifications class="notifications" :include-types="includeTypes" :unread-only="false"/>
-			</swiper-slide>
-			<swiper-slide>
-				<XNotifications class="notifications" :include-types="includeTypes" :unread-only="true"/>
-			</swiper-slide>
-			<swiper-slide>
-				<XNotes :pagination="mentionsPagination"/>
-			</swiper-slide>
-			<swiper-slide>
-				<XNotes :pagination="directNotesPagination"/>
-			</swiper-slide>
-		</swiper>
+		<div v-if="tab === 'all' || tab === 'unread'">
+			<XNotifications class="notifications" :include-types="includeTypes" :unread-only="unreadOnly"/>
+		</div>
+		<div v-else-if="tab === 'mentions'">
+			<XNotes :pagination="mentionsPagination"/>
+		</div>
+		<div v-else-if="tab === 'directNotes'">
+			<XNotes :pagination="directNotesPagination"/>
+		</div>
 	</MkSpacer>
 </MkStickyContainer>
 </template>
@@ -35,30 +25,21 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
 import { notificationTypes } from 'misskey-js';
-import { Virtual } from 'swiper';
-import { Swiper, SwiperSlide } from 'swiper/vue';
 import XNotifications from '@/components/MkNotifications.vue';
 import XNotes from '@/components/MkNotes.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { deviceKind } from '@/scripts/device-kind';
-import 'swiper/scss';
-import 'swiper/scss/virtual';
+
+let tab = $ref('all');
 let includeTypes = $ref<string[] | null>(null);
 let unreadOnly = $computed(() => tab === 'unread');
 os.api('notifications/mark-all-as-read');
 
-const tab = $computed({
-	get: () => 'all',
-	set: (x) => {
-		syncSlide(['all', 'unread', 'mentions', 'directNotes'].indexOf(x));
-	},
-});
-
 const MOBILE_THRESHOLD = 500;
 const isMobile = ref(
-	deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD,
+	deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD
 );
 window.addEventListener('resize', () => {
 	isMobile.value =
@@ -113,34 +94,20 @@ const headerTabs = $computed(() => [{
 	key: 'all',
 	title: i18n.ts.all,
 	icon: 'fas fa-bell',
-	iconOnly: true,
 }, {
 	key: 'unread',
 	title: i18n.ts.unread,
 	icon: 'fas fa-exclamation',
-	iconOnly: true,
 }, {
 	key: 'mentions',
 	title: i18n.ts.mentions,
 	icon: 'fas fa-at',
-	iconOnly: true,
 }, {
 	key: 'directNotes',
 	title: i18n.ts.directNotes,
 	icon: 'fas fa-envelope',
-	iconOnly: true,
 }]);
 
-let swiperRef = null;
-
-function setSwiperRef(swiper) {
-	swiperRef = swiper;
-}
-
-function syncSlide(index) {
-	swiperRef.slideTo(index);
-}
-
 definePageMetadata(computed(() => ({
 	title: i18n.ts.notifications,
 	icon: 'fas fa-bell',

From 0f21d4c0776824eaa08fe7fcc45d8f150a257737 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 7 Sep 2022 16:23:33 -0700
Subject: [PATCH 166/245] chore: :arrow_up: Upgrade several deps

From yarn upgrade-interactive
---
 package.json                  |  10 +-
 packages/backend/package.json |  14 +-
 packages/client/package.json  |  26 +-
 packages/sw/package.json      |   4 +-
 yarn.lock                     | 631 +++++++++++++---------------------
 5 files changed, 273 insertions(+), 412 deletions(-)

diff --git a/package.json b/package.json
index 39b3c148a..44a0cdd95 100644
--- a/package.json
+++ b/package.json
@@ -41,8 +41,8 @@
 	"dependencies": {
 		"@bull-board/api": "^4.2.2",
 		"@bull-board/ui": "^4.2.2",
-		"@tensorflow/tfjs": "^3.18.0",
-		"eslint": "^8.20.0",
+		"@tensorflow/tfjs": "^3.20.0",
+		"eslint": "^8.23.0",
 		"execa": "5.1.1",
 		"gulp": "4.0.2",
 		"gulp-cssnano": "2.1.3",
@@ -57,12 +57,12 @@
 		"@swc/core": "^1.2.244",
 		"@types/gulp": "4.0.9",
 		"@types/gulp-rename": "2.0.1",
-		"@typescript-eslint/parser": "5.35.1",
+		"@typescript-eslint/parser": "5.36.2",
 		"cross-env": "7.0.3",
-		"cypress": "10.6.0",
+		"cypress": "10.7.0",
 		"start-server-and-test": "1.14.0",
 		"typescript": "4.8.2",
 		"unplugin-swc": "^1.3.2",
-		"vue-eslint-parser": "^9.0.2"
+		"vue-eslint-parser": "^9.0.3"
 	}
 }
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 3adc6c2fb..1393f1d51 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -33,7 +33,7 @@
 		"aws-sdk": "2.1204.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "1.1.5",
-		"bull": "4.8.5",
+		"bull": "4.9.0",
 		"cacheable-lookup": "6.1.0",
 		"cbor": "8.1.0",
 		"chalk": "5.0.1",
@@ -76,10 +76,10 @@
 		"nested-property": "4.0.0",
 		"node-fetch": "3.2.10",
 		"nodemailer": "6.7.8",
-		"nsfwjs": "2.4.1",
+		"nsfwjs": "2.4.2",
 		"oauth": "^0.9.15",
 		"os-utils": "0.0.14",
-		"parse5": "7.0.0",
+		"parse5": "7.1.1",
 		"pg": "8.8.0",
 		"private-ip": "2.3.4",
 		"probe-image-size": "7.2.3",
@@ -99,7 +99,7 @@
 		"s-age": "1.1.2",
 		"sanitize-html": "2.7.1",
 		"semver": "7.3.7",
-		"sharp": "0.30.6",
+		"sharp": "0.30.7",
 		"speakeasy": "2.0.0",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
@@ -145,7 +145,7 @@
 		"@types/koa__multer": "2.0.4",
 		"@types/koa__router": "8.0.11",
 		"@types/mocha": "9.1.1",
-		"@types/node": "18.7.13",
+		"@types/node": "18.7.16",
 		"@types/node-fetch": "3.0.3",
 		"@types/nodemailer": "6.4.5",
 		"@types/oauth": "0.9.1",
@@ -167,8 +167,8 @@
 		"@types/web-push": "3.3.2",
 		"@types/websocket": "1.0.5",
 		"@types/ws": "8.5.3",
-		"@typescript-eslint/eslint-plugin": "5.35.1",
-		"@typescript-eslint/parser": "5.35.1",
+		"@typescript-eslint/eslint-plugin": "5.36.2",
+		"@typescript-eslint/parser": "5.36.2",
 		"cross-env": "7.0.3",
 		"eslint": "8.23.0",
 		"eslint-plugin-import": "2.26.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index 458303254..7f781c240 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -8,13 +8,13 @@
 	},
 	"dependencies": {
 		"@discordapp/twemoji": "14.0.2",
-		"@fortawesome/fontawesome-free": "6.1.2",
+		"@fortawesome/fontawesome-free": "6.2.0",
 		"@rollup/plugin-alias": "3.1.9",
 		"@rollup/plugin-json": "4.1.0",
 		"@rollup/pluginutils": "^4.2.1",
 		"@syuilo/aiscript": "0.11.1",
-		"@vitejs/plugin-vue": "3.0.3",
-		"@vue/compiler-sfc": "3.2.37",
+		"@vitejs/plugin-vue": "3.1.0",
+		"@vue/compiler-sfc": "3.2.38",
 		"autobind-decorator": "2.4.0",
 		"autosize": "5.0.1",
 		"blurhash": "1.1.5",
@@ -25,7 +25,7 @@
 		"chartjs-plugin-gradient": "0.5.1",
 		"chartjs-plugin-zoom": "1.2.1",
 		"compare-versions": "5.0.1",
-		"cropperjs": "2.0.0-beta",
+		"cropperjs": "2.0.0-beta.1",
 		"date-fns": "2.29.2",
 		"escape-regexp": "0.0.1",
 		"eventemitter3": "4.0.7",
@@ -36,13 +36,13 @@
 		"matter-js": "0.18.0",
 		"mfm-js": "0.23.0",
 		"misskey-js": "0.0.14",
-		"photoswipe": "5.3.0",
+		"photoswipe": "5.3.2",
 		"prismjs": "1.29.0",
 		"punycode": "2.1.1",
 		"querystring": "0.2.1",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"sass": "1.54.5",
+		"sass": "1.54.9",
 		"seedrandom": "3.0.5",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
@@ -60,11 +60,11 @@
 		"uuid": "8.3.2",
 		"vanilla-tilt": "1.7.2",
 		"vite": "^3.1.0",
-		"vue": "3.2.37",
+		"vue": "3.2.38",
 		"vue-plyr": "^7.0.0",
 		"vue-prism-editor": "2.0.0-alpha.2",
-		"vue3-lottie": "^2.2.5",
-		"vuedraggable": "4.0.1"
+		"vue3-lottie": "^2.3.0",
+		"vuedraggable": "4.1.0"
 	},
 	"devDependencies": {
 		"@types/escape-regexp": "0.0.1",
@@ -78,14 +78,14 @@
 		"@types/throttle-debounce": "5.0.0",
 		"@types/tinycolor2": "1.4.3",
 		"@types/uuid": "8.3.4",
-		"@typescript-eslint/eslint-plugin": "5.35.1",
-		"@typescript-eslint/parser": "5.35.1",
+		"@typescript-eslint/eslint-plugin": "5.36.2",
+		"@typescript-eslint/parser": "5.36.2",
 		"cross-env": "7.0.3",
-		"cypress": "10.6.0",
+		"cypress": "10.7.0",
 		"eslint": "8.23.0",
 		"eslint-plugin-import": "2.26.0",
 		"eslint-plugin-vue": "9.4.0",
-		"rollup": "2.78.1",
+		"rollup": "2.79.0",
 		"start-server-and-test": "1.14.0"
 	}
 }
diff --git a/packages/sw/package.json b/packages/sw/package.json
index 7ff08d201..6520fbb6e 100644
--- a/packages/sw/package.json
+++ b/packages/sw/package.json
@@ -7,11 +7,11 @@
 		"lint": "eslint --quiet src/**/*.{ts}"
 	},
 	"dependencies": {
-		"esbuild": "^0.14.42",
+		"esbuild": "^0.14.54",
 		"idb-keyval": "^6.1.0",
 		"misskey-js": "0.0.14"
 	},
 	"devDependencies": {
-		"eslint": "^8.16.0"
+		"eslint": "^8.23.0"
 	}
 }
diff --git a/yarn.lock b/yarn.lock
index 6268c829d..f3c3d397f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -193,7 +193,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cropper/elements@npm:^2.0.0-beta":
+"@cropper/elements@npm:^2.0.0-beta.1":
   version: 2.0.0-beta.1
   resolution: "@cropper/elements@npm:2.0.0-beta.1"
   dependencies:
@@ -210,7 +210,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cropper/utils@npm:^2.0.0-beta, @cropper/utils@npm:^2.0.0-beta.1":
+"@cropper/utils@npm:^2.0.0-beta.1":
   version: 2.0.0-beta.1
   resolution: "@cropper/utils@npm:2.0.0-beta.1"
   checksum: 3ffebc3177bf2646046c28044711ba6a54f9d6b24f2c9aa473c54245bfe58f6186fcdef9e1fec1cb47773d73d71b4813339a56cecf4dd784406273b24ba8d831
@@ -311,23 +311,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/eslintrc@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "@eslint/eslintrc@npm:1.3.0"
-  dependencies:
-    ajv: ^6.12.4
-    debug: ^4.3.2
-    espree: ^9.3.2
-    globals: ^13.15.0
-    ignore: ^5.2.0
-    import-fresh: ^3.2.1
-    js-yaml: ^4.1.0
-    minimatch: ^3.1.2
-    strip-json-comments: ^3.1.1
-  checksum: a1e734ad31a8b5328dce9f479f185fd4fc83dd7f06c538e1fa457fd8226b89602a55cc6458cd52b29573b01cdfaf42331be8cfc1fec732570086b591f4ed6515
-  languageName: node
-  linkType: hard
-
 "@eslint/eslintrc@npm:^1.3.1":
   version: 1.3.1
   resolution: "@eslint/eslintrc@npm:1.3.1"
@@ -345,10 +328,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@fortawesome/fontawesome-free@npm:6.1.2":
-  version: 6.1.2
-  resolution: "@fortawesome/fontawesome-free@npm:6.1.2"
-  checksum: 0d3c9d60ffbb9c1fa4041051eff6542adc1fc29653501399d0235c077a2195a35f286d979da42fe021f73649032f9eeae2c9a0511eaacda2896559155d40a0fc
+"@fortawesome/fontawesome-free@npm:6.2.0":
+  version: 6.2.0
+  resolution: "@fortawesome/fontawesome-free@npm:6.2.0"
+  checksum: fd3fcc0a963b907110922b5ac0ca67633aea20b5034102a1f5d285830f7f7a27f9c9de0c4a30228ccd2579bd8f95581a1bbef9519c7b74632e7012d60dd57bb7
   languageName: node
   linkType: hard
 
@@ -1034,18 +1017,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tensorflow/tfjs-backend-cpu@npm:3.19.0":
-  version: 3.19.0
-  resolution: "@tensorflow/tfjs-backend-cpu@npm:3.19.0"
-  dependencies:
-    "@types/seedrandom": ^2.4.28
-    seedrandom: ^3.0.5
-  peerDependencies:
-    "@tensorflow/tfjs-core": 3.19.0
-  checksum: 3baaaa1cae4fa2163803bf62ddb87ee36d271724513b553e2b62ebf89e3c2a0bf45bc675312150edeaf2b4abcf895a2875ba59471b80aa939bcf266af432c300
-  languageName: node
-  linkType: hard
-
 "@tensorflow/tfjs-backend-cpu@npm:3.20.0":
   version: 3.20.0
   resolution: "@tensorflow/tfjs-backend-cpu@npm:3.20.0"
@@ -1058,22 +1029,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tensorflow/tfjs-backend-webgl@npm:3.19.0":
-  version: 3.19.0
-  resolution: "@tensorflow/tfjs-backend-webgl@npm:3.19.0"
-  dependencies:
-    "@tensorflow/tfjs-backend-cpu": 3.19.0
-    "@types/offscreencanvas": ~2019.3.0
-    "@types/seedrandom": ^2.4.28
-    "@types/webgl-ext": 0.0.30
-    "@types/webgl2": 0.0.6
-    seedrandom: ^3.0.5
-  peerDependencies:
-    "@tensorflow/tfjs-core": 3.19.0
-  checksum: ade332b5334724286b21d9c11f1662bb5221617cd7eccda25b51e83a07c569767ec2972cefe14e151cfa18956a539b3d3ab9fe58eb716c51b63e4e9e0a4885a1
-  languageName: node
-  linkType: hard
-
 "@tensorflow/tfjs-backend-webgl@npm:3.20.0":
   version: 3.20.0
   resolution: "@tensorflow/tfjs-backend-webgl@npm:3.20.0"
@@ -1090,15 +1045,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tensorflow/tfjs-converter@npm:3.19.0":
-  version: 3.19.0
-  resolution: "@tensorflow/tfjs-converter@npm:3.19.0"
-  peerDependencies:
-    "@tensorflow/tfjs-core": 3.19.0
-  checksum: 51d7c99bec24808b0596bc3b03fae7b8c7e7cadf51786a0beddc72ba4df24aabe53710c2e780fe4362d81b737dc88c67d2a8dae7baa93de883b45695fe98bf2b
-  languageName: node
-  linkType: hard
-
 "@tensorflow/tfjs-converter@npm:3.20.0":
   version: 3.20.0
   resolution: "@tensorflow/tfjs-converter@npm:3.20.0"
@@ -1108,22 +1054,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tensorflow/tfjs-core@npm:3.19.0":
-  version: 3.19.0
-  resolution: "@tensorflow/tfjs-core@npm:3.19.0"
-  dependencies:
-    "@types/long": ^4.0.1
-    "@types/offscreencanvas": ~2019.3.0
-    "@types/seedrandom": ^2.4.28
-    "@types/webgl-ext": 0.0.30
-    "@webgpu/types": 0.1.16
-    long: 4.0.0
-    node-fetch: ~2.6.1
-    seedrandom: ^3.0.5
-  checksum: f35ce93882d753c4200dfb36ba3bae939267758501a2c8d52203bd60d4a8b013f4187479103f60ff9aafda4d13b79609ca84740c2312c96a5677701729b633f5
-  languageName: node
-  linkType: hard
-
 "@tensorflow/tfjs-core@npm:3.20.0":
   version: 3.20.0
   resolution: "@tensorflow/tfjs-core@npm:3.20.0"
@@ -1140,20 +1070,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tensorflow/tfjs-data@npm:3.19.0":
-  version: 3.19.0
-  resolution: "@tensorflow/tfjs-data@npm:3.19.0"
-  dependencies:
-    "@types/node-fetch": ^2.1.2
-    node-fetch: ~2.6.1
-    string_decoder: ^1.3.0
-  peerDependencies:
-    "@tensorflow/tfjs-core": 3.19.0
-    seedrandom: ^3.0.5
-  checksum: 1bb0d150a5dd9b79e2bc414074064ecd29ce77ffe74db3b8cc95d828d598068cc72e6c990f3e7020203e6288f29197a78c8145570930a45dc9581ec7265f8345
-  languageName: node
-  linkType: hard
-
 "@tensorflow/tfjs-data@npm:3.20.0":
   version: 3.20.0
   resolution: "@tensorflow/tfjs-data@npm:3.20.0"
@@ -1168,15 +1084,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tensorflow/tfjs-layers@npm:3.19.0":
-  version: 3.19.0
-  resolution: "@tensorflow/tfjs-layers@npm:3.19.0"
-  peerDependencies:
-    "@tensorflow/tfjs-core": 3.19.0
-  checksum: 43c362ff53506a4c6b50c1d602a307fcaaf7aa473b1360165d2a1297e0b1c03197d5408bd22b44e7c14f3dfab2f1eabc725b2c73470cf30b0505b432ab0962e2
-  languageName: node
-  linkType: hard
-
 "@tensorflow/tfjs-layers@npm:3.20.0":
   version: 3.20.0
   resolution: "@tensorflow/tfjs-layers@npm:3.20.0"
@@ -1202,7 +1109,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tensorflow/tfjs@npm:3.20.0":
+"@tensorflow/tfjs@npm:3.20.0, @tensorflow/tfjs@npm:^3.20.0":
   version: 3.20.0
   resolution: "@tensorflow/tfjs@npm:3.20.0"
   dependencies:
@@ -1223,27 +1130,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tensorflow/tfjs@npm:^3.18.0":
-  version: 3.19.0
-  resolution: "@tensorflow/tfjs@npm:3.19.0"
-  dependencies:
-    "@tensorflow/tfjs-backend-cpu": 3.19.0
-    "@tensorflow/tfjs-backend-webgl": 3.19.0
-    "@tensorflow/tfjs-converter": 3.19.0
-    "@tensorflow/tfjs-core": 3.19.0
-    "@tensorflow/tfjs-data": 3.19.0
-    "@tensorflow/tfjs-layers": 3.19.0
-    argparse: ^1.0.10
-    chalk: ^4.1.0
-    core-js: 3
-    regenerator-runtime: ^0.13.5
-    yargs: ^16.0.3
-  bin:
-    tfjs-custom-module: dist/tools/custom_module/cli.js
-  checksum: 92c410b9c0b3dcf687650c6ed3cf1bea24dd4153e0a30461646f78ec556c696c733897344caaf10159ccf0d3eb50ced26ef31175ffda30661cfe6813e0988259
-  languageName: node
-  linkType: hard
-
 "@tokenizer/token@npm:^0.3.0":
   version: 0.3.0
   resolution: "@tokenizer/token@npm:0.3.0"
@@ -1779,10 +1665,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:18.7.13":
-  version: 18.7.13
-  resolution: "@types/node@npm:18.7.13"
-  checksum: 45431e7e89ecaf85c7d2c180d801c132a7c59e2f8ad578726b6d71cc74e3267c18f9ccdcad738bc0479790c078f0c79efb0e58da2c6be535c15995dbb19050c9
+"@types/node@npm:18.7.16":
+  version: 18.7.16
+  resolution: "@types/node@npm:18.7.16"
+  checksum: 01a3d35c764a3f0e7370b56e1ad4203731131883c65784e020009014171b3f53c4649cde6c7aa4f1026b907ee87ef6ae6ece2bc518151dc7b81100fe8b1db3ad
   languageName: node
   linkType: hard
 
@@ -2113,13 +1999,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:5.35.1":
-  version: 5.35.1
-  resolution: "@typescript-eslint/eslint-plugin@npm:5.35.1"
+"@typescript-eslint/eslint-plugin@npm:5.36.2":
+  version: 5.36.2
+  resolution: "@typescript-eslint/eslint-plugin@npm:5.36.2"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.35.1
-    "@typescript-eslint/type-utils": 5.35.1
-    "@typescript-eslint/utils": 5.35.1
+    "@typescript-eslint/scope-manager": 5.36.2
+    "@typescript-eslint/type-utils": 5.36.2
+    "@typescript-eslint/utils": 5.36.2
     debug: ^4.3.4
     functional-red-black-tree: ^1.0.1
     ignore: ^5.2.0
@@ -2132,42 +2018,43 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 073f4dffd863881f1c87e1c217ac13bda44aaa2db12ef260032b5e8eb6ffd6b9cf6f62c85132dbf84152f353c435c66dd4f75c3bcb86eb23e926737aa4fb66fa
+  checksum: edcd9fcecdeb22a689b421cafe3b7adc859bf2fd6227aecdd7412c319c808e7bab063c8f94af32116cfc971962f9780d181cb0a4aa999951c2d2be1f84c6c376
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:5.35.1":
-  version: 5.35.1
-  resolution: "@typescript-eslint/parser@npm:5.35.1"
+"@typescript-eslint/parser@npm:5.36.2":
+  version: 5.36.2
+  resolution: "@typescript-eslint/parser@npm:5.36.2"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.35.1
-    "@typescript-eslint/types": 5.35.1
-    "@typescript-eslint/typescript-estree": 5.35.1
+    "@typescript-eslint/scope-manager": 5.36.2
+    "@typescript-eslint/types": 5.36.2
+    "@typescript-eslint/typescript-estree": 5.36.2
     debug: ^4.3.4
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 57ea1a1da60b370f8d5c11c86155f7339359a90f2c59e34c89f626f1a79cb440248f07bd307a27ebbbcc997d2731cb9754cdbc37639770940521a938dd89870c
+  checksum: d6cc22cbc7aacb5ecebf55eb1d681cb6b964b108e147b418295c3e48701a77768cff128c16da421ae50eabb9f1296ecec7fa3cc5f2ccb63a3febf79f98b4195f
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:5.35.1":
-  version: 5.35.1
-  resolution: "@typescript-eslint/scope-manager@npm:5.35.1"
+"@typescript-eslint/scope-manager@npm:5.36.2":
+  version: 5.36.2
+  resolution: "@typescript-eslint/scope-manager@npm:5.36.2"
   dependencies:
-    "@typescript-eslint/types": 5.35.1
-    "@typescript-eslint/visitor-keys": 5.35.1
-  checksum: 5a969a081309bac5962f99ee6dfdfd9c68ea677bc79d9796592dce82a36217f67aa55c7bf421b2c97b46c5149d6a9401bb4c57829595e8c19f47cfa9e8c2dd86
+    "@typescript-eslint/types": 5.36.2
+    "@typescript-eslint/visitor-keys": 5.36.2
+  checksum: 93ff655f7c237c88ec6dc5911202dd8f81bd8909b27f1a758a9d77e9791040f1ee6fe2891314bde75c808ce586246e98003a1b1396937b0312f2440016dea751
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:5.35.1":
-  version: 5.35.1
-  resolution: "@typescript-eslint/type-utils@npm:5.35.1"
+"@typescript-eslint/type-utils@npm:5.36.2":
+  version: 5.36.2
+  resolution: "@typescript-eslint/type-utils@npm:5.36.2"
   dependencies:
-    "@typescript-eslint/utils": 5.35.1
+    "@typescript-eslint/typescript-estree": 5.36.2
+    "@typescript-eslint/utils": 5.36.2
     debug: ^4.3.4
     tsutils: ^3.21.0
   peerDependencies:
@@ -2175,23 +2062,23 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: af317ba156f2767f76a7f97193873a00468370e157fdcc6ac19f664bc6c4c0a6836bd25028d17fdd54d339b6842fda68b82f1ce4142a222de6953625ea6c0a9c
+  checksum: c202b7d2cd08ed7f7d1ad7e430e9e1596478e147f0d485d02babfda0211c55fa950de1dc4d1c950008a8a047a31c1e982e97fe5558f93d496830eb9d9532bc71
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:5.35.1":
-  version: 5.35.1
-  resolution: "@typescript-eslint/types@npm:5.35.1"
-  checksum: a4e1001867f43f3364b109fc5a07b91ae7a34b78ab191c6c5c4695dac9bb2b80b0a602651c0b807c1c7c1fc3656d2bbd47c637afa08a09e7b1c39eae3c489e00
+"@typescript-eslint/types@npm:5.36.2":
+  version: 5.36.2
+  resolution: "@typescript-eslint/types@npm:5.36.2"
+  checksum: 736cb8a76b58f2f9a7d066933094c5510ffe31479ea8b804a829ec85942420f1b55e0eb2688fbdaaaa9c0e5b3b590fb8f14bbd745353696b4fd33fda620d417b
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:5.35.1":
-  version: 5.35.1
-  resolution: "@typescript-eslint/typescript-estree@npm:5.35.1"
+"@typescript-eslint/typescript-estree@npm:5.36.2":
+  version: 5.36.2
+  resolution: "@typescript-eslint/typescript-estree@npm:5.36.2"
   dependencies:
-    "@typescript-eslint/types": 5.35.1
-    "@typescript-eslint/visitor-keys": 5.35.1
+    "@typescript-eslint/types": 5.36.2
+    "@typescript-eslint/visitor-keys": 5.36.2
     debug: ^4.3.4
     globby: ^11.1.0
     is-glob: ^4.0.3
@@ -2200,33 +2087,33 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: a917ca4753a3f92c8d8555c96f5414383a9742761625476fa36a019401543aa74996159afa0f7fc7fae05fe0f904e3c6f4153a55412070c8a94e8171e81084c7
+  checksum: 2827ff57a114b6107ea6d555f3855007133b08a7c2bafba0cfa0c935d8b99fd7b49e982d48cccc1c5ba550d95748d0239f5e2109893f12a165d76ed64a0d261b
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:5.35.1":
-  version: 5.35.1
-  resolution: "@typescript-eslint/utils@npm:5.35.1"
+"@typescript-eslint/utils@npm:5.36.2":
+  version: 5.36.2
+  resolution: "@typescript-eslint/utils@npm:5.36.2"
   dependencies:
     "@types/json-schema": ^7.0.9
-    "@typescript-eslint/scope-manager": 5.35.1
-    "@typescript-eslint/types": 5.35.1
-    "@typescript-eslint/typescript-estree": 5.35.1
+    "@typescript-eslint/scope-manager": 5.36.2
+    "@typescript-eslint/types": 5.36.2
+    "@typescript-eslint/typescript-estree": 5.36.2
     eslint-scope: ^5.1.1
     eslint-utils: ^3.0.0
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: 2b04092583c3139dd090727c24fb9d7fdb1fb9f20f2e3f0141cab5b98b6a1934b0fc8cab948f7faae55588385b0f1fb7bbf91f52c705ce4528036a527c3119c6
+  checksum: 45356cf55a8733e3ab1f2c3c19cdaefdb79857e35eb1433c29b81f3df071e9cef8a286bc407abe243889a21d9e793e999f92f03b9c727a0fac1c17a48e64c42a
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:5.35.1":
-  version: 5.35.1
-  resolution: "@typescript-eslint/visitor-keys@npm:5.35.1"
+"@typescript-eslint/visitor-keys@npm:5.36.2":
+  version: 5.36.2
+  resolution: "@typescript-eslint/visitor-keys@npm:5.36.2"
   dependencies:
-    "@typescript-eslint/types": 5.35.1
+    "@typescript-eslint/types": 5.36.2
     eslint-visitor-keys: ^3.3.0
-  checksum: ef3c8377aac89935b5cc2fcf37bb3e42aa5f98848e7c22bdcbe5bb06c0fe8a1373a6897fd21109be8929b4708ad06c8874d2ef7bba17ff64911964203457330d
+  checksum: 87ccdcfa5cdedaa3a1aac30d656969f4f5910b62bcaacdf80a514dbf0cbbd8e79b55f8e987eab34cc79ece8ce4b8c19d5caf8b0afb74e0b0d7ab39fb29aa8eba
   languageName: node
   linkType: hard
 
@@ -2237,35 +2124,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vitejs/plugin-vue@npm:3.0.3":
-  version: 3.0.3
-  resolution: "@vitejs/plugin-vue@npm:3.0.3"
+"@vitejs/plugin-vue@npm:3.1.0":
+  version: 3.1.0
+  resolution: "@vitejs/plugin-vue@npm:3.1.0"
   peerDependencies:
     vite: ^3.0.0
     vue: ^3.2.25
-  checksum: f9678a1dac192ebd55adec1daaefab7b0e12dd8859073273e098c4cf99ff31656473cfc9a14de2ea2064685bbf749e86205d5a119aa354ae3385c21e5593ad4c
+  checksum: 351436306090dee709314f71bb52f0b502c284c8f556d4aecbbdfea840b1d35a8af32e78e962df28d3a6034a75c78886448e3371cee320f711dab833f6ada274
   languageName: node
   linkType: hard
 
-"@vue/compiler-core@npm:3.2.37":
-  version: 3.2.37
-  resolution: "@vue/compiler-core@npm:3.2.37"
+"@vue/compiler-core@npm:3.2.38":
+  version: 3.2.38
+  resolution: "@vue/compiler-core@npm:3.2.38"
   dependencies:
     "@babel/parser": ^7.16.4
-    "@vue/shared": 3.2.37
+    "@vue/shared": 3.2.38
     estree-walker: ^2.0.2
     source-map: ^0.6.1
-  checksum: 5642e20813352f7ed57ef0eec0fb8a075d6485c91548555b435e8163e62a5e03402c26944bfa2486d6cc4c992f2649478f887478bcd23c8ad9036636f2dcff6a
+  checksum: fd1049aa14f93ac167d5cff2c867c12aca3a57b6070ca07b45930549a3643296fd07ad0b2e3799a3cabdbc08609325431b475b6d504b47bfe098ebaca61a120d
   languageName: node
   linkType: hard
 
-"@vue/compiler-dom@npm:3.2.37":
-  version: 3.2.37
-  resolution: "@vue/compiler-dom@npm:3.2.37"
+"@vue/compiler-dom@npm:3.2.38":
+  version: 3.2.38
+  resolution: "@vue/compiler-dom@npm:3.2.38"
   dependencies:
-    "@vue/compiler-core": 3.2.37
-    "@vue/shared": 3.2.37
-  checksum: 6cfa9d2ee123339549ba005fa61b2cd5ccf079ba8d8d797f0075e7054c2766744029cb0997341bcb6a51e129ae43489263aa7d8500b262ef7b81c63c2b0c4576
+    "@vue/compiler-core": 3.2.38
+    "@vue/shared": 3.2.38
+  checksum: 21ee60938a9a4e81365be3cb29f336a1b7be8878ad750f8f9735ee04d00d51f3c11b3ce60136491abf3a9c7fb714c1c58561e859bde83dc1e0759d0f3488a50f
   languageName: node
   linkType: hard
 
@@ -2280,93 +2167,93 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vue/compiler-sfc@npm:3.2.37":
-  version: 3.2.37
-  resolution: "@vue/compiler-sfc@npm:3.2.37"
+"@vue/compiler-sfc@npm:3.2.38":
+  version: 3.2.38
+  resolution: "@vue/compiler-sfc@npm:3.2.38"
   dependencies:
     "@babel/parser": ^7.16.4
-    "@vue/compiler-core": 3.2.37
-    "@vue/compiler-dom": 3.2.37
-    "@vue/compiler-ssr": 3.2.37
-    "@vue/reactivity-transform": 3.2.37
-    "@vue/shared": 3.2.37
+    "@vue/compiler-core": 3.2.38
+    "@vue/compiler-dom": 3.2.38
+    "@vue/compiler-ssr": 3.2.38
+    "@vue/reactivity-transform": 3.2.38
+    "@vue/shared": 3.2.38
     estree-walker: ^2.0.2
     magic-string: ^0.25.7
     postcss: ^8.1.10
     source-map: ^0.6.1
-  checksum: 9f9067d79f40b0016e4063c180f5417e893f820b970ee291050cad8e19d9258f70a128e5de862e484bfb15572d335c8d5881c95e6b6a3032cb1a94829e8694cb
+  checksum: 1d72cc4f1c643db455a0034d11ede23c83a3ff4fd4e2ffcfdb85805c99fc7a4227faddc8994b41a41d5abbf3e9edf7b87557378f13c141f920b9b12dd180d285
   languageName: node
   linkType: hard
 
-"@vue/compiler-ssr@npm:3.2.37":
-  version: 3.2.37
-  resolution: "@vue/compiler-ssr@npm:3.2.37"
+"@vue/compiler-ssr@npm:3.2.38":
+  version: 3.2.38
+  resolution: "@vue/compiler-ssr@npm:3.2.38"
   dependencies:
-    "@vue/compiler-dom": 3.2.37
-    "@vue/shared": 3.2.37
-  checksum: e137462340c220ef7891d0b40f11124e7d5311e760fdb0de1748c046481505aecd5be8ec8f7b25ac6fc26d2393cbcc267f258d2d26742a50cb9abaf828c28839
+    "@vue/compiler-dom": 3.2.38
+    "@vue/shared": 3.2.38
+  checksum: f457245a43d8290dbdb8f782fd873557041798801be61e8c3e52d88784232a7545dc23532c4552ed3fd74c1dfdfd07531ab83be3e5b5441dda4c4b282055043a
   languageName: node
   linkType: hard
 
-"@vue/reactivity-transform@npm:3.2.37":
-  version: 3.2.37
-  resolution: "@vue/reactivity-transform@npm:3.2.37"
+"@vue/reactivity-transform@npm:3.2.38":
+  version: 3.2.38
+  resolution: "@vue/reactivity-transform@npm:3.2.38"
   dependencies:
     "@babel/parser": ^7.16.4
-    "@vue/compiler-core": 3.2.37
-    "@vue/shared": 3.2.37
+    "@vue/compiler-core": 3.2.38
+    "@vue/shared": 3.2.38
     estree-walker: ^2.0.2
     magic-string: ^0.25.7
-  checksum: d9e7c353e2bd3a62a9bbb7498ae231f5194428da003672daadb3e7af50c7839e10fb0ac68252852be353138428d1a36f3b8c7815f9c15499d46e7edaf3730c7e
+  checksum: 84b665185ed60b21195992b33b6cc068fe8c6c68ffa526f3aa1334ffdeac94daf07a74fc6dda6ef40230bcb940ec6607aa5ae0ae0309942a71717c7b22639d8a
   languageName: node
   linkType: hard
 
-"@vue/reactivity@npm:3.2.37":
-  version: 3.2.37
-  resolution: "@vue/reactivity@npm:3.2.37"
+"@vue/reactivity@npm:3.2.38":
+  version: 3.2.38
+  resolution: "@vue/reactivity@npm:3.2.38"
   dependencies:
-    "@vue/shared": 3.2.37
-  checksum: 94e353f8b8a9301cae15c9366f2fec6a163efb7293e9fe5d1da3ed647f1859139b7b321451db56fb5e3141192c0f0755f74ca9c4bcd30ec44372e45def61d69f
+    "@vue/shared": 3.2.38
+  checksum: c9afb0184603c93a450553d8280a4e32b4e327ab90cadb94d020d8118d6214bee820db4312d26d0570679ede18e9b8d4ca696eab012abd0839a346c30b5ca07e
   languageName: node
   linkType: hard
 
-"@vue/runtime-core@npm:3.2.37":
-  version: 3.2.37
-  resolution: "@vue/runtime-core@npm:3.2.37"
+"@vue/runtime-core@npm:3.2.38":
+  version: 3.2.38
+  resolution: "@vue/runtime-core@npm:3.2.38"
   dependencies:
-    "@vue/reactivity": 3.2.37
-    "@vue/shared": 3.2.37
-  checksum: 8dbf4e1f973335f5089d6b5965c2756a47589009956f883adb47036315a6d5701ef9d23d52456a6272673bc6f0bcee4f096826b5eae3fec65274e24e9f722a9b
+    "@vue/reactivity": 3.2.38
+    "@vue/shared": 3.2.38
+  checksum: d3936ca50b3eabc3eae575bb9e3b8219c4a0d6ebcde0e111fefe0b154d9aba827a87cc939ce9be626a9fa92b408b000287fb57ca97126186a8c7ef2b7f9c4844
   languageName: node
   linkType: hard
 
-"@vue/runtime-dom@npm:3.2.37":
-  version: 3.2.37
-  resolution: "@vue/runtime-dom@npm:3.2.37"
+"@vue/runtime-dom@npm:3.2.38":
+  version: 3.2.38
+  resolution: "@vue/runtime-dom@npm:3.2.38"
   dependencies:
-    "@vue/runtime-core": 3.2.37
-    "@vue/shared": 3.2.37
+    "@vue/runtime-core": 3.2.38
+    "@vue/shared": 3.2.38
     csstype: ^2.6.8
-  checksum: 36dddfd56161c94a9a483903a570897e1ee46a95126d54f7948bc184d5d333c9f0c1a9c4cee90ddec63baf4ea2e35be9d0d678108427aba907b0adf0800c75a5
+  checksum: d1d889c3e85b6b1a12efd432160c57d8b5eff4889717d36d27dae39094578bdcceefa536e991bf040e32e4baf3dc096f579aa14af1077eb91a79772843755fca
   languageName: node
   linkType: hard
 
-"@vue/server-renderer@npm:3.2.37":
-  version: 3.2.37
-  resolution: "@vue/server-renderer@npm:3.2.37"
+"@vue/server-renderer@npm:3.2.38":
+  version: 3.2.38
+  resolution: "@vue/server-renderer@npm:3.2.38"
   dependencies:
-    "@vue/compiler-ssr": 3.2.37
-    "@vue/shared": 3.2.37
+    "@vue/compiler-ssr": 3.2.38
+    "@vue/shared": 3.2.38
   peerDependencies:
-    vue: 3.2.37
-  checksum: 634d43cd21ed902ef3d1d710db2065c4d47402c979914325494f73e2cd37545d809e665c3aace1a02b32c3332a9ad7e772a00159f42e63abb8b73b0fef27a102
+    vue: 3.2.38
+  checksum: d7d8458e6913f0c6cd517cd2b3b673ebd28b3d85fdb4a004896c0da68a9e58eb69d30141b403b8afaa2f341029aa00c2860b845363f75ed5e1116787283bcc1c
   languageName: node
   linkType: hard
 
-"@vue/shared@npm:3.2.37":
-  version: 3.2.37
-  resolution: "@vue/shared@npm:3.2.37"
-  checksum: 999ab8baeb13de190d07536e7dd0e74ab9354a864d8d903850a2127ae1a2aa2713a9edc0d957620ebf91165d6603d0cd2b0e8ee0db6cbaf8d57a6a0f912af810
+"@vue/shared@npm:3.2.38":
+  version: 3.2.38
+  resolution: "@vue/shared@npm:3.2.38"
+  checksum: c1aa5ec1320fff7431297c594cb976908b5ff240a16384930b4b16dc2a0d663aa09706337dee6910db260c5bb24fb31359006637d01de98009247a68acde5eae
   languageName: node
   linkType: hard
 
@@ -3183,7 +3070,7 @@ __metadata:
     "@types/koa__multer": 2.0.4
     "@types/koa__router": 8.0.11
     "@types/mocha": 9.1.1
-    "@types/node": 18.7.13
+    "@types/node": 18.7.16
     "@types/node-fetch": 3.0.3
     "@types/nodemailer": 6.4.5
     "@types/oauth": 0.9.1
@@ -3205,8 +3092,8 @@ __metadata:
     "@types/web-push": 3.3.2
     "@types/websocket": 1.0.5
     "@types/ws": 8.5.3
-    "@typescript-eslint/eslint-plugin": 5.35.1
-    "@typescript-eslint/parser": 5.35.1
+    "@typescript-eslint/eslint-plugin": 5.36.2
+    "@typescript-eslint/parser": 5.36.2
     ajv: 8.11.0
     archiver: 5.3.1
     autobind-decorator: 2.4.0
@@ -3214,7 +3101,7 @@ __metadata:
     aws-sdk: 2.1204.0
     bcryptjs: 2.4.3
     blurhash: 1.1.5
-    bull: 4.8.5
+    bull: 4.9.0
     cacheable-lookup: 6.1.0
     cbor: 8.1.0
     chalk: 5.0.1
@@ -3262,10 +3149,10 @@ __metadata:
     nested-property: 4.0.0
     node-fetch: 3.2.10
     nodemailer: 6.7.8
-    nsfwjs: 2.4.1
+    nsfwjs: 2.4.2
     oauth: ^0.9.15
     os-utils: 0.0.14
-    parse5: 7.0.0
+    parse5: 7.1.1
     pg: 8.8.0
     private-ip: 2.3.4
     probe-image-size: 7.2.3
@@ -3285,7 +3172,7 @@ __metadata:
     s-age: 1.1.2
     sanitize-html: 2.7.1
     semver: 7.3.7
-    sharp: 0.30.6
+    sharp: 0.30.7
     speakeasy: 2.0.0
     strict-event-emitter-types: 2.0.0
     stringz: 2.1.0
@@ -3662,9 +3549,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bull@npm:4.8.5":
-  version: 4.8.5
-  resolution: "bull@npm:4.8.5"
+"bull@npm:4.9.0":
+  version: 4.9.0
+  resolution: "bull@npm:4.9.0"
   dependencies:
     cron-parser: ^4.2.1
     debuglog: ^1.0.0
@@ -3675,7 +3562,7 @@ __metadata:
     p-timeout: ^3.2.0
     semver: ^7.3.2
     uuid: ^8.3.0
-  checksum: bf95a6661db066b693c8fd75f1b73df5ffee57f4dfd8478530b71c0cf678c05536d37480bf4c926aa3e1ccb69336e15cf8e493d5f730f9f3d6de3fe1acd369c5
+  checksum: 6f100feb753a9100ab2653f67a525f42de3f4c137bdc1b5659b1154d37fd8371e23834a7b36271b54e13bd3a7ac4e534414ecd8b13e26c73e9fc425a28b70a8e
   languageName: node
   linkType: hard
 
@@ -3791,13 +3678,13 @@ __metadata:
     "@bull-board/api": ^4.2.2
     "@bull-board/ui": ^4.2.2
     "@swc/core": ^1.2.244
-    "@tensorflow/tfjs": ^3.18.0
+    "@tensorflow/tfjs": ^3.20.0
     "@types/gulp": 4.0.9
     "@types/gulp-rename": 2.0.1
-    "@typescript-eslint/parser": 5.35.1
+    "@typescript-eslint/parser": 5.36.2
     cross-env: 7.0.3
-    cypress: 10.6.0
-    eslint: ^8.20.0
+    cypress: 10.7.0
+    eslint: ^8.23.0
     execa: 5.1.1
     gulp: 4.0.2
     gulp-cssnano: 2.1.3
@@ -3810,7 +3697,7 @@ __metadata:
     start-server-and-test: 1.14.0
     typescript: 4.8.2
     unplugin-swc: ^1.3.2
-    vue-eslint-parser: ^9.0.2
+    vue-eslint-parser: ^9.0.3
   languageName: unknown
   linkType: soft
 
@@ -4177,7 +4064,7 @@ __metadata:
   resolution: "client@workspace:packages/client"
   dependencies:
     "@discordapp/twemoji": 14.0.2
-    "@fortawesome/fontawesome-free": 6.1.2
+    "@fortawesome/fontawesome-free": 6.2.0
     "@rollup/plugin-alias": 3.1.9
     "@rollup/plugin-json": 4.1.0
     "@rollup/pluginutils": ^4.2.1
@@ -4193,23 +4080,23 @@ __metadata:
     "@types/throttle-debounce": 5.0.0
     "@types/tinycolor2": 1.4.3
     "@types/uuid": 8.3.4
-    "@typescript-eslint/eslint-plugin": 5.35.1
-    "@typescript-eslint/parser": 5.35.1
-    "@vitejs/plugin-vue": 3.0.3
-    "@vue/compiler-sfc": 3.2.37
+    "@typescript-eslint/eslint-plugin": 5.36.2
+    "@typescript-eslint/parser": 5.36.2
+    "@vitejs/plugin-vue": 3.1.0
+    "@vue/compiler-sfc": 3.2.38
     autobind-decorator: 2.4.0
     autosize: 5.0.1
     blurhash: 1.1.5
     broadcast-channel: 4.14.0
-    browser-image-resizer: "https://github.com/misskey-dev/browser-image-resizer"
+    browser-image-resizer: "https://github.com/misskey-dev/browser-image-resizer.git#commit=0227e860621e55cbed0aabe6dc601096a7748c4a"
     chart.js: 3.9.1
     chartjs-adapter-date-fns: 2.0.0
     chartjs-plugin-gradient: 0.5.1
     chartjs-plugin-zoom: 1.2.1
     compare-versions: 5.0.1
-    cropperjs: 2.0.0-beta
+    cropperjs: 2.0.0-beta.1
     cross-env: 7.0.3
-    cypress: 10.6.0
+    cypress: 10.7.0
     date-fns: 2.29.2
     escape-regexp: 0.0.1
     eslint: 8.23.0
@@ -4223,14 +4110,14 @@ __metadata:
     matter-js: 0.18.0
     mfm-js: 0.23.0
     misskey-js: 0.0.14
-    photoswipe: 5.3.0
+    photoswipe: 5.3.2
     prismjs: 1.29.0
     punycode: 2.1.1
     querystring: 0.2.1
     rndstr: 1.0.0
-    rollup: 2.78.1
+    rollup: 2.79.0
     s-age: 1.1.2
-    sass: 1.54.5
+    sass: 1.54.9
     seedrandom: 3.0.5
     start-server-and-test: 1.14.0
     strict-event-emitter-types: 2.0.0
@@ -4249,11 +4136,11 @@ __metadata:
     uuid: 8.3.2
     vanilla-tilt: 1.7.2
     vite: ^3.1.0
-    vue: 3.2.37
+    vue: 3.2.38
     vue-plyr: ^7.0.0
     vue-prism-editor: 2.0.0-alpha.2
-    vue3-lottie: ^2.2.5
-    vuedraggable: 4.0.1
+    vue3-lottie: ^2.3.0
+    vuedraggable: 4.1.0
   languageName: unknown
   linkType: soft
 
@@ -4787,13 +4674,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cropperjs@npm:2.0.0-beta":
-  version: 2.0.0-beta
-  resolution: "cropperjs@npm:2.0.0-beta"
+"cropperjs@npm:2.0.0-beta.1":
+  version: 2.0.0-beta.1
+  resolution: "cropperjs@npm:2.0.0-beta.1"
   dependencies:
-    "@cropper/elements": ^2.0.0-beta
-    "@cropper/utils": ^2.0.0-beta
-  checksum: bc18180c09b526c08d6849214d8fe4b9180bf5c70648f3e7713fe12b1f3ffbe6024751d15385b3f660c29b42ccf39e4e464e0943306bd56edf2fec9c0ccb8497
+    "@cropper/elements": ^2.0.0-beta.1
+    "@cropper/utils": ^2.0.0-beta.1
+  checksum: 055fd228cfcb20a489c032740a8eb69247ab29ff69a7fafcfbdbf502174afb598a755f20950bc4dee6ef2698fec29c6103d223f0da9ef9d751c811f6636a9b00
   languageName: node
   linkType: hard
 
@@ -4960,9 +4847,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cypress@npm:10.6.0":
-  version: 10.6.0
-  resolution: "cypress@npm:10.6.0"
+"cypress@npm:10.7.0":
+  version: 10.7.0
+  resolution: "cypress@npm:10.7.0"
   dependencies:
     "@cypress/request": ^2.88.10
     "@cypress/xvfb": ^1.2.4
@@ -5008,7 +4895,7 @@ __metadata:
     yauzl: ^2.10.0
   bin:
     cypress: bin/cypress
-  checksum: 53993d2d712222df13ef4802db051fee8a7ac59b180ed11b22e6f10d36f5d9b2c2622f1bbfa012f61c7756139287a976abd075275ddd37191b13f40ec8deaa85
+  checksum: ef8a5ae54f3404f7926e1e248ba7a27c7f66e654a9603bf9df6366731d8dd75455f6ec9cc34d7e55e1a8c3cb8e0e36ce59add81b7b14466f2063cfe45e6c00f4
   languageName: node
   linkType: hard
 
@@ -5718,6 +5605,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"entities@npm:^4.4.0":
+  version: 4.4.0
+  resolution: "entities@npm:4.4.0"
+  checksum: 84d250329f4b56b40fa93ed067b194db21e8815e4eb9b59f43a086f0ecd342814f6bc483de8a77da5d64e0f626033192b1b4f1792232a7ea6b970ebe0f3187c2
+  languageName: node
+  linkType: hard
+
 "env-paths@npm:^2.2.0":
   version: 2.2.1
   resolution: "env-paths@npm:2.2.1"
@@ -6132,7 +6026,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.14.42":
+"esbuild@npm:^0.14.54":
   version: 0.14.54
   resolution: "esbuild@npm:0.14.54"
   dependencies:
@@ -6441,7 +6335,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:8.23.0":
+"eslint@npm:8.23.0, eslint@npm:^8.23.0":
   version: 8.23.0
   resolution: "eslint@npm:8.23.0"
   dependencies:
@@ -6490,56 +6384,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:^8.16.0, eslint@npm:^8.20.0":
-  version: 8.22.0
-  resolution: "eslint@npm:8.22.0"
-  dependencies:
-    "@eslint/eslintrc": ^1.3.0
-    "@humanwhocodes/config-array": ^0.10.4
-    "@humanwhocodes/gitignore-to-minimatch": ^1.0.2
-    ajv: ^6.10.0
-    chalk: ^4.0.0
-    cross-spawn: ^7.0.2
-    debug: ^4.3.2
-    doctrine: ^3.0.0
-    escape-string-regexp: ^4.0.0
-    eslint-scope: ^7.1.1
-    eslint-utils: ^3.0.0
-    eslint-visitor-keys: ^3.3.0
-    espree: ^9.3.3
-    esquery: ^1.4.0
-    esutils: ^2.0.2
-    fast-deep-equal: ^3.1.3
-    file-entry-cache: ^6.0.1
-    find-up: ^5.0.0
-    functional-red-black-tree: ^1.0.1
-    glob-parent: ^6.0.1
-    globals: ^13.15.0
-    globby: ^11.1.0
-    grapheme-splitter: ^1.0.4
-    ignore: ^5.2.0
-    import-fresh: ^3.0.0
-    imurmurhash: ^0.1.4
-    is-glob: ^4.0.0
-    js-yaml: ^4.1.0
-    json-stable-stringify-without-jsonify: ^1.0.1
-    levn: ^0.4.1
-    lodash.merge: ^4.6.2
-    minimatch: ^3.1.2
-    natural-compare: ^1.4.0
-    optionator: ^0.9.1
-    regexpp: ^3.2.0
-    strip-ansi: ^6.0.1
-    strip-json-comments: ^3.1.0
-    text-table: ^0.2.0
-    v8-compile-cache: ^2.0.3
-  bin:
-    eslint: bin/eslint.js
-  checksum: 2d84a7a2207138cdb250759b047fdb05a57fede7f87b7a039d9370edba7f26e23a873a208becfd4b2c9e4b5499029f3fc3b9318da3290e693d25c39084119c80
-  languageName: node
-  linkType: hard
-
-"espree@npm:^9.3.1, espree@npm:^9.3.2, espree@npm:^9.3.3":
+"espree@npm:^9.3.1":
   version: 9.3.3
   resolution: "espree@npm:9.3.3"
   dependencies:
@@ -11254,14 +11099,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nsfwjs@npm:2.4.1":
-  version: 2.4.1
-  resolution: "nsfwjs@npm:2.4.1"
+"nsfwjs@npm:2.4.2":
+  version: 2.4.2
+  resolution: "nsfwjs@npm:2.4.2"
   dependencies:
     "@nsfw-filter/gif-frames": 1.0.2
   peerDependencies:
-    "@tensorflow/tfjs": ^3.1.0
-  checksum: c9f88d0c839223452124e833348c480c7e7d5d0df2c47e83586959a1fb97e0e432ddfba68c33c08d3c5adddf87fb57ba8379624cbf48ce1cfcf4bde37ac9e73c
+    "@tensorflow/tfjs": ^3.18.0
+  checksum: a66a78caaa17ecd11ff072a809d2cc2b2b6851403889247ec6770744c077e7b786937e646ad0a28892cfb36ab9e093945d2f3e7e7da04044b75b2095fc644c08
   languageName: node
   linkType: hard
 
@@ -11744,12 +11589,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parse5@npm:7.0.0, parse5@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "parse5@npm:7.0.0"
+"parse5@npm:7.1.1":
+  version: 7.1.1
+  resolution: "parse5@npm:7.1.1"
   dependencies:
-    entities: ^4.3.0
-  checksum: 7da5d61cc18eb36ffa71fc861e65cbfd1f23d96483a6631254e627be667dbc9c93ac0b0e6cb17a13a2e4033dab19bfb2f76f38e5936cfb57240ed49036a83fcc
+    entities: ^4.4.0
+  checksum: 8f72fbfa6df83a3f29f58e1818f7bd46b47ff3e26d79c74e10b8fc7ef7ee76163f205113f1b2f6a5b8dc4e31e726f490444f04890cead6e974dbcbe8172b1321
   languageName: node
   linkType: hard
 
@@ -11767,6 +11612,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"parse5@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "parse5@npm:7.0.0"
+  dependencies:
+    entities: ^4.3.0
+  checksum: 7da5d61cc18eb36ffa71fc861e65cbfd1f23d96483a6631254e627be667dbc9c93ac0b0e6cb17a13a2e4033dab19bfb2f76f38e5936cfb57240ed49036a83fcc
+  languageName: node
+  linkType: hard
+
 "parseurl@npm:^1.3.2":
   version: 1.3.3
   resolution: "parseurl@npm:1.3.3"
@@ -11982,10 +11836,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"photoswipe@npm:5.3.0":
-  version: 5.3.0
-  resolution: "photoswipe@npm:5.3.0"
-  checksum: 3a55d797badc8ec0bdefef3a6dc29320108a9364fa34a87947c4760f18249cc6a880999ad5cd17cc8d027fc5d9400f1c4887fc53ba45515b404d0938259ed245
+"photoswipe@npm:5.3.2":
+  version: 5.3.2
+  resolution: "photoswipe@npm:5.3.2"
+  checksum: c9a369e088b40e7dfac6b3bc402183dee2b3b04971299544910b00bfc97f550080baaf8b0ba1b4229bad8427c80cfa7bff7b693db43d9e6f74808687efe28025
   languageName: node
   linkType: hard
 
@@ -12471,7 +12325,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prebuild-install@npm:^7.1.0":
+"prebuild-install@npm:^7.1.1":
   version: 7.1.1
   resolution: "prebuild-install@npm:7.1.1"
   dependencies:
@@ -13568,7 +13422,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup@npm:2.78.1, rollup@npm:~2.78.0":
+"rollup@npm:2.79.0":
+  version: 2.79.0
+  resolution: "rollup@npm:2.79.0"
+  dependencies:
+    fsevents: ~2.3.2
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  bin:
+    rollup: dist/bin/rollup
+  checksum: 166f1ffea1898e157003920065b3a328e7012ea6808860ee8fe5d1ce94804fcce9985c95a3c0f7fe9c611aff0d09a70f073f1d6f715c8faba28e4e40f71ee3bb
+  languageName: node
+  linkType: hard
+
+"rollup@npm:~2.78.0":
   version: 2.78.1
   resolution: "rollup@npm:2.78.1"
   dependencies:
@@ -13684,16 +13552,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass@npm:1.54.5":
-  version: 1.54.5
-  resolution: "sass@npm:1.54.5"
+"sass@npm:1.54.9":
+  version: 1.54.9
+  resolution: "sass@npm:1.54.9"
   dependencies:
     chokidar: ">=3.0.0 <4.0.0"
     immutable: ^4.0.0
     source-map-js: ">=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: ba7a65aa7508419468547c8de4d59e537bec874f52823f501663dc98d80dfd2d374e8ea73a31200db7f510b8816c925edf89728c9b36889f4e6673d3e94ec100
+  checksum: 90182b566072b48e2263c5a87229ab85164e13b71b24847ba76a8e68eb952cb69a7dcef815f4ccc0189dd2d0c254311acff6972166603338d33bbc96f6d500c6
   languageName: node
   linkType: hard
 
@@ -13862,20 +13730,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sharp@npm:0.30.6":
-  version: 0.30.6
-  resolution: "sharp@npm:0.30.6"
+"sharp@npm:0.30.7":
+  version: 0.30.7
+  resolution: "sharp@npm:0.30.7"
   dependencies:
     color: ^4.2.3
     detect-libc: ^2.0.1
     node-addon-api: ^5.0.0
     node-gyp: latest
-    prebuild-install: ^7.1.0
+    prebuild-install: ^7.1.1
     semver: ^7.3.7
     simple-get: ^4.0.1
     tar-fs: ^2.1.1
     tunnel-agent: ^0.6.0
-  checksum: 2560b5769d78ee660d767e59f6fa56531c448d16383f9700e4ecb8016382104c1bb42991bdd4ea741c0f4d934ea5246c5d602fc5f39062bcc1c2c8786421fd5a
+  checksum: bbc63ca3c7ea8a5bff32cd77022cfea30e25a03f5bd031e935924bf6cf0e11e3388e8b0e22b3137bf8816aa73407f1e4fbeb190f3a35605c27ffca9f32b91601
   languageName: node
   linkType: hard
 
@@ -14056,10 +13924,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sortablejs@npm:1.10.2":
-  version: 1.10.2
-  resolution: "sortablejs@npm:1.10.2"
-  checksum: 37f8d47a9702b93c38077c5e0af90174dcf8e95cf96fe61a722033003eb293bdf3832e4a943f281eaedc433e24cd7d5a48a408706a71a21e75bc11ced0b358da
+"sortablejs@npm:1.14.0":
+  version: 1.14.0
+  resolution: "sortablejs@npm:1.14.0"
+  checksum: 7b9d2cbb0331f3f259b8703a17174ff46a941b6d59c77c75ca05a5bd484bf2b409a9c1d21344f9c933939880450803b254825c7c7d7f88034e8c7e675420b389
   languageName: node
   linkType: hard
 
@@ -14634,8 +14502,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "sw@workspace:packages/sw"
   dependencies:
-    esbuild: ^0.14.42
-    eslint: ^8.16.0
+    esbuild: ^0.14.54
+    eslint: ^8.23.0
     idb-keyval: ^6.1.0
     misskey-js: 0.0.14
   languageName: unknown
@@ -15732,13 +15600,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"v8-compile-cache@npm:^2.0.3":
-  version: 2.3.0
-  resolution: "v8-compile-cache@npm:2.3.0"
-  checksum: adb0a271eaa2297f2f4c536acbfee872d0dd26ec2d76f66921aa7fc437319132773483344207bdbeee169225f4739016d8d2dbf0553913a52bb34da6d0334f8e
-  languageName: node
-  linkType: hard
-
 "v8flags@npm:^3.0.1":
   version: 3.1.3
   resolution: "v8flags@npm:3.1.3"
@@ -15899,7 +15760,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vue-eslint-parser@npm:^9.0.1, vue-eslint-parser@npm:^9.0.2":
+"vue-eslint-parser@npm:^9.0.1, vue-eslint-parser@npm:^9.0.3":
   version: 9.0.3
   resolution: "vue-eslint-parser@npm:9.0.3"
   dependencies:
@@ -15935,27 +15796,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vue3-lottie@npm:^2.2.5":
-  version: 2.2.5
-  resolution: "vue3-lottie@npm:2.2.5"
+"vue3-lottie@npm:^2.3.0":
+  version: 2.3.0
+  resolution: "vue3-lottie@npm:2.3.0"
   dependencies:
     lottie-web: ^5.8.1
   peerDependencies:
     vue: ^3.2
-  checksum: a044f2c9e9ec3940cd3c7f241d708d7c7a4dd401e4e49996f7350c70ac19c6459a5334a0bc3aa96c4d58cabaa309908a3fec43cbdf9a5c1954a0023b190cb96b
+  checksum: b2ccd2f85f21c1dc77a466567619c774f6bf5b748500f59b501f99245a262f1f50a3753e5349494b150290ef11d2cae9836f4562459fba93219683a873663ebe
   languageName: node
   linkType: hard
 
-"vue@npm:3.2.37":
-  version: 3.2.37
-  resolution: "vue@npm:3.2.37"
+"vue@npm:3.2.38":
+  version: 3.2.38
+  resolution: "vue@npm:3.2.38"
   dependencies:
-    "@vue/compiler-dom": 3.2.37
-    "@vue/compiler-sfc": 3.2.37
-    "@vue/runtime-dom": 3.2.37
-    "@vue/server-renderer": 3.2.37
-    "@vue/shared": 3.2.37
-  checksum: cd20069c311e1de54b7d9b5d9c6021f1a6a70b0cf05cf7fc36b59c02623cbdc7c0075fb2c9e17859c77c86b15c596a447ee16c70064e9f2feba2df27139260b9
+    "@vue/compiler-dom": 3.2.38
+    "@vue/compiler-sfc": 3.2.38
+    "@vue/runtime-dom": 3.2.38
+    "@vue/server-renderer": 3.2.38
+    "@vue/shared": 3.2.38
+  checksum: 9b82cb893018d6fae601823bdf1523a600c90f38bb690f92a2f2ec56d536beb2a86bf3bc0c0e6252ca0daddb86f46ead38dfbb546078f4c18281eb7bc5b7366e
   languageName: node
   linkType: hard
 
@@ -15969,14 +15830,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vuedraggable@npm:4.0.1":
-  version: 4.0.1
-  resolution: "vuedraggable@npm:4.0.1"
+"vuedraggable@npm:4.1.0":
+  version: 4.1.0
+  resolution: "vuedraggable@npm:4.1.0"
   dependencies:
-    sortablejs: 1.10.2
+    sortablejs: 1.14.0
   peerDependencies:
     vue: ^3.0.1
-  checksum: 039e5d38560144299be3689270728639d041737b487cbb7dfec09b6c372b48804031785f9b40e6e14da0d213315b98ddc005713cc60a749cf98028e0c16fd866
+  checksum: 8b4c5a6b384361df97f7a3595d7772dfbb086bf97c6702a1117b532a9e49db2908cb5d21b7959cb10179714c4c2225e4be0b77b29f778923169ea8a8197a429f
   languageName: node
   linkType: hard
 

From 5a045794a381caf7d2fc247f4dbf6a4b6ecd12af Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 7 Sep 2022 16:23:58 -0700
Subject: [PATCH 167/245] chore: :bookmark: .16

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

diff --git a/package.json b/package.json
index 44a0cdd95..c691635c7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-beta.2-rc.15",
+	"version": "12.118.1-calc.2-beta.2-rc.16",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From f08c04cdb10ee7da8afde94dbde1ed2316dd6cb5 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 8 Sep 2022 10:42:01 -0700
Subject: [PATCH 168/245] fix: :bug: fix header button positions on mobile

---
 package.json                                  |   4 +-
 .../src/components/global/MkPageHeader.vue    |   4 +-
 yarn.lock                                     | 116 +++++++++---------
 3 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/package.json b/package.json
index c691635c7..95a104c25 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-beta.2-rc.16",
+	"version": "12.118.1-calc.2-beta.2-rc.17",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
@@ -54,7 +54,7 @@
 		"seedrandom": "^3.0.5"
 	},
 	"devDependencies": {
-		"@swc/core": "^1.2.244",
+		"@swc/core": "^1.2.248",
 		"@types/gulp": "4.0.9",
 		"@types/gulp-rename": "2.0.1",
 		"@typescript-eslint/parser": "5.36.2",
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index d2062afc7..d414bbf2e 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -327,8 +327,8 @@ onUnmounted(() => {
 
 	> .tabs {
 		position: relative;
-		margin-left: 16px;
-		font-size: 0.9em;
+		width: 100%;
+		font-size: 1em;
 		overflow: auto;
 		white-space: nowrap;
 
diff --git a/yarn.lock b/yarn.lock
index f3c3d397f..ffd9bd166 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -819,126 +819,126 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-android-arm-eabi@npm:1.2.244":
-  version: 1.2.244
-  resolution: "@swc/core-android-arm-eabi@npm:1.2.244"
+"@swc/core-android-arm-eabi@npm:1.2.248":
+  version: 1.2.248
+  resolution: "@swc/core-android-arm-eabi@npm:1.2.248"
   dependencies:
     "@swc/wasm": 1.2.122
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-android-arm64@npm:1.2.244":
-  version: 1.2.244
-  resolution: "@swc/core-android-arm64@npm:1.2.244"
+"@swc/core-android-arm64@npm:1.2.248":
+  version: 1.2.248
+  resolution: "@swc/core-android-arm64@npm:1.2.248"
   dependencies:
     "@swc/wasm": 1.2.130
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.2.244":
-  version: 1.2.244
-  resolution: "@swc/core-darwin-arm64@npm:1.2.244"
+"@swc/core-darwin-arm64@npm:1.2.248":
+  version: 1.2.248
+  resolution: "@swc/core-darwin-arm64@npm:1.2.248"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.2.244":
-  version: 1.2.244
-  resolution: "@swc/core-darwin-x64@npm:1.2.244"
+"@swc/core-darwin-x64@npm:1.2.248":
+  version: 1.2.248
+  resolution: "@swc/core-darwin-x64@npm:1.2.248"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-freebsd-x64@npm:1.2.244":
-  version: 1.2.244
-  resolution: "@swc/core-freebsd-x64@npm:1.2.244"
+"@swc/core-freebsd-x64@npm:1.2.248":
+  version: 1.2.248
+  resolution: "@swc/core-freebsd-x64@npm:1.2.248"
   dependencies:
     "@swc/wasm": 1.2.130
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.2.244":
-  version: 1.2.244
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.2.244"
+"@swc/core-linux-arm-gnueabihf@npm:1.2.248":
+  version: 1.2.248
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.2.248"
   dependencies:
     "@swc/wasm": 1.2.130
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.2.244":
-  version: 1.2.244
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.2.244"
+"@swc/core-linux-arm64-gnu@npm:1.2.248":
+  version: 1.2.248
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.2.248"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.2.244":
-  version: 1.2.244
-  resolution: "@swc/core-linux-arm64-musl@npm:1.2.244"
+"@swc/core-linux-arm64-musl@npm:1.2.248":
+  version: 1.2.248
+  resolution: "@swc/core-linux-arm64-musl@npm:1.2.248"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.2.244":
-  version: 1.2.244
-  resolution: "@swc/core-linux-x64-gnu@npm:1.2.244"
+"@swc/core-linux-x64-gnu@npm:1.2.248":
+  version: 1.2.248
+  resolution: "@swc/core-linux-x64-gnu@npm:1.2.248"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.2.244":
-  version: 1.2.244
-  resolution: "@swc/core-linux-x64-musl@npm:1.2.244"
+"@swc/core-linux-x64-musl@npm:1.2.248":
+  version: 1.2.248
+  resolution: "@swc/core-linux-x64-musl@npm:1.2.248"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.2.244":
-  version: 1.2.244
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.2.244"
+"@swc/core-win32-arm64-msvc@npm:1.2.248":
+  version: 1.2.248
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.2.248"
   dependencies:
     "@swc/wasm": 1.2.130
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.2.244":
-  version: 1.2.244
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.2.244"
+"@swc/core-win32-ia32-msvc@npm:1.2.248":
+  version: 1.2.248
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.2.248"
   dependencies:
     "@swc/wasm": 1.2.130
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.2.244":
-  version: 1.2.244
-  resolution: "@swc/core-win32-x64-msvc@npm:1.2.244"
+"@swc/core-win32-x64-msvc@npm:1.2.248":
+  version: 1.2.248
+  resolution: "@swc/core-win32-x64-msvc@npm:1.2.248"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core@npm:^1.2.244":
-  version: 1.2.244
-  resolution: "@swc/core@npm:1.2.244"
+"@swc/core@npm:^1.2.248":
+  version: 1.2.248
+  resolution: "@swc/core@npm:1.2.248"
   dependencies:
-    "@swc/core-android-arm-eabi": 1.2.244
-    "@swc/core-android-arm64": 1.2.244
-    "@swc/core-darwin-arm64": 1.2.244
-    "@swc/core-darwin-x64": 1.2.244
-    "@swc/core-freebsd-x64": 1.2.244
-    "@swc/core-linux-arm-gnueabihf": 1.2.244
-    "@swc/core-linux-arm64-gnu": 1.2.244
-    "@swc/core-linux-arm64-musl": 1.2.244
-    "@swc/core-linux-x64-gnu": 1.2.244
-    "@swc/core-linux-x64-musl": 1.2.244
-    "@swc/core-win32-arm64-msvc": 1.2.244
-    "@swc/core-win32-ia32-msvc": 1.2.244
-    "@swc/core-win32-x64-msvc": 1.2.244
+    "@swc/core-android-arm-eabi": 1.2.248
+    "@swc/core-android-arm64": 1.2.248
+    "@swc/core-darwin-arm64": 1.2.248
+    "@swc/core-darwin-x64": 1.2.248
+    "@swc/core-freebsd-x64": 1.2.248
+    "@swc/core-linux-arm-gnueabihf": 1.2.248
+    "@swc/core-linux-arm64-gnu": 1.2.248
+    "@swc/core-linux-arm64-musl": 1.2.248
+    "@swc/core-linux-x64-gnu": 1.2.248
+    "@swc/core-linux-x64-musl": 1.2.248
+    "@swc/core-win32-arm64-msvc": 1.2.248
+    "@swc/core-win32-ia32-msvc": 1.2.248
+    "@swc/core-win32-x64-msvc": 1.2.248
   dependenciesMeta:
     "@swc/core-android-arm-eabi":
       optional: true
@@ -968,7 +968,7 @@ __metadata:
       optional: true
   bin:
     swcx: run_swcx.js
-  checksum: be714bc484b0e3ad8e68269e739f02a8b9ba47cd4ea2fd2d223832fa78d00f85b02fed12bb8e7a61c430981d9260c6319d3215af86c8d1f4832bb419e269691f
+  checksum: fda7fe0f3d4c3f38e14ccad2299a2dbb0107e7a1eb17437caa6dbe7e99a3bf9fc4a3a4ae0e8c7aa9da4f4da278b9b2015a607b70504379c54bf8b9107b2522bf
   languageName: node
   linkType: hard
 
@@ -3677,7 +3677,7 @@ __metadata:
   dependencies:
     "@bull-board/api": ^4.2.2
     "@bull-board/ui": ^4.2.2
-    "@swc/core": ^1.2.244
+    "@swc/core": ^1.2.248
     "@tensorflow/tfjs": ^3.20.0
     "@types/gulp": 4.0.9
     "@types/gulp-rename": 2.0.1
@@ -4088,7 +4088,7 @@ __metadata:
     autosize: 5.0.1
     blurhash: 1.1.5
     broadcast-channel: 4.14.0
-    browser-image-resizer: "https://github.com/misskey-dev/browser-image-resizer.git#commit=0227e860621e55cbed0aabe6dc601096a7748c4a"
+    browser-image-resizer: "https://github.com/misskey-dev/browser-image-resizer"
     chart.js: 3.9.1
     chartjs-adapter-date-fns: 2.0.0
     chartjs-plugin-gradient: 0.5.1

From 11a5a99a6ff1a945103e5292b95558bbef441dd1 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 11:06:18 -0700
Subject: [PATCH 169/245] fix: :bug: Fix slide sync on initial timeline load

---
 package.json                           | 2 +-
 packages/client/src/pages/timeline.vue | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 95a104c25..4e6509716 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-beta.2-rc.17",
+	"version": "12.118.1-calc.2-rc.18",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index adfda93c9..e32902aae 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -127,7 +127,7 @@ const rootEl = $ref<HTMLElement>();
 
 let queue = $ref(0);
 const src = $computed({
-	get: () => defaultStore.reactiveState.tl.value.src,
+	get: () => getSrc(),
 	set: (x) => {
 		saveSrc(x);
 		syncSlide(timelines.indexOf(x));
@@ -278,6 +278,12 @@ function setSwiperRef(swiper) {
 	swiperRef = swiper;
 }
 
+function getSrc(): 'home' | 'local' | 'recommended' | 'social' | 'global' {
+	const dSrc = defaultStore.state.tl.src;
+	syncSlide(dSrc);
+	return dSrc;
+}
+
 function onSlideChange() {
 	saveSrc(timelines[swiperRef.activeIndex]);
 }

From 00218e73876dabad5ec875c645e2cbc281aea40d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 12:09:12 -0700
Subject: [PATCH 170/245] feat: :alembic: Swiping in featured

---
 packages/client/src/pages/explore.vue | 87 ++++++++++++++++++++-------
 1 file changed, 64 insertions(+), 23 deletions(-)

diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index 2b170a6ee..b11d5648b 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -2,35 +2,45 @@
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
 	<div class="lznhrdub">
-		<div v-if="tab === 'featured'">
-			<XFeatured/>
-		</div>
-		<div v-else-if="tab === 'users'">
-			<XUsers/>
-		</div>
-		<div v-else-if="tab === 'search'">
-			<MkSpacer :content-max="1200">
-				<div>
-					<MkInput v-model="searchQuery" :debounce="true" type="search" class="_formBlock">
-						<template #prefix><i class="fas fa-search"></i></template>
-						<template #label>{{ i18n.ts.searchUser }}</template>
-					</MkInput>
-					<MkRadios v-model="searchOrigin" class="_formBlock">
-						<option value="combined">{{ i18n.ts.all }}</option>
-						<option value="local">{{ i18n.ts.local }}</option>
-						<option value="remote">{{ i18n.ts.remote }}</option>
-					</MkRadios>
-				</div>
+		<swiper
+			:modules="[Virtual]"
+			:space-between="20"
+			:virtual="true"
+			@swiper="setSwiperRef"
+			@slide-change="onSlideChange"
+		>
+			<swiper-slide>
+				<XFeatured/>
+			</swiper-slide>
+			<swiper-slide>
+				<XUsers/>
+			</swiper-slide>
+			<swiper-slide>
+				<MkSpacer :content-max="1200">
+					<div>
+						<MkInput v-model="searchQuery" :debounce="true" type="search" class="_formBlock">
+							<template #prefix><i class="fas fa-search"></i></template>
+							<template #label>{{ i18n.ts.searchUser }}</template>
+						</MkInput>
+						<MkRadios v-model="searchOrigin" class="_formBlock">
+							<option value="combined">{{ i18n.ts.all }}</option>
+							<option value="local">{{ i18n.ts.local }}</option>
+							<option value="remote">{{ i18n.ts.remote }}</option>
+						</MkRadios>
+					</div>
 
-				<XUserList v-if="searchQuery" ref="searchEl" class="_gap" :pagination="searchPagination"/>
-			</MkSpacer>
-		</div>
+					<XUserList v-if="searchQuery" ref="searchEl" class="_gap" :pagination="searchPagination"/>
+				</MkSpacer>
+			</swiper-slide>
+		</swiper>
 	</div>
 </MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
 import { computed, watch } from 'vue';
+import { Virtual } from 'swiper';
+import { Swiper, SwiperSlide } from 'swiper/vue';
 import XFeatured from './explore.featured.vue';
 import XUsers from './explore.users.vue';
 import MkFolder from '@/components/ui/folder.vue';
@@ -42,12 +52,22 @@ import { definePageMetadata } from '@/scripts/page-metadata';
 import { i18n } from '@/i18n';
 import { instance } from '@/instance';
 import XUserList from '@/components/MkUserList.vue';
+import 'swiper/scss';
+import 'swiper/scss/virtual';
 
 const props = defineProps<{
 	tag?: string;
 }>();
 
-let tab = $ref('featured');
+// let tab = $ref('featured');
+
+const tab = $computed({
+	get: () => getSrc(),
+	set: (x) => {
+		syncSlide(['featured', 'users', 'search'].indexOf(x));
+	},
+});
+
 let tagsEl = $ref<InstanceType<typeof MkFolder>>();
 let searchQuery = $ref(null);
 let searchOrigin = $ref('combined');
@@ -85,4 +105,25 @@ definePageMetadata(computed(() => ({
 	title: i18n.ts.explore,
 	icon: 'fas fa-hashtag',
 })));
+
+let swiperRef = null;
+
+function setSwiperRef(swiper) {
+	swiperRef = swiper;
+}
+
+function onSlideChange() {
+	saveSrc(timelines[swiperRef.activeIndex]);
+}
+
+function syncSlide(index) {
+	swiperRef.slideTo(index);
+}
+
+function getSrc() {
+	const dSrc = $ref('featured');
+	syncSlide(dSrc);
+	return dSrc;
+}
+
 </script>

From 82cc9420f00ec2d960f9f3ccc032e832aa4f5213 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 12:17:11 -0700
Subject: [PATCH 171/245] upstream b

---
 packages/client/src/ui/visitor/b.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/ui/visitor/b.vue b/packages/client/src/ui/visitor/b.vue
index 4afe8640f..6427593ea 100644
--- a/packages/client/src/ui/visitor/b.vue
+++ b/packages/client/src/ui/visitor/b.vue
@@ -52,6 +52,7 @@ import XKanban from './kanban.vue';
 import { host, instanceName } from '@/config';
 import { search } from '@/scripts/search';
 import * as os from '@/os';
+import { instance } from '@/instance';
 import MkPagination from '@/components/MkPagination.vue';
 import XSigninDialog from '@/components/MkSigninDialog.vue';
 import XSignupDialog from '@/components/MkSignupDialog.vue';

From c13dd0f70e82bf5bedf0a003f15da5bd08b85c70 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 12:22:05 -0700
Subject: [PATCH 172/245] fix: :bug: Promper Info import

---
 packages/client/src/pages/admin/custom-css.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/admin/custom-css.vue b/packages/client/src/pages/admin/custom-css.vue
index 65c70dda7..597410e71 100644
--- a/packages/client/src/pages/admin/custom-css.vue
+++ b/packages/client/src/pages/admin/custom-css.vue
@@ -11,7 +11,7 @@
 <script lang="ts" setup>
 import { ref, watch } from 'vue';
 import FormTextarea from '@/components/form/textarea.vue';
-import FormInfo from '@/components/ui/info.vue';
+import FormInfo from '@/components/MkInfo.vue';
 import * as os from '@/os';
 import { unisonReload } from '@/scripts/unison-reload';
 import { i18n } from '@/i18n';

From 3143f457ec0674bdb8fcb15a744dc1e65aa1ca56 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 12:24:51 -0700
Subject: [PATCH 173/245] cl

---
 CALCKEY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index d6af1b131..a3bb4542d 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -41,7 +41,7 @@
 - Saner defaults
 - Recommended instances timeline
 - Improve mobile UX
-  - Swipe through timelines/notifications on mobile
+  - Swipe through pages on mobile
   - Redesigned mobile bottom nav bar
   - Post button on TL
 - Star as default reaction

From 86d6fe7b04a0f9b76c10a0af184e82cbf85e46d7 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 13:31:48 -0700
Subject: [PATCH 174/245] fix: :ambulance: tl not showing up

---
 package.json                           |  2 +-
 packages/client/src/pages/explore.vue  |  8 +-------
 packages/client/src/pages/timeline.vue | 10 +++-------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 4e6509716..9ce3cb73b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-rc.18",
+	"version": "12.118.1-calc.2-rc.19",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index bc8d31404..460c1eed3 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -62,7 +62,7 @@ const props = defineProps<{
 // let tab = $ref('featured');
 
 const tab = $computed({
-	get: () => getSrc(),
+	get: () => $ref('featured'),
 	set: (x) => {
 		syncSlide(['featured', 'users', 'search'].indexOf(x));
 	},
@@ -120,10 +120,4 @@ function syncSlide(index) {
 	swiperRef.slideTo(index);
 }
 
-function getSrc() {
-	const dSrc = $ref('featured');
-	syncSlide(dSrc);
-	return dSrc;
-}
-
 </script>
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index e32902aae..7a1012fe0 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -127,7 +127,7 @@ const rootEl = $ref<HTMLElement>();
 
 let queue = $ref(0);
 const src = $computed({
-	get: () => getSrc(),
+	get: () => defaultStore.state.tl.src,
 	set: (x) => {
 		saveSrc(x);
 		syncSlide(timelines.indexOf(x));
@@ -278,12 +278,6 @@ function setSwiperRef(swiper) {
 	swiperRef = swiper;
 }
 
-function getSrc(): 'home' | 'local' | 'recommended' | 'social' | 'global' {
-	const dSrc = defaultStore.state.tl.src;
-	syncSlide(dSrc);
-	return dSrc;
-}
-
 function onSlideChange() {
 	saveSrc(timelines[swiperRef.activeIndex]);
 }
@@ -292,6 +286,8 @@ function syncSlide(index) {
 	swiperRef.slideTo(index);
 }
 
+syncSlide(timelines.indexOf(src));
+
 </script>
 
 <style lang="scss" scoped>

From 09d3740c671d44895d721b70360efbb52472e4a6 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 13:32:52 -0700
Subject: [PATCH 175/245] f

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

diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index 460c1eed3..6e5aec75e 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -59,10 +59,10 @@ const props = defineProps<{
 	tag?: string;
 }>();
 
-// let tab = $ref('featured');
+let featured = $ref('featured');
 
 const tab = $computed({
-	get: () => $ref('featured'),
+	get: () => featured,
 	set: (x) => {
 		syncSlide(['featured', 'users', 'search'].indexOf(x));
 	},

From 02ccf1dbe497b9f257528d810db8bea49c2ee7d9 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 13:35:48 -0700
Subject: [PATCH 176/245] fix

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

diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 7a1012fe0..f06605aa2 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -276,6 +276,7 @@ let swiperRef = null;
 
 function setSwiperRef(swiper) {
 	swiperRef = swiper;
+	syncSlide(timelines.indexOf(src));
 }
 
 function onSlideChange() {
@@ -286,7 +287,6 @@ function syncSlide(index) {
 	swiperRef.slideTo(index);
 }
 
-syncSlide(timelines.indexOf(src));
 
 </script>
 

From 2964c363760c4a05b9a7a636110823fb03c242d1 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 13:35:58 -0700
Subject: [PATCH 177/245] .20

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

diff --git a/package.json b/package.json
index 9ce3cb73b..936cb07d4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-rc.19",
+	"version": "12.118.1-calc.2-rc.20",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 870f6d7b501a92d5aeacdf466e04230aba18f409 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 13:41:13 -0700
Subject: [PATCH 178/245] revert

---
 package.json                           | 2 +-
 packages/client/src/pages/timeline.vue | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 936cb07d4..63e8d69d9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-rc.20",
+	"version": "12.118.1-calc.2-rc.21",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index f06605aa2..965e5490d 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -276,7 +276,6 @@ let swiperRef = null;
 
 function setSwiperRef(swiper) {
 	swiperRef = swiper;
-	syncSlide(timelines.indexOf(src));
 }
 
 function onSlideChange() {

From 7ef63a770c269fa988b96b5dd51274133486d736 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 13:47:19 -0700
Subject: [PATCH 179/245] me not smart

---
 package.json                           | 2 +-
 packages/client/src/pages/timeline.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 63e8d69d9..a11643265 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-rc.21",
+	"version": "12.118.1-calc.2-rc.22",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 965e5490d..01f37d6e4 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -127,7 +127,7 @@ const rootEl = $ref<HTMLElement>();
 
 let queue = $ref(0);
 const src = $computed({
-	get: () => defaultStore.state.tl.src,
+	get: () => defaultStore.reactiveState.tl.value.src,
 	set: (x) => {
 		saveSrc(x);
 		syncSlide(timelines.indexOf(x));

From 72ee2e3fdcdd8d4830c0fd272f652d3b0cc2fdec Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 13:56:42 -0700
Subject: [PATCH 180/245] fix: :bug: gay gay homosexual gay

---
 package.json                           | 2 +-
 packages/client/src/pages/explore.vue  | 7 ++++---
 packages/client/src/pages/timeline.vue | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a11643265..882b08131 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-rc.22",
+	"version": "12.118.1-calc.2-rc.23",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index 6e5aec75e..ab8b40b78 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -60,11 +60,12 @@ const props = defineProps<{
 }>();
 
 let featured = $ref('featured');
+const tabs = ['featured', 'users', 'search'];
 
-const tab = $computed({
+let tab = $computed({
 	get: () => featured,
 	set: (x) => {
-		syncSlide(['featured', 'users', 'search'].indexOf(x));
+		syncSlide(tabs.indexOf(x));
 	},
 });
 
@@ -113,7 +114,7 @@ function setSwiperRef(swiper) {
 }
 
 function onSlideChange() {
-	saveSrc(timelines[swiperRef.activeIndex]);
+	tab = tabs[swiperRef.activeIndex];
 }
 
 function syncSlide(index) {
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 01f37d6e4..c441cfcea 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -276,6 +276,7 @@ let swiperRef = null;
 
 function setSwiperRef(swiper) {
 	swiperRef = swiper;
+	syncSlide(timelines.indexOf(src));
 }
 
 function onSlideChange() {
@@ -286,7 +287,6 @@ function syncSlide(index) {
 	swiperRef.slideTo(index);
 }
 
-
 </script>
 
 <style lang="scss" scoped>

From 51b259a3bb3b49e9f6260d0a76ef2a3a19f0320c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 13:59:15 -0700
Subject: [PATCH 181/245] sus

---
 package.json                          | 2 +-
 packages/client/src/pages/explore.vue | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 882b08131..556d999ed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-rc.23",
+	"version": "12.118.1-calc.2-rc.24",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index ab8b40b78..51e08b496 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -111,6 +111,7 @@ let swiperRef = null;
 
 function setSwiperRef(swiper) {
 	swiperRef = swiper;
+	syncSlide(tabs.indexOf(tab));
 }
 
 function onSlideChange() {

From f7ed1b77cc3ff56250a54686f6839b715e681d0d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 15:04:31 -0700
Subject: [PATCH 182/245] fix: :bug: Show title on mobile if there's no tab
 buttons

---
 package.json                                           |  2 +-
 packages/client/src/components/global/MkPageHeader.vue |  2 +-
 packages/client/src/pages/explore.vue                  | 10 +---------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 556d999ed..35821ea18 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-rc.24",
+	"version": "12.118.1-calc.2-rc.25",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index d414bbf2e..6ca0972b0 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -10,7 +10,7 @@
 
 			<div class="title">
 				<MkUserName v-if="metadata.userName" :user="metadata.userName" :nowrap="true" class="title"/>
-				<div v-else-if="!narrow && metadata.title" class="title">{{ metadata.title }}</div>
+				<div v-else-if="metadata.title && !(tabs != null && tabs.length > 0 && narrow)" class="title">{{ metadata.title }}</div>
 				<div v-if="!narrow && metadata.subtitle" class="subtitle">
 					{{ metadata.subtitle }}
 				</div>
diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index 51e08b496..5baabd2d6 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -28,7 +28,6 @@
 							<option value="remote">{{ i18n.ts.remote }}</option>
 						</MkRadios>
 					</div>
-
 					<XUserList v-if="searchQuery" ref="searchEl" class="_gap" :pagination="searchPagination"/>
 				</MkSpacer>
 			</swiper-slide>
@@ -59,16 +58,9 @@ const props = defineProps<{
 	tag?: string;
 }>();
 
-let featured = $ref('featured');
 const tabs = ['featured', 'users', 'search'];
 
-let tab = $computed({
-	get: () => featured,
-	set: (x) => {
-		syncSlide(tabs.indexOf(x));
-	},
-});
-
+let tab = $ref('featured');
 let tagsEl = $ref<InstanceType<typeof MkFolder>>();
 let searchQuery = $ref(null);
 let searchOrigin = $ref('combined');

From d5ed3dbe9d26a5374f46e40d08b5944356651b0f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 15:11:06 -0700
Subject: [PATCH 183/245] Add swiper to about

---
 packages/client/src/pages/about.vue | 171 +++++++++++++++++-----------
 1 file changed, 104 insertions(+), 67 deletions(-)

diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue
index a1cbc2dc2..65ae86f1e 100644
--- a/packages/client/src/pages/about.vue
+++ b/packages/client/src/pages/about.vue
@@ -1,86 +1,104 @@
 <template>
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer v-if="tab === 'overview'" :content-max="600" :margin-min="20">
-		<div class="_formRoot">
-			<div class="_formBlock fwhjspax" :style="{ backgroundImage: `url(${ $instance.bannerUrl })` }">
-				<div class="content">
-					<img :src="$instance.iconUrl || $instance.faviconUrl || '/favicon.ico'" alt="" class="icon"/>
-					<div class="name">
-						<b>{{ $instance.name || host }}</b>
+	<swiper
+		:modules="[Virtual]"
+		:space-between="20"
+		:virtual="true"
+		@swiper="setSwiperRef"
+		@slide-change="onSlideChange"
+	>
+		<swiper-slide>
+			<MkSpacer :content-max="600" :margin-min="20">
+				<div class="_formRoot">
+					<div class="_formBlock fwhjspax" :style="{ backgroundImage: `url(${ $instance.bannerUrl })` }">
+						<div class="content">
+							<img :src="$instance.iconUrl || $instance.faviconUrl || '/favicon.ico'" alt="" class="icon"/>
+							<div class="name">
+								<b>{{ $instance.name || host }}</b>
+							</div>
+						</div>
 					</div>
-				</div>
-			</div>
 
-			<MkKeyValue class="_formBlock">
-				<template #key>{{ i18n.ts.description }}</template>
-				<template #value>{{ $instance.description }}</template>
-			</MkKeyValue>
-
-			<FormSection>
-				<MkKeyValue class="_formBlock" :copy="version">
-					<template #key>Calckey</template>
-					<template #value>{{ version }}</template>
-				</MkKeyValue>
-				<FormLink to="/about-misskey">{{ i18n.ts.aboutMisskey }}</FormLink>
-			</FormSection>
-
-			<FormSection>
-				<FormSplit>
 					<MkKeyValue class="_formBlock">
-						<template #key>{{ i18n.ts.administrator }}</template>
-						<template #value>{{ $instance.maintainerName }}</template>
+						<template #key>{{ i18n.ts.description }}</template>
+						<template #value>{{ $instance.description }}</template>
 					</MkKeyValue>
-					<MkKeyValue class="_formBlock">
-						<template #key>{{ i18n.ts.contact }}</template>
-						<template #value>{{ $instance.maintainerEmail }}</template>
-					</MkKeyValue>
-				</FormSplit>
-				<FormLink v-if="$instance.tosUrl" :to="$instance.tosUrl" class="_formBlock" external>{{ i18n.ts.tos }}</FormLink>
-			</FormSection>
 
-			<FormSuspense :p="initStats">
-				<FormSection>
-					<template #label>{{ i18n.ts.statistics }}</template>
-					<FormSplit>
-						<MkKeyValue class="_formBlock">
-							<template #key>{{ i18n.ts.users }}</template>
-							<template #value>{{ number(stats.originalUsersCount) }}</template>
+					<FormSection>
+						<MkKeyValue class="_formBlock" :copy="version">
+							<template #key>Calckey</template>
+							<template #value>{{ version }}</template>
 						</MkKeyValue>
-						<MkKeyValue class="_formBlock">
-							<template #key>{{ i18n.ts.notes }}</template>
-							<template #value>{{ number(stats.originalNotesCount) }}</template>
-						</MkKeyValue>
-					</FormSplit>
-				</FormSection>
-			</FormSuspense>
+						<FormLink to="/about-misskey">{{ i18n.ts.aboutMisskey }}</FormLink>
+					</FormSection>
 
-			<FormSection>
-				<template #label>Well-known resources</template>
-				<div class="_formLinks">
-					<FormLink :to="`/.well-known/host-meta`" external>host-meta</FormLink>
-					<FormLink :to="`/.well-known/host-meta.json`" external>host-meta.json</FormLink>
-					<FormLink :to="`/.well-known/nodeinfo`" external>nodeinfo</FormLink>
-					<FormLink :to="`/robots.txt`" external>robots.txt</FormLink>
-					<FormLink :to="`/manifest.json`" external>manifest.json</FormLink>
+					<FormSection>
+						<FormSplit>
+							<MkKeyValue class="_formBlock">
+								<template #key>{{ i18n.ts.administrator }}</template>
+								<template #value>{{ $instance.maintainerName }}</template>
+							</MkKeyValue>
+							<MkKeyValue class="_formBlock">
+								<template #key>{{ i18n.ts.contact }}</template>
+								<template #value>{{ $instance.maintainerEmail }}</template>
+							</MkKeyValue>
+						</FormSplit>
+						<FormLink v-if="$instance.tosUrl" :to="$instance.tosUrl" class="_formBlock" external>{{ i18n.ts.tos }}</FormLink>
+					</FormSection>
+
+					<FormSuspense :p="initStats">
+						<FormSection>
+							<template #label>{{ i18n.ts.statistics }}</template>
+							<FormSplit>
+								<MkKeyValue class="_formBlock">
+									<template #key>{{ i18n.ts.users }}</template>
+									<template #value>{{ number(stats.originalUsersCount) }}</template>
+								</MkKeyValue>
+								<MkKeyValue class="_formBlock">
+									<template #key>{{ i18n.ts.notes }}</template>
+									<template #value>{{ number(stats.originalNotesCount) }}</template>
+								</MkKeyValue>
+							</FormSplit>
+						</FormSection>
+					</FormSuspense>
+
+					<FormSection>
+						<template #label>Well-known resources</template>
+						<div class="_formLinks">
+							<FormLink :to="`/.well-known/host-meta`" external>host-meta</FormLink>
+							<FormLink :to="`/.well-known/host-meta.json`" external>host-meta.json</FormLink>
+							<FormLink :to="`/.well-known/nodeinfo`" external>nodeinfo</FormLink>
+							<FormLink :to="`/robots.txt`" external>robots.txt</FormLink>
+							<FormLink :to="`/manifest.json`" external>manifest.json</FormLink>
+						</div>
+					</FormSection>
 				</div>
-			</FormSection>
-		</div>
-	</MkSpacer>
-	<MkSpacer v-else-if="tab === 'emojis'" :content-max="1000" :margin-min="20">
-		<XEmojis/>
-	</MkSpacer>
-	<MkSpacer v-else-if="tab === 'federation'" :content-max="1000" :margin-min="20">
-		<XFederation/>
-	</MkSpacer>
-	<MkSpacer v-else-if="tab === 'charts'" :content-max="1000" :margin-min="20">
-		<MkInstanceStats :chart-limit="500" :detailed="true"/>
-	</MkSpacer>
+			</MkSpacer>
+		</swiper-slide>
+		<swiper-slide>
+			<MkSpacer :content-max="1000" :margin-min="20">
+				<XEmojis/>
+			</MkSpacer>
+		</swiper-slide>
+		<swiper-slide>
+			<MkSpacer :content-max="1000" :margin-min="20">
+				<XFederation/>
+			</MkSpacer>
+		</swiper-slide>
+		<swiper-slide>
+			<MkSpacer :content-max="1000" :margin-min="20">
+				<MkInstanceStats :chart-limit="500" :detailed="true"/>
+			</MkSpacer>
+		</swiper-slide>
+	</swiper>
 </MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
 import { ref, computed } from 'vue';
+import { Virtual } from 'swiper';
+import { Swiper, SwiperSlide } from 'swiper/vue';
 import XEmojis from './about.emojis.vue';
 import XFederation from './about.federation.vue';
 import { version, instanceName , host } from '@/config';
@@ -95,6 +113,8 @@ import number from '@/filters/number';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { iAmModerator } from '@/account';
+import 'swiper/scss';
+import 'swiper/scss/virtual';
 
 const props = withDefaults(defineProps<{
 	initialTab?: string;
@@ -104,6 +124,8 @@ const props = withDefaults(defineProps<{
 
 let stats = $ref(null);
 let tab = $ref(props.initialTab);
+let tabs = ['overview', 'emojis','charts'];
+if (iAmModerator) tabs.push('federation');
 
 const initStats = () => os.api('stats', {
 }).then((res) => {
@@ -142,6 +164,21 @@ definePageMetadata(computed(() => ({
 	title: i18n.ts.instanceInfo,
 	icon: 'fas fa-info-circle',
 })));
+
+let swiperRef = null;
+
+function setSwiperRef(swiper) {
+	swiperRef = swiper;
+	syncSlide(tabs.indexOf(tab));
+}
+
+function onSlideChange() {
+	tab = tabs[swiperRef.activeIndex];
+}
+
+function syncSlide(index) {
+	swiperRef.slideTo(index);
+}
 </script>
 
 <style lang="scss" scoped>

From 038c367fd73bbed6c30f170196b7c3d2a7dd3299 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 15:26:33 -0700
Subject: [PATCH 184/245] Add swiper for admin file

---
 packages/client/src/pages/admin-file.vue | 152 ++++++++++++++---------
 1 file changed, 96 insertions(+), 56 deletions(-)

diff --git a/packages/client/src/pages/admin-file.vue b/packages/client/src/pages/admin-file.vue
index a62e0f630..40a868c1b 100644
--- a/packages/client/src/pages/admin-file.vue
+++ b/packages/client/src/pages/admin-file.vue
@@ -1,68 +1,88 @@
 <template>
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer v-if="file" :content-max="600" :margin-min="16" :margin-max="32">
-		<div v-if="tab === 'overview'" class="cxqhhsmd _formRoot">
-			<a class="_formBlock thumbnail" :href="file.url" target="_blank">
-				<MkDriveFileThumbnail class="thumbnail" :file="file" fit="contain"/>
-			</a>
-			<div class="_formBlock">
-				<MkKeyValue :copy="file.type" oneline style="margin: 1em 0;">
-					<template #key>MIME Type</template>
-					<template #value><span class="_monospace">{{ file.type }}</span></template>
-				</MkKeyValue>
-				<MkKeyValue oneline style="margin: 1em 0;">
-					<template #key>Size</template>
-					<template #value><span class="_monospace">{{ bytes(file.size) }}</span></template>
-				</MkKeyValue>
-				<MkKeyValue :copy="file.id" oneline style="margin: 1em 0;">
-					<template #key>ID</template>
-					<template #value><span class="_monospace">{{ file.id }}</span></template>
-				</MkKeyValue>
-				<MkKeyValue :copy="file.md5" oneline style="margin: 1em 0;">
-					<template #key>MD5</template>
-					<template #value><span class="_monospace">{{ file.md5 }}</span></template>
-				</MkKeyValue>
-				<MkKeyValue oneline style="margin: 1em 0;">
-					<template #key>{{ i18n.ts.createdAt }}</template>
-					<template #value><span class="_monospace"><MkTime :time="file.createdAt" mode="detail" style="display: block;"/></span></template>
-				</MkKeyValue>
-			</div>
-			<MkA v-if="file.user" class="user" :to="`/user-info/${file.user.id}`">
-				<MkUserCardMini :user="file.user"/>
-			</MkA>
-			<div class="_formBlock">
-				<MkSwitch v-model="isSensitive" @update:modelValue="toggleIsSensitive">NSFW</MkSwitch>
-			</div>
+	<swiper
+		:modules="[Virtual]"
+		:space-between="20"
+		:virtual="true"
+		@swiper="setSwiperRef"
+		@slide-change="onSlideChange"
+	>
+		<swiper-slide>
+			<MkSpacer :content-max="600" :margin-min="16" :margin-max="32">
+				<div class="cxqhhsmd _formRoot">
+					<a class="_formBlock thumbnail" :href="file.url" target="_blank">
+						<MkDriveFileThumbnail class="thumbnail" :file="file" fit="contain"/>
+					</a>
+					<div class="_formBlock">
+						<MkKeyValue :copy="file.type" oneline style="margin: 1em 0;">
+							<template #key>MIME Type</template>
+							<template #value><span class="_monospace">{{ file.type }}</span></template>
+						</MkKeyValue>
+						<MkKeyValue oneline style="margin: 1em 0;">
+							<template #key>Size</template>
+							<template #value><span class="_monospace">{{ bytes(file.size) }}</span></template>
+						</MkKeyValue>
+						<MkKeyValue :copy="file.id" oneline style="margin: 1em 0;">
+							<template #key>ID</template>
+							<template #value><span class="_monospace">{{ file.id }}</span></template>
+						</MkKeyValue>
+						<MkKeyValue :copy="file.md5" oneline style="margin: 1em 0;">
+							<template #key>MD5</template>
+							<template #value><span class="_monospace">{{ file.md5 }}</span></template>
+						</MkKeyValue>
+						<MkKeyValue oneline style="margin: 1em 0;">
+							<template #key>{{ i18n.ts.createdAt }}</template>
+							<template #value><span class="_monospace"><MkTime :time="file.createdAt" mode="detail" style="display: block;"/></span></template>
+						</MkKeyValue>
+					</div>
+					<MkA v-if="file.user" class="user" :to="`/user-info/${file.user.id}`">
+						<MkUserCardMini :user="file.user"/>
+					</MkA>
+					<div class="_formBlock">
+						<MkSwitch v-model="isSensitive" @update:modelValue="toggleIsSensitive">NSFW</MkSwitch>
+					</div>
 
-			<div class="_formBlock">
-				<MkButton danger @click="del"><i class="fas fa-trash-alt"></i> {{ i18n.ts.delete }}</MkButton>
-			</div>
-		</div>
-		<div v-else-if="tab === 'ip' && info" class="_formRoot">
-			<MkInfo v-if="!iAmAdmin" warn>{{ i18n.ts.requireAdminForView }}</MkInfo>
-			<MkKeyValue v-if="info.requestIp" class="_formBlock _monospace" :copy="info.requestIp" oneline>
-				<template #key>IP</template>
-				<template #value>{{ info.requestIp }}</template>
-			</MkKeyValue>
-			<FormSection v-if="info.requestHeaders">
-				<template #label>Headers</template>
-				<MkKeyValue v-for="(v, k) in info.requestHeaders" :key="k" class="_formBlock _monospace">
-					<template #key>{{ k }}</template>
-					<template #value>{{ v }}</template>
-				</MkKeyValue>
-			</FormSection>
-		</div>
-		<div v-else-if="tab === 'raw'" class="_formRoot">
-			<MkObjectView v-if="info" tall :value="info">
-			</MkObjectView>
-		</div>
-	</MkSpacer>
+					<div class="_formBlock">
+						<MkButton danger @click="del"><i class="fas fa-trash-alt"></i> {{ i18n.ts.delete }}</MkButton>
+					</div>
+				</div>
+			</MkSpacer>
+		</swiper-slide>
+		<swiper-slide>
+			<MkSpacer :content-max="600" :margin-min="16" :margin-max="32">
+				<div v-if="info" class="_formRoot">
+					<MkInfo v-if="!iAmAdmin" warn>{{ i18n.ts.requireAdminForView }}</MkInfo>
+					<MkKeyValue v-if="info.requestIp" class="_formBlock _monospace" :copy="info.requestIp" oneline>
+						<template #key>IP</template>
+						<template #value>{{ info.requestIp }}</template>
+					</MkKeyValue>
+					<FormSection v-if="info.requestHeaders">
+						<template #label>Headers</template>
+						<MkKeyValue v-for="(v, k) in info.requestHeaders" :key="k" class="_formBlock _monospace">
+							<template #key>{{ k }}</template>
+							<template #value>{{ v }}</template>
+						</MkKeyValue>
+					</FormSection>
+				</div>
+			</MkSpacer>
+		</swiper-slide>
+		<swiper-slide>
+			<MkSpacer :content-max="600" :margin-min="16" :margin-max="32">
+				<div class="_formRoot">
+					<MkObjectView v-if="info" tall :value="info">
+					</MkObjectView>
+				</div>
+			</MkSpacer>
+		</swiper-slide>
+	</swiper>
 </MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
 import { computed } from 'vue';
+import { Virtual } from 'swiper';
+import { Swiper, SwiperSlide } from 'swiper/vue';
 import MkButton from '@/components/MkButton.vue';
 import MkSwitch from '@/components/form/switch.vue';
 import MkObjectView from '@/components/MkObjectView.vue';
@@ -77,8 +97,13 @@ import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { acct } from '@/filters/user';
 import { iAmAdmin, iAmModerator } from '@/account';
+import 'swiper/scss';
+import 'swiper/scss/virtual';
 
 let tab = $ref('overview');
+let tabs = ['overview'];
+if (iAmModerator) tabs.push('ip');
+tabs.push('raw');
 let file: any = $ref(null);
 let info: any = $ref(null);
 let isSensitive: boolean = $ref(false);
@@ -138,6 +163,21 @@ definePageMetadata(computed(() => ({
 	title: file ? i18n.ts.file + ': ' + file.name : i18n.ts.file,
 	icon: 'fas fa-file',
 })));
+
+let swiperRef = null;
+
+function setSwiperRef(swiper) {
+	swiperRef = swiper;
+	syncSlide(tabs.indexOf(tab));
+}
+
+function onSlideChange() {
+	tab = tabs[swiperRef.activeIndex];
+}
+
+function syncSlide(index) {
+	swiperRef.slideTo(index);
+}
 </script>
 
 <style lang="scss" scoped>

From a846a2e15c4d09b70fe9ff82ab4cc586af31d23d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 15:32:05 -0700
Subject: [PATCH 185/245] Add swiper to channels

---
 packages/client/src/pages/channels.vue | 74 +++++++++++++++++++-------
 1 file changed, 56 insertions(+), 18 deletions(-)

diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue
index 56ea98d15..3989f5e77 100644
--- a/packages/client/src/pages/channels.vue
+++ b/packages/client/src/pages/channels.vue
@@ -1,39 +1,62 @@
 <template>
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="700">
-		<div v-if="tab === 'featured'" class="_content grwlizim featured">
-			<MkPagination v-slot="{items}" :pagination="featuredPagination">
-				<MkChannelPreview v-for="channel in items" :key="channel.id" class="_gap" :channel="channel"/>
-			</MkPagination>
-		</div>
-		<div v-else-if="tab === 'following'" class="_content grwlizim following">
-			<MkPagination v-slot="{items}" :pagination="followingPagination">
-				<MkChannelPreview v-for="channel in items" :key="channel.id" class="_gap" :channel="channel"/>
-			</MkPagination>
-		</div>
-		<div v-else-if="tab === 'owned'" class="_content grwlizim owned">
-			<MkButton class="new" @click="create()"><i class="fas fa-plus"></i></MkButton>
-			<MkPagination v-slot="{items}" :pagination="ownedPagination">
-				<MkChannelPreview v-for="channel in items" :key="channel.id" class="_gap" :channel="channel"/>
-			</MkPagination>
-		</div>
-	</MkSpacer>
+	<swiper
+		:modules="[Virtual]"
+		:space-between="20"
+		:virtual="true"
+		@swiper="setSwiperRef"
+		@slide-change="onSlideChange"
+	>
+		<swiper-slide>
+			<MkSpacer :content-max="700">
+				<div class="_content grwlizim featured">
+					<MkPagination v-slot="{items}" :pagination="featuredPagination">
+						<MkChannelPreview v-for="channel in items" :key="channel.id" class="_gap" :channel="channel"/>
+					</MkPagination>
+				</div>
+			</MkSpacer>
+		</swiper-slide>
+		<swiper-slide>
+			<MkSpacer :content-max="700">
+				<div class="_content grwlizim following">
+					<MkPagination v-slot="{items}" :pagination="followingPagination">
+						<MkChannelPreview v-for="channel in items" :key="channel.id" class="_gap" :channel="channel"/>
+					</MkPagination>
+				</div>
+			</MkSpacer>
+		</swiper-slide>
+		<swiper-slide>
+			<MkSpacer :content-max="700">
+				<div class="_content grwlizim owned">
+					<MkButton class="new" @click="create()"><i class="fas fa-plus"></i></MkButton>
+					<MkPagination v-slot="{items}" :pagination="ownedPagination">
+						<MkChannelPreview v-for="channel in items" :key="channel.id" class="_gap" :channel="channel"/>
+					</MkPagination>
+				</div>
+			</MkSpacer>
+		</swiper-slide>
+	</swiper>
 </MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
 import { computed, defineComponent, inject } from 'vue';
+import { Virtual } from 'swiper';
+import { Swiper, SwiperSlide } from 'swiper/vue';
 import MkChannelPreview from '@/components/MkChannelPreview.vue';
 import MkPagination from '@/components/MkPagination.vue';
 import MkButton from '@/components/MkButton.vue';
 import { useRouter } from '@/router';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { i18n } from '@/i18n';
+import 'swiper/scss';
+import 'swiper/scss/virtual';
 
 const router = useRouter();
 
 let tab = $ref('featured');
+const tabs = ['featured', 'following', 'owned'];
 
 const featuredPagination = {
 	endpoint: 'channels/featured' as const,
@@ -76,4 +99,19 @@ definePageMetadata(computed(() => ({
 	title: i18n.ts.channel,
 	icon: 'fas fa-satellite-dish',
 })));
+
+let swiperRef = null;
+
+function setSwiperRef(swiper) {
+	swiperRef = swiper;
+	syncSlide(tabs.indexOf(tab));
+}
+
+function onSlideChange() {
+	tab = tabs[swiperRef.activeIndex];
+}
+
+function syncSlide(index) {
+	swiperRef.slideTo(index);
+}
 </script>

From b5df90c797bf8b1f46089beea871733980bcf6e0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 15:42:17 -0700
Subject: [PATCH 186/245] Add swiper for instance info, fix MkSpacer

---
 packages/client/src/pages/about.vue         |  42 ++--
 packages/client/src/pages/admin-file.vue    |  36 ++-
 packages/client/src/pages/channels.vue      |  36 ++-
 packages/client/src/pages/instance-info.vue | 249 +++++++++++---------
 4 files changed, 193 insertions(+), 170 deletions(-)

diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue
index 65ae86f1e..4bddbb505 100644
--- a/packages/client/src/pages/about.vue
+++ b/packages/client/src/pages/about.vue
@@ -1,15 +1,15 @@
 <template>
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<swiper
-		:modules="[Virtual]"
-		:space-between="20"
-		:virtual="true"
-		@swiper="setSwiperRef"
-		@slide-change="onSlideChange"
-	>
-		<swiper-slide>
-			<MkSpacer :content-max="600" :margin-min="20">
+	<MkSpacer :content-max="600" :margin-min="20">
+		<swiper
+			:modules="[Virtual]"
+			:space-between="20"
+			:virtual="true"
+			@swiper="setSwiperRef"
+			@slide-change="onSlideChange"
+		>
+			<swiper-slide>
 				<div class="_formRoot">
 					<div class="_formBlock fwhjspax" :style="{ backgroundImage: `url(${ $instance.bannerUrl })` }">
 						<div class="content">
@@ -74,24 +74,18 @@
 						</div>
 					</FormSection>
 				</div>
-			</MkSpacer>
-		</swiper-slide>
-		<swiper-slide>
-			<MkSpacer :content-max="1000" :margin-min="20">
+			</swiper-slide>
+			<swiper-slide>
 				<XEmojis/>
-			</MkSpacer>
-		</swiper-slide>
-		<swiper-slide>
-			<MkSpacer :content-max="1000" :margin-min="20">
+			</swiper-slide>
+			<swiper-slide>
 				<XFederation/>
-			</MkSpacer>
-		</swiper-slide>
-		<swiper-slide>
-			<MkSpacer :content-max="1000" :margin-min="20">
+			</swiper-slide>
+			<swiper-slide>
 				<MkInstanceStats :chart-limit="500" :detailed="true"/>
-			</MkSpacer>
-		</swiper-slide>
-	</swiper>
+			</swiper-slide>
+		</swiper>
+	</MkSpacer>
 </MkStickyContainer>
 </template>
 
diff --git a/packages/client/src/pages/admin-file.vue b/packages/client/src/pages/admin-file.vue
index 40a868c1b..ed21552b9 100644
--- a/packages/client/src/pages/admin-file.vue
+++ b/packages/client/src/pages/admin-file.vue
@@ -1,15 +1,15 @@
 <template>
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<swiper
-		:modules="[Virtual]"
-		:space-between="20"
-		:virtual="true"
-		@swiper="setSwiperRef"
-		@slide-change="onSlideChange"
-	>
-		<swiper-slide>
-			<MkSpacer :content-max="600" :margin-min="16" :margin-max="32">
+	<MkSpacer :content-max="600" :margin-min="16" :margin-max="32">
+		<swiper
+			:modules="[Virtual]"
+			:space-between="20"
+			:virtual="true"
+			@swiper="setSwiperRef"
+			@slide-change="onSlideChange"
+		>
+			<swiper-slide>
 				<div class="cxqhhsmd _formRoot">
 					<a class="_formBlock thumbnail" :href="file.url" target="_blank">
 						<MkDriveFileThumbnail class="thumbnail" :file="file" fit="contain"/>
@@ -47,10 +47,8 @@
 						<MkButton danger @click="del"><i class="fas fa-trash-alt"></i> {{ i18n.ts.delete }}</MkButton>
 					</div>
 				</div>
-			</MkSpacer>
-		</swiper-slide>
-		<swiper-slide>
-			<MkSpacer :content-max="600" :margin-min="16" :margin-max="32">
+			</swiper-slide>
+			<swiper-slide>
 				<div v-if="info" class="_formRoot">
 					<MkInfo v-if="!iAmAdmin" warn>{{ i18n.ts.requireAdminForView }}</MkInfo>
 					<MkKeyValue v-if="info.requestIp" class="_formBlock _monospace" :copy="info.requestIp" oneline>
@@ -65,17 +63,15 @@
 						</MkKeyValue>
 					</FormSection>
 				</div>
-			</MkSpacer>
-		</swiper-slide>
-		<swiper-slide>
-			<MkSpacer :content-max="600" :margin-min="16" :margin-max="32">
+			</swiper-slide>
+			<swiper-slide>
 				<div class="_formRoot">
 					<MkObjectView v-if="info" tall :value="info">
 					</MkObjectView>
 				</div>
-			</MkSpacer>
-		</swiper-slide>
-	</swiper>
+			</swiper-slide>
+		</swiper>
+	</MkSpacer>
 </MkStickyContainer>
 </template>
 
diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue
index 3989f5e77..3080dda34 100644
--- a/packages/client/src/pages/channels.vue
+++ b/packages/client/src/pages/channels.vue
@@ -1,42 +1,38 @@
 <template>
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<swiper
-		:modules="[Virtual]"
-		:space-between="20"
-		:virtual="true"
-		@swiper="setSwiperRef"
-		@slide-change="onSlideChange"
-	>
-		<swiper-slide>
-			<MkSpacer :content-max="700">
+	<MkSpacer :content-max="700">
+		<swiper
+			:modules="[Virtual]"
+			:space-between="20"
+			:virtual="true"
+			@swiper="setSwiperRef"
+			@slide-change="onSlideChange"
+		>
+			<swiper-slide>
 				<div class="_content grwlizim featured">
 					<MkPagination v-slot="{items}" :pagination="featuredPagination">
 						<MkChannelPreview v-for="channel in items" :key="channel.id" class="_gap" :channel="channel"/>
 					</MkPagination>
 				</div>
-			</MkSpacer>
-		</swiper-slide>
-		<swiper-slide>
-			<MkSpacer :content-max="700">
+			</swiper-slide>
+			<swiper-slide>
 				<div class="_content grwlizim following">
 					<MkPagination v-slot="{items}" :pagination="followingPagination">
 						<MkChannelPreview v-for="channel in items" :key="channel.id" class="_gap" :channel="channel"/>
 					</MkPagination>
 				</div>
-			</MkSpacer>
-		</swiper-slide>
-		<swiper-slide>
-			<MkSpacer :content-max="700">
+			</swiper-slide>
+			<swiper-slide>
 				<div class="_content grwlizim owned">
 					<MkButton class="new" @click="create()"><i class="fas fa-plus"></i></MkButton>
 					<MkPagination v-slot="{items}" :pagination="ownedPagination">
 						<MkChannelPreview v-for="channel in items" :key="channel.id" class="_gap" :channel="channel"/>
 					</MkPagination>
 				</div>
-			</MkSpacer>
-		</swiper-slide>
-	</swiper>
+			</swiper-slide>
+		</swiper>
+	</MkSpacer>
 </MkStickyContainer>
 </template>
 
diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue
index c5378a284..b393d9ba4 100644
--- a/packages/client/src/pages/instance-info.vue
+++ b/packages/client/src/pages/instance-info.vue
@@ -2,120 +2,138 @@
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer v-if="instance" :content-max="600" :margin-min="16" :margin-max="32">
-		<div v-if="tab === 'overview'" class="_formRoot">
-			<div class="fnfelxur">
-				<img :src="instance.iconUrl || instance.faviconUrl" alt="" class="icon"/>
-				<span class="name">{{ instance.name || `(${i18n.ts.unknown})` }}</span>
-			</div>
-			<MkKeyValue :copy="host" oneline style="margin: 1em 0;">
-				<template #key>Host</template>
-				<template #value><span class="_monospace"><MkLink :url="`https://${host}`">{{ host }}</MkLink></span></template>
-			</MkKeyValue>
-			<MkKeyValue oneline style="margin: 1em 0;">
-				<template #key>{{ i18n.ts.software }}</template>
-				<template #value><span class="_monospace">{{ instance.softwareName || `(${i18n.ts.unknown})` }} / {{ instance.softwareVersion || `(${i18n.ts.unknown})` }}</span></template>
-			</MkKeyValue>
-			<MkKeyValue oneline style="margin: 1em 0;">
-				<template #key>{{ i18n.ts.administrator }}</template>
-				<template #value>{{ instance.maintainerName || `(${i18n.ts.unknown})` }} ({{ instance.maintainerEmail || `(${i18n.ts.unknown})` }})</template>
-			</MkKeyValue>
-			<MkKeyValue>
-				<template #key>{{ i18n.ts.description }}</template>
-				<template #value>{{ instance.description }}</template>
-			</MkKeyValue>
-
-			<FormSection v-if="iAmModerator">
-				<template #label>Moderation</template>
-				<FormSwitch v-model="suspended" class="_formBlock" @update:modelValue="toggleSuspend">{{ i18n.ts.stopActivityDelivery }}</FormSwitch>
-				<FormSwitch v-model="isBlocked" class="_formBlock" @update:modelValue="toggleBlock">{{ i18n.ts.blockThisInstance }}</FormSwitch>
-				<MkButton @click="refreshMetadata"><i class="fas fa-refresh"></i> Refresh metadata</MkButton>
-			</FormSection>
-
-			<FormSection>
-				<MkKeyValue oneline style="margin: 1em 0;">
-					<template #key>{{ i18n.ts.registeredAt }}</template>
-					<template #value><MkTime mode="detail" :time="instance.caughtAt"/></template>
-				</MkKeyValue>
-				<MkKeyValue oneline style="margin: 1em 0;">
-					<template #key>{{ i18n.ts.updatedAt }}</template>
-					<template #value><MkTime mode="detail" :time="instance.infoUpdatedAt"/></template>
-				</MkKeyValue>
-				<MkKeyValue oneline style="margin: 1em 0;">
-					<template #key>{{ i18n.ts.latestRequestSentAt }}</template>
-					<template #value><MkTime v-if="instance.latestRequestSentAt" :time="instance.latestRequestSentAt"/><span v-else>N/A</span></template>
-				</MkKeyValue>
-				<MkKeyValue oneline style="margin: 1em 0;">
-					<template #key>{{ i18n.ts.latestStatus }}</template>
-					<template #value>{{ instance.latestStatus ? instance.latestStatus : 'N/A' }}</template>
-				</MkKeyValue>
-				<MkKeyValue oneline style="margin: 1em 0;">
-					<template #key>{{ i18n.ts.latestRequestReceivedAt }}</template>
-					<template #value><MkTime v-if="instance.latestRequestReceivedAt" :time="instance.latestRequestReceivedAt"/><span v-else>N/A</span></template>
-				</MkKeyValue>
-			</FormSection>
-
-			<FormSection>
-				<MkKeyValue oneline style="margin: 1em 0;">
-					<template #key>Following (Pub)</template>
-					<template #value>{{ number(instance.followingCount) }}</template>
-				</MkKeyValue>
-				<MkKeyValue oneline style="margin: 1em 0;">
-					<template #key>Followers (Sub)</template>
-					<template #value>{{ number(instance.followersCount) }}</template>
-				</MkKeyValue>
-			</FormSection>
-
-			<FormSection>
-				<template #label>Well-known resources</template>
-				<FormLink :to="`https://${host}/.well-known/host-meta`" external style="margin-bottom: 8px;">host-meta</FormLink>
-				<FormLink :to="`https://${host}/.well-known/host-meta.json`" external style="margin-bottom: 8px;">host-meta.json</FormLink>
-				<FormLink :to="`https://${host}/.well-known/nodeinfo`" external style="margin-bottom: 8px;">nodeinfo</FormLink>
-				<FormLink :to="`https://${host}/robots.txt`" external style="margin-bottom: 8px;">robots.txt</FormLink>
-				<FormLink :to="`https://${host}/manifest.json`" external style="margin-bottom: 8px;">manifest.json</FormLink>
-			</FormSection>
-		</div>
-		<div v-else-if="tab === 'chart'" class="_formRoot">
-			<div class="cmhjzshl">
-				<div class="selects">
-					<MkSelect v-model="chartSrc" style="margin: 0 10px 0 0; flex: 1;">
-						<option value="instance-requests">{{ i18n.ts._instanceCharts.requests }}</option>
-						<option value="instance-users">{{ i18n.ts._instanceCharts.users }}</option>
-						<option value="instance-users-total">{{ i18n.ts._instanceCharts.usersTotal }}</option>
-						<option value="instance-notes">{{ i18n.ts._instanceCharts.notes }}</option>
-						<option value="instance-notes-total">{{ i18n.ts._instanceCharts.notesTotal }}</option>
-						<option value="instance-ff">{{ i18n.ts._instanceCharts.ff }}</option>
-						<option value="instance-ff-total">{{ i18n.ts._instanceCharts.ffTotal }}</option>
-						<option value="instance-drive-usage">{{ i18n.ts._instanceCharts.cacheSize }}</option>
-						<option value="instance-drive-usage-total">{{ i18n.ts._instanceCharts.cacheSizeTotal }}</option>
-						<option value="instance-drive-files">{{ i18n.ts._instanceCharts.files }}</option>
-						<option value="instance-drive-files-total">{{ i18n.ts._instanceCharts.filesTotal }}</option>
-					</MkSelect>
+		<swiper
+			:modules="[Virtual]"
+			:space-between="20"
+			:virtual="true"
+			@swiper="setSwiperRef"
+			@slide-change="onSlideChange"
+		>
+			<swiper-slide>
+				<div class="_formRoot">
+					<div class="fnfelxur">
+						<img :src="instance.iconUrl || instance.faviconUrl" alt="" class="icon"/>
+						<span class="name">{{ instance.name || `(${i18n.ts.unknown})` }}</span>
+					</div>
+					<MkKeyValue :copy="host" oneline style="margin: 1em 0;">
+						<template #key>Host</template>
+						<template #value><span class="_monospace"><MkLink :url="`https://${host}`">{{ host }}</MkLink></span></template>
+					</MkKeyValue>
+					<MkKeyValue oneline style="margin: 1em 0;">
+						<template #key>{{ i18n.ts.software }}</template>
+						<template #value><span class="_monospace">{{ instance.softwareName || `(${i18n.ts.unknown})` }} / {{ instance.softwareVersion || `(${i18n.ts.unknown})` }}</span></template>
+					</MkKeyValue>
+					<MkKeyValue oneline style="margin: 1em 0;">
+						<template #key>{{ i18n.ts.administrator }}</template>
+						<template #value>{{ instance.maintainerName || `(${i18n.ts.unknown})` }} ({{ instance.maintainerEmail || `(${i18n.ts.unknown})` }})</template>
+					</MkKeyValue>
+					<MkKeyValue>
+						<template #key>{{ i18n.ts.description }}</template>
+						<template #value>{{ instance.description }}</template>
+					</MkKeyValue>
+	
+					<FormSection v-if="iAmModerator">
+						<template #label>Moderation</template>
+						<FormSwitch v-model="suspended" class="_formBlock" @update:modelValue="toggleSuspend">{{ i18n.ts.stopActivityDelivery }}</FormSwitch>
+						<FormSwitch v-model="isBlocked" class="_formBlock" @update:modelValue="toggleBlock">{{ i18n.ts.blockThisInstance }}</FormSwitch>
+						<MkButton @click="refreshMetadata"><i class="fas fa-refresh"></i> Refresh metadata</MkButton>
+					</FormSection>
+	
+					<FormSection>
+						<MkKeyValue oneline style="margin: 1em 0;">
+							<template #key>{{ i18n.ts.registeredAt }}</template>
+							<template #value><MkTime mode="detail" :time="instance.caughtAt"/></template>
+						</MkKeyValue>
+						<MkKeyValue oneline style="margin: 1em 0;">
+							<template #key>{{ i18n.ts.updatedAt }}</template>
+							<template #value><MkTime mode="detail" :time="instance.infoUpdatedAt"/></template>
+						</MkKeyValue>
+						<MkKeyValue oneline style="margin: 1em 0;">
+							<template #key>{{ i18n.ts.latestRequestSentAt }}</template>
+							<template #value><MkTime v-if="instance.latestRequestSentAt" :time="instance.latestRequestSentAt"/><span v-else>N/A</span></template>
+						</MkKeyValue>
+						<MkKeyValue oneline style="margin: 1em 0;">
+							<template #key>{{ i18n.ts.latestStatus }}</template>
+							<template #value>{{ instance.latestStatus ? instance.latestStatus : 'N/A' }}</template>
+						</MkKeyValue>
+						<MkKeyValue oneline style="margin: 1em 0;">
+							<template #key>{{ i18n.ts.latestRequestReceivedAt }}</template>
+							<template #value><MkTime v-if="instance.latestRequestReceivedAt" :time="instance.latestRequestReceivedAt"/><span v-else>N/A</span></template>
+						</MkKeyValue>
+					</FormSection>
+	
+					<FormSection>
+						<MkKeyValue oneline style="margin: 1em 0;">
+							<template #key>Following (Pub)</template>
+							<template #value>{{ number(instance.followingCount) }}</template>
+						</MkKeyValue>
+						<MkKeyValue oneline style="margin: 1em 0;">
+							<template #key>Followers (Sub)</template>
+							<template #value>{{ number(instance.followersCount) }}</template>
+						</MkKeyValue>
+					</FormSection>
+	
+					<FormSection>
+						<template #label>Well-known resources</template>
+						<FormLink :to="`https://${host}/.well-known/host-meta`" external style="margin-bottom: 8px;">host-meta</FormLink>
+						<FormLink :to="`https://${host}/.well-known/host-meta.json`" external style="margin-bottom: 8px;">host-meta.json</FormLink>
+						<FormLink :to="`https://${host}/.well-known/nodeinfo`" external style="margin-bottom: 8px;">nodeinfo</FormLink>
+						<FormLink :to="`https://${host}/robots.txt`" external style="margin-bottom: 8px;">robots.txt</FormLink>
+						<FormLink :to="`https://${host}/manifest.json`" external style="margin-bottom: 8px;">manifest.json</FormLink>
+					</FormSection>
 				</div>
-				<div class="charts">
-					<div class="label">{{ i18n.t('recentNHours', { n: 90 }) }}</div>
-					<MkChart class="chart" :src="chartSrc" span="hour" :limit="90" :args="{ host: host }" :detailed="true"></MkChart>
-					<div class="label">{{ i18n.t('recentNDays', { n: 90 }) }}</div>
-					<MkChart class="chart" :src="chartSrc" span="day" :limit="90" :args="{ host: host }" :detailed="true"></MkChart>
+			</swiper-slide>
+			<swiper-slide>
+				<div class="_formRoot">
+					<div class="cmhjzshl">
+						<div class="selects">
+							<MkSelect v-model="chartSrc" style="margin: 0 10px 0 0; flex: 1;">
+								<option value="instance-requests">{{ i18n.ts._instanceCharts.requests }}</option>
+								<option value="instance-users">{{ i18n.ts._instanceCharts.users }}</option>
+								<option value="instance-users-total">{{ i18n.ts._instanceCharts.usersTotal }}</option>
+								<option value="instance-notes">{{ i18n.ts._instanceCharts.notes }}</option>
+								<option value="instance-notes-total">{{ i18n.ts._instanceCharts.notesTotal }}</option>
+								<option value="instance-ff">{{ i18n.ts._instanceCharts.ff }}</option>
+								<option value="instance-ff-total">{{ i18n.ts._instanceCharts.ffTotal }}</option>
+								<option value="instance-drive-usage">{{ i18n.ts._instanceCharts.cacheSize }}</option>
+								<option value="instance-drive-usage-total">{{ i18n.ts._instanceCharts.cacheSizeTotal }}</option>
+								<option value="instance-drive-files">{{ i18n.ts._instanceCharts.files }}</option>
+								<option value="instance-drive-files-total">{{ i18n.ts._instanceCharts.filesTotal }}</option>
+							</MkSelect>
+						</div>
+						<div class="charts">
+							<div class="label">{{ i18n.t('recentNHours', { n: 90 }) }}</div>
+							<MkChart class="chart" :src="chartSrc" span="hour" :limit="90" :args="{ host: host }" :detailed="true"></MkChart>
+							<div class="label">{{ i18n.t('recentNDays', { n: 90 }) }}</div>
+							<MkChart class="chart" :src="chartSrc" span="day" :limit="90" :args="{ host: host }" :detailed="true"></MkChart>
+						</div>
+					</div>
 				</div>
-			</div>
-		</div>
-		<div v-else-if="tab === 'users'" class="_formRoot">
-			<MkPagination v-slot="{items}" :pagination="usersPagination" style="display: grid; grid-template-columns: repeat(auto-fill,minmax(270px,1fr)); grid-gap: 12px;">
-				<MkA v-for="user in items" :key="user.id" v-tooltip.mfm="`Last posted: ${new Date(user.updatedAt).toLocaleString()}`" class="user" :to="`/user-info/${user.id}`">
-					<MkUserCardMini :user="user"/>
-				</MkA>
-			</MkPagination>
-		</div>
-		<div v-else-if="tab === 'raw'" class="_formRoot">
-			<MkObjectView tall :value="instance">
-			</MkObjectView>
-		</div>
+			</swiper-slide>
+			<swiper-slide>
+				<div class="_formRoot">
+					<MkPagination v-slot="{items}" :pagination="usersPagination" style="display: grid; grid-template-columns: repeat(auto-fill,minmax(270px,1fr)); grid-gap: 12px;">
+						<MkA v-for="user in items" :key="user.id" v-tooltip.mfm="`Last posted: ${new Date(user.updatedAt).toLocaleString()}`" class="user" :to="`/user-info/${user.id}`">
+							<MkUserCardMini :user="user"/>
+						</MkA>
+					</MkPagination>
+				</div>
+			</swiper-slide>
+			<swiper-slide>
+				<div class="_formRoot">
+					<MkObjectView tall :value="instance">
+					</MkObjectView>
+				</div>
+			</swiper-slide>
+		</swiper>
 	</MkSpacer>
 </MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
 import { } from 'vue';
+import { Virtual } from 'swiper';
+import { Swiper, SwiperSlide } from 'swiper/vue';
 import * as misskey from 'misskey-js';
 import MkChart from '@/components/MkChart.vue';
 import MkObjectView from '@/components/MkObjectView.vue';
@@ -134,12 +152,16 @@ import { definePageMetadata } from '@/scripts/page-metadata';
 import { i18n } from '@/i18n';
 import MkUserCardMini from '@/components/MkUserCardMini.vue';
 import MkPagination from '@/components/MkPagination.vue';
+import 'swiper/scss';
+import 'swiper/scss/virtual';
 
 const props = defineProps<{
 	host: string;
 }>();
 
 let tab = $ref('overview');
+let tabs = ['overview'];
+if (iAmModerator) tabs.push('chart', 'users', 'raw');
 let chartSrc = $ref('instance-requests');
 let meta = $ref<misskey.entities.DetailedInstanceMetadata | null>(null);
 let instance = $ref<misskey.entities.Instance | null>(null);
@@ -228,6 +250,21 @@ definePageMetadata({
 	title: props.host,
 	icon: 'fas fa-server',
 });
+
+let swiperRef = null;
+
+function setSwiperRef(swiper) {
+	swiperRef = swiper;
+	syncSlide(tabs.indexOf(tab));
+}
+
+function onSlideChange() {
+	tab = tabs[swiperRef.activeIndex];
+}
+
+function syncSlide(index) {
+	swiperRef.slideTo(index);
+}
 </script>
 
 <style lang="scss" scoped>

From 3b3e8b5f5145c12d78e57f358ada8d0aed55fcec Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 15:44:55 -0700
Subject: [PATCH 187/245] Add swiper to notifications

---
 packages/client/src/pages/notifications.vue | 49 +++++++++++++++++----
 1 file changed, 40 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index c99a88ba1..9896d8ac1 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -9,21 +9,34 @@
 		/>
 	</template>
 	<MkSpacer :content-max="800">
-		<div v-if="tab === 'all' || tab === 'unread'">
-			<XNotifications class="notifications" :include-types="includeTypes" :unread-only="unreadOnly"/>
-		</div>
-		<div v-else-if="tab === 'mentions'">
-			<XNotes :pagination="mentionsPagination"/>
-		</div>
-		<div v-else-if="tab === 'directNotes'">
-			<XNotes :pagination="directNotesPagination"/>
-		</div>
+		<swiper
+			:modules="[Virtual]"
+			:space-between="20"
+			:virtual="true"
+			@swiper="setSwiperRef"
+			@slide-change="onSlideChange"
+		>
+			<swiper-slide>
+				<XNotifications class="notifications" :include-types="includeTypes" :unread-only="false"/>
+			</swiper-slide>
+			<swiper-slide>
+				<XNotifications class="notifications" :include-types="includeTypes" :unread-only="true"/>
+			</swiper-slide>
+			<swiper-slide>
+				<XNotes :pagination="mentionsPagination"/>
+			</swiper-slide>
+			<swiper-slide>
+				<XNotes :pagination="directNotesPagination"/>
+			</swiper-slide>
+		</swiper>
 	</MkSpacer>
 </MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
+import { Virtual } from 'swiper';
+import { Swiper, SwiperSlide } from 'swiper/vue';
 import { notificationTypes } from 'misskey-js';
 import XNotifications from '@/components/MkNotifications.vue';
 import XNotes from '@/components/MkNotes.vue';
@@ -31,8 +44,11 @@ import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { deviceKind } from '@/scripts/device-kind';
+import 'swiper/scss';
+import 'swiper/scss/virtual';
 
 let tab = $ref('all');
+const tabs = ['all', 'unread', 'mentions', 'directNotes'];
 let includeTypes = $ref<string[] | null>(null);
 let unreadOnly = $computed(() => tab === 'unread');
 os.api('notifications/mark-all-as-read');
@@ -112,4 +128,19 @@ definePageMetadata(computed(() => ({
 	title: i18n.ts.notifications,
 	icon: 'fas fa-bell',
 })));
+
+let swiperRef = null;
+
+function setSwiperRef(swiper) {
+	swiperRef = swiper;
+	syncSlide(tabs.indexOf(tab));
+}
+
+function onSlideChange() {
+	tab = tabs[swiperRef.activeIndex];
+}
+
+function syncSlide(index) {
+	swiperRef.slideTo(index);
+}
 </script>

From ba0bf7785ab3d30ff636618a9994b2411a8e77d9 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 15:47:53 -0700
Subject: [PATCH 188/245] Add swiper to pages

---
 packages/client/src/pages/pages.vue | 53 +++++++++++++++++++----------
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/packages/client/src/pages/pages.vue b/packages/client/src/pages/pages.vue
index 02b05c57b..e3218592d 100644
--- a/packages/client/src/pages/pages.vue
+++ b/packages/client/src/pages/pages.vue
@@ -2,40 +2,57 @@
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :content-max="700">
-		<div v-if="tab === 'featured'" class="rknalgpo">
-			<MkPagination v-slot="{items}" :pagination="featuredPagesPagination">
-				<MkPagePreview v-for="page in items" :key="page.id" class="ckltabjg" :page="page"/>
-			</MkPagination>
-		</div>
-
-		<div v-else-if="tab === 'my'" class="rknalgpo my">
-			<MkButton class="new" @click="create()"><i class="fas fa-plus"></i></MkButton>
-			<MkPagination v-slot="{items}" :pagination="myPagesPagination">
-				<MkPagePreview v-for="page in items" :key="page.id" class="ckltabjg" :page="page"/>
-			</MkPagination>
-		</div>
-
-		<div v-else-if="tab === 'liked'" class="rknalgpo">
-			<MkPagination v-slot="{items}" :pagination="likedPagesPagination">
-				<MkPagePreview v-for="like in items" :key="like.page.id" class="ckltabjg" :page="like.page"/>
-			</MkPagination>
-		</div>
+		<swiper
+			:modules="[Virtual]"
+			:space-between="20"
+			:virtual="true"
+			@swiper="setSwiperRef"
+			@slide-change="onSlideChange"
+		>
+			<swiper-slide>
+				<div class="rknalgpo">
+					<MkPagination v-slot="{items}" :pagination="featuredPagesPagination">
+						<MkPagePreview v-for="page in items" :key="page.id" class="ckltabjg" :page="page"/>
+					</MkPagination>
+				</div>
+			</swiper-slide>
+			<swiper-slide>
+				<div class="rknalgpo my">
+					<MkButton class="new" @click="create()"><i class="fas fa-plus"></i></MkButton>
+					<MkPagination v-slot="{items}" :pagination="myPagesPagination">
+						<MkPagePreview v-for="page in items" :key="page.id" class="ckltabjg" :page="page"/>
+					</MkPagination>
+				</div>
+			</swiper-slide>
+			<swiper-slide>
+				<div class="rknalgpo">
+					<MkPagination v-slot="{items}" :pagination="likedPagesPagination">
+						<MkPagePreview v-for="like in items" :key="like.page.id" class="ckltabjg" :page="like.page"/>
+					</MkPagination>
+				</div>
+			</swiper-slide>
+		</swiper>
 	</MkSpacer>
 </MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
 import { computed, inject } from 'vue';
+import Virtual from 'swiper';
+import { Swiper, SwiperSlide } from 'swiper/vue';
 import MkPagePreview from '@/components/MkPagePreview.vue';
 import MkPagination from '@/components/MkPagination.vue';
 import MkButton from '@/components/MkButton.vue';
 import { useRouter } from '@/router';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
+import 'swiper/scss';
+import 'swiper/scss/virtual';
 
 const router = useRouter();
 
 let tab = $ref('featured');
+const tabs = ['featured', 'my', 'liked'];
 
 const featuredPagesPagination = {
 	endpoint: 'pages/featured' as const,

From e748a791654517a68be702ab649072f679353ddd Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 15:48:12 -0700
Subject: [PATCH 189/245] .26

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

diff --git a/package.json b/package.json
index 35821ea18..1bbed56b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-rc.25",
+	"version": "12.118.1-calc.2-rc.26",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 09996374e472af77a1b203a430f2a0107387ee57 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 15:51:43 -0700
Subject: [PATCH 190/245] fix: :bug: add script to pages view

---
 packages/client/src/pages/pages.vue | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/client/src/pages/pages.vue b/packages/client/src/pages/pages.vue
index e3218592d..1a58fe772 100644
--- a/packages/client/src/pages/pages.vue
+++ b/packages/client/src/pages/pages.vue
@@ -95,6 +95,21 @@ definePageMetadata(computed(() => ({
 	title: i18n.ts.pages,
 	icon: 'fas fa-sticky-note',
 })));
+
+let swiperRef = null;
+
+function setSwiperRef(swiper) {
+	swiperRef = swiper;
+	syncSlide(tabs.indexOf(tab));
+}
+
+function onSlideChange() {
+	tab = tabs[swiperRef.activeIndex];
+}
+
+function syncSlide(index) {
+	swiperRef.slideTo(index);
+}
 </script>
 
 <style lang="scss" scoped>

From b63c6632c9c301e1f517ec546b23319cd0f75f97 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Sep 2022 15:53:38 -0700
Subject: [PATCH 191/245] Shorten text on add emoji button

---
 locales/en-US.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 7f4e43ec2..0968fbf7e 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -134,7 +134,7 @@ emoji: "Emoji"
 emojis: "Emoji"
 emojiName: "Emoji name"
 emojiUrl: "Emoji URL"
-addEmoji: "Add an emoji"
+addEmoji: "Add"
 settingGuide: "Recommended settings"
 cacheRemoteFiles: "Cache remote files"
 cacheRemoteFilesDescription: "When this setting is disabled, remote files are loaded directly from the remote instance. Disabling this will decrease storage usage, but increase traffic, as thumbnails will not be generated."

From 20aee2deed6ed43420deedb371710984cd91fab6 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 10 Sep 2022 16:28:59 +0900
Subject: [PATCH 192/245] chore(client): :art:

---
 packages/client/src/components/form/range.vue | 22 ++++++++++++++++---
 .../client/src/pages/settings/general.vue     |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/components/form/range.vue b/packages/client/src/components/form/range.vue
index c0fc8c651..db21c3571 100644
--- a/packages/client/src/components/form/range.vue
+++ b/packages/client/src/components/form/range.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="timctyfi" :class="{ disabled }">
+<div class="timctyfi" :class="{ disabled, easing }">
 	<div class="label"><slot name="label"></slot></div>
 	<div v-adaptive-border class="body">
 		<div ref="containerEl" class="container">
@@ -28,9 +28,11 @@ const props = withDefaults(defineProps<{
 	step?: number;
 	textConverter?: (value: number) => string,
 	showTicks?: boolean;
+	easing?: boolean;
 }>(), {
 	step: 1,
 	textConverter: (v) => v.toString(),
+	easing: false,
 });
 
 const emit = defineEmits<{
@@ -198,7 +200,6 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => {
 					height: 100%;
 					background: var(--accent);
 					opacity: 0.5;
-					//transition: width 0.2s cubic-bezier(0,0,0,1);
 				}
 			}
 
@@ -231,7 +232,6 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => {
 				cursor: grab;
 				background: var(--accent);
 				border-radius: 999px;
-				//transition: left 0.2s cubic-bezier(0,0,0,1);
 
 				&:hover {
 					background: var(--accentLighten);
@@ -239,5 +239,21 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => {
 			}
 		}
 	}
+
+	&.easing {
+		> .body {
+			> .container {
+				> .track {
+					> .highlight {
+						transition: width 0.2s cubic-bezier(0,0,0,1);
+					}
+				}
+
+				> .thumb {
+					transition: left 0.2s cubic-bezier(0,0,0,1);
+				}
+			}
+		}
+	}
 }
 </style>
diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue
index 2710a41ec..9072bcefc 100644
--- a/packages/client/src/pages/settings/general.vue
+++ b/packages/client/src/pages/settings/general.vue
@@ -81,7 +81,7 @@
 		<option value="force">{{ i18n.ts._nsfw.force }}</option>
 	</FormSelect>
 
-	<FormRange v-model="numberOfPageCache" :min="1" :max="10" :step="1" class="_formBlock">
+	<FormRange v-model="numberOfPageCache" :min="1" :max="10" :step="1" easing class="_formBlock">
 		<template #label>{{ i18n.ts.numberOfPageCache }}</template>
 		<template #caption>{{ i18n.ts.numberOfPageCacheDescription }}</template>
 	</FormRange>

From 7c89a27e617ac02138a58c55d55f6dfc8eef3c66 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 10 Sep 2022 19:14:07 +0900
Subject: [PATCH 193/245] update deps

---
 package.json                  |   6 +-
 packages/backend/package.json |  18 +-
 packages/backend/yarn.lock    | 170 ++++++-----
 packages/client/package.json  |  28 +-
 packages/client/yarn.lock     | 536 +++++++++++++++++-----------------
 yarn.lock                     |  72 ++---
 6 files changed, 430 insertions(+), 400 deletions(-)

diff --git a/package.json b/package.json
index f55572773..e965999fa 100644
--- a/package.json
+++ b/package.json
@@ -41,10 +41,10 @@
 	"devDependencies": {
 		"@types/gulp": "4.0.9",
 		"@types/gulp-rename": "2.0.1",
-		"@typescript-eslint/parser": "5.35.1",
+		"@typescript-eslint/parser": "5.36.2",
 		"cross-env": "7.0.3",
-		"cypress": "10.6.0",
+		"cypress": "10.7.0",
 		"start-server-and-test": "1.14.0",
-		"typescript": "4.8.2"
+		"typescript": "4.8.3"
 	}
 }
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 61189e812..be8283e4a 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -30,10 +30,10 @@
 		"archiver": "5.3.1",
 		"autobind-decorator": "2.4.0",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.1204.0",
+		"aws-sdk": "2.1213.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "1.1.5",
-		"bull": "4.8.5",
+		"bull": "4.9.0",
 		"cacheable-lookup": "6.1.0",
 		"cbor": "8.1.0",
 		"chalk": "5.0.1",
@@ -77,9 +77,9 @@
 		"nested-property": "4.0.0",
 		"node-fetch": "3.2.10",
 		"nodemailer": "6.7.8",
-		"nsfwjs": "2.4.1",
+		"nsfwjs": "2.4.2",
 		"os-utils": "0.0.14",
-		"parse5": "7.0.0",
+		"parse5": "7.1.1",
 		"pg": "8.8.0",
 		"private-ip": "2.3.4",
 		"probe-image-size": "7.2.3",
@@ -116,7 +116,7 @@
 		"typeorm": "0.3.9",
 		"ulid": "2.3.0",
 		"unzipper": "0.10.11",
-		"uuid": "8.3.2",
+		"uuid": "9.0.0",
 		"web-push": "3.5.0",
 		"websocket": "1.0.34",
 		"ws": "8.8.1",
@@ -145,7 +145,7 @@
 		"@types/koa__multer": "2.0.4",
 		"@types/koa__router": "8.0.11",
 		"@types/mocha": "9.1.1",
-		"@types/node": "18.7.13",
+		"@types/node": "18.7.16",
 		"@types/node-fetch": "3.0.3",
 		"@types/nodemailer": "6.4.5",
 		"@types/oauth": "0.9.1",
@@ -167,12 +167,12 @@
 		"@types/web-push": "3.3.2",
 		"@types/websocket": "1.0.5",
 		"@types/ws": "8.5.3",
-		"@typescript-eslint/eslint-plugin": "5.35.1",
-		"@typescript-eslint/parser": "5.35.1",
+		"@typescript-eslint/eslint-plugin": "5.36.2",
+		"@typescript-eslint/parser": "5.36.2",
 		"cross-env": "7.0.3",
 		"eslint": "8.23.0",
 		"eslint-plugin-import": "2.26.0",
 		"execa": "6.1.0",
-		"typescript": "4.8.2"
+		"typescript": "4.8.3"
 	}
 }
diff --git a/packages/backend/yarn.lock b/packages/backend/yarn.lock
index 7d27016de..3be2f0d52 100644
--- a/packages/backend/yarn.lock
+++ b/packages/backend/yarn.lock
@@ -811,10 +811,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.6.2.tgz#331b7b9f8621c638284787c5559423822fdffc50"
   integrity sha512-LSw8TZt12ZudbpHc6EkIyDM3nHVWKYrAvGy6EAJfNfjusbwnThqjqxUKKRwuV3iWYeW/LYMzNgaq3MaLffQ2xA==
 
-"@types/node@18.7.13":
-  version "18.7.13"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.13.tgz#23e6c5168333480d454243378b69e861ab5c011a"
-  integrity sha512-46yIhxSe5xEaJZXWdIBP7GU4HDTG8/eo0qd9atdiL+lFpA03y8KS+lkTN834TWJj5767GbWv4n/P6efyTFt1Dw==
+"@types/node@18.7.16":
+  version "18.7.16"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.16.tgz#0eb3cce1e37c79619943d2fd903919fc30850601"
+  integrity sha512-EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg==
 
 "@types/node@^14.11.8":
   version "14.17.9"
@@ -1000,14 +1000,14 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.35.1.tgz#0d822bfea7469904dfc1bb8f13cabd362b967c93"
-  integrity sha512-RBZZXZlI4XCY4Wzgy64vB+0slT9+yAPQRjj/HSaRwUot33xbDjF1oN9BLwOLTewoOI0jothIltZRe9uJCHf8gg==
+"@typescript-eslint/eslint-plugin@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.36.2.tgz#6df092a20e0f9ec748b27f293a12cb39d0c1fe4d"
+  integrity sha512-OwwR8LRwSnI98tdc2z7mJYgY60gf7I9ZfGjN5EjCwwns9bdTuQfAXcsjSB2wSQ/TVNYSGKf4kzVXbNGaZvwiXw==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.35.1"
-    "@typescript-eslint/type-utils" "5.35.1"
-    "@typescript-eslint/utils" "5.35.1"
+    "@typescript-eslint/scope-manager" "5.36.2"
+    "@typescript-eslint/type-utils" "5.36.2"
+    "@typescript-eslint/utils" "5.36.2"
     debug "^4.3.4"
     functional-red-black-tree "^1.0.1"
     ignore "^5.2.0"
@@ -1015,69 +1015,70 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.35.1.tgz#bf2ee2ebeaa0a0567213748243fb4eec2857f04f"
-  integrity sha512-XL2TBTSrh3yWAsMYpKseBYTVpvudNf69rPOWXWVBI08My2JVT5jR66eTt4IgQFHA/giiKJW5dUD4x/ZviCKyGg==
+"@typescript-eslint/parser@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.36.2.tgz#3ddf323d3ac85a25295a55fcb9c7a49ab4680ddd"
+  integrity sha512-qS/Kb0yzy8sR0idFspI9Z6+t7mqk/oRjnAYfewG+VN73opAUvmYL3oPIMmgOX6CnQS6gmVIXGshlb5RY/R22pA==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.35.1"
-    "@typescript-eslint/types" "5.35.1"
-    "@typescript-eslint/typescript-estree" "5.35.1"
+    "@typescript-eslint/scope-manager" "5.36.2"
+    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/typescript-estree" "5.36.2"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.35.1.tgz#ccb69d54b7fd0f2d0226a11a75a8f311f525ff9e"
-  integrity sha512-kCYRSAzIW9ByEIzmzGHE50NGAvAP3wFTaZevgWva7GpquDyFPFcmvVkFJGWJJktg/hLwmys/FZwqM9EKr2u24Q==
+"@typescript-eslint/scope-manager@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.36.2.tgz#a75eb588a3879ae659514780831370642505d1cd"
+  integrity sha512-cNNP51L8SkIFSfce8B1NSUBTJTu2Ts4nWeWbFrdaqjmn9yKrAaJUBHkyTZc0cL06OFHpb+JZq5AUHROS398Orw==
   dependencies:
-    "@typescript-eslint/types" "5.35.1"
-    "@typescript-eslint/visitor-keys" "5.35.1"
+    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/visitor-keys" "5.36.2"
 
-"@typescript-eslint/type-utils@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.35.1.tgz#d50903b56758c5c8fc3be52b3be40569f27f9c4a"
-  integrity sha512-8xT8ljvo43Mp7BiTn1vxLXkjpw8wS4oAc00hMSB4L1/jIiYbjjnc3Qp2GAUOG/v8zsNCd1qwcqfCQ0BuishHkw==
+"@typescript-eslint/type-utils@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.36.2.tgz#752373f4babf05e993adf2cd543a763632826391"
+  integrity sha512-rPQtS5rfijUWLouhy6UmyNquKDPhQjKsaKH0WnY6hl/07lasj8gPaH2UD8xWkePn6SC+jW2i9c2DZVDnL+Dokw==
   dependencies:
-    "@typescript-eslint/utils" "5.35.1"
+    "@typescript-eslint/typescript-estree" "5.36.2"
+    "@typescript-eslint/utils" "5.36.2"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.35.1.tgz#af355fe52a0cc88301e889bc4ada72f279b63d61"
-  integrity sha512-FDaujtsH07VHzG0gQ6NDkVVhi1+rhq0qEvzHdJAQjysN+LHDCKDKCBRlZFFE0ec0jKxiv0hN63SNfExy0KrbQQ==
+"@typescript-eslint/types@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.36.2.tgz#a5066e500ebcfcee36694186ccc57b955c05faf9"
+  integrity sha512-9OJSvvwuF1L5eS2EQgFUbECb99F0mwq501w0H0EkYULkhFa19Qq7WFbycdw1PexAc929asupbZcgjVIe6OK/XQ==
 
-"@typescript-eslint/typescript-estree@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.35.1.tgz#db878a39a0dbdc9bb133f11cdad451770bfba211"
-  integrity sha512-JUqE1+VRTGyoXlDWWjm6MdfpBYVq+hixytrv1oyjYIBEOZhBCwtpp5ZSvBt4wIA1MKWlnaC2UXl2XmYGC3BoQA==
+"@typescript-eslint/typescript-estree@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.2.tgz#0c93418b36c53ba0bc34c61fe9405c4d1d8fe560"
+  integrity sha512-8fyH+RfbKc0mTspfuEjlfqA4YywcwQK2Amcf6TDOwaRLg7Vwdu4bZzyvBZp4bjt1RRjQ5MDnOZahxMrt2l5v9w==
   dependencies:
-    "@typescript-eslint/types" "5.35.1"
-    "@typescript-eslint/visitor-keys" "5.35.1"
+    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/visitor-keys" "5.36.2"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.35.1.tgz#ae1399afbfd6aa7d0ed1b7d941e9758d950250eb"
-  integrity sha512-v6F8JNXgeBWI4pzZn36hT2HXXzoBBBJuOYvoQiaQaEEjdi5STzux3Yj8v7ODIpx36i/5s8TdzuQ54TPc5AITQQ==
+"@typescript-eslint/utils@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.36.2.tgz#b01a76f0ab244404c7aefc340c5015d5ce6da74c"
+  integrity sha512-uNcopWonEITX96v9pefk9DC1bWMdkweeSsewJ6GeC7L6j2t0SJywisgkr9wUTtXk90fi2Eljj90HSHm3OGdGRg==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.35.1"
-    "@typescript-eslint/types" "5.35.1"
-    "@typescript-eslint/typescript-estree" "5.35.1"
+    "@typescript-eslint/scope-manager" "5.36.2"
+    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/typescript-estree" "5.36.2"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/visitor-keys@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.35.1.tgz#285e9e34aed7c876f16ff646a3984010035898e6"
-  integrity sha512-cEB1DvBVo1bxbW/S5axbGPE6b7FIMAbo3w+AGq6zNDA7+NYJOIkKj/sInfTv4edxd4PxJSgdN4t6/pbvgA+n5g==
+"@typescript-eslint/visitor-keys@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.2.tgz#2f8f78da0a3bad3320d2ac24965791ac39dace5a"
+  integrity sha512-BtRvSR6dEdrNt7Net2/XDjbYKU5Ml6GqJgVfXT0CxTCJlnIqK7rAGreuWKMT2t8cFUT2Msv5oxw0GMRD7T5J7A==
   dependencies:
-    "@typescript-eslint/types" "5.35.1"
+    "@typescript-eslint/types" "5.36.2"
     eslint-visitor-keys "^3.3.0"
 
 "@ungap/promise-all-settled@1.1.2":
@@ -1463,10 +1464,10 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
-aws-sdk@2.1204.0:
-  version "2.1204.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1204.0.tgz#6e0c5d0b4b50ff122b66772bb0ab5453009e6106"
-  integrity sha512-H3dRQBdgzAfZ/e/dfiW44fhQrgAuCfIzWhI5y5J9122caI4uZY6TEUd003UXP4nXq2eMfuPWg0bA/mPwbj8RkA==
+aws-sdk@2.1213.0:
+  version "2.1213.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1213.0.tgz#efdbe52c72e6879348650ff9a69ab55ef948b6f3"
+  integrity sha512-ZfrUfhlLjwvQ6QTbg8lR4+SRFHaivzZMmfpS+64YzafcKjwc7rklYqiyh4MPTSmdNZkErgaAykYpXPMuTiWBug==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"
@@ -1686,10 +1687,10 @@ bufferutil@^4.0.1:
   dependencies:
     node-gyp-build "~3.7.0"
 
-bull@4.8.5:
-  version "4.8.5"
-  resolved "https://registry.yarnpkg.com/bull/-/bull-4.8.5.tgz#eebafddc3249d6d5e8ced1c42b8bfa8efcc274aa"
-  integrity sha512-2Z630e4f6VsLJnWMAtfEHwIqJYmND4W3dcG48RIbXeWpvb4UnYtpe/zxEdslJu0PKrltB4IkFj5YtBsdeQRn8w==
+bull@4.9.0:
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/bull/-/bull-4.9.0.tgz#522a955fa045141ce2c063ab24c2c78e4ee3782e"
+  integrity sha512-yiaSb41dywjIhJ3i1mczjQGDmM6pLIoM1Ea0Gcf5HKDxOoEzL5i9XEEKW7fbsj7u083UEOnQ4gSWfbWIUDO6JQ==
   dependencies:
     cron-parser "^4.2.1"
     debuglog "^1.0.0"
@@ -2737,6 +2738,11 @@ entities@^4.3.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.3.0.tgz#62915f08d67353bb4eb67e3d62641a4059aec656"
   integrity sha512-/iP1rZrSEJ0DTlPiX+jbzlA3eVkY/e8L8SozroF395fIqE3TYF/Nz7YOMAawta+vLmyJ/hkGNNPcSbMADCCXbg==
 
+entities@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
+  integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
+
 env-paths@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
@@ -5591,10 +5597,10 @@ npmlog@^6.0.0:
     gauge "^4.0.0"
     set-blocking "^2.0.0"
 
-nsfwjs@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/nsfwjs/-/nsfwjs-2.4.1.tgz#406dff6e379f4fc1c5fd4d16b7a64e4ae4b355c1"
-  integrity sha512-8XPUPVeIIfkSeWjHEytDMedZNISR0SCjv67JYbS75SIYcmz8Y7GZqNfLupltjcwsqV0e4bwdc4l4bEOno58QdA==
+nsfwjs@2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/nsfwjs/-/nsfwjs-2.4.2.tgz#dd8656705f79f53d789245eaf317d6b6818a0032"
+  integrity sha512-i4Pp2yt59qPQgeZFyg3wXFBX52uSeu/hkDoqdZfe+sILRxNBUu0VDogj7Lmqak0GlrXviS/wLiVeIx40IDUu7A==
   dependencies:
     "@nsfw-filter/gif-frames" "1.0.2"
 
@@ -5864,12 +5870,12 @@ parse5-htmlparser2-tree-adapter@^6.0.0:
   dependencies:
     parse5 "^6.0.1"
 
-parse5@7.0.0, parse5@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.0.0.tgz#51f74a5257f5fcc536389e8c2d0b3802e1bfa91a"
-  integrity sha512-y/t8IXSPWTuRZqXc0ajH/UwDj4mnqLEbSttNbThcFhGrZuOyoyvNBO85PBp2jQa55wY9d07PBNjsK8ZP3K5U6g==
+parse5@7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.1.tgz#4649f940ccfb95d8754f37f73078ea20afe0c746"
+  integrity sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg==
   dependencies:
-    entities "^4.3.0"
+    entities "^4.4.0"
 
 parse5@^5.1.1:
   version "5.1.1"
@@ -5881,6 +5887,13 @@ parse5@^6.0.1:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
+parse5@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.0.0.tgz#51f74a5257f5fcc536389e8c2d0b3802e1bfa91a"
+  integrity sha512-y/t8IXSPWTuRZqXc0ajH/UwDj4mnqLEbSttNbThcFhGrZuOyoyvNBO85PBp2jQa55wY9d07PBNjsK8ZP3K5U6g==
+  dependencies:
+    entities "^4.3.0"
+
 parseurl@^1.3.2:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -7605,10 +7618,10 @@ typeorm@0.3.9:
     xml2js "^0.4.23"
     yargs "^17.3.1"
 
-typescript@4.8.2:
-  version "4.8.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790"
-  integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==
+typescript@4.8.3:
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.3.tgz#d59344522c4bc464a65a730ac695007fdb66dd88"
+  integrity sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==
 
 ulid@2.3.0:
   version "2.3.0"
@@ -7739,16 +7752,21 @@ uuid@8.0.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.0.0.tgz#bc6ccf91b5ff0ac07bbcdbf1c7c4e150db4dbb6c"
   integrity sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==
 
-uuid@8.3.2, uuid@^8.3.0, uuid@^8.3.2:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
-  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+uuid@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
+  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
 
 uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
+uuid@^8.3.0, uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
 v8-compile-cache-lib@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
diff --git a/packages/client/package.json b/packages/client/package.json
index 188b42021..c90c7f966 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -15,8 +15,8 @@
 		"@rollup/plugin-alias": "3.1.9",
 		"@rollup/plugin-json": "4.1.0",
 		"@syuilo/aiscript": "0.11.1",
-		"@vitejs/plugin-vue": "3.0.3",
-		"@vue/compiler-sfc": "3.2.37",
+		"@vitejs/plugin-vue": "3.1.0",
+		"@vue/compiler-sfc": "3.2.39",
 		"autobind-decorator": "2.4.0",
 		"autosize": "5.0.1",
 		"blurhash": "1.1.5",
@@ -38,35 +38,35 @@
 		"matter-js": "0.18.0",
 		"mfm-js": "0.23.0",
 		"misskey-js": "0.0.14",
-		"photoswipe": "5.3.0",
+		"photoswipe": "5.3.2",
 		"prismjs": "1.29.0",
 		"punycode": "2.1.1",
 		"querystring": "0.2.1",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"sass": "1.54.5",
+		"sass": "1.54.9",
 		"seedrandom": "3.0.5",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
 		"syuilo-password-strength": "0.0.1",
 		"textarea-caret": "3.1.0",
-		"three": "0.143.0",
+		"three": "0.144.0",
 		"throttle-debounce": "5.0.0",
 		"tinycolor2": "1.4.2",
 		"tsc-alias": "1.7.0",
 		"tsconfig-paths": "4.1.0",
 		"twemoji-parser": "14.0.0",
-		"typescript": "4.8.2",
-		"uuid": "8.3.2",
+		"typescript": "4.8.3",
+		"uuid": "9.0.0",
 		"vanilla-tilt": "1.7.2",
-		"vite": "3.0.9",
-		"vue": "3.2.37",
+		"vite": "3.1.0",
+		"vue": "3.2.39",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vuedraggable": "4.0.1"
 	},
 	"devDependencies": {
 		"@types/escape-regexp": "0.0.1",
-		"@types/glob": "7.2.0",
+		"@types/glob": "8.0.0",
 		"@types/gulp": "4.0.9",
 		"@types/gulp-rename": "2.0.1",
 		"@types/katex": "0.14.0",
@@ -76,14 +76,14 @@
 		"@types/throttle-debounce": "5.0.0",
 		"@types/tinycolor2": "1.4.3",
 		"@types/uuid": "8.3.4",
-		"@typescript-eslint/eslint-plugin": "5.35.1",
-		"@typescript-eslint/parser": "5.35.1",
+		"@typescript-eslint/eslint-plugin": "5.36.2",
+		"@typescript-eslint/parser": "5.36.2",
 		"cross-env": "7.0.3",
-		"cypress": "10.6.0",
+		"cypress": "10.7.0",
 		"eslint": "8.23.0",
 		"eslint-plugin-import": "2.26.0",
 		"eslint-plugin-vue": "9.4.0",
-		"rollup": "2.78.1",
+		"rollup": "2.79.0",
 		"start-server-and-test": "1.14.0"
 	}
 }
diff --git a/packages/client/yarn.lock b/packages/client/yarn.lock
index b01f95c65..abaf3e344 100644
--- a/packages/client/yarn.lock
+++ b/packages/client/yarn.lock
@@ -162,6 +162,11 @@
     twemoji-parser "14.0.0"
     universalify "^0.1.2"
 
+"@esbuild/linux-loong64@0.15.7":
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.7.tgz#1ec4af4a16c554cbd402cc557ccdd874e3f7be53"
+  integrity sha512-IKznSJOsVUuyt7cDzzSZyqBEcZe+7WlBqTVXiF1OXP/4Nm387ToaXZ0fyLwI1iBlI/bzpxVq411QE2/Bt2XWWw==
+
 "@eslint/eslintrc@^1.3.1":
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.1.tgz#de0807bfeffc37b964a7d0400e0c348ce5a2543d"
@@ -332,10 +337,10 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/glob@7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
-  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
+"@types/glob@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.0.0.tgz#321607e9cbaec54f687a0792b2d1d370739455d2"
+  integrity sha512-l6NQsDDyQUVeoTynNpC9uRvCUint/gSUXQA2euwmTuWGvPY5LSDUu6tkCtJB2SvGQlJQzLaKqcGZP4//7EDveA==
   dependencies:
     "@types/minimatch" "*"
     "@types/node" "*"
@@ -463,14 +468,14 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.35.1.tgz#0d822bfea7469904dfc1bb8f13cabd362b967c93"
-  integrity sha512-RBZZXZlI4XCY4Wzgy64vB+0slT9+yAPQRjj/HSaRwUot33xbDjF1oN9BLwOLTewoOI0jothIltZRe9uJCHf8gg==
+"@typescript-eslint/eslint-plugin@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.36.2.tgz#6df092a20e0f9ec748b27f293a12cb39d0c1fe4d"
+  integrity sha512-OwwR8LRwSnI98tdc2z7mJYgY60gf7I9ZfGjN5EjCwwns9bdTuQfAXcsjSB2wSQ/TVNYSGKf4kzVXbNGaZvwiXw==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.35.1"
-    "@typescript-eslint/type-utils" "5.35.1"
-    "@typescript-eslint/utils" "5.35.1"
+    "@typescript-eslint/scope-manager" "5.36.2"
+    "@typescript-eslint/type-utils" "5.36.2"
+    "@typescript-eslint/utils" "5.36.2"
     debug "^4.3.4"
     functional-red-black-tree "^1.0.1"
     ignore "^5.2.0"
@@ -478,165 +483,166 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.35.1.tgz#bf2ee2ebeaa0a0567213748243fb4eec2857f04f"
-  integrity sha512-XL2TBTSrh3yWAsMYpKseBYTVpvudNf69rPOWXWVBI08My2JVT5jR66eTt4IgQFHA/giiKJW5dUD4x/ZviCKyGg==
+"@typescript-eslint/parser@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.36.2.tgz#3ddf323d3ac85a25295a55fcb9c7a49ab4680ddd"
+  integrity sha512-qS/Kb0yzy8sR0idFspI9Z6+t7mqk/oRjnAYfewG+VN73opAUvmYL3oPIMmgOX6CnQS6gmVIXGshlb5RY/R22pA==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.35.1"
-    "@typescript-eslint/types" "5.35.1"
-    "@typescript-eslint/typescript-estree" "5.35.1"
+    "@typescript-eslint/scope-manager" "5.36.2"
+    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/typescript-estree" "5.36.2"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.35.1.tgz#ccb69d54b7fd0f2d0226a11a75a8f311f525ff9e"
-  integrity sha512-kCYRSAzIW9ByEIzmzGHE50NGAvAP3wFTaZevgWva7GpquDyFPFcmvVkFJGWJJktg/hLwmys/FZwqM9EKr2u24Q==
+"@typescript-eslint/scope-manager@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.36.2.tgz#a75eb588a3879ae659514780831370642505d1cd"
+  integrity sha512-cNNP51L8SkIFSfce8B1NSUBTJTu2Ts4nWeWbFrdaqjmn9yKrAaJUBHkyTZc0cL06OFHpb+JZq5AUHROS398Orw==
   dependencies:
-    "@typescript-eslint/types" "5.35.1"
-    "@typescript-eslint/visitor-keys" "5.35.1"
+    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/visitor-keys" "5.36.2"
 
-"@typescript-eslint/type-utils@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.35.1.tgz#d50903b56758c5c8fc3be52b3be40569f27f9c4a"
-  integrity sha512-8xT8ljvo43Mp7BiTn1vxLXkjpw8wS4oAc00hMSB4L1/jIiYbjjnc3Qp2GAUOG/v8zsNCd1qwcqfCQ0BuishHkw==
+"@typescript-eslint/type-utils@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.36.2.tgz#752373f4babf05e993adf2cd543a763632826391"
+  integrity sha512-rPQtS5rfijUWLouhy6UmyNquKDPhQjKsaKH0WnY6hl/07lasj8gPaH2UD8xWkePn6SC+jW2i9c2DZVDnL+Dokw==
   dependencies:
-    "@typescript-eslint/utils" "5.35.1"
+    "@typescript-eslint/typescript-estree" "5.36.2"
+    "@typescript-eslint/utils" "5.36.2"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.35.1.tgz#af355fe52a0cc88301e889bc4ada72f279b63d61"
-  integrity sha512-FDaujtsH07VHzG0gQ6NDkVVhi1+rhq0qEvzHdJAQjysN+LHDCKDKCBRlZFFE0ec0jKxiv0hN63SNfExy0KrbQQ==
+"@typescript-eslint/types@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.36.2.tgz#a5066e500ebcfcee36694186ccc57b955c05faf9"
+  integrity sha512-9OJSvvwuF1L5eS2EQgFUbECb99F0mwq501w0H0EkYULkhFa19Qq7WFbycdw1PexAc929asupbZcgjVIe6OK/XQ==
 
-"@typescript-eslint/typescript-estree@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.35.1.tgz#db878a39a0dbdc9bb133f11cdad451770bfba211"
-  integrity sha512-JUqE1+VRTGyoXlDWWjm6MdfpBYVq+hixytrv1oyjYIBEOZhBCwtpp5ZSvBt4wIA1MKWlnaC2UXl2XmYGC3BoQA==
+"@typescript-eslint/typescript-estree@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.2.tgz#0c93418b36c53ba0bc34c61fe9405c4d1d8fe560"
+  integrity sha512-8fyH+RfbKc0mTspfuEjlfqA4YywcwQK2Amcf6TDOwaRLg7Vwdu4bZzyvBZp4bjt1RRjQ5MDnOZahxMrt2l5v9w==
   dependencies:
-    "@typescript-eslint/types" "5.35.1"
-    "@typescript-eslint/visitor-keys" "5.35.1"
+    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/visitor-keys" "5.36.2"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.35.1.tgz#ae1399afbfd6aa7d0ed1b7d941e9758d950250eb"
-  integrity sha512-v6F8JNXgeBWI4pzZn36hT2HXXzoBBBJuOYvoQiaQaEEjdi5STzux3Yj8v7ODIpx36i/5s8TdzuQ54TPc5AITQQ==
+"@typescript-eslint/utils@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.36.2.tgz#b01a76f0ab244404c7aefc340c5015d5ce6da74c"
+  integrity sha512-uNcopWonEITX96v9pefk9DC1bWMdkweeSsewJ6GeC7L6j2t0SJywisgkr9wUTtXk90fi2Eljj90HSHm3OGdGRg==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.35.1"
-    "@typescript-eslint/types" "5.35.1"
-    "@typescript-eslint/typescript-estree" "5.35.1"
+    "@typescript-eslint/scope-manager" "5.36.2"
+    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/typescript-estree" "5.36.2"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/visitor-keys@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.35.1.tgz#285e9e34aed7c876f16ff646a3984010035898e6"
-  integrity sha512-cEB1DvBVo1bxbW/S5axbGPE6b7FIMAbo3w+AGq6zNDA7+NYJOIkKj/sInfTv4edxd4PxJSgdN4t6/pbvgA+n5g==
+"@typescript-eslint/visitor-keys@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.2.tgz#2f8f78da0a3bad3320d2ac24965791ac39dace5a"
+  integrity sha512-BtRvSR6dEdrNt7Net2/XDjbYKU5Ml6GqJgVfXT0CxTCJlnIqK7rAGreuWKMT2t8cFUT2Msv5oxw0GMRD7T5J7A==
   dependencies:
-    "@typescript-eslint/types" "5.35.1"
+    "@typescript-eslint/types" "5.36.2"
     eslint-visitor-keys "^3.3.0"
 
-"@vitejs/plugin-vue@3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-3.0.3.tgz#7e3e401ccb30b4380d2279d9849281413f1791ef"
-  integrity sha512-U4zNBlz9mg+TA+i+5QPc3N5lQvdUXENZLO2h0Wdzp56gI1MWhqJOv+6R+d4kOzoaSSq6TnGPBdZAXKOe4lXy6g==
+"@vitejs/plugin-vue@3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-3.1.0.tgz#3a423ea6943a450e806da412a911150e928598ed"
+  integrity sha512-fmxtHPjSOEIRg6vHYDaem+97iwCUg/uSIaTzp98lhELt2ISOQuDo2hbkBdXod0g15IhfPMQmAxh4heUks2zvDA==
 
-"@vue/compiler-core@3.2.37":
-  version "3.2.37"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.37.tgz#b3c42e04c0e0f2c496ff1784e543fbefe91e215a"
-  integrity sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==
+"@vue/compiler-core@3.2.39":
+  version "3.2.39"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.39.tgz#0d77e635f4bdb918326669155a2dc977c053943e"
+  integrity sha512-mf/36OWXqWn0wsC40nwRRGheR/qoID+lZXbIuLnr4/AngM0ov8Xvv8GHunC0rKRIkh60bTqydlqTeBo49rlbqw==
   dependencies:
     "@babel/parser" "^7.16.4"
-    "@vue/shared" "3.2.37"
+    "@vue/shared" "3.2.39"
     estree-walker "^2.0.2"
     source-map "^0.6.1"
 
-"@vue/compiler-dom@3.2.37":
-  version "3.2.37"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz#10d2427a789e7c707c872da9d678c82a0c6582b5"
-  integrity sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==
+"@vue/compiler-dom@3.2.39":
+  version "3.2.39"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.39.tgz#bd69d35c1a48fe2cea4ab9e96d2a3a735d146fdf"
+  integrity sha512-HMFI25Be1C8vLEEv1hgEO1dWwG9QQ8LTTPmCkblVJY/O3OvWx6r1+zsox5mKPMGvqYEZa6l8j+xgOfUspgo7hw==
   dependencies:
-    "@vue/compiler-core" "3.2.37"
-    "@vue/shared" "3.2.37"
+    "@vue/compiler-core" "3.2.39"
+    "@vue/shared" "3.2.39"
 
-"@vue/compiler-sfc@3.2.37":
-  version "3.2.37"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz#3103af3da2f40286edcd85ea495dcb35bc7f5ff4"
-  integrity sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==
+"@vue/compiler-sfc@3.2.39":
+  version "3.2.39"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.39.tgz#8fe29990f672805b7c5a2ecfa5b05e681c862ea2"
+  integrity sha512-fqAQgFs1/BxTUZkd0Vakn3teKUt//J3c420BgnYgEOoVdTwYpBTSXCMJ88GOBCylmUBbtquGPli9tVs7LzsWIA==
   dependencies:
     "@babel/parser" "^7.16.4"
-    "@vue/compiler-core" "3.2.37"
-    "@vue/compiler-dom" "3.2.37"
-    "@vue/compiler-ssr" "3.2.37"
-    "@vue/reactivity-transform" "3.2.37"
-    "@vue/shared" "3.2.37"
+    "@vue/compiler-core" "3.2.39"
+    "@vue/compiler-dom" "3.2.39"
+    "@vue/compiler-ssr" "3.2.39"
+    "@vue/reactivity-transform" "3.2.39"
+    "@vue/shared" "3.2.39"
     estree-walker "^2.0.2"
     magic-string "^0.25.7"
     postcss "^8.1.10"
     source-map "^0.6.1"
 
-"@vue/compiler-ssr@3.2.37":
-  version "3.2.37"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz#4899d19f3a5fafd61524a9d1aee8eb0505313cff"
-  integrity sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==
+"@vue/compiler-ssr@3.2.39":
+  version "3.2.39"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.39.tgz#4f3bfb535cb98b764bee45e078700e03ccc60633"
+  integrity sha512-EoGCJ6lincKOZGW+0Ky4WOKsSmqL7hp1ZYgen8M7u/mlvvEQUaO9tKKOy7K43M9U2aA3tPv0TuYYQFrEbK2eFQ==
   dependencies:
-    "@vue/compiler-dom" "3.2.37"
-    "@vue/shared" "3.2.37"
+    "@vue/compiler-dom" "3.2.39"
+    "@vue/shared" "3.2.39"
 
-"@vue/reactivity-transform@3.2.37":
-  version "3.2.37"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz#0caa47c4344df4ae59f5a05dde2a8758829f8eca"
-  integrity sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==
+"@vue/reactivity-transform@3.2.39":
+  version "3.2.39"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.39.tgz#da6ae6c8fd77791b9ae21976720d116591e1c4aa"
+  integrity sha512-HGuWu864zStiWs9wBC6JYOP1E00UjMdDWIG5W+FpUx28hV3uz9ODOKVNm/vdOy/Pvzg8+OcANxAVC85WFBbl3A==
   dependencies:
     "@babel/parser" "^7.16.4"
-    "@vue/compiler-core" "3.2.37"
-    "@vue/shared" "3.2.37"
+    "@vue/compiler-core" "3.2.39"
+    "@vue/shared" "3.2.39"
     estree-walker "^2.0.2"
     magic-string "^0.25.7"
 
-"@vue/reactivity@3.2.37":
-  version "3.2.37"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.37.tgz#5bc3847ac58828e2b78526e08219e0a1089f8848"
-  integrity sha512-/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A==
+"@vue/reactivity@3.2.39":
+  version "3.2.39"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.39.tgz#e6e3615fe2288d4232b104640ddabd0729a78c80"
+  integrity sha512-vlaYX2a3qMhIZfrw3Mtfd+BuU+TZmvDrPMa+6lpfzS9k/LnGxkSuf0fhkP0rMGfiOHPtyKoU9OJJJFGm92beVQ==
   dependencies:
-    "@vue/shared" "3.2.37"
+    "@vue/shared" "3.2.39"
 
-"@vue/runtime-core@3.2.37":
-  version "3.2.37"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.37.tgz#7ba7c54bb56e5d70edfc2f05766e1ca8519966e3"
-  integrity sha512-JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ==
+"@vue/runtime-core@3.2.39":
+  version "3.2.39"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.39.tgz#dc1faccab11b3e81197aba33fb30c9447c1d2c84"
+  integrity sha512-xKH5XP57JW5JW+8ZG1khBbuLakINTgPuINKL01hStWLTTGFOrM49UfCFXBcFvWmSbci3gmJyLl2EAzCaZWsx8g==
   dependencies:
-    "@vue/reactivity" "3.2.37"
-    "@vue/shared" "3.2.37"
+    "@vue/reactivity" "3.2.39"
+    "@vue/shared" "3.2.39"
 
-"@vue/runtime-dom@3.2.37":
-  version "3.2.37"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.37.tgz#002bdc8228fa63949317756fb1e92cdd3f9f4bbd"
-  integrity sha512-HimKdh9BepShW6YozwRKAYjYQWg9mQn63RGEiSswMbW+ssIht1MILYlVGkAGGQbkhSh31PCdoUcfiu4apXJoPw==
+"@vue/runtime-dom@3.2.39":
+  version "3.2.39"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.39.tgz#4a8cb132bcef316e8151c5ed07fc7272eb064614"
+  integrity sha512-4G9AEJP+sLhsqf5wXcyKVWQKUhI+iWfy0hWQgea+CpaTD7BR0KdQzvoQdZhwCY6B3oleSyNLkLAQwm0ya/wNoA==
   dependencies:
-    "@vue/runtime-core" "3.2.37"
-    "@vue/shared" "3.2.37"
+    "@vue/runtime-core" "3.2.39"
+    "@vue/shared" "3.2.39"
     csstype "^2.6.8"
 
-"@vue/server-renderer@3.2.37":
-  version "3.2.37"
-  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.37.tgz#840a29c8dcc29bddd9b5f5ffa22b95c0e72afdfc"
-  integrity sha512-kLITEJvaYgZQ2h47hIzPh2K3jG8c1zCVbp/o/bzQOyvzaKiCquKS7AaioPI28GNxIsE/zSx+EwWYsNxDCX95MA==
+"@vue/server-renderer@3.2.39":
+  version "3.2.39"
+  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.39.tgz#4358292d925233b0d8b54cf0513eaece8b2351c5"
+  integrity sha512-1yn9u2YBQWIgytFMjz4f/t0j43awKytTGVptfd3FtBk76t1pd8mxbek0G/DrnjJhd2V7mSTb5qgnxMYt8Z5iSQ==
   dependencies:
-    "@vue/compiler-ssr" "3.2.37"
-    "@vue/shared" "3.2.37"
+    "@vue/compiler-ssr" "3.2.39"
+    "@vue/shared" "3.2.39"
 
-"@vue/shared@3.2.37":
-  version "3.2.37"
-  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.37.tgz#8e6adc3f2759af52f0e85863dfb0b711ecc5c702"
-  integrity sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==
+"@vue/shared@3.2.39":
+  version "3.2.39"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.39.tgz#302df167559a1a5156da162d8cc6760cef67f8e3"
+  integrity sha512-D3dl2ZB9qE6mTuWPk9RlhDeP1dgNRUKC3NJxji74A4yL8M2MwlhLKUC/49WHjrNzSPug58fWx/yFbaTzGAQSBw==
 
 acorn-jsx@^5.3.2:
   version "5.3.2"
@@ -1103,10 +1109,10 @@ csstype@^2.6.8:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.13.tgz#a6893015b90e84dd6e85d0e3b442a1e84f2dbe0f"
   integrity sha512-ul26pfSQTZW8dcOnD2iiJssfXw0gdNVX9IJDH/X3K5DGPfj+fUYe3kB+swUY6BF3oZDxaID3AJt+9/ojSAE05A==
 
-cypress@10.6.0:
-  version "10.6.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.6.0.tgz#13f46867febf2c3715874ed5dce9c2e946b175fe"
-  integrity sha512-6sOpHjostp8gcLO34p6r/Ci342lBs8S5z9/eb3ZCQ22w2cIhMWGUoGKkosabPBfKcvRS9BE4UxybBtlIs8gTQA==
+cypress@10.7.0:
+  version "10.7.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.7.0.tgz#2d37f8b9751c6de33ee48639cb7e67a2ce593231"
+  integrity sha512-gTFvjrUoBnqPPOu9Vl5SBHuFlzx/Wxg/ZXIz2H4lzoOLFelKeF7mbwYUOzgzgF0oieU2WhJAestQdkgwJMMTvQ==
   dependencies:
     "@cypress/request" "^2.88.10"
     "@cypress/xvfb" "^1.2.4"
@@ -1313,131 +1319,132 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-esbuild-android-64@0.14.48:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.48.tgz#7e6394a0e517f738641385aaf553c7e4fb6d1ae3"
-  integrity sha512-3aMjboap/kqwCUpGWIjsk20TtxVoKck8/4Tu19rubh7t5Ra0Yrpg30Mt1QXXlipOazrEceGeWurXKeFJgkPOUg==
+esbuild-android-64@0.15.7:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.7.tgz#a521604d8c4c6befc7affedc897df8ccde189bea"
+  integrity sha512-p7rCvdsldhxQr3YHxptf1Jcd86dlhvc3EQmQJaZzzuAxefO9PvcI0GLOa5nCWem1AJ8iMRu9w0r5TG8pHmbi9w==
 
-esbuild-android-arm64@0.14.48:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.48.tgz#6877566be0f82dd5a43030c0007d06ece7f7c02f"
-  integrity sha512-vptI3K0wGALiDq+EvRuZotZrJqkYkN5282iAfcffjI5lmGG9G1ta/CIVauhY42MBXwEgDJkweiDcDMRLzBZC4g==
+esbuild-android-arm64@0.15.7:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.7.tgz#307b81f1088bf1e81dfe5f3d1d63a2d2a2e3e68e"
+  integrity sha512-L775l9ynJT7rVqRM5vo+9w5g2ysbOCfsdLV4CWanTZ1k/9Jb3IYlQ06VCI1edhcosTYJRECQFJa3eAvkx72eyQ==
 
-esbuild-darwin-64@0.14.48:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.48.tgz#ea3caddb707d88f844b1aa1dea5ff3b0a71ef1fd"
-  integrity sha512-gGQZa4+hab2Va/Zww94YbshLuWteyKGD3+EsVon8EWTWhnHFRm5N9NbALNbwi/7hQ/hM1Zm4FuHg+k6BLsl5UA==
+esbuild-darwin-64@0.15.7:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.7.tgz#270117b0c4ec6bcbc5cf3a297a7d11954f007e11"
+  integrity sha512-KGPt3r1c9ww009t2xLB6Vk0YyNOXh7hbjZ3EecHoVDxgtbUlYstMPDaReimKe6eOEfyY4hBEEeTvKwPsiH5WZg==
 
-esbuild-darwin-arm64@0.14.48:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.48.tgz#4e5eaab54df66cc319b76a2ac0e8af4e6f0d9c2f"
-  integrity sha512-bFjnNEXjhZT+IZ8RvRGNJthLWNHV5JkCtuOFOnjvo5pC0sk2/QVk0Qc06g2PV3J0TcU6kaPC3RN9yy9w2PSLEA==
+esbuild-darwin-arm64@0.15.7:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.7.tgz#97851eacd11dacb7719713602e3319e16202fc77"
+  integrity sha512-kBIHvtVqbSGajN88lYMnR3aIleH3ABZLLFLxwL2stiuIGAjGlQW741NxVTpUHQXUmPzxi6POqc9npkXa8AcSZQ==
 
-esbuild-freebsd-64@0.14.48:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.48.tgz#47b5abc7426eae66861490ffbb380acc67af5b15"
-  integrity sha512-1NOlwRxmOsnPcWOGTB10JKAkYSb2nue0oM1AfHWunW/mv3wERfJmnYlGzL3UAOIUXZqW8GeA2mv+QGwq7DToqA==
+esbuild-freebsd-64@0.15.7:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.7.tgz#1de15ffaf5ae916aa925800aa6d02579960dd8c4"
+  integrity sha512-hESZB91qDLV5MEwNxzMxPfbjAhOmtfsr9Wnuci7pY6TtEh4UDuevmGmkUIjX/b+e/k4tcNBMf7SRQ2mdNuK/HQ==
 
-esbuild-freebsd-arm64@0.14.48:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.48.tgz#e8c54c8637cd44feed967ea12338b0a4da3a7b11"
-  integrity sha512-gXqKdO8wabVcYtluAbikDH2jhXp+Klq5oCD5qbVyUG6tFiGhrC9oczKq3vIrrtwcxDQqK6+HDYK8Zrd4bCA9Gw==
+esbuild-freebsd-arm64@0.15.7:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.7.tgz#0f160dbf5c9a31a1d8dd87acbbcb1a04b7031594"
+  integrity sha512-dLFR0ChH5t+b3J8w0fVKGvtwSLWCv7GYT2Y2jFGulF1L5HftQLzVGN+6pi1SivuiVSmTh28FwUhi9PwQicXI6Q==
 
-esbuild-linux-32@0.14.48:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.48.tgz#229cf3246de2b7937c3ac13fac622d4d7a1344c5"
-  integrity sha512-ghGyDfS289z/LReZQUuuKq9KlTiTspxL8SITBFQFAFRA/IkIvDpnZnCAKTCjGXAmUqroMQfKJXMxyjJA69c/nQ==
+esbuild-linux-32@0.15.7:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.7.tgz#422eb853370a5e40bdce8b39525380de11ccadec"
+  integrity sha512-v3gT/LsONGUZcjbt2swrMjwxo32NJzk+7sAgtxhGx1+ZmOFaTRXBAi1PPfgpeo/J//Un2jIKm/I+qqeo4caJvg==
 
-esbuild-linux-64@0.14.48:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.48.tgz#7c0e7226c02c42aacc5656c36977493dc1e96c4f"
-  integrity sha512-vni3p/gppLMVZLghI7oMqbOZdGmLbbKR23XFARKnszCIBpEMEDxOMNIKPmMItQrmH/iJrL1z8Jt2nynY0bE1ug==
+esbuild-linux-64@0.15.7:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.7.tgz#f89c468453bb3194b14f19dc32e0b99612e81d2b"
+  integrity sha512-LxXEfLAKwOVmm1yecpMmWERBshl+Kv5YJ/1KnyAr6HRHFW8cxOEsEfisD3sVl/RvHyW//lhYUVSuy9jGEfIRAQ==
 
-esbuild-linux-arm64@0.14.48:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.48.tgz#0af1eda474b5c6cc0cace8235b74d0cb8fcf57a7"
-  integrity sha512-3CFsOlpoxlKPRevEHq8aAntgYGYkE1N9yRYAcPyng/p4Wyx0tPR5SBYsxLKcgPB9mR8chHEhtWYz6EZ+H199Zw==
+esbuild-linux-arm64@0.15.7:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.7.tgz#68a79d6eb5e032efb9168a0f340ccfd33d6350a1"
+  integrity sha512-P3cfhudpzWDkglutWgXcT2S7Ft7o2e3YDMrP1n0z2dlbUZghUkKCyaWw0zhp4KxEEzt/E7lmrtRu/pGWnwb9vw==
 
-esbuild-linux-arm@0.14.48:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.48.tgz#de4d1fa6b77cdcd00e2bb43dd0801e4680f0ab52"
-  integrity sha512-+VfSV7Akh1XUiDNXgqgY1cUP1i2vjI+BmlyXRfVz5AfV3jbpde8JTs5Q9sYgaoq5cWfuKfoZB/QkGOI+QcL1Tw==
+esbuild-linux-arm@0.15.7:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.7.tgz#2b7c784d0b3339878013dfa82bf5eaf82c7ce7d3"
+  integrity sha512-JKgAHtMR5f75wJTeuNQbyznZZa+pjiUHV7sRZp42UNdyXC6TiUYMW/8z8yIBAr2Fpad8hM1royZKQisqPABPvQ==
 
-esbuild-linux-mips64le@0.14.48:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.48.tgz#822c1778495f7868e990d4da47ad7281df28fd15"
-  integrity sha512-cs0uOiRlPp6ymknDnjajCgvDMSsLw5mST2UXh+ZIrXTj2Ifyf2aAP3Iw4DiqgnyYLV2O/v/yWBJx+WfmKEpNLA==
+esbuild-linux-mips64le@0.15.7:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.7.tgz#bb8330a50b14aa84673816cb63cc6c8b9beb62cc"
+  integrity sha512-T7XKuxl0VpeFLCJXub6U+iybiqh0kM/bWOTb4qcPyDDwNVhLUiPcGdG2/0S7F93czUZOKP57YiLV8YQewgLHKw==
 
-esbuild-linux-ppc64le@0.14.48:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.48.tgz#55de0a9ec4a48fedfe82a63e083164d001709447"
-  integrity sha512-+2F0vJMkuI0Wie/wcSPDCqXvSFEELH7Jubxb7mpWrA/4NpT+/byjxDz0gG6R1WJoeDefcrMfpBx4GFNN1JQorQ==
+esbuild-linux-ppc64le@0.15.7:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.7.tgz#52544e7fa992811eb996674090d0bc41f067a14b"
+  integrity sha512-6mGuC19WpFN7NYbecMIJjeQgvDb5aMuvyk0PDYBJrqAEMkTwg3Z98kEKuCm6THHRnrgsdr7bp4SruSAxEM4eJw==
 
-esbuild-linux-riscv64@0.14.48:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.48.tgz#cd2b7381880b2f4b21a5a598fb673492120f18a5"
-  integrity sha512-BmaK/GfEE+5F2/QDrIXteFGKnVHGxlnK9MjdVKMTfvtmudjY3k2t8NtlY4qemKSizc+QwyombGWTBDc76rxePA==
+esbuild-linux-riscv64@0.15.7:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.7.tgz#a43ae60697992b957e454cbb622f7ee5297e8159"
+  integrity sha512-uUJsezbswAYo/X7OU/P+PuL/EI9WzxsEQXDekfwpQ23uGiooxqoLFAPmXPcRAt941vjlY9jtITEEikWMBr+F/g==
 
-esbuild-linux-s390x@0.14.48:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.48.tgz#4b319eca2a5c64637fc7397ffbd9671719cdb6bf"
-  integrity sha512-tndw/0B9jiCL+KWKo0TSMaUm5UWBLsfCKVdbfMlb3d5LeV9WbijZ8Ordia8SAYv38VSJWOEt6eDCdOx8LqkC4g==
+esbuild-linux-s390x@0.15.7:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.7.tgz#8c76a125dd10a84c166294d77416caaf5e1c7b64"
+  integrity sha512-+tO+xOyTNMc34rXlSxK7aCwJgvQyffqEM5MMdNDEeMU3ss0S6wKvbBOQfgd5jRPblfwJ6b+bKiz0g5nABpY0QQ==
 
-esbuild-netbsd-64@0.14.48:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.48.tgz#c27cde8b5cb55dcc227943a18ab078fb98d0adbf"
-  integrity sha512-V9hgXfwf/T901Lr1wkOfoevtyNkrxmMcRHyticybBUHookznipMOHoF41Al68QBsqBxnITCEpjjd4yAos7z9Tw==
+esbuild-netbsd-64@0.15.7:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.7.tgz#19b2e75449d7d9c32b5d8a222bac2f1e0c3b08fd"
+  integrity sha512-yVc4Wz+Pu3cP5hzm5kIygNPrjar/v5WCSoRmIjCPWfBVJkZNb5brEGKUlf+0Y759D48BCWa0WHrWXaNy0DULTQ==
 
-esbuild-openbsd-64@0.14.48:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.48.tgz#af5ab2d1cb41f09064bba9465fc8bf1309150df1"
-  integrity sha512-+IHf4JcbnnBl4T52egorXMatil/za0awqzg2Vy6FBgPcBpisDWT2sVz/tNdrK9kAqj+GZG/jZdrOkj7wsrNTKA==
+esbuild-openbsd-64@0.15.7:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.7.tgz#1357b2bf72fd037d9150e751420a1fe4c8618ad7"
+  integrity sha512-GsimbwC4FSR4lN3wf8XmTQ+r8/0YSQo21rWDL0XFFhLHKlzEA4SsT1Tl8bPYu00IU6UWSJ+b3fG/8SB69rcuEQ==
 
-esbuild-sunos-64@0.14.48:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.48.tgz#db3ae20526055cf6fd5c4582676233814603ac54"
-  integrity sha512-77m8bsr5wOpOWbGi9KSqDphcq6dFeJyun8TA+12JW/GAjyfTwVtOnN8DOt6DSPUfEV+ltVMNqtXUeTeMAxl5KA==
+esbuild-sunos-64@0.15.7:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.7.tgz#87ab2c604592a9c3c763e72969da0d72bcde91d2"
+  integrity sha512-8CDI1aL/ts0mDGbWzjEOGKXnU7p3rDzggHSBtVryQzkSOsjCHRVe0iFYUuhczlxU1R3LN/E7HgUO4NXzGGP/Ag==
 
-esbuild-windows-32@0.14.48:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.48.tgz#021ffceb0a3f83078262870da88a912293c57475"
-  integrity sha512-EPgRuTPP8vK9maxpTGDe5lSoIBHGKO/AuxDncg5O3NkrPeLNdvvK8oywB0zGaAZXxYWfNNSHskvvDgmfVTguhg==
+esbuild-windows-32@0.15.7:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.7.tgz#c81e688c0457665a8d463a669e5bf60870323e99"
+  integrity sha512-cOnKXUEPS8EGCzRSFa1x6NQjGhGsFlVgjhqGEbLTPsA7x4RRYiy2RKoArNUU4iR2vHmzqS5Gr84MEumO/wxYKA==
 
-esbuild-windows-64@0.14.48:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.48.tgz#a4d3407b580f9faac51f61eec095fa985fb3fee4"
-  integrity sha512-YmpXjdT1q0b8ictSdGwH3M8VCoqPpK1/UArze3X199w6u8hUx3V8BhAi1WjbsfDYRBanVVtduAhh2sirImtAvA==
+esbuild-windows-64@0.15.7:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.7.tgz#2421d1ae34b0561a9d6767346b381961266c4eff"
+  integrity sha512-7MI08Ec2sTIDv+zH6StNBKO+2hGUYIT42GmFyW6MBBWWtJhTcQLinKS6ldIN1d52MXIbiJ6nXyCJ+LpL4jBm3Q==
 
-esbuild-windows-arm64@0.14.48:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.48.tgz#762c0562127d8b09bfb70a3c816460742dd82880"
-  integrity sha512-HHaOMCsCXp0rz5BT2crTka6MPWVno121NKApsGs/OIW5QC0ggC69YMGs1aJct9/9FSUF4A1xNE/cLvgB5svR4g==
+esbuild-windows-arm64@0.15.7:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.7.tgz#7d5e9e060a7b454cb2f57f84a3f3c23c8f30b7d2"
+  integrity sha512-R06nmqBlWjKHddhRJYlqDd3Fabx9LFdKcjoOy08YLimwmsswlFBJV4rXzZCxz/b7ZJXvrZgj8DDv1ewE9+StMw==
 
-esbuild@^0.14.47:
-  version "0.14.48"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.48.tgz#da5d8d25cd2d940c45ea0cfecdca727f7aee2b85"
-  integrity sha512-w6N1Yn5MtqK2U1/WZTX9ZqUVb8IOLZkZ5AdHkT6x3cHDMVsYWC7WPdiLmx19w3i4Rwzy5LqsEMtVihG3e4rFzA==
+esbuild@^0.15.6:
+  version "0.15.7"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.7.tgz#8a1f1aff58671a3199dd24df95314122fc1ddee8"
+  integrity sha512-7V8tzllIbAQV1M4QoE52ImKu8hT/NLGlGXkiDsbEU5PS6K8Mn09ZnYoS+dcmHxOS9CRsV4IRAMdT3I67IyUNXw==
   optionalDependencies:
-    esbuild-android-64 "0.14.48"
-    esbuild-android-arm64 "0.14.48"
-    esbuild-darwin-64 "0.14.48"
-    esbuild-darwin-arm64 "0.14.48"
-    esbuild-freebsd-64 "0.14.48"
-    esbuild-freebsd-arm64 "0.14.48"
-    esbuild-linux-32 "0.14.48"
-    esbuild-linux-64 "0.14.48"
-    esbuild-linux-arm "0.14.48"
-    esbuild-linux-arm64 "0.14.48"
-    esbuild-linux-mips64le "0.14.48"
-    esbuild-linux-ppc64le "0.14.48"
-    esbuild-linux-riscv64 "0.14.48"
-    esbuild-linux-s390x "0.14.48"
-    esbuild-netbsd-64 "0.14.48"
-    esbuild-openbsd-64 "0.14.48"
-    esbuild-sunos-64 "0.14.48"
-    esbuild-windows-32 "0.14.48"
-    esbuild-windows-64 "0.14.48"
-    esbuild-windows-arm64 "0.14.48"
+    "@esbuild/linux-loong64" "0.15.7"
+    esbuild-android-64 "0.15.7"
+    esbuild-android-arm64 "0.15.7"
+    esbuild-darwin-64 "0.15.7"
+    esbuild-darwin-arm64 "0.15.7"
+    esbuild-freebsd-64 "0.15.7"
+    esbuild-freebsd-arm64 "0.15.7"
+    esbuild-linux-32 "0.15.7"
+    esbuild-linux-64 "0.15.7"
+    esbuild-linux-arm "0.15.7"
+    esbuild-linux-arm64 "0.15.7"
+    esbuild-linux-mips64le "0.15.7"
+    esbuild-linux-ppc64le "0.15.7"
+    esbuild-linux-riscv64 "0.15.7"
+    esbuild-linux-s390x "0.15.7"
+    esbuild-netbsd-64 "0.15.7"
+    esbuild-openbsd-64 "0.15.7"
+    esbuild-sunos-64 "0.15.7"
+    esbuild-windows-32 "0.15.7"
+    esbuild-windows-64 "0.15.7"
+    esbuild-windows-arm64 "0.15.7"
 
 escape-regexp@0.0.1:
   version "0.0.1"
@@ -2861,10 +2868,10 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-photoswipe@5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/photoswipe/-/photoswipe-5.3.0.tgz#fe118b147dddaf58ccc17c9403c7d7148805f8d2"
-  integrity sha512-vZMwziQorjiagzX7EvWimVT0YHO0DWNtR9UT6cv3yW1FA199LgsTpj4ziB2oJ/X/197gKmi56Oux5PudWUAmuw==
+photoswipe@5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/photoswipe/-/photoswipe-5.3.2.tgz#814d26197ba59076828ddefd41b7f9ed5eb355a8"
+  integrity sha512-QJrf0kGa3tYX3sUascZymkT+ZIkgw8YNcwL+hGqoLTyphcn9vSTEab7tmCnA1tthgVzWQRgPjX9psuk7yFrTcA==
 
 picocolors@^1.0.0:
   version "1.0.0"
@@ -3072,17 +3079,17 @@ rndstr@1.0.0:
     rangestr "0.0.1"
     seedrandom "2.4.2"
 
-rollup@2.78.1:
-  version "2.78.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.78.1.tgz#52fe3934d9c83cb4f7c4cb5fb75d88591be8648f"
-  integrity sha512-VeeCgtGi4P+o9hIg+xz4qQpRl6R401LWEXBmxYKOV4zlF82lyhgh2hTZnheFUbANE8l2A41F458iwj2vEYaXJg==
+rollup@2.79.0:
+  version "2.79.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.0.tgz#9177992c9f09eb58c5e56cbfa641607a12b57ce2"
+  integrity sha512-x4KsrCgwQ7ZJPcFA/SUu6QVcYlO7uRLfLAy0DSA4NS2eG8japdbpM50ToH7z4iObodRYOJ0soneF0iaQRJ6zhA==
   optionalDependencies:
     fsevents "~2.3.2"
 
-"rollup@>=2.75.6 <2.77.0 || ~2.77.0":
-  version "2.77.3"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.3.tgz#8f00418d3a2740036e15deb653bed1a90ee0cc12"
-  integrity sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g==
+rollup@~2.78.0:
+  version "2.78.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.78.1.tgz#52fe3934d9c83cb4f7c4cb5fb75d88591be8648f"
+  integrity sha512-VeeCgtGi4P+o9hIg+xz4qQpRl6R401LWEXBmxYKOV4zlF82lyhgh2hTZnheFUbANE8l2A41F458iwj2vEYaXJg==
   optionalDependencies:
     fsevents "~2.3.2"
 
@@ -3125,10 +3132,10 @@ safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass@1.54.5:
-  version "1.54.5"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.54.5.tgz#93708f5560784f6ff2eab8542ade021a4a947b3a"
-  integrity sha512-p7DTOzxkUPa/63FU0R3KApkRHwcVZYC0PLnLm5iyZACyp15qSi32x7zVUhRdABAATmkALqgGrjCJAcWvobmhHw==
+sass@1.54.9:
+  version "1.54.9"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.54.9.tgz#b05f14ed572869218d1a76961de60cd647221762"
+  integrity sha512-xb1hjASzEH+0L0WI9oFjqhRi51t/gagWnxLiwUNMltA0Ab6jIDkAacgKiGYKM9Jhy109osM7woEEai6SXeJo5Q==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -3376,10 +3383,10 @@ textarea-caret@3.1.0:
   resolved "https://registry.yarnpkg.com/textarea-caret/-/textarea-caret-3.1.0.tgz#5d5a35bb035fd06b2ff0e25d5359e97f2655087f"
   integrity sha512-cXAvzO9pP5CGa6NKx0WYHl+8CHKZs8byMkt3PCJBCmq2a34YA9pO1NrQET5pzeqnBjBdToF5No4rrmkDUgQC2Q==
 
-three@0.143.0:
-  version "0.143.0"
-  resolved "https://registry.yarnpkg.com/three/-/three-0.143.0.tgz#1455bca132cc2b20beb7f41d313e10c29e5ed9df"
-  integrity sha512-oKcAGYHhJ46TGEuHjodo2n6TY2R6lbvrkp+feKZxqsUL/WkH7GKKaeu6RHeyb2Xjfk2dPLRKLsOP0KM2VgT8Zg==
+three@0.144.0:
+  version "0.144.0"
+  resolved "https://registry.yarnpkg.com/three/-/three-0.144.0.tgz#2818517169f8ff94eea5f664f6ff1fcdcd436cc8"
+  integrity sha512-R8AXPuqfjfRJKkYoTQcTK7A6i3AdO9++2n8ubya/GTU+fEHhYKu1ZooRSCPkx69jbnzT7dD/xEo6eROQTt2lJw==
 
 throttle-debounce@5.0.0:
   version "5.0.0"
@@ -3505,10 +3512,10 @@ type-fest@^0.21.3:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
-typescript@4.8.2:
-  version "4.8.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790"
-  integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==
+typescript@4.8.3:
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.3.tgz#d59344522c4bc464a65a730ac695007fdb66dd88"
+  integrity sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==
 
 unbox-primitive@^1.0.1:
   version "1.0.1"
@@ -3560,7 +3567,12 @@ uuid@7.0.3:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
   integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
 
-uuid@8.3.2, uuid@^8.3.2:
+uuid@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
+  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
+
+uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
@@ -3579,15 +3591,15 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vite@3.0.9:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-3.0.9.tgz#45fac22c2a5290a970f23d66c1aef56a04be8a30"
-  integrity sha512-waYABTM+G6DBTCpYAxvevpG50UOlZuynR0ckTK5PawNVt7ebX6X7wNXHaGIO6wYYFXSM7/WcuFuO2QzhBB6aMw==
+vite@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-3.1.0.tgz#3138b279072941d57e76bcf7f66f272fc6a17fe2"
+  integrity sha512-YBg3dUicDpDWFCGttmvMbVyS9ydjntwEjwXRj2KBFwSB8SxmGcudo1yb8FW5+M/G86aS8x828ujnzUVdsLjs9g==
   dependencies:
-    esbuild "^0.14.47"
+    esbuild "^0.15.6"
     postcss "^8.4.16"
     resolve "^1.22.1"
-    rollup ">=2.75.6 <2.77.0 || ~2.77.0"
+    rollup "~2.78.0"
   optionalDependencies:
     fsevents "~2.3.2"
 
@@ -3609,16 +3621,16 @@ vue-prism-editor@2.0.0-alpha.2:
   resolved "https://registry.yarnpkg.com/vue-prism-editor/-/vue-prism-editor-2.0.0-alpha.2.tgz#aa53a88efaaed628027cbb282c2b1d37fc7c5c69"
   integrity sha512-Gu42ba9nosrE+gJpnAEuEkDMqG9zSUysIR8SdXUw8MQKDjBnnNR9lHC18uOr/ICz7yrA/5c7jHJr9lpElODC7w==
 
-vue@3.2.37:
-  version "3.2.37"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.37.tgz#da220ccb618d78579d25b06c7c21498ca4e5452e"
-  integrity sha512-bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ==
+vue@3.2.39:
+  version "3.2.39"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.39.tgz#de071c56c4c32c41cbd54e55f11404295c0dd62d"
+  integrity sha512-tRkguhRTw9NmIPXhzk21YFBqXHT2t+6C6wPOgQ50fcFVWnPdetmRqbmySRHznrYjX2E47u0cGlKGcxKZJ38R/g==
   dependencies:
-    "@vue/compiler-dom" "3.2.37"
-    "@vue/compiler-sfc" "3.2.37"
-    "@vue/runtime-dom" "3.2.37"
-    "@vue/server-renderer" "3.2.37"
-    "@vue/shared" "3.2.37"
+    "@vue/compiler-dom" "3.2.39"
+    "@vue/compiler-sfc" "3.2.39"
+    "@vue/runtime-dom" "3.2.39"
+    "@vue/server-renderer" "3.2.39"
+    "@vue/shared" "3.2.39"
 
 vuedraggable@4.0.1:
   version "4.0.1"
diff --git a/yarn.lock b/yarn.lock
index 89e994a7e..75c8b5c33 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -234,48 +234,48 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/parser@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.35.1.tgz#bf2ee2ebeaa0a0567213748243fb4eec2857f04f"
-  integrity sha512-XL2TBTSrh3yWAsMYpKseBYTVpvudNf69rPOWXWVBI08My2JVT5jR66eTt4IgQFHA/giiKJW5dUD4x/ZviCKyGg==
+"@typescript-eslint/parser@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.36.2.tgz#3ddf323d3ac85a25295a55fcb9c7a49ab4680ddd"
+  integrity sha512-qS/Kb0yzy8sR0idFspI9Z6+t7mqk/oRjnAYfewG+VN73opAUvmYL3oPIMmgOX6CnQS6gmVIXGshlb5RY/R22pA==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.35.1"
-    "@typescript-eslint/types" "5.35.1"
-    "@typescript-eslint/typescript-estree" "5.35.1"
+    "@typescript-eslint/scope-manager" "5.36.2"
+    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/typescript-estree" "5.36.2"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.35.1.tgz#ccb69d54b7fd0f2d0226a11a75a8f311f525ff9e"
-  integrity sha512-kCYRSAzIW9ByEIzmzGHE50NGAvAP3wFTaZevgWva7GpquDyFPFcmvVkFJGWJJktg/hLwmys/FZwqM9EKr2u24Q==
+"@typescript-eslint/scope-manager@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.36.2.tgz#a75eb588a3879ae659514780831370642505d1cd"
+  integrity sha512-cNNP51L8SkIFSfce8B1NSUBTJTu2Ts4nWeWbFrdaqjmn9yKrAaJUBHkyTZc0cL06OFHpb+JZq5AUHROS398Orw==
   dependencies:
-    "@typescript-eslint/types" "5.35.1"
-    "@typescript-eslint/visitor-keys" "5.35.1"
+    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/visitor-keys" "5.36.2"
 
-"@typescript-eslint/types@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.35.1.tgz#af355fe52a0cc88301e889bc4ada72f279b63d61"
-  integrity sha512-FDaujtsH07VHzG0gQ6NDkVVhi1+rhq0qEvzHdJAQjysN+LHDCKDKCBRlZFFE0ec0jKxiv0hN63SNfExy0KrbQQ==
+"@typescript-eslint/types@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.36.2.tgz#a5066e500ebcfcee36694186ccc57b955c05faf9"
+  integrity sha512-9OJSvvwuF1L5eS2EQgFUbECb99F0mwq501w0H0EkYULkhFa19Qq7WFbycdw1PexAc929asupbZcgjVIe6OK/XQ==
 
-"@typescript-eslint/typescript-estree@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.35.1.tgz#db878a39a0dbdc9bb133f11cdad451770bfba211"
-  integrity sha512-JUqE1+VRTGyoXlDWWjm6MdfpBYVq+hixytrv1oyjYIBEOZhBCwtpp5ZSvBt4wIA1MKWlnaC2UXl2XmYGC3BoQA==
+"@typescript-eslint/typescript-estree@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.2.tgz#0c93418b36c53ba0bc34c61fe9405c4d1d8fe560"
+  integrity sha512-8fyH+RfbKc0mTspfuEjlfqA4YywcwQK2Amcf6TDOwaRLg7Vwdu4bZzyvBZp4bjt1RRjQ5MDnOZahxMrt2l5v9w==
   dependencies:
-    "@typescript-eslint/types" "5.35.1"
-    "@typescript-eslint/visitor-keys" "5.35.1"
+    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/visitor-keys" "5.36.2"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/visitor-keys@5.35.1":
-  version "5.35.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.35.1.tgz#285e9e34aed7c876f16ff646a3984010035898e6"
-  integrity sha512-cEB1DvBVo1bxbW/S5axbGPE6b7FIMAbo3w+AGq6zNDA7+NYJOIkKj/sInfTv4edxd4PxJSgdN4t6/pbvgA+n5g==
+"@typescript-eslint/visitor-keys@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.2.tgz#2f8f78da0a3bad3320d2ac24965791ac39dace5a"
+  integrity sha512-BtRvSR6dEdrNt7Net2/XDjbYKU5Ml6GqJgVfXT0CxTCJlnIqK7rAGreuWKMT2t8cFUT2Msv5oxw0GMRD7T5J7A==
   dependencies:
-    "@typescript-eslint/types" "5.35.1"
+    "@typescript-eslint/types" "5.36.2"
     eslint-visitor-keys "^3.3.0"
 
 acorn@^8.5.0:
@@ -1129,10 +1129,10 @@ csso@~2.3.1:
     clap "^1.0.9"
     source-map "^0.5.3"
 
-cypress@10.6.0:
-  version "10.6.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.6.0.tgz#13f46867febf2c3715874ed5dce9c2e946b175fe"
-  integrity sha512-6sOpHjostp8gcLO34p6r/Ci342lBs8S5z9/eb3ZCQ22w2cIhMWGUoGKkosabPBfKcvRS9BE4UxybBtlIs8gTQA==
+cypress@10.7.0:
+  version "10.7.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.7.0.tgz#2d37f8b9751c6de33ee48639cb7e67a2ce593231"
+  integrity sha512-gTFvjrUoBnqPPOu9Vl5SBHuFlzx/Wxg/ZXIz2H4lzoOLFelKeF7mbwYUOzgzgF0oieU2WhJAestQdkgwJMMTvQ==
   dependencies:
     "@cypress/request" "^2.88.10"
     "@cypress/xvfb" "^1.2.4"
@@ -4242,10 +4242,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@4.8.2:
-  version "4.8.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790"
-  integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==
+typescript@4.8.3:
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.3.tgz#d59344522c4bc464a65a730ac695007fdb66dd88"
+  integrity sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==
 
 unc-path-regex@^0.1.2:
   version "0.1.2"

From 406d08842119c11242caef51a540b89b75b1b889 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 10 Sep 2022 19:14:14 +0900
Subject: [PATCH 194/245] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 383eff769..98357c77a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,9 +13,13 @@ You should also include the user name that made the change.
 
 ### Improvements
 - Client: Add following badge to user preview popup @nvisser
+- Client: mobile twitter url can be used as widget @caipira113
+- Client: Improve clock widget @syuilo
 
 ### Bugfixes
+- マイグレーションに失敗する問題を修正
 - Server: 他人の通知を既読にできる可能性があるのを修正 @syuilo
+- Client: アクセストークン管理画面、アカウント管理画面表示できないのを修正 @futchitwo
 
 ## 12.118.1 (2022/08/08)
 

From d4b146e77a5a6d64aa4ff80f6a77ed7e212af674 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 10 Sep 2022 19:25:06 +0900
Subject: [PATCH 195/245] New Crowdin updates (#9047)

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

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (Polish)

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

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Chinese Traditional)
---
 locales/cs-CZ.yml | 372 ++++++++++++++++++++++++++++++++++++++++++++++
 locales/ko-KR.yml |  22 ++-
 locales/pl-PL.yml | 198 +++++++++++++++++++++++-
 locales/ru-RU.yml |   1 +
 locales/th-TH.yml | 187 ++++++++++++++++++++++-
 locales/zh-CN.yml |   8 +-
 locales/zh-TW.yml |   6 +-
 7 files changed, 778 insertions(+), 16 deletions(-)

diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index ff8a7ae8b..9d54e0082 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -206,6 +206,7 @@ instanceFollowers: "Následovníci na instanci"
 instanceUsers: "Uživatelé této instance"
 changePassword: "Změnit heslo"
 security: "Zabezpečení"
+retypedNotMatch: "Zadané údaje se neshodují."
 currentPassword: "Současné heslo"
 newPassword: "Nové heslo"
 newPasswordRetype: "Nové heslo (znovu)"
@@ -268,6 +269,7 @@ addFile: "Přidat soubor"
 emptyFolder: "Tato složka je prázdná"
 unableToDelete: "Nelze smazat"
 inputNewFileName: "Zadejte nový název"
+inputNewFolderName: "Zadejte název nové složky"
 copyUrl: "Kopírovat URL"
 rename: "Přejmenovat"
 avatar: "Avatar"
@@ -310,9 +312,11 @@ pinnedUsers: "Připnutí uživatelé"
 pinnedNotes: "Připnutá poznámka"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "Aktivovat hCaptchu"
+hcaptchaSiteKey: "Klíč stránky"
 hcaptchaSecretKey: "Tajný Klíč (Secret Key)"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Zapnout ReCAPTCHu"
+recaptchaSiteKey: "Klíč stránky"
 recaptchaSecretKey: "Tajný Klíč (Secret Key)"
 antennas: "Antény"
 manageAntennas: "Spravovat Antény"
@@ -321,6 +325,10 @@ antennaSource: "Zdroj Antény"
 enableServiceworker: "Povolit ServiceWorker"
 caseSensitive: "Rozlišuje malá a velká písmena"
 connectedTo: "Následující účty jsou připojeny"
+notesAndReplies: "Poznámky a odpovědi"
+withFiles: "Včetně souborů"
+popularUsers: "Populární uživatelé"
+recentlyUpdatedUsers: "Nedávno aktívni uživatelé"
 popularTags: "Populární tagy"
 userList: "Seznamy"
 about: "Informace"
@@ -365,10 +373,14 @@ next: "Další"
 retype: "Zadejte znovu"
 noteOf: "{user} poznámky"
 inviteToGroup: "Pozvat do skupiny"
+quoteAttached: "Citace"
+quoteQuestion: "Přiložit jako citaci?"
+noMessagesYet: "Zatím tu nejsou žádné zprávy"
 newMessageExists: "Máte novou zprávu"
 onlyOneFileCanBeAttached: "Ke zprávě můžete přiložit jenom jeden soubor"
 signinRequired: "Přihlašte se, prosím"
 invitations: "Pozvat"
+invitationCode: "Kód pozvánky"
 checking: "Ověřuji"
 available: "K dispozici"
 unavailable: "Není k dispozici"
@@ -382,6 +394,7 @@ passwordMatched: "Hesla se schodují"
 passwordNotMatched: "Hesla se neschodují"
 signinWith: "Přihlásit se s {x}"
 signinFailed: "Nelze se přihlásit. Zkontrolujte prosím své uživatelské jméno a heslo."
+tapSecurityKey: "Ťukněte na bezpečnostní klíč"
 or: "Nebo"
 language: "Jazyk"
 uiLanguage: "Jazyk uživatelského rozhraní"
@@ -411,9 +424,20 @@ accountSettings: "Nastavení účtu"
 promotion: "Propagace"
 promote: "Propagovat"
 numberOfDays: "Počet dní"
+objectStorageBaseUrl: "Base URL"
+objectStorageBucket: "Bucket"
+objectStoragePrefix: "Předpona"
+objectStorageEndpoint: "Endpoint"
+objectStorageRegion: "Región"
+objectStorageUseSSL: "Použít SSL"
 deleteAll: "Smazat vše"
 showFixedPostForm: "Zobrazit formulář pro nové příspěvky nad časovou osou"
+listen: "Poslouchat"
+showInPage: "Zobrazit na stránce"
+popout: "Pop-out"
+volume: "Hlasitost"
 masterVolume: "Celková hlasitost"
+details: "Detaily"
 chooseEmoji: "Vybrat emotikon"
 unableToProcess: "Operace nebyla dokončena."
 recentUsed: "Naposledy použité"
@@ -434,13 +458,20 @@ deleteAllFiles: "Smazat všechny soubory"
 deleteAllFilesConfirm: "Jste si jistí že chcete smazat všechny soubory?"
 userSuspended: "Tomuto uživateli byl pozastaven účet."
 menu: "Menu"
+divider: "Dělící čára"
 addItem: "Přidat položku"
+relays: "Relay"
+addRelay: "Přidat Relay"
 inboxUrl: "Inbox URL"
 deletedNote: "Odstraněné příspěvky"
 invisibleNote: "Skryté příspěvky"
 description: "Popis"
 author: "Autor"
 manage: "Administrace"
+width: "Šířka"
+height: "Výška"
+large: "Velké"
+medium: "Střední"
 small: "Malé"
 generateAccessToken: "Vygenerovat přístupový token"
 permission: "Oprávnění"
@@ -458,11 +489,16 @@ smtpPort: "Port"
 smtpUser: "Uživatelské jméno"
 smtpPass: "Heslo"
 smtpSecureInfo: "Toto vypněte pokud používáte STARTTLS"
+testEmail: "Otestovat doručení emailů"
 makeActive: "Aktivovat"
 display: "Zobrazit"
 copy: "Kopírovat"
+metrics: "Metriky"
+overview: "Shrnutí"
 logs: "Logy"
+delayed: "Prodleva"
 database: "Databáze"
+channel: "Kanály"
 create: "Vytvořit"
 notificationSetting: "Nastavení oznámení"
 useGlobalSetting: "Použít globální nastavení"
@@ -470,79 +506,415 @@ other: "Ostatní"
 fileIdOrUrl: "ID nebo URL souboru"
 behavior: "Chování"
 sample: "Ukázka"
+send: "Odeslat"
+openInNewTab: "Otevřít v nové kartě"
+random: "Náhodně"
+system: "Systém"
+desktop: "Plocha"
+clip: "Oříznout"
+createNew: "Vytvořit nový"
+optional: "Volitelné"
+yes: "Ano"
+no: "Ne"
+notSet: "Není nastaveno"
+emailVerified: "Váš e-mail byl ověřen"
+contact: "Kontakt"
+useSystemFont: "Použít výchozí font systému"
+clips: "Oříznout"
+experimentalFeatures: "Experimentální funkce"
+developer: "Vývojář"
+duplicate: "Duplikovat"
+left: "Vlevo"
+center: "Uprostřed"
+wide: "Široké"
+narrow: "Úzké"
 clearCache: "Vyprázdnit mezipaměť"
+nUsers: "{n} užívatelů"
+nNotes: "{n} poznámek"
+myTheme: "Moje vzhledy"
+backgroundColor: "Pozadí"
+accentColor: "Akcent"
+textColor: "Barva textu"
+saveAs: "Uložit jako…"
+advanced: "Pokročilé"
+value: "Hodnota"
+createdAt: "Vytvořeno"
+updatedAt: "Upraveno"
+saveConfirm: "Uložit změny?"
+deleteConfirm: "Opravdu smazat?"
+invalidValue: "Neplatná hodnota."
+registry: "Registr"
 info: "Informace"
+unknown: "Neznámý"
+onlineStatus: "Online status"
+hideOnlineStatus: "Skrýt Váš online status"
+hideOnlineStatusDescription: "Skrytí vašeho online stavu může snížit funkcionalitu některých funkcí, například vyhledávání."
+online: "Online"
+active: "Aktivní"
+offline: "Offline"
+notRecommended: "Nedoporučuje se"
+botProtection: "Bot ochrana"
+instanceBlocking: "Blokované instance"
+selectAccount: "Vybrat účet"
+switchAccount: "Přepnout účet"
+enabled: "Zapnuto"
+disabled: "Vypnuto"
+quickAction: "Rychlé akce"
 user: "Uživatelé"
 administration: "Administrace"
+accounts: "Účty"
+switch: "Přepnout"
+configure: "Nastavit"
+gallery: "Galerie"
+recentPosts: "Poslední příspěvky"
+ads: "Reklamy"
+memo: "Memo"
+priority: "Priorita"
+high: "Vysoká"
+middle: "Střední"
+low: "Nízká"
+emailNotConfiguredWarning: "E-mailová adresa není nastavena."
+ratio: "Poměr"
+global: "Globální"
+sent: "Odeslat"
+hashtags: "Hashtagy"
+troubleshooting: "Poradce při potížích"
+whatIsNew: "Zobrazit změny"
+translate: "Přeložit"
+hide: "Skrýt"
+smartphone: "Telefon"
+tablet: "Tablet"
+auto: "Auto"
+size: "Velikost"
+numberOfColumn: "Počet sloupců"
 searchByGoogle: "Vyhledávání"
+indefinitely: "Navždy"
+tenMinutes: "10 minut"
+oneHour: "1 hodina"
+oneDay: "1 den"
+oneWeek: "1 týden"
+reflectMayTakeTime: "Může trvat nějakou dobu, než se projeví změny."
+cropImage: "Oříznout obrázek"
 file: "Soubor(ů)"
+recentNHours: "Posledních {n} hodin"
+recentNDays: "Posledních {n} dnů"
+recommended: "Doporučeno"
+deleteAccount: "Odstranit účet"
+document: "Dokumentace"
+logoutConfirm: "Opravdu se chcete odhlásit?"
+pleaseSelect: "Vybrat možnost"
+reverse: "Otočit"
+colored: "Barevné"
+type: "Typ"
+speed: "Rychlost"
+slow: "Pomalá"
+fast: "Rychlá"
+account: "Účty"
+_ad:
+  back: "Zpět"
+_gallery:
+  my: "Moje galerie"
 _email:
   _follow:
     title: "Máte nového následovníka"
+_plugin:
+  install: "Instalovat plugin"
+  manage: "Správce pluginů"
+_preferencesBackups:
+  list: "Vytvořit backup"
+  loadFile: "Načíst ze souboru"
+  save: "Uložit změny"
+_registry:
+  scope: "Rozsah"
+  key: "Klíč"
+  keys: "Klíče"
+  domain: "Doména"
+  createKey: "Vytvořit klíč"
+_aboutMisskey:
+  allContributors: "Všichni přispěvatelé"
+  source: "Zdrojový kód"
 _mfm:
   mention: "Zmínění"
+  hashtag: "Hashtag"
+  link: "Odkaz"
+  bold: "Tučně"
   quote: "Citovat"
   emoji: "Vlastní emoji"
   search: "Vyhledávání"
+  flip: "Otočit"
+  tada: "Animace (tadá)"
+  blur: "Rozmazání"
+  font: "Font"
+  rainbow: "Duha"
+_channel:
+  featured: "Trendy"
+_menuDisplay:
+  top: "Nahoru"
+  hide: "Skrýt"
 _theme:
+  install: "Nainstalovat vzhled"
+  manage: "Správa vzhledů"
+  code: "Kód vzhledu"
   description: "Popis"
+  installedThemes: "Nainstalované vzhledy"
+  constant: "Konstanta"
+  defaultValue: "Výchozí hodnota"
+  color: "Barva"
+  key: "Klíč"
+  func: "Funkce "
   keys:
+    shadow: "Stín"
+    header: "Nadpis"
+    link: "Odkaz"
+    hashtag: "Hashtag"
     mention: "Zmínění"
     renote: "Přeposlat"
+    divider: "Dělící čára"
 _sfx:
   note: "Poznámky"
   notification: "Oznámení"
   chat: "Zprávy"
+_ago:
+  future: "Budoucí"
+  justNow: "Teď"
+_time:
+  second: "Sekund"
+  minute: "Minut"
+  hour: "Hodin"
+_2fa:
+  registerDevice: "Přidat zařízení"
+  registerKey: "Přidat bezpečnostní klíč"
+_weekday:
+  sunday: "Neděle"
+  monday: "Pondělí"
+  tuesday: "Úterý"
+  wednesday: "Středa"
+  thursday: "Čtvrtek"
+  friday: "Pátek"
+  saturday: "Sobota"
 _widgets:
   notifications: "Oznámení"
   timeline: "Časová osa"
+  calendar: "Kalendář"
+  trends: "Trendy"
+  clock: "Hodiny"
+  rss: "RSS čtečka"
   activity: "Aktivita"
+  photos: "Fotky"
+  digitalClock: "Digitální hodiny"
   federation: "Federace"
+  slideshow: "Prezentace"
+  button: "Tlačítko"
+  onlineUsers: "Online uživatelé"
   jobQueue: "Fronta úloh"
+  aiscript: "AiScript conzole"
+  aichan: "Ai"
 _cw:
+  hide: "Skrýt"
   show: "Zobrazit více"
+_poll:
+  noMore: "Více už přidat nemůžete"
+  infinite: "Nikdy"
+  deadlineDate: "Datum ukončení"
+  deadlineTime: "Hodin"
+  duration: "Trvání"
 _visibility:
   home: "Domů"
   followers: "Sledující"
+_postForm:
+  _placeholders:
+    f: "Čekám, až něco napíšete..."
 _profile:
   name: "Jméno"
   username: "Uživatelské jméno"
+  description: "O mně"
+  youCanIncludeHashtags: "V popisku o Vás můžete použít i hastagy."
+  metadata: "Doplňující informace"
+  metadataContent: "Obsah"
 _exportOrImport:
+  allNotes: "Všechny poznámky"
   followingList: "Sledovaní"
   muteList: "Ztlumit"
   blockingList: "Zablokovat"
   userLists: "Seznamy"
 _charts:
   federation: "Federace"
+  apRequest: "Požadavek"
+  usersTotal: "Celkem uživatelů"
+  activeUsers: "Aktivní uživatelé"
+  notesTotal: "Celkový počet poznámek"
 _timelines:
   home: "Domů"
+  global: "Globální"
 _pages:
+  newPage: "Vytvořit novou stránku"
+  editPage: "Upravit stránku"
+  created: "Stránka byla úspěšně vytvořena"
+  updated: "Stránka byla úspěšně aktualizována"
+  deleted: "Stránka byla úspěšně smazána"
+  pageSetting: "Nastavení stránky"
+  invalidNameText: "Ujistěte se že jméno stránky je vyplněno"
+  contents: "Obsah"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans Serif"
+  chooseBlock: "Přidat blok"
+  selectType: "Vyberte typ"
+  contentBlocks: "Obsah"
+  inputBlocks: "Vstup"
+  specialBlocks: "Speciální"
   blocks:
+    text: "Text"
+    textarea: "Textové pole"
+    section: "Sekce"
     image: "Obrázky"
+    button: "Tlačítko"
+    if: "Pokud"
+    _if:
+      variable: "Proměnná"
+    _post:
+      text: "Obsah"
+      canvasId: "Canvas ID"
+    _textInput:
+      name: "Jméno proměnné"
+      text: "Titulek"
+      default: "Výchozí hodnota"
+    _textareaInput:
+      name: "Jméno proměnné"
+      text: "Titulek"
+      default: "Výchozí hodnota"
+    _numberInput:
+      name: "Jméno proměnné"
+      text: "Titulek"
+      default: "Výchozí hodnota"
+    canvas: "Canvas"
+    _canvas:
+      id: "Canvas ID"
+      width: "Šířka"
+      height: "Výška"
+    _switch:
+      name: "Jméno proměnné"
+      text: "Titulek"
+      default: "Výchozí hodnota"
+    _counter:
+      name: "Jméno proměnné"
+      text: "Titulek"
+      inc: "Krok"
+    _button:
+      text: "Titulek"
+      colored: "Barevné"
+      _action:
+        _dialog:
+          content: "Obsah"
+    _radioButton:
+      name: "Jméno proměnné"
+      default: "Výchozí hodnota"
   script:
     categories:
       list: "Seznamy"
     blocks:
+      text: "Text"
+      _strLen:
+        arg1: "Text"
+      _strPick:
+        arg1: "Text"
+      _strReplace:
+        arg1: "Text"
+      _strReverse:
+        arg1: "Text"
       _join:
         arg1: "Seznamy"
+      _subtract:
+        arg1: "A"
+        arg2: "B"
+      _multiply:
+        arg1: "A"
+        arg2: "B"
+      _divide:
+        arg1: "A"
+        arg2: "B"
+      _mod:
+        arg1: "A"
+        arg2: "B"
+      round: "Zaokrouhlení zlomku"
+      _round:
+        arg1: "Číselná hodnota"
+      eq: "A a B jsou stejné"
+      _eq:
+        arg1: "A"
+        arg2: "B"
+      notEq: "A a B jsou odlišné"
+      _notEq:
+        arg1: "A"
+        arg2: "B"
+      _and:
+        arg1: "A"
+        arg2: "B"
+      _or:
+        arg1: "A"
+        arg2: "B"
+      _lt:
+        arg1: "A"
+        arg2: "B"
+      _gt:
+        arg1: "A"
+        arg2: "B"
+      _ltEq:
+        arg1: "A"
+        arg2: "B"
+      _gtEq:
+        arg1: "A"
+        arg2: "B"
+      if: "Větev"
+      _if:
+        arg1: "Pokud"
+        arg2: "Potom"
+        arg3: "Nebo"
+      random: "Náhodně"
+      _random:
+        arg1: "Pravděpodobnost"
+      rannum: "Náhodné číslo"
+      _rannum:
+        arg1: "Minimální hodnota"
+        arg2: "Maximální hodnota"
       _randomPick:
         arg1: "Seznamy"
+      _dailyRandom:
+        arg1: "Pravděpodobnost"
+      _dailyRannum:
+        arg1: "Minimální hodnota"
+        arg2: "Maximální hodnota"
       _dailyRandomPick:
         arg1: "Seznamy"
+      _seedRandom:
+        arg2: "Pravděpodobnost"
+      _seedRannum:
+        arg2: "Minimální hodnota"
+        arg3: "Maximální hodnota"
       _seedRandomPick:
         arg2: "Seznamy"
       _pick:
         arg1: "Seznamy"
       _listLen:
         arg1: "Seznamy"
+      number: "Číselná hodnota"
+      _stringToNumber:
+        arg1: "Text"
+      _numberToString:
+        arg1: "Číselná hodnota"
+      _splitStrByLine:
+        arg1: "Text"
     types:
+      string: "Text"
+      number: "Číselná hodnota"
       array: "Seznamy"
 _notification:
   youWereFollowed: "Máte nového následovníka"
   youWereInvitedToGroup: "Pozvat do skupiny"
   _types:
+    all: "Vše"
     follow: "Sledovaní"
     mention: "Zmínění"
+    reply: "Odpovědi"
     renote: "Přeposlat"
     quote: "Citovat"
     reaction: "Reakce"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 168fa9d65..d77f7e920 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -562,6 +562,7 @@ author: "작성자"
 leaveConfirm: "저장하지 않은 변경사항이 있습니다. 취소하시겠습니까?"
 manage: "관리"
 plugins: "플러그인"
+preferencesBackups: "환경설정 백업"
 deck: "덱"
 undeck: "덱 해제"
 useBlurEffectForModal: "모달에 흐림 효과 사용"
@@ -612,7 +613,7 @@ create: "생성"
 notificationSetting: "알림 설정"
 notificationSettingDesc: "표시할 알림의 종류를 선택해 주세요."
 useGlobalSetting: "글로벌 설정을 사용하기"
-useGlobalSettingDesc: "활성화하면 계정의 알림 설정이 적용되니다. 비활성화하면 개별적으로 설정할 수 있게 됩니다."
+useGlobalSettingDesc: "활성화하면 계정의 알림 설정이 적용됩니다. 비활성화하면 개별적으로 설정할 수 있게 됩니다."
 other: "기타"
 regenerateLoginToken: "로그인 토큰을 재생성"
 regenerateLoginTokenDescription: "로그인할 때 사용되는 내부 토큰을 재생성합니다. 일반적으로 이 작업을 실행할 필요는 없습니다. 이 기능을 사용하면 이 계정으로 로그인한 모든 기기에서 로그아웃됩니다."
@@ -941,6 +942,24 @@ _plugin:
   install: "플러그인 설치"
   installWarn: "신뢰할 수 없는 플러그인은 설치하지 않는 것이 좋습니다."
   manage: "플러그인 관리"
+_preferencesBackups:
+  list: "생성한 백업"
+  saveNew: "새 백업 만들기"
+  loadFile: "파일 가져오기"
+  apply: "이 기기에 적용"
+  save: "현재 설정으로 덮어쓰기"
+  inputName: "백업 이름을 입력하세요"
+  cannotSave: "저장하지 못했습니다"
+  nameAlreadyExists: "\"{name}\" 백업이 이미 존재합니다. 다른 이름을 설정하여 주십시오."
+  applyConfirm: "\"{name}\" 백업을 현재 기기에 적용하시겠습니까? 현재 설정은 덮어 씌워집니다."
+  saveConfirm: "{name} 을 덮어쓰시겠습니까?"
+  deleteConfirm: "{name} 을(를) 삭제하시겠습니까?"
+  renameConfirm: "\"{old}\" 백업을 \"{new}\"(으)로 바꾸시겠습니까?"
+  noBackups: "저장된 백업이 없습니다. \"새 백업 만들기\"를 눌러 현재 클라이언트 설정을 서버에 백업할 수 있습니다."
+  createdAt: "생성 날짜: {date} {time}"
+  updatedAt: "갱신 날짜: {date} {time}"
+  cannotLoad: "가져오기에 실패했습니다"
+  invalidFile: "파일 형식이 올바르지 않습니다."
 _registry:
   scope: "범위"
   key: "키"
@@ -1258,6 +1277,7 @@ _widgets:
   activity: "활동"
   photos: "사진"
   digitalClock: "디지털 시계"
+  unixClock: "UNIX 시계"
   federation: "연합"
   instanceCloud: "인스턴스 구름"
   postForm: "글 입력란"
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index f0470395f..933b722c5 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -1,5 +1,5 @@
 ---
-_lang_: "język polski"
+_lang_: "Polski"
 headlineMisskey: "Sieć połączona wpisami"
 introMisskey: "Misskey jest serwisem mikroblogowym typu open source.\nMisskey to opensource'owy serwis mikroblogowy, w którym możesz tworzyć \"notatki\", aby dzielić się tym, co się dzieje i opowiadać wszystkim o sobie.\nMożesz również użyć funkcji \"Reakcje\", aby szybko dodać własne reakcje do notatek innych użytkowników👍.\nOdkrywaj nowy świat🚀!"
 monthAndDay: "{month}-{day}"
@@ -88,7 +88,7 @@ enterListName: "Nazwa listy"
 privacy: "Prywatność"
 makeFollowManuallyApprove: "Prośby o możliwość obserwacji wymagają zatwierdzenia"
 defaultNoteVisibility: "Domyślna widoczność"
-follow: "Obserwowani"
+follow: "Obserwuj"
 followRequest: "Poproś o możliwość obserwacji"
 followRequests: "Prośby o możliwość obserwacji"
 unfollow: "Przestań obserwować"
@@ -127,7 +127,7 @@ unsuspendConfirm: "Czy na pewno chcesz cofnąć zawieszenie tego konta?"
 selectList: "Wybierz listę"
 selectAntenna: "Wybierz Antennę"
 selectWidget: "Wybierz widżet"
-editWidgets: "Edytuj widżet"
+editWidgets: "Edytuj widżety"
 editWidgetsExit: "Gotowe"
 customEmojis: "Niestandardowe emoji"
 emoji: "Emoji"
@@ -142,6 +142,7 @@ flagAsBot: "To konto jest botem"
 flagAsBotDescription: "Jeżeli ten kanał jest kontrolowany przez jakiś program, ustaw tę opcję. Jeżeli włączona, będzie działać jako flaga informująca innych programistów, aby zapobiegać nieskończonej interakcji z różnymi botami i dostosowywać wewnętrzne systemy Misskey, traktując konto jako bota."
 flagAsCat: "To konto jest kotem"
 flagAsCatDescription: "Przełącz tę opcję, aby konto było oznaczone jako kot."
+flagShowTimelineReplies: "Pokazuj odpowiedzi na osi czasu"
 autoAcceptFollowed: "Automatycznie przyjmuj prośby o możliwość obserwacji od użytkowników, których obserwujesz"
 addAccount: "Dodaj konto"
 loginFailed: "Nie udało się zalogować"
@@ -201,6 +202,7 @@ done: "Gotowe"
 processing: "Przetwarzanie"
 preview: "Podgląd"
 default: "Domyślne"
+defaultValueIs: "Domyślne: {value}"
 noCustomEmojis: "Brak emoji"
 noJobs: "Brak zadań"
 federating: "Federowanie"
@@ -235,6 +237,7 @@ resetAreYouSure: "Czy na pewno chcesz zresetować?"
 saved: "Zapisano"
 messaging: "Wiadomości"
 upload: "Wyślij"
+keepOriginalUploading: "Zachowaj oryginalny obraz"
 fromDrive: "Z dysku"
 fromUrl: "Z adresu URL"
 uploadFromUrl: "Wyślij z adresu URL"
@@ -377,6 +380,7 @@ administrator: "Admin"
 token: "Token"
 twoStepAuthentication: "Uwierzytelnianie dwuskładnikowe"
 moderator: "Moderator"
+moderation: "Moderacja"
 nUsersMentioned: "{n} wspomnianych użytkowników"
 securityKey: "Klucz bezpieczeństwa"
 securityKeyName: "Nazwa klucza"
@@ -444,11 +448,13 @@ uiLanguage: "Język wyświetlania UI"
 groupInvited: "Zaproszony(-a) do grupy"
 aboutX: "O {x}"
 useOsNativeEmojis: "Używaj natywnych Emoji systemu"
+disableDrawer: "Nie używaj menu w stylu szuflady"
 youHaveNoGroups: "Nie masz żadnych grup"
 joinOrCreateGroup: "Uzyskaj zaproszenie do dołączenia do grupy lub utwórz własną grupę."
 noHistory: "Brak historii"
 signinHistory: "Historia logowania"
 disableAnimatedMfm: "Wyłącz MFM z animacją"
+doing: "Przetwarzanie..."
 category: "Kategoria"
 tags: "Tagi"
 docSource: "Źródło tego dokumentu"
@@ -523,6 +529,9 @@ deleteAllFilesConfirm: "Czy na pewno chcesz usunąć wszystkie pliki?"
 removeAllFollowingDescription: "Przestań obserwować wszystkie konta z {host}. Wykonaj to, jeżeli instancja już nie istnieje."
 userSuspended: "To konto zostało zawieszone."
 userSilenced: "Ten użytkownik został wyciszony."
+yourAccountSuspendedTitle: "To konto jest zawieszone"
+yourAccountSuspendedDescription: "To konto zostało zawieszone z powodu złamania regulaminu serwera lub innych podobnych. Skontaktuj się z administratorem, jeśli chciałbyś poznać bardziej szczegółowy powód. Proszę nie zakładać nowego konta."
+menu: "Menu"
 divider: "Rozdzielacz"
 addItem: "Dodaj element"
 relays: "Przekaźniki"
@@ -541,7 +550,7 @@ disablePlayer: "Zamknij odtwarzacz wideo"
 expandTweet: "Rozwiń tweet"
 themeEditor: "Edytor motywu"
 description: "Opis"
-describeFile: "dodaj podpis"
+describeFile: "Dodaj podpis"
 enterFileDescription: "Wprowadź napis"
 author: "Autor"
 leaveConfirm: "Są niezapisane zmiany. Czy chcesz je odrzucić?"
@@ -578,6 +587,7 @@ emptyToDisableSmtpAuth: "Pozostaw adres e-mail i hasło puste, aby wyłączyć w
 smtpSecureInfo: "Wyłącz, jeżeli używasz STARTTLS"
 testEmail: "Przetestuj dostarczanie wiadomości e-mail"
 wordMute: "Wyciszenie słowa"
+instanceMute: "Wyciszone instancje"
 userSaysSomething: "{name} powiedział(-a) coś"
 makeActive: "Aktywuj"
 display: "Wyświetlanie"
@@ -607,6 +617,7 @@ fillAbuseReportDescription: "Wypełnij szczegóły zgłoszenia. Jeżeli dotyczy
 abuseReported: "Twoje zgłoszenie zostało wysłane. Dziękujemy."
 reporteeOrigin: "Pochodzenie zgłoszonego"
 reporterOrigin: "Pochodzenie zgłaszającego"
+forwardReport: "Przekaż zgłoszenie do innej instancji"
 send: "Wyślij"
 abuseMarkAsResolved: "Oznacz zgłoszenie jako rozwiązane"
 openInNewTab: "Otwórz w nowej karcie"
@@ -619,8 +630,12 @@ random: "Losowe"
 system: "System"
 switchUi: "Przełącz interfejs użytkownika"
 desktop: "Pulpit"
+clip: "Klip"
 createNew: "Utwórz nowy"
 optional: "Nieobowiązkowe"
+createNewClip: "Utwórz nowy klip"
+unclip: "Odczep"
+confirmToUnclipAlreadyClippedNote: "Ten wpis jest już częścią klipu \"{name}\". Czy chcesz ją usunąć z tego klipu?"
 public: "Publiczny"
 i18nInfo: "Misskey jest tłumaczone na wiele języków przez wolontariuszy. Możesz pomóc na {link}."
 manageAccessTokens: "Zarządzaj tokenami dostępu"
@@ -654,6 +669,7 @@ pageLikesCount: "Liczba otrzymanych polubień stron"
 pageLikedCount: "Liczba polubionych stron"
 contact: "Kontakt"
 useSystemFont: "Używaj domyślnej czcionki systemu"
+clips: "Klipy"
 experimentalFeatures: "Eksperymentalne funkcje"
 developer: "Programista"
 makeExplorable: "Pokazuj konto na stronie „Eksploruj”"
@@ -725,6 +741,7 @@ notRecommended: "Nie zalecane"
 botProtection: "Zabezpieczenie przed botami"
 instanceBlocking: "Zablokowane instancje"
 selectAccount: "Wybierz konto"
+switchAccount: "Przełącz konto"
 enabled: "Właczono"
 disabled: "Wyłączono"
 quickAction: "Szybkie działania"
@@ -756,22 +773,103 @@ global: "Globalna"
 squareAvatars: "Wyświetlaj kwadratowe awatary"
 sent: "Wyślij"
 received: "Otrzymane"
+searchResult: "Wyniki wyszukiwania"
 hashtags: "Hashtag"
+troubleshooting: "Rozwiązywanie problemów"
+useBlurEffect: "Użyj efektów rozmycia w UI"
+learnMore: "Dowiedz się więcej"
+misskeyUpdated: "Misskey zostało zaktualizowane!"
+whatIsNew: "Pokaż zmiany"
+translate: "Przetłumacz"
+translatedFrom: "Przetłumaczone z {x}"
+accountDeletionInProgress: "Trwa usuwanie konta"
+usernameInfo: "Nazwa, która identyfikuje Twoje konto spośród innych na tym serwerze.  Możesz użyć alfabetu (a~z, A~Z), cyfr (0~9) lub podkreślników (_). Nazwy użytkownika nie mogą być później zmieniane."
+aiChanMode: "Tryb Ai"
+keepCw: "Zostaw ostrzeżenia o zawartości"
 pubSub: "Konta Pub/Sub"
+resolved: "Rozwiązane"
+unresolved: "Nierozwiązane"
+breakFollow: "Usuń obserwującego"
+itsOn: "Włączone"
+itsOff: "Wyłączone"
+unread: "Nieodczytane"
+filter: "Filtr"
+controlPanel: "Panel sterowania"
+manageAccounts: "Zarządzaj kontami"
+makeReactionsPublic: "Ustawić historię reakcji jako publiczną"
+makeReactionsPublicDescription: "To spowoduje, że lista wszystkich Twoich dotychczasowych reakcji będzie publicznie widoczna."
+classic: "Klasyczny"
+muteThread: "Wycisz wątek"
+unmuteThread: "Wyłącz wyciszenie wątku"
+ffVisibility: "Widoczność obserwowanych/obserwujących"
+ffVisibilityDescription: "Pozwala skonfigurować, kto może zobaczyć, kogo obserwujesz i kto Cię obserwuje."
+continueThread: "Pokaż kontynuację wątku"
+deleteAccountConfirm: "Spowoduje to nieodwracalne usunięcie Twojego konta. Kontynuować?"
+incorrectPassword: "Nieprawidłowe hasło."
+voteConfirm: "Potwierdzić swój głos na \"{choice}\"?"
 hide: "Ukryj"
+leaveGroup: "Opuść grupę"
+leaveGroupConfirm: "Czy na pewno chcesz opuścić \"{name}\"?"
+useDrawerReactionPickerForMobile: "Wyświetlaj wybornik reakcji jako szufladę na urządzeniach mobilnych"
+welcomeBackWithName: "Witaj z powrotem, {name}"
+clickToFinishEmailVerification: "Kliknij [{ok}], aby zakończyć weryfikację e-mail."
+overridedDeviceKind: "Typ urządzenia"
+smartphone: "Smartfon"
+tablet: "Tablet"
+auto: "Automatycznie"
+size: "Rozmiar"
+numberOfColumn: "Liczba kolumn"
 searchByGoogle: "Szukaj"
 indefinitely: "Nigdy"
 file: "Pliki"
+logoutConfirm: "Czy na pewno chcesz się wylogować?"
+lastActiveDate: "Ostatnio użyte w"
+statusbar: "Pasek stanu"
+pleaseSelect: "Wybierz opcję"
 reverse: "Odwróć"
 colored: "Kolorowe"
 label: "Etykieta"
+type: "Typ"
+speed: "Prędkość"
+localOnly: "Lokalne tylko"
+failedToUpload: "Przesyłanie nie powiodło się"
+cannotUploadBecauseInappropriate: "Nie można przesłać tego pliku, ponieważ jego części zostały wykryte jako potencjalnie nieodpowiednie."
+cannotUploadBecauseNoFreeSpace: "Przesyłanie nie powiodło się z powodu braku miejsca na dysku."
+beta: "Beta"
+enableAutoSensitive: "Automatyczne oznaczanie NSFW"
+enableAutoSensitiveDescription: "Umożliwia automatyczne wykrywanie i oznaczanie zawartości NSFW za pomocą uczenia maszynowego. Nawet jeśli ta opcja jest wyłączona, może być włączona w całej instancji."
+navbar: "Pasek nawigacyjny"
 account: "Konta"
+move: "Przenieś"
+_sensitiveMediaDetection:
+  description: "Zmniejsza wysiłek związany z moderacją serwera dzięki automatycznemu rozpoznawaniu zawartości NSFW za pomocą uczenia maszynowego. To nieznacznie zwiększy obciążenie serwera."
+  setSensitiveFlagAutomatically: "Oznacz jako NSFW"
+_emailUnavailable:
+  used: "Ten adres e-mail jest już używany"
+  format: "Format tego adresu e-mail jest nieprawidłowy"
+  disposable: "Nie można używać jednorazowych adresów e-mail"
+  mx: "Ten serwer e-mail jest nieprawidłowy"
+  smtp: "Ten serwer e-mail nie odpowiada"
 _ffVisibility:
-  public: "Publikuj"
+  public: "Publiczne"
+  followers: "Widoczne tylko dla obserwujących"
+  private: "Prywatne"
+_signup:
+  almostThere: "Prawie na miejscu"
+  emailAddressInfo: "Podaj swój adres e-mail. Nie zostanie on upubliczniony."
+  emailSent: "E-mail z potwierdzeniem został wysłany na Twój adres e-mail ({email}). Kliknij dołączony link, aby dokończyć tworzenie konta."
+_accountDelete:
+  accountDelete: "Usuń konto"
+  mayTakeTime: "Ponieważ usuwanie konta jest procesem wymagającym dużej ilości zasobów, jego ukończenie może zająć trochę czasu, w zależności od ilości utworzonej zawartości i liczby przesłanych plików."
+  sendEmail: "Po zakończeniu usuwania konta na adres e-mail zarejestrowany na tym koncie zostanie wysłana wiadomość e-mail."
+  requestAccountDelete: "Poproś o usunięcie konta"
+  started: "Usuwanie się rozpoczęło."
+  inProgress: "Usuwanie jest obecnie w toku"
 _ad:
   back: "Wróć"
   reduceFrequencyOfThisAd: "Pokazuj tę reklamę rzadziej"
 _forgotPassword:
+  enterEmail: "Wpisz adres e-mail użyty do rejestracji. Zostanie do niego wysłany link, za pomocą którego możesz zresetować hasło."
   ifNoEmail: "Jeżeli nie podano adresu e-mail podczas rejestracji, skontaktuj się z administratorem zamiast tego."
   contactAdmin: "Jeżeli Twoja instancja nie obsługuje adresów e-mail, skontaktuj się zamiast tego z administratorem, aby zresetować hasło."
 _gallery:
@@ -788,6 +886,23 @@ _plugin:
   install: "Zainstaluj wtyczki"
   installWarn: "Nie instaluj niezaufanych wtyczek."
   manage: "Zarządzanie wtyczkami"
+_preferencesBackups:
+  list: "Utworzone kopie zapasowe"
+  saveNew: "Zapisz nową kopię zapasową"
+  loadFile: "Załaduj z pliku"
+  apply: "Zastosuj do tego urządzenia"
+  save: "Zapisz zmiany"
+  inputName: "Proszę podać nazwę dla tej kopii zapasowej"
+  cannotSave: "Zapisanie nie powiodło się"
+  nameAlreadyExists: "Kopia zapasowa o nazwie \"{name}\" już istnieje. Proszę podać inną nazwę."
+  applyConfirm: "Czy na pewno chcesz zastosować kopię zapasową \"{name}\" na tym urządzeniu? Istniejące ustawienia tego urządzenia zostaną nadpisane."
+  saveConfirm: "Zapisać kopię zapasową jako {name}?"
+  deleteConfirm: "Usunąć kopię zapasową {name}?"
+  renameConfirm: "Zmienić nazwę kopii zapasowej z \"{old}\" na \"{new}\"?"
+  createdAt: "Utworzony w: {date} {time}"
+  updatedAt: "Zaktualizowano w: {date} {time}"
+  cannotLoad: "Ładowanie nie powiodło się"
+  invalidFile: "Nieprawidłowy format pliku"
 _registry:
   scope: "Zakres"
   key: "Klucz"
@@ -822,10 +937,13 @@ _mfm:
   bold: "Pogrubienie"
   boldDescription: "Wyróżnia litery pogrubiając je."
   small: "Małe"
+  smallDescription: "Wyświetla treść jako małą i cienką."
   center: "Wyśrodkowanie"
   centerDescription: "Wyśrodkowuje zawartość."
+  inlineCode: "Kod (w wierszu)"
   blockCode: "Kod (blok)"
   blockCodeDescription: "Wyświetla kod z podświetlaną składnią składający się z wielu linii."
+  blockMath: "Matematyka (Blok)"
   quote: "Cytuj"
   quoteDescription: "Wyświetla treść jako cytat."
   emoji: "Niestandardowe emoji"
@@ -834,6 +952,20 @@ _mfm:
   searchDescription: "Wyświetla pole wyszukiwania z wcześniej wpisanym tekstem."
   flip: "Odwróć"
   flipDescription: "Przerzuca treść poziomo lub pionowo."
+  jelly: "Animacja (Galaretka)"
+  jellyDescription: "Nadaje treści galaretowatą animację."
+  tada: "Animation (Tada)"
+  tadaDescription: "Nadaje treści animację podobną do \"Tada!\"."
+  jump: "Animacja (Skok)"
+  jumpDescription: "Nadaje treści animację skakania."
+  bounce: "Animacja (Odbijanie)"
+  bounceDescription: "Nadaje treści animację odbijania się."
+  shake: "Animacja (Wstrząsanie)"
+  shakeDescription: "Nadaje treści animację wstrząsania."
+  twitch: "Animacja (Drganie)"
+  twitchDescription: "Nadaje treści mocno drgającą animację."
+  spin: "Animacja (Obrót)"
+  spinDescription: "Nadaje treści animację obracania."
   x2: "Duże"
   x2Description: "Czyni treść większą."
   x3: "Bardzo duże"
@@ -841,9 +973,17 @@ _mfm:
   x4: "Ogromne"
   x4Description: "Czyni treść jeszcze większą niż jeszcze większa."
   blur: "Rozmycie"
+  blurDescription: "Rozmywa treść. Zostanie wyraźnie wyświetlona po najechaniu."
   font: "Czcionka"
   fontDescription: "Wybiera czcionkę do wyświetlania treści."
+  rainbow: "Tęcza"
+  rainbowDescription: "Sprawia, że zawartość pojawia się w kolorach tęczy."
+  sparkle: "Blask"
+  sparkleDescription: "Nadaje zawartości efekt lśniącego brokatu."
   rotate: "Obróć"
+  rotateDescription: "Obraca zawartość o określony kąt."
+  plain: "Zwyczajny"
+  plainDescription: "Wyłącza efekty wszystkich MFM zawartych w tym efekcie MFM."
 _instanceTicker:
   none: "Nigdy nie pokazuj"
   remote: "Pokaż dla zdalnych użytkowników"
@@ -863,6 +1003,7 @@ _channel:
   usersCount: "{n} uczestnicy"
   notesCount: "{n} wpisy"
 _menuDisplay:
+  top: "Góra"
   hide: "Ukryj"
 _wordMute:
   muteWords: "Słowo do wyciszenia"
@@ -870,6 +1011,9 @@ _wordMute:
   soft: "Łagodny"
   hard: "Twardy"
   mutedNotes: "Wyciszone wpisy"
+_instanceMute:
+  title: "Ukrywa wpisy z wymienionych instancji."
+  heading: "Lista instancji do wyciszenia"
 _theme:
   explore: "Przeglądaj motywy"
   install: "Zainstaluj motyw"
@@ -950,6 +1094,7 @@ _sfx:
   notification: "Powiadomienia"
   chat: "Wiadomości"
   chatBg: "Rozmowy (tło)"
+  antenna: "Anteny"
   channel: "Powiadomienia kanału"
 _ago:
   future: "W przyszłości"
@@ -969,12 +1114,30 @@ _time:
 _tutorial:
   title: "Jak korzystać z Misskey"
   step1_1: "Witaj!"
+  step1_2: "Ta strona nazywa się „oś czasu”. Pokazuje chronologicznie uporządkowane wpisy osób, które „śledzisz”."
   step1_3: "Twoja oś czasu jest jeszcze pusta, ponieważ nie opublikowałeś(-aś) jeszcze żadnych wpisów i nie obserwujesz jeszcze nikogo."
   step2_1: "Ukończmy konfigurację profilu zanim utworzymy wpis lub zaczniemy kogoś obserwować."
+  step2_2: "Podanie pewnych informacji o tym, kim jesteś, ułatwi innym określenie, czy chcą widzieć Twoje wpisy lub Cię obserwować."
   step3_1: "Zakończyłeś(-aś) konfigurację profilu?"
+  step3_2: "Następnie spróbujmy opublikować wpis. Możesz to zrobić, naciskając przycisk z ikoną ołówka na ekranie."
   step3_3: "Wypełnij pole i kliknij przycisk w prawym górnym rogu by wysłać post."
+  step3_4: "Nie masz nic do powiedzenia? Spróbuj \"ustawiam swój misskey\"!"
+  step4_1: "Zakończyłeś publikowanie pierwszego wpisu?"
+  step4_2: "Hurra! Teraz Twój pierwszy wpis powinien być wyświetlany na Twojej osi czasu."
+  step5_1: "Teraz spróbujmy ożywić Twoją oś czasu, przez zaobserwowanie innych ludzi."
+  step5_2: "{featured} pokaże Ci popularne wpisy na tej instancji. {explore} pozwoli Ci znaleźć popularnych użytkowników. Spróbuj znaleźć tam osoby, które chcesz obserwować!"
+  step5_3: "Aby obserwować innych użytkowników, kliknij ich ikonę i naciśnij przycisk \"Obserwuj\" na ich profilu."
+  step5_4: "Jeśli inny użytkownik ma ikonę kłódki obok swojej nazwy, może minąć trochę czasu, zanim ten użytkownik ręcznie zatwierdzi Twoją prośbę o obserwowanie."
+  step6_1: "Powinieneś teraz widzieć wpisy innych użytkowników na swojej osi czasu."
+  step6_2: "Możesz także umieścić „reakcje” na wpisach innych osób, aby szybko na nie odpowiedzieć."
+  step6_3: "Aby dodać \"reakcję\", naciśnij znak \"+\" na wpisie innego użytkownika i wybierz emotikonę, którą chcesz zareagować."
+  step7_1: "Gratulacje! Ukończyłeś podstawowy samouczek Misskey."
+  step7_2: "Jeśli chcesz dowiedzieć się więcej o Misskey, wypróbuj sekcję {help}."
+  step7_3: "A teraz powodzenia i baw się dobrze z Misskey! 🚀"
 _2fa:
+  alreadyRegistered: "Zarejestrowałeś już urządzenie do uwierzytelniania dwuskładnikowego."
   registerDevice: "Zarejestruj nowe urządzenie"
+  registerKey: "Zarejestruj klucz bezpieczeństwa"
   step1: "Najpierw, zainstaluj aplikację uwierzytelniającą (taką jak {a} lub {b}) na swoim urządzeniu."
   step2: "Następnie, zeskanuje kod QR z ekranu."
   step3: "Wprowadź token podany w aplikacji, aby ukończyć konfigurację."
@@ -990,6 +1153,7 @@ _permissions:
   "write:favorites": "Edycja Twojej listy ulubionych."
   "read:following": "Wyświetlanie informacji o obserwowanych"
   "write:following": "Obserwowanie lub cofanie obserwacji innych kont"
+  "read:messaging": "Zobacz swoje czaty"
   "read:mutes": "Wyświetlanie listy osób, które wyciszyłeś(-aś)"
   "write:mutes": "Edycja listy osób, które wyciszyłeś(-aś)"
   "read:notifications": "Wyświetlanie powiadomień"
@@ -1003,6 +1167,10 @@ _permissions:
   "write:page-likes": "Edycja polubień na stronach"
   "read:user-groups": "Wyświetlanie grup użytkownika"
   "write:user-groups": "Edycja lub usuwanie grup użytkownika"
+  "read:channels": "Zobacz swoje kanały"
+  "write:channels": "Edytuj swoje kanały"
+  "read:gallery": "Zobacz swoją galerię"
+  "write:gallery": "Edytuj swoją galerię"
 _auth:
   shareAccess: "Czy chcesz autoryzować „{name}” do dostępu do tego konta?"
   permissionAsk: "Ta aplikacja wymaga następujących uprawnień:"
@@ -1021,12 +1189,21 @@ _widgets:
   calendar: "Kalendarz"
   trends: "Na czasie"
   clock: "Zegar"
+  rss: "Czytnik RSS"
   activity: "Aktywność"
   photos: "Zdjęcia"
+  digitalClock: "Zegar cyfrowy"
+  unixClock: "Zegar UNIX"
   federation: "Federacja"
-  postForm: "Utwórz wpis"
+  instanceCloud: "Chmura instancji"
+  postForm: "Formularz tworzenia wpisu"
+  slideshow: "Pokaz slajdów"
   button: "Przycisk"
+  onlineUsers: "Użytkownicy online"
   jobQueue: "Kolejka zadań"
+  serverMetric: "Metryka serwera"
+  aiscript: "Konsola AiScript"
+  aichan: "Ai"
 _cw:
   hide: "Ukryj"
   show: "Załaduj więcej"
@@ -1393,9 +1570,11 @@ _notification:
   youReceivedFollowRequest: "Otrzymałeś(-aś) prośbę o możliwość obserwacji"
   yourFollowRequestAccepted: "Twoja prośba o możliwość obserwacji została przyjęta"
   youWereInvitedToGroup: "Zaproszony(-a) do grupy"
+  pollEnded: "Wyniki ankiety stały się dostępne"
+  emptyPushNotificationMessage: "Powiadomienia push zostały zaktualizowane"
   _types:
     all: "Wszystkie"
-    follow: "Obserwowani"
+    follow: "Nowi obserwujący"
     mention: "Wspomnij"
     reply: "Odpowiedzi"
     renote: "Udostępnij"
@@ -1407,12 +1586,14 @@ _notification:
     groupInvited: "Zaproszono do grup"
     app: "Powiadomienia z aplikacji"
   _actions:
+    followBack: "zaobserwował cię z powrotem"
     reply: "Odpowiedz"
     renote: "Udostępnij"
 _deck:
   alwaysShowMainColumn: "Zawsze pokazuj główną kolumnę"
   columnAlign: "Wyrównaj kolumny"
   addColumn: "Dodaj kolumnę"
+  configureColumn: "Ustawienia kolumny"
   swapLeft: "Przesuń w lewo"
   swapRight: "Przesuń w prawo"
   swapUp: "Zamień z powyższym"
@@ -1420,6 +1601,9 @@ _deck:
   stackLeft: "Przypnij do lewej"
   popRight: "Odepnij w prawo"
   profile: "Profil"
+  newProfile: "Nowy profil"
+  deleteProfile: "Usuń profil"
+  widgetsIntroduction: "Wybierz \"Edytuj widżety\" w menu kolumny i dodaj widżet."
   _columns:
     main: "Główna"
     widgets: "Widżety"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index 2a6988e9b..afce5ec02 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -562,6 +562,7 @@ author: "Автор"
 leaveConfirm: "Вы не сохранили изменения. Хотите выйти и потерять их?"
 manage: "Управление"
 plugins: "Расширения"
+preferencesBackups: "Резервная копия"
 deck: "Пульт"
 undeck: "Покинуть пульт"
 useBlurEffectForModal: "Размывка под формой поверх всего"
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index 6c731ea6e..6f794a7c7 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -562,6 +562,7 @@ author: "ผู้เขียน"
 leaveConfirm: "คุณมีการเปลี่ยนแปลงที่ไม่ได้บันทึกนะ นายต้องการทิ้งการเปลี่ยนแปลงเหล่านั้นหรอ?"
 manage: "การจัดการ"
 plugins: "ปลั๊กอิน"
+preferencesBackups: "ตั้งค่าการสำรองข้อมูล"
 deck: "เด็ค"
 undeck: "ออกจากเด็ค"
 useBlurEffectForModal: "ใช้เอฟเฟกต์เบลอสำหรับโมดอล"
@@ -598,7 +599,7 @@ wordMute: "ปิดเสียงคำ"
 regexpError: "ข้อผิดพลาดของนิพจน์ทั่วไป"
 regexpErrorDescription: "เกิดข้อผิดพลาดในนิพจน์ทั่วไปในบรรทัดที่ {line} ของการปิดเสียงคำ {tab} ของคุณ:"
 instanceMute: "ปิดเสียง อินสแตนซ์"
-userSaysSomething: "{ชื่อ} พูดอะไรบางอย่าง"
+userSaysSomething: "{name} พูดอะไรบางอย่าง"
 makeActive: "เปิดใช้งาน"
 display: "แสดงผล"
 copy: "คัดลอก"
@@ -913,13 +914,89 @@ _ffVisibility:
 _signup:
   almostThere: "เกือบจะมี"
   emailAddressInfo: "โปรดกรอกอีเมลของคุณ มันจะไม่เปิดเผยต่อสาธารณะ"
+  emailSent: "เราได้ส่งอีเมลยืนยันไปยังที่อยู่อีเมลของคุณแล้วนะ ({email}) โปรดคลิกลิงก์ที่รวมไว้เพื่อสร้างบัญชีให้เสร็จสิ้น"
+_accountDelete:
+  accountDelete: "ลบบัญชีผู้ใช้"
+  mayTakeTime: "เนื่องจากการลบบัญชีนี้จะเป็นกระบวนการที่ต้องใช้ทรัพยากรมาก จึงอาจจะต้องใช้เวลาสักครู่ถึงจะเสร็จสมบูรณ์ ทั้งนี้ขึ้นอยู่กับจำนวนเนื้อหาที่คุณสร้างและจำนวนไฟล์ที่คุณอัปโหลดนะ"
+  sendEmail: "เมื่อการลบบัญชีนี้เสร็จสิ้น เราอาจจะส่งอีเมลไปยังที่อยู่อีเมลของคุณที่เคยลงทะเบียนไว้กับบัญชีนี้นะ"
+  requestAccountDelete: "ร้องขอให้ลบบัญชี"
+  started: "การลบได้เริ่มต้นขึ้น"
+  inProgress: "ปัจจุบันกำลังดำเนินการลบอยู่"
 _ad:
   back: "ย้อนกลับ"
+  reduceFrequencyOfThisAd: "แสดงโฆษณานี้ให้น้อยลง"
+_forgotPassword:
+  enterEmail: "ป้อนที่อยู่อีเมลที่คุณเคยใช้ในการลงทะเบียนไว้ ลิงก์ที่คุณสามารถรีเซ็ตรหัสผ่านได้นั้นจะถูกส่งไปนะ"
+  ifNoEmail: "ถ้าหากคุณไม่ได้ใช้อีเมลระหว่างการลงทะเบียน กรุณาติดต่อผู้ดูแลระบบอินสแตนซ์แทนนะ"
+  contactAdmin: "อินสแตนซ์นี้ไม่รองรับการใช้งานที่อยู่อีเมลนี้ กรุณาติดต่อผู้ดูแลระบบอินสแตนซ์เพื่อรีเซ็ตรหัสผ่านของคุณแทน"
+_gallery:
+  my: "แกลลอรี่ของฉัน"
+  liked: "โพสต์ที่ถูกใจ"
+  like: "ชื่นชอบ"
+  unlike: "ลบไลค์"
 _email:
   _follow:
     title: "ได้ติดตามคุณ"
+  _receiveFollowRequest:
+    title: "คุณได้รับคำขอติดตาม"
+_plugin:
+  install: "ติดตั้งปลั๊กอิน"
+  installWarn: "กรุณาอย่าติดตั้งปลั๊กอินที่ไม่น่าเชื่อถือนะคะ"
+  manage: "จัดการปลั๊กอิน"
+_preferencesBackups:
+  list: "สร้างการสำรองข้อมูล"
+  saveNew: "บันทึกใหม่"
+  loadFile: "โหลดจากไฟล์"
+  apply: "นำไปใช้กับอุปกรณ์นี้"
+  save: "บันทึก"
+  inputName: "กรุณาป้อนชื่อสำหรับข้อมูลสำรองนี้"
+  cannotSave: "การบันทึกล้มเหลว"
+  nameAlreadyExists: "มีข้อมูลสำรองชื่อ \"{name}\" นี้อยู่แล้ว กรุณาป้อนชื่ออื่นนะ"
+  applyConfirm: "คุณต้องการใช้ข้อมูลสำรอง \"{name}\" กับอุปกรณ์นี้อย่างงั้นจริงหรอ การตั้งค่าที่มีอยู่ของอุปกรณ์นี้จะถูกเขียนทับนะ"
+  saveConfirm: "บันทึกข้อมูลสำรองเป็น {name} มั้ย?"
+  deleteConfirm: "ลบข้อมูลสำรอง {name} มั้ย?"
+  renameConfirm: "เปลี่ยนชื่อข้อมูลสำรองนี้จาก \"{old}\" เป็น \"{new}\" หรือป่าว"
+  noBackups: "ไม่มีข้อมูลสำรองนะ คุณสามารถสำรองข้อมูลการตั้งค่าไคลเอนต์ของคุณบนเซิร์ฟเวอร์นี้โดยใช้ \"สร้างการสำรองข้อมูลใหม่\"ได้นะ"
+  createdAt: "สร้างเมื่อ: {date} {time}"
+  updatedAt: "อัปเดตเมื่อ: {date} {time}"
+  cannotLoad: "การโหลดล้มเหลว"
+  invalidFile: "รูปแบบไฟล์ไม่ถูกต้องนะ"
+_registry:
+  scope: "สโคป"
+  key: "คีย์"
+  keys: "คีย์"
+  domain: "โดเมน"
+  createKey: "สร้างคีย์"
+_aboutMisskey:
+  about: "Misskey เป็นซอฟต์แวร์โอเพ่นซอร์สที่ถูกพัฒนาโดย Syuilo ตั้งแต่ปี 2014"
+  contributors: "ผู้สนับสนุนหลัก"
+  allContributors: "ผู้มีส่วนร่วมทั้งหมด"
+  source: "ซอร์สโค้ด"
+  translation: "รับแปลภาษา Misskey"
+  donate: "บริจาคให้กับ Misskey"
+  morePatrons: "เราขอขอบคุณสำหรับความช่วยเหลือจากผู้ช่วยอื่นๆ ที่ไม่ได้ระบุไว้ที่นี่นะ ขอขอบคุณ! 🥰"
+  patrons: "สมาชิกพันธมิตร"
+_nsfw:
+  respect: "ซ่อนสื่อ NSFW"
+  ignore: "อย่าซ่อนสื่อ NSFW"
+  force: "ซ่อนสื่อทั้งหมด"
 _mfm:
+  cheatSheet: "โค้ด MFM Cheat Sheet"
+  intro: "MFM เป็นภาษามาร์กอัปพิเศษเฉพาะของ Misskey ที่สามารถใช้ได้ในหลายที่ คุณยังสามารถดูรายการไวยากรณ์ MFM ที่มีอยู่ทั้งหมดได้ที่นี่นะ"
+  dummy: "Misskey ขยายโลกของ Fediverse"
   mention: "กล่าวถึง"
+  mentionDescription: "คุณสามารถระบุผู้ใช้โดยใช้ At-Symbol และชื่อผู้ใช้ได้นะ"
+  hashtag: "แฮชแท็ก"
+  hashtagDescription: "คุณสามารถระบุชื่อแฮชแท็กได้โดยใช้เครื่องหมายตัวเลขและข้อความได้นะ"
+  url: "URL"
+  urlDescription: "สามารถแสดง URL ได้นะ"
+  link: "ลิงก์"
+  linkDescription: "เจาะจงเฉพาะ ส่วนของข้อความที่สามารถแสดงเป็น URL ได้"
+  bold: "ตัวหนา"
+  boldDescription: "ไฮไลท์ตัวอักษรโดยทำให้หนาขึ้น"
+  small: "ขนาดเล็ก"
+  smallDescription: "แสดงผลเนื้อหาขนาดเล็กและบาง"
+  center: "เซ็นเตอร์"
   centerDescription: "แสดงผลเนื้อหาเป็นศูนย์กลาง"
   inlineCode: "โค้ด (อินไลน์)"
   inlineCodeDescription: "แสดงผลการเน้นไวยากรณ์แบบอินไลน์สำหรับโค้ด (โปรแกรม)"
@@ -936,9 +1013,117 @@ _mfm:
   search: "ค้นหา"
   searchDescription: "แสดงผลกล่องค้นหาพร้อมกับข้อความที่ป้อนไว้ล่วงหน้า"
   flip: "พลิก"
+  flipDescription: "พลิกเนื้อหาในแนวนอนหรือแนวตั้ง"
+  jelly: "แอนิเมชั่น (เยลลี่)"
+  jellyDescription: "ให้เนื้อหาเป็นแอนิเมชั่นเหมือนเยลลี่"
+  tada: "แอนิเมชั่น (ธาดา)"
+  tadaDescription: "ให้เนื้อหาเป็นแอนิเมชั่นเหมือน \"ทาด้า!\""
+  jump: "อนิเมชั่น (กระโดด)"
+  jumpDescription: "ให้เนื้อหามีภาพเคลื่อนไหวแบบกระโดด"
+  bounce: "อนิเมชั่น (เด้ง)"
+  bounceDescription: "ให้เนื้อหามีอนิเมชั่นเด้ง"
+  shake: "อนิเมชั่น (เขย่า)"
+  shakeDescription: "ให้เนื้อหามีภาพเคลื่อนไหวสั่น"
+  twitch: "แอนิเมชั่น (Twitch)"
+  twitchDescription: "ให้เนื้อหามีแอนิเมชั่นกระตุกอย่างแรง"
+  spin: "แอนิเมชั่น (สปิน)"
+  spinDescription: "ให้เนื้อหาเป็นภาพเคลื่อนไหวแบบหมุน"
+  x2: "ขนาดใหญ่"
+  x2Description: "แสดงเนื้อหาที่ใหญ่ขึ้น"
+  x3: "ใหญ่มาก"
+  x3Description: "แสดงเนื้อหาอีเว้นท์ที่ใหญ่ขึ้น"
+  x4: "ใหญ่อย่างไม่น่าเชื่อ"
+  x4Description: "แสดงผลเนื้อหาที่ใหญ่กว่าใหญ่กว่าขนาดใหญ่"
+  blur: "เบลอ"
+  blurDescription: "เบลอเนื้อหา จะแสดงผลอย่างชัดเจนต่อเมื่อวางเมาส์เหนือ"
+  font: "ตัวอักษร"
+  fontDescription: "ตั้งค่าตัวอักษรเพื่อแสดงเนื้อหาใน"
+  rainbow: "สายรุ้ง"
+  rainbowDescription: "ทำให้เนื้อหานั้นปรากฏเป็นสีรุ้ง"
+  sparkle: "กลิตเตอร์"
+  sparkleDescription: "ให้เนื้อหานั้นมีเอฟเฟกต์แบบอนุภาคประกาย"
+  rotate: "หมุนหน้าจอ"
+  rotateDescription: "เปลี่ยนเนื้อหาตามด้วยมุมที่ระบุไว้"
+  plain: "เรียบง่าย"
+  plainDescription: "ปิดการใช้งานเอฟเฟกต์ของ MFM ทั้งหมดที่มีอยู่ในเอฟเฟกต์ MFM นี้"
+_instanceTicker:
+  none: "ไม่ต้องแสดง"
+  remote: "แสดงสำหรับผู้ใช้ระยะไกล"
+  always: "แสดงเสมอ"
+_serverDisconnectedBehavior:
+  reload: "โหลดใหม่โดยอัตโนมัติ"
+  dialog: "แสดงกล่องโต้ตอบคำเตือน"
+  quiet: "แสดงคำเตือนที่ไม่เป็นการรบกวน"
+_channel:
+  create: "สร้างแชนแนลใหม่"
+  edit: "แก้ไขแชนแนล"
+  setBanner: "เซตแบนเนอร์"
+  removeBanner: "ลบแบนเนอร์"
+  featured: "เทรนด์"
+  owned: "เจ้าของ"
+  following: "ติดตามแล้ว"
+  usersCount: "{n} ผู้เข้าร่วม"
+  notesCount: "{n} โน้ต"
+_menuDisplay:
+  sideFull: "ด้านข้าง"
+  sideIcon: "ด้านข้าง (ไอคอน)"
+  top: "ท็อป"
+  hide: "ซ่อน"
+_wordMute:
+  muteWords: "ปิดเสียงคำ"
+  muteWordsDescription: "คั่นด้วยช่องว่างสำหรับเงื่อนไข AND หรือด้วยการขึ้นบรรทัดใหม่สำหรับเงื่อนไข OR นะ"
+  muteWordsDescription2: "ล้อมรอบคีย์เวิร์ดด้วยเครื่องหมายทับเพื่อใช้นิพจน์ทั่วไป"
+  softDescription: "ซ่อนโน้ตให้ตรงตามเงื่อนไขที่ตั้งไว้จากไทม์ไลน์"
+  hardDescription: "ป้องกันไม่ให้โน้ตย่อที่ตรงตามเงื่อนไขที่ตั้งไว้ไม่ให้ถูกเพิ่มลงในไทม์ไลน์ นอกจากนี้ โน้ตเหล่านี้จะไม่ถูกเพิ่มลงในไทม์ไลน์แม้ว่าจะมีการเปลี่ยนแปลงเงื่อนไขยังไงก็ตาม"
+  soft: "ซอฟ"
+  hard: "ยาก"
+  mutedNotes: "ปิดเสียงโน้ต"
+_instanceMute:
+  instanceMuteDescription: "การดำเนินการนี้จะปิดเสียง\"โน้ต/รีโน้ต\"จากอินสแตนซ์ที่อยู่ในรายการ รวมถึงบันทึกของผู้ใช้ที่ตอบกลับผู้ใช้จากอินสแตนซ์ที่ปิดเสียง"
+  instanceMuteDescription2: "คั่นด้วยการขึ้นบรรทัดใหม่"
+  title: "ซ่อนโน้ตจากอินสแตนซ์ที่มีอยู่ในรายการ"
+  heading: "รายชื่ออินสแตนซ์ที่ถูกปิดเสียง"
 _theme:
+  explore: "สำรวจธีม"
+  install: "ติดตั้งธีม"
+  manage: "จัดการธีม"
+  code: "โค้ดธีม"
   description: "รายละเอียด"
+  installed: "{name} ได้รับการติดตั้ง"
+  installedThemes: "ธีมที่ติดตั้ง"
+  builtinThemes: "ธีมในตัว"
+  alreadyInstalled: "ธีมนี้ได้รับการติดตั้งแล้ว"
+  invalid: "รูปแบบของธีมนี้ไม่ถูกต้องนะ"
+  make: "ทำธีม"
+  base: "ฐาน"
+  addConstant: "เพิ่มค่าคงที่"
+  constant: "ตัวแปร"
+  defaultValue: "ค่าเริ่มต้น"
+  color: "สี"
+  refProp: "อ้างอิงคุณสมบัติ"
+  refConst: "อ้างอิงค่าคงที่"
+  key: "คีย์"
+  func: "ฟังก์ชัน"
+  funcKind: "ประเภทฟังก์ชัน"
+  argument: "อากิวเม้นต์"
+  basedProp: "ทรัพย์สินอ้างอิง"
+  alpha: "ความทึบแสง"
+  darken: "มืดลง"
+  lighten: "สว่าง"
+  inputConstantName: "ป้อนชื่อสำหรับค่าคงที่นี้"
+  importInfo: "ถ้าหากต้องการป้อนโค้ดที่นี่ คุณยังสามารถนำเข้าไปยังโปรแกรมแก้ไขธีมได้"
+  deleteConstantConfirm: "คุณต้องการลบค่าคงที่ {const} หรือป่าว?"
   keys:
+    accent: "เน้น"
+    bg: "ภาพพื้นหลัง"
+    fg: "ข้อความ"
+    focus: "โฟกัส"
+    indicator: "ตัวบ่งชี้"
+    panel: "แผงควบคุม"
+    shadow: "เงา"
+    header: "ส่วนหัว"
+    navBg: "พื้นหลังแถบด้านข้าง"
+    navFg: "ข้อความแถบด้านข้าง"
     mention: "กล่าวถึง"
     renote: "รีโน้ต"
     divider: "ตัวแบ่ง"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 182cebf5a..1b6f29667 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -141,7 +141,7 @@ cacheRemoteFilesDescription: "当禁用此设定时远程文件将直接从远
 flagAsBot: "这是一个机器人账号"
 flagAsBotDescription: "如果此帐户由程序控制，请启用此项。启用后，此标志可以帮助其他开发人员防止机器人之间产生无限互动的行为，并让Misskey的内部系统将此帐户识别为机器人。"
 flagAsCat: "将这个账户设定为一只猫"
-flagAsCatDescription: "如果您想表明此帐户是一只猫，请打开此标志。"
+flagAsCatDescription: "如果您想表明此帐户是一只猫，请打开此标志。\n开启后，会在您的头像上出现猫耳朵，并将你的帖子中的「na」替换为「nya」，日文同理。"
 flagShowTimelineReplies: "在时间线上显示帖子的回复"
 flagShowTimelineRepliesDescription: "启用时，时间线除了显示用户的帖子外，还会显示其他用户对帖子的回复。"
 autoAcceptFollowed: "自动允许关注者的关注"
@@ -252,7 +252,7 @@ messageRead: "已读"
 noMoreHistory: "没有更多的历史记录"
 startMessaging: "添加聊天"
 nUsersRead: "{n}人已读"
-agreeTo: "{0}勾选则表示已阅读并同意"
+agreeTo: "勾选则表示已阅读并同意{0}"
 tos: "服务条款"
 start: "开始"
 home: "首页"
@@ -668,7 +668,7 @@ yes: "是"
 no: "否"
 driveFilesCount: "网盘的文件数"
 driveUsage: "网盘的空间用量"
-noCrawle: "要求搜索引擎不索引该站点"
+noCrawle: "要求搜索引擎不索引该用户"
 noCrawleDescription: "要求搜索引擎不要收录（索引）您的用户页面，帖子，页面等。"
 lockedAccountInfo: "即使通过了关注请求，只要您不将帖子可见范围设置成“关注者”，任何人都可以看到您的帖子。"
 alwaysMarkSensitive: "默认将媒体文件标记为敏感内容"
@@ -747,7 +747,7 @@ userInfo: "用户信息"
 unknown: "未知"
 onlineStatus: "在线状态"
 hideOnlineStatus: "隐藏在线状态"
-hideOnlineStatusDescription: "隐藏在线状态后，可能会降低例如搜索等功能的便利性。"
+hideOnlineStatusDescription: "隐藏在线状态后，可能会降低搜索等功能的便利性。"
 online: "在线"
 active: "活动"
 offline: "离线"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index c7b4fe77f..3449da99a 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -883,8 +883,8 @@ sensitiveMediaDetection: "敏感性媒體的檢測"
 localOnly: "僅限本地"
 remoteOnly: "僅限遠端"
 failedToUpload: "上傳失敗"
-cannotUploadBecauseInappropriate: "由於判定可能包含不適當的內容，因此無法上船。"
-cannotUploadBecauseNoFreeSpace: "由於雲端硬碟沒有可用空間，因此無法上船>"
+cannotUploadBecauseInappropriate: "由於判定可能包含不適當的內容，因此無法上傳。"
+cannotUploadBecauseNoFreeSpace: "由於雲端硬碟沒有可用空間，因此無法上傳。"
 beta: "Beta"
 enableAutoSensitive: "自動NSFW判定"
 enableAutoSensitiveDescription: "如果可用，請利用機器學習在媒體上自動設置 NSFW 旗標。 即使關閉此功能，依實例而定也可能會自動設置。"
@@ -917,7 +917,7 @@ _signup:
   emailSent: "已將確認郵件發送至您輸入的電子郵件地址 ({email})。請開啟電子郵件中的連結以完成帳戶創建。"
 _accountDelete:
   accountDelete: "刪除帳戶"
-  mayTakeTime: "刪除帳戶的處理負荷較大，如果帳戶產生的內容數量上船的檔案數量較多的話，就需要花费一段時間才能完成。"
+  mayTakeTime: "刪除帳戶的處理負荷較大，如果帳戶產生的內容數量上傳的檔案數量較多的話，就需要花费一段時間才能完成。"
   sendEmail: "帳戶删除完成後，將向註冊地電子郵件地址發送通知。"
   requestAccountDelete: "刪除帳戶請求"
   started: "已開始刪除作業。"

From e60a6cc621faafa1f59bd1407d92a955d5ae5bae Mon Sep 17 00:00:00 2001
From: rinsuki <428rinsuki+git@gmail.com>
Date: Sat, 10 Sep 2022 19:25:32 +0900
Subject: [PATCH 196/245] chore(sw): only proxies HTML requests (#9070)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(sw): only proxies HTML requests

もはやHTMLじゃなさそうなリクエストにはSWで関与しないようにする

こうするといろいろな面倒事が解決するはず…たぶん

Resolve #9037
Resolve #9038

* align code style

* Update packages/sw/src/sw.ts

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

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
---
 packages/sw/src/sw.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/sw/src/sw.ts b/packages/sw/src/sw.ts
index 872692f90..92391f1fb 100644
--- a/packages/sw/src/sw.ts
+++ b/packages/sw/src/sw.ts
@@ -24,6 +24,16 @@ self.addEventListener('activate', ev => {
 });
 
 self.addEventListener('fetch', ev => {
+	let isHTMLRequest = false;
+	if (ev.request.headers.get('sec-fetch-dest') === 'document') {
+		isHTMLRequest = true;
+	} else if (ev.request.headers.get('accept')?.includes('/html')) {
+		isHTMLRequest = true;
+	} else if (ev.request.url.endsWith('/')) {
+		isHTMLRequest = true;
+	}
+
+	if (!isHTMLRequest) return;
 	ev.respondWith(
 		fetch(ev.request)
 		.catch(() => new Response(`Offline. Service Worker @${_VERSION_}`, { status: 200 }))

From 606d7dbc22ebcbce565ccb0336515a9d7a6e4ccf Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 10 Sep 2022 19:26:17 +0900
Subject: [PATCH 197/245] 12.119.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98357c77a..5bafc0a01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@
 You should also include the user name that made the change.
 -->
 
-## 12.x.x (unreleased)
+## 12.119.0 (2022/09/10)
 
 ### Improvements
 - Client: Add following badge to user preview popup @nvisser
diff --git a/package.json b/package.json
index e965999fa..37f0762f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1",
+	"version": "12.119.0",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",

From 4c767f16f621baac82c7f3dad9cd2683f33f0ee5 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 11 Sep 2022 01:58:34 +0900
Subject: [PATCH 198/245] Update .eslintrc.js

---
 packages/shared/.eslintrc.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/shared/.eslintrc.js b/packages/shared/.eslintrc.js
index aed822be9..2e48a764a 100644
--- a/packages/shared/.eslintrc.js
+++ b/packages/shared/.eslintrc.js
@@ -71,6 +71,7 @@ module.exports = {
 		'@typescript-eslint/no-misused-promises': ['error', {
 			'checksVoidReturn': false,
 		}],
+		'@typescript-eslint/consistent-type-imports': 'error',
 		'import/no-unresolved': ['off'],
 		'import/no-default-export': ['warn'],
 		'import/order': ['warn', {

From a97fcd9e73b12c886d767314eb180aa3c3fac5e6 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 11 Sep 2022 03:34:41 +0900
Subject: [PATCH 199/245] Update .eslintrc.js

---
 packages/shared/.eslintrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/shared/.eslintrc.js b/packages/shared/.eslintrc.js
index 2e48a764a..5a6a9c5af 100644
--- a/packages/shared/.eslintrc.js
+++ b/packages/shared/.eslintrc.js
@@ -14,7 +14,7 @@ module.exports = {
 	rules: {
 		'indent': ['warn', 'tab', {
 			'SwitchCase': 1,
-			'MemberExpression': 'off',
+			'MemberExpression': 1,
 			'flatTernaryExpressions': true,
 			'ArrayExpression': 'first',
 			'ObjectExpression': 'first',

From d9ab03f086a8058d1325816eca6387eb8e160ce8 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 11 Sep 2022 03:40:24 +0900
Subject: [PATCH 200/245] Update ROADMAP.md

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

diff --git a/ROADMAP.md b/ROADMAP.md
index 9b3016cad..b2c5c8757 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -18,6 +18,8 @@ This is the phase we are at now. We need to make a high-maintenance environment
 	- Measure coverage
 		- https://github.com/misskey-dev/misskey/pull/9081
 - Improve documentation
+- Refactoring
+	- Extract the logic of each endpoint definition into a service and just call it
 
 ## (2) Improve functionality
 Once Phase 1 is complete and an environment conducive to the development of a stable system is in place, the implementation of new functions can begin gradually.

From 3f7f3fd388c63e3b5ee93bf25addb43fc69b510d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 10 Sep 2022 12:15:41 -0700
Subject: [PATCH 201/245] chore: :package: Update lockfile

---
 yarn.lock | 220 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 114 insertions(+), 106 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index ffd9bd166..77f851a05 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1352,13 +1352,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/glob@npm:7.2.0":
-  version: 7.2.0
-  resolution: "@types/glob@npm:7.2.0"
+"@types/glob@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@types/glob@npm:8.0.0"
   dependencies:
     "@types/minimatch": "*"
     "@types/node": "*"
-  checksum: 6ae717fedfdfdad25f3d5a568323926c64f52ef35897bcac8aca8e19bc50c0bd84630bbd063e5d52078b2137d8e7d3c26eabebd1a2f03ff350fff8a91e79fc19
+  checksum: 1817b05f5a8aed851d102a65b5e926d5c777bef927ea62b36d635860eef5364f2046bb5a692d135b6f2b28f34e4a9d44ade9396122c0845bcc7636d35f624747
   languageName: node
   linkType: hard
 
@@ -2134,25 +2134,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vue/compiler-core@npm:3.2.38":
-  version: 3.2.38
-  resolution: "@vue/compiler-core@npm:3.2.38"
+"@vue/compiler-core@npm:3.2.39":
+  version: 3.2.39
+  resolution: "@vue/compiler-core@npm:3.2.39"
   dependencies:
     "@babel/parser": ^7.16.4
-    "@vue/shared": 3.2.38
+    "@vue/shared": 3.2.39
     estree-walker: ^2.0.2
     source-map: ^0.6.1
-  checksum: fd1049aa14f93ac167d5cff2c867c12aca3a57b6070ca07b45930549a3643296fd07ad0b2e3799a3cabdbc08609325431b475b6d504b47bfe098ebaca61a120d
+  checksum: dd70ed60b14faba2f46a2a99ddf20819db7dff124dd49ec15ba76ea3c6d8311feca4256d4dac8e8316c6670434cbb7c0c6a2cb5f6e97b321ba42ff454102c3be
   languageName: node
   linkType: hard
 
-"@vue/compiler-dom@npm:3.2.38":
-  version: 3.2.38
-  resolution: "@vue/compiler-dom@npm:3.2.38"
+"@vue/compiler-dom@npm:3.2.39":
+  version: 3.2.39
+  resolution: "@vue/compiler-dom@npm:3.2.39"
   dependencies:
-    "@vue/compiler-core": 3.2.38
-    "@vue/shared": 3.2.38
-  checksum: 21ee60938a9a4e81365be3cb29f336a1b7be8878ad750f8f9735ee04d00d51f3c11b3ce60136491abf3a9c7fb714c1c58561e859bde83dc1e0759d0f3488a50f
+    "@vue/compiler-core": 3.2.39
+    "@vue/shared": 3.2.39
+  checksum: 505a8f8515f8551795e3a01859d451645e0bd77be2d70d5c48f6edd02ebc255d911230c66ccfc478fd0218ab8a7b69bd99e2c12b406db4889285058f52d13363
   languageName: node
   linkType: hard
 
@@ -2167,93 +2167,93 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vue/compiler-sfc@npm:3.2.38":
-  version: 3.2.38
-  resolution: "@vue/compiler-sfc@npm:3.2.38"
+"@vue/compiler-sfc@npm:3.2.39":
+  version: 3.2.39
+  resolution: "@vue/compiler-sfc@npm:3.2.39"
   dependencies:
     "@babel/parser": ^7.16.4
-    "@vue/compiler-core": 3.2.38
-    "@vue/compiler-dom": 3.2.38
-    "@vue/compiler-ssr": 3.2.38
-    "@vue/reactivity-transform": 3.2.38
-    "@vue/shared": 3.2.38
+    "@vue/compiler-core": 3.2.39
+    "@vue/compiler-dom": 3.2.39
+    "@vue/compiler-ssr": 3.2.39
+    "@vue/reactivity-transform": 3.2.39
+    "@vue/shared": 3.2.39
     estree-walker: ^2.0.2
     magic-string: ^0.25.7
     postcss: ^8.1.10
     source-map: ^0.6.1
-  checksum: 1d72cc4f1c643db455a0034d11ede23c83a3ff4fd4e2ffcfdb85805c99fc7a4227faddc8994b41a41d5abbf3e9edf7b87557378f13c141f920b9b12dd180d285
+  checksum: b82755eec28c03800e38b99603a90b85af03d670558c845f9916650fea5cac8c2eb1511d66aa71e602ca9af8d2795e9f6a16fc867efce8c8694a6ea106f0ac95
   languageName: node
   linkType: hard
 
-"@vue/compiler-ssr@npm:3.2.38":
-  version: 3.2.38
-  resolution: "@vue/compiler-ssr@npm:3.2.38"
+"@vue/compiler-ssr@npm:3.2.39":
+  version: 3.2.39
+  resolution: "@vue/compiler-ssr@npm:3.2.39"
   dependencies:
-    "@vue/compiler-dom": 3.2.38
-    "@vue/shared": 3.2.38
-  checksum: f457245a43d8290dbdb8f782fd873557041798801be61e8c3e52d88784232a7545dc23532c4552ed3fd74c1dfdfd07531ab83be3e5b5441dda4c4b282055043a
+    "@vue/compiler-dom": 3.2.39
+    "@vue/shared": 3.2.39
+  checksum: 27323a548df3696d38a8b029b55e136fc94195f1a9e12a25161a8d524cc779dbcc5f69db525a8d86f6ed28326f9f8595db5ba94ccaa7c8f127f752be36bffe5f
   languageName: node
   linkType: hard
 
-"@vue/reactivity-transform@npm:3.2.38":
-  version: 3.2.38
-  resolution: "@vue/reactivity-transform@npm:3.2.38"
+"@vue/reactivity-transform@npm:3.2.39":
+  version: 3.2.39
+  resolution: "@vue/reactivity-transform@npm:3.2.39"
   dependencies:
     "@babel/parser": ^7.16.4
-    "@vue/compiler-core": 3.2.38
-    "@vue/shared": 3.2.38
+    "@vue/compiler-core": 3.2.39
+    "@vue/shared": 3.2.39
     estree-walker: ^2.0.2
     magic-string: ^0.25.7
-  checksum: 84b665185ed60b21195992b33b6cc068fe8c6c68ffa526f3aa1334ffdeac94daf07a74fc6dda6ef40230bcb940ec6607aa5ae0ae0309942a71717c7b22639d8a
+  checksum: b609d9367d875bf326ca8f31779407723cad2b2b4a26e7fb8860089c720e1b0bb8d5fe19604e8baff1d9ffc1fdbafb21a43db9063a24ae4ad30cb70b1c712de3
   languageName: node
   linkType: hard
 
-"@vue/reactivity@npm:3.2.38":
-  version: 3.2.38
-  resolution: "@vue/reactivity@npm:3.2.38"
+"@vue/reactivity@npm:3.2.39":
+  version: 3.2.39
+  resolution: "@vue/reactivity@npm:3.2.39"
   dependencies:
-    "@vue/shared": 3.2.38
-  checksum: c9afb0184603c93a450553d8280a4e32b4e327ab90cadb94d020d8118d6214bee820db4312d26d0570679ede18e9b8d4ca696eab012abd0839a346c30b5ca07e
+    "@vue/shared": 3.2.39
+  checksum: c4d440a53b2196e46129271affdb22182586a8123bc44d082468cd089242023890bccd6eaa1acc72919ea2c1febad979504be737720632afefee6ec6b75370a9
   languageName: node
   linkType: hard
 
-"@vue/runtime-core@npm:3.2.38":
-  version: 3.2.38
-  resolution: "@vue/runtime-core@npm:3.2.38"
+"@vue/runtime-core@npm:3.2.39":
+  version: 3.2.39
+  resolution: "@vue/runtime-core@npm:3.2.39"
   dependencies:
-    "@vue/reactivity": 3.2.38
-    "@vue/shared": 3.2.38
-  checksum: d3936ca50b3eabc3eae575bb9e3b8219c4a0d6ebcde0e111fefe0b154d9aba827a87cc939ce9be626a9fa92b408b000287fb57ca97126186a8c7ef2b7f9c4844
+    "@vue/reactivity": 3.2.39
+    "@vue/shared": 3.2.39
+  checksum: 13f6b92d70fb3bc8b12caef9eaf9cc1fb3aa1f1bd07e2392013f02d65c74b09d4121e62d149d7f7c316ef2c6b3496c9ec828795286480f08e5f45e910b0f2671
   languageName: node
   linkType: hard
 
-"@vue/runtime-dom@npm:3.2.38":
-  version: 3.2.38
-  resolution: "@vue/runtime-dom@npm:3.2.38"
+"@vue/runtime-dom@npm:3.2.39":
+  version: 3.2.39
+  resolution: "@vue/runtime-dom@npm:3.2.39"
   dependencies:
-    "@vue/runtime-core": 3.2.38
-    "@vue/shared": 3.2.38
+    "@vue/runtime-core": 3.2.39
+    "@vue/shared": 3.2.39
     csstype: ^2.6.8
-  checksum: d1d889c3e85b6b1a12efd432160c57d8b5eff4889717d36d27dae39094578bdcceefa536e991bf040e32e4baf3dc096f579aa14af1077eb91a79772843755fca
+  checksum: 0c47f941148a000ac0cb93add51edb08eca5ae16fa7898dd070300f22e4ba77533c85342f0ceca0cab8637b80b1f92cfab10adb2160e4c6dd4be4a5b27ae1ff3
   languageName: node
   linkType: hard
 
-"@vue/server-renderer@npm:3.2.38":
-  version: 3.2.38
-  resolution: "@vue/server-renderer@npm:3.2.38"
+"@vue/server-renderer@npm:3.2.39":
+  version: 3.2.39
+  resolution: "@vue/server-renderer@npm:3.2.39"
   dependencies:
-    "@vue/compiler-ssr": 3.2.38
-    "@vue/shared": 3.2.38
+    "@vue/compiler-ssr": 3.2.39
+    "@vue/shared": 3.2.39
   peerDependencies:
-    vue: 3.2.38
-  checksum: d7d8458e6913f0c6cd517cd2b3b673ebd28b3d85fdb4a004896c0da68a9e58eb69d30141b403b8afaa2f341029aa00c2860b845363f75ed5e1116787283bcc1c
+    vue: 3.2.39
+  checksum: ae6ccd08b85ad8c18cae461404ad8c4b3b602c779fe07ab3a69e0a9a4cef274ea8dcd662fa365f3717f67d4ba02a9eac88dd2ebf5194072ae43dd5db99c2cb2c
   languageName: node
   linkType: hard
 
-"@vue/shared@npm:3.2.38":
-  version: 3.2.38
-  resolution: "@vue/shared@npm:3.2.38"
-  checksum: c1aa5ec1320fff7431297c594cb976908b5ff240a16384930b4b16dc2a0d663aa09706337dee6910db260c5bb24fb31359006637d01de98009247a68acde5eae
+"@vue/shared@npm:3.2.39":
+  version: 3.2.39
+  resolution: "@vue/shared@npm:3.2.39"
+  checksum: 0bf9f5b4851b634cfae92c08d64173c2db674bd817424473d28fc58af7c17c54a255f9b3e837d3857e1e62f9092ab1d74b4714237e45c94fcd46f92155ef653f
   languageName: node
   linkType: hard
 
@@ -2958,9 +2958,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aws-sdk@npm:2.1204.0":
-  version: 2.1204.0
-  resolution: "aws-sdk@npm:2.1204.0"
+"aws-sdk@npm:2.1213.0":
+  version: 2.1213.0
+  resolution: "aws-sdk@npm:2.1213.0"
   dependencies:
     buffer: 4.9.2
     events: 1.1.1
@@ -2972,7 +2972,7 @@ __metadata:
     util: ^0.12.4
     uuid: 8.0.0
     xml2js: 0.4.19
-  checksum: aba204f852853a8da6e6e42d823571adc827c540de542e980e0b629c2ecfd4ba961ed8a700adc18794af7c95f47f87f7722a6cb19ad43ec38cdfa8f6f02a8c91
+  checksum: 134e088e2397ffcef1bee3eebc6a5f86f2b8767c8bc85e7ad4c9b32c2083524cf986856134bfbcb54cbeeea516614199505a5fc5193026b66e372af233e65e09
   languageName: node
   linkType: hard
 
@@ -3098,7 +3098,7 @@ __metadata:
     archiver: 5.3.1
     autobind-decorator: 2.4.0
     autwh: 0.1.0
-    aws-sdk: 2.1204.0
+    aws-sdk: 2.1213.0
     bcryptjs: 2.4.3
     blurhash: 1.1.5
     bull: 4.9.0
@@ -3120,7 +3120,6 @@ __metadata:
     feed: 4.2.2
     file-type: 17.1.6
     fluent-ffmpeg: 2.1.2
-    form-data: ^4.0.0
     got: 12.3.1
     hpagent: 0.1.2
     ioredis: 4.28.5
@@ -3186,11 +3185,11 @@ __metadata:
     tsc-alias: 1.7.0
     tsconfig-paths: 4.1.0
     twemoji-parser: 14.0.0
-    typeorm: ^0.3.9
-    typescript: 4.8.2
+    typeorm: 0.3.9
+    typescript: 4.8.3
     ulid: 2.3.0
     unzipper: 0.10.11
-    uuid: 8.3.2
+    uuid: 9.0.0
     web-push: 3.5.0
     websocket: 1.0.34
     ws: 8.8.1
@@ -3695,7 +3694,7 @@ __metadata:
     long: ^5.2.0
     seedrandom: ^3.0.5
     start-server-and-test: 1.14.0
-    typescript: 4.8.2
+    typescript: 4.8.3
     unplugin-swc: ^1.3.2
     vue-eslint-parser: ^9.0.3
   languageName: unknown
@@ -4070,7 +4069,7 @@ __metadata:
     "@rollup/pluginutils": ^4.2.1
     "@syuilo/aiscript": 0.11.1
     "@types/escape-regexp": 0.0.1
-    "@types/glob": 7.2.0
+    "@types/glob": 8.0.0
     "@types/gulp": 4.0.9
     "@types/gulp-rename": 2.0.1
     "@types/katex": 0.14.0
@@ -4083,7 +4082,7 @@ __metadata:
     "@typescript-eslint/eslint-plugin": 5.36.2
     "@typescript-eslint/parser": 5.36.2
     "@vitejs/plugin-vue": 3.1.0
-    "@vue/compiler-sfc": 3.2.38
+    "@vue/compiler-sfc": 3.2.39
     autobind-decorator: 2.4.0
     autosize: 5.0.1
     blurhash: 1.1.5
@@ -4126,17 +4125,17 @@ __metadata:
     syuilo-password-strength: 0.0.1
     tesseract.js: ^2.1.5
     textarea-caret: 3.1.0
-    three: 0.143.0
+    three: 0.144.0
     throttle-debounce: 5.0.0
     tinycolor2: 1.4.2
     tsc-alias: 1.7.0
     tsconfig-paths: 4.1.0
     twemoji-parser: 14.0.0
-    typescript: 4.8.2
-    uuid: 8.3.2
+    typescript: 4.8.3
+    uuid: 9.0.0
     vanilla-tilt: 1.7.2
     vite: ^3.1.0
-    vue: 3.2.38
+    vue: 3.2.39
     vue-plyr: ^7.0.0
     vue-prism-editor: 2.0.0-alpha.2
     vue3-lottie: ^2.3.0
@@ -14694,10 +14693,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"three@npm:0.143.0":
-  version: 0.143.0
-  resolution: "three@npm:0.143.0"
-  checksum: 6fe8793a04a931c8fb86bad566ac4310a6243c9e9139678b5084e0773457a63fe254109479c4d4a2b484812d0932940eabf9baa21749c8c8d8dceb2815ca747b
+"three@npm:0.144.0":
+  version: 0.144.0
+  resolution: "three@npm:0.144.0"
+  checksum: 6fb1afb3d189fede913c17e05ad17f3e653370eb3f1030b94a1cc49e84be1e45ea50a340c87289ff30f9bf90a87d04fcdc507577c7c5b062ff730b942f8a16ea
   languageName: node
   linkType: hard
 
@@ -15162,7 +15161,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typeorm@npm:^0.3.9":
+"typeorm@npm:0.3.9":
   version: 0.3.9
   resolution: "typeorm@npm:0.3.9"
   dependencies:
@@ -15244,23 +15243,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:4.8.2":
-  version: 4.8.2
-  resolution: "typescript@npm:4.8.2"
+"typescript@npm:4.8.3":
+  version: 4.8.3
+  resolution: "typescript@npm:4.8.3"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 7f5b81d0d558c9067f952c7af52ab7f19c2e70a916817929e4a5b256c93990bf3178eccb1ac8a850bc75df35f6781b6f4cb3370ce20d8b1ded92ed462348f628
+  checksum: 8286a5edcaf3d68e65c451aa1e7150ad1cf53ee0813c07ec35b7abdfdb10f355ecaa13c6a226a694ae7a67785fd7eeebf89f845da0b4f7e4a35561ddc459aba0
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@4.8.2#~builtin<compat/typescript>":
-  version: 4.8.2
-  resolution: "typescript@patch:typescript@npm%3A4.8.2#~builtin<compat/typescript>::version=4.8.2&hash=f456af"
+"typescript@patch:typescript@4.8.3#~builtin<compat/typescript>":
+  version: 4.8.3
+  resolution: "typescript@patch:typescript@npm%3A4.8.3#~builtin<compat/typescript>::version=4.8.3&hash=f456af"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 6f49363af8af2fe480da1d5fa68712644438785208b06690a3cbe5e7365fd652c3a0f1e587bc8684d78fb69de3dde4de185c0bad7bb4f3664ddfc813ce8caad6
+  checksum: 0404a09c625df01934ef774b45ce1ca57ccae41cd625fcdbb82056715320d9329e70d9d75c2c732ec6ef947444ca978c189a332b71fa21f5c1437d5a83e24906
   languageName: node
   linkType: hard
 
@@ -15575,12 +15574,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uuid@npm:8.3.2, uuid@npm:^8.3.0, uuid@npm:^8.3.2":
-  version: 8.3.2
-  resolution: "uuid@npm:8.3.2"
+"uuid@npm:9.0.0":
+  version: 9.0.0
+  resolution: "uuid@npm:9.0.0"
   bin:
     uuid: dist/bin/uuid
-  checksum: 5575a8a75c13120e2f10e6ddc801b2c7ed7d8f3c8ac22c7ed0c7b2ba6383ec0abda88c905085d630e251719e0777045ae3236f04c812184b7c765f63a70e58df
+  checksum: 8dd2c83c43ddc7e1c71e36b60aea40030a6505139af6bee0f382ebcd1a56f6cd3028f7f06ffb07f8cf6ced320b76aea275284b224b002b289f89fe89c389b028
   languageName: node
   linkType: hard
 
@@ -15593,6 +15592,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"uuid@npm:^8.3.0, uuid@npm:^8.3.2":
+  version: 8.3.2
+  resolution: "uuid@npm:8.3.2"
+  bin:
+    uuid: dist/bin/uuid
+  checksum: 5575a8a75c13120e2f10e6ddc801b2c7ed7d8f3c8ac22c7ed0c7b2ba6383ec0abda88c905085d630e251719e0777045ae3236f04c812184b7c765f63a70e58df
+  languageName: node
+  linkType: hard
+
 "v8-compile-cache-lib@npm:^3.0.1":
   version: 3.0.1
   resolution: "v8-compile-cache-lib@npm:3.0.1"
@@ -15807,16 +15815,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vue@npm:3.2.38":
-  version: 3.2.38
-  resolution: "vue@npm:3.2.38"
+"vue@npm:3.2.39":
+  version: 3.2.39
+  resolution: "vue@npm:3.2.39"
   dependencies:
-    "@vue/compiler-dom": 3.2.38
-    "@vue/compiler-sfc": 3.2.38
-    "@vue/runtime-dom": 3.2.38
-    "@vue/server-renderer": 3.2.38
-    "@vue/shared": 3.2.38
-  checksum: 9b82cb893018d6fae601823bdf1523a600c90f38bb690f92a2f2ec56d536beb2a86bf3bc0c0e6252ca0daddb86f46ead38dfbb546078f4c18281eb7bc5b7366e
+    "@vue/compiler-dom": 3.2.39
+    "@vue/compiler-sfc": 3.2.39
+    "@vue/runtime-dom": 3.2.39
+    "@vue/server-renderer": 3.2.39
+    "@vue/shared": 3.2.39
+  checksum: f096a3f0a5f72c65d26246ff7989729eda2b996dc30c63fd8cd7ccda07e9c318d478e3e24661ff01e49bcf5fed6f330142fcf29d6ad46c13423f36b3ae1a54cc
   languageName: node
   linkType: hard
 

From afa87c1cabf32447b67a389b027e7fe3deba75a9 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 10 Sep 2022 12:25:22 -0700
Subject: [PATCH 202/245] chore: :recycle: `about-misskey` -> `about-calckey`

---
 locales/en-US.yml                                             | 2 +-
 locales/ja-JP.yml                                             | 2 +-
 packages/backend/src/models/entities/meta.ts                  | 2 +-
 .../client/src/pages/{about-misskey.vue => about-calckey.vue} | 0
 packages/client/src/pages/about.vue                           | 2 +-
 packages/client/src/pages/welcome.entrance.a.vue              | 2 +-
 packages/client/src/pages/welcome.entrance.b.vue              | 2 +-
 packages/client/src/pages/welcome.entrance.c.vue              | 2 +-
 packages/client/src/router.ts                                 | 4 ++--
 packages/client/src/ui/_common_/navbar-for-mobile.vue         | 2 +-
 packages/client/src/ui/_common_/navbar.vue                    | 2 +-
 packages/client/src/ui/classic.sidebar.vue                    | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)
 rename packages/client/src/pages/{about-misskey.vue => about-calckey.vue} (100%)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 0968fbf7e..bfde20c5c 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -989,7 +989,7 @@ _registry:
   domain: "Domain"
   createKey: "Create key"
 _aboutMisskey:
-  about: "Calckey is a fork of Misskey made by ThatOneCalculator being developed since 2022."
+  about: "Calckeyは、2022年から開発されているThatOneCalculator社製のMisskeyのforkです。"
   contributors: "Main contributors"
   allContributors: "All contributors"
   source: "Source code"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index ecd30b42d..c0b244cbc 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -379,7 +379,7 @@ exploreFediverse: "Fediverseを探索"
 popularTags: "人気のタグ"
 userList: "リスト"
 about: "情報"
-aboutMisskey: "Misskeyについて"
+aboutMisskey: "Calckeyについて"
 administrator: "管理者"
 token: "トークン"
 twoStepAuthentication: "二段階認証"
diff --git a/packages/backend/src/models/entities/meta.ts b/packages/backend/src/models/entities/meta.ts
index 63a4193aa..0741dd5e9 100644
--- a/packages/backend/src/models/entities/meta.ts
+++ b/packages/backend/src/models/entities/meta.ts
@@ -113,7 +113,7 @@ export class Meta {
 	public allowedHosts: string[];
 
 	@Column('varchar', {
-		length: 512, array: true, default: '{/featured,/channels,/explore,/pages,/about-misskey}',
+		length: 512, array: true, default: '{/featured,/channels,/explore,/pages,/about-calckey}',
 	})
 	public pinnedPages: string[];
 
diff --git a/packages/client/src/pages/about-misskey.vue b/packages/client/src/pages/about-calckey.vue
similarity index 100%
rename from packages/client/src/pages/about-misskey.vue
rename to packages/client/src/pages/about-calckey.vue
diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue
index 4bddbb505..df781db45 100644
--- a/packages/client/src/pages/about.vue
+++ b/packages/client/src/pages/about.vue
@@ -30,7 +30,7 @@
 							<template #key>Calckey</template>
 							<template #value>{{ version }}</template>
 						</MkKeyValue>
-						<FormLink to="/about-misskey">{{ i18n.ts.aboutMisskey }}</FormLink>
+						<FormLink to="/about-calckey">{{ i18n.ts.aboutMisskey }}</FormLink>
 					</FormSection>
 
 					<FormSection>
diff --git a/packages/client/src/pages/welcome.entrance.a.vue b/packages/client/src/pages/welcome.entrance.a.vue
index abe35af35..4e8c9c3e0 100644
--- a/packages/client/src/pages/welcome.entrance.a.vue
+++ b/packages/client/src/pages/welcome.entrance.a.vue
@@ -122,7 +122,7 @@ function showMenu(ev) {
 		text: i18n.ts.aboutMisskey,
 		icon: 'fas fa-info-circle',
 		action: () => {
-			os.pageWindow('/about-misskey');
+			os.pageWindow('/about-calckey');
 		},
 	}, null, {
 		text: i18n.ts.help,
diff --git a/packages/client/src/pages/welcome.entrance.b.vue b/packages/client/src/pages/welcome.entrance.b.vue
index 4bf117590..b56f2cb39 100644
--- a/packages/client/src/pages/welcome.entrance.b.vue
+++ b/packages/client/src/pages/welcome.entrance.b.vue
@@ -112,7 +112,7 @@ export default defineComponent({
 				text: this.$ts.aboutMisskey,
 				icon: 'fas fa-info-circle',
 				action: () => {
-					os.pageWindow('/about-misskey');
+					os.pageWindow('/about-calckey');
 				}
 			}, null, {
 				text: this.$ts.help,
diff --git a/packages/client/src/pages/welcome.entrance.c.vue b/packages/client/src/pages/welcome.entrance.c.vue
index a590834a4..9a565a21f 100644
--- a/packages/client/src/pages/welcome.entrance.c.vue
+++ b/packages/client/src/pages/welcome.entrance.c.vue
@@ -132,7 +132,7 @@ export default defineComponent({
 				text: this.$ts.aboutMisskey,
 				icon: 'fas fa-info-circle',
 				action: () => {
-					os.pageWindow('/about-misskey');
+					os.pageWindow('/about-calckey');
 				}
 			}, null, {
 				text: this.$ts.help,
diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts
index 85af0f726..eff86b6a5 100644
--- a/packages/client/src/router.ts
+++ b/packages/client/src/router.ts
@@ -218,8 +218,8 @@ export const routes = [{
 	component: page(() => import('./pages/about.vue')),
 	hash: 'initialTab',
 }, {
-	path: '/about-misskey',
-	component: page(() => import('./pages/about-misskey.vue')),
+	path: '/about-calckey',
+	component: page(() => import('./pages/about-calckey.vue')),
 }, {
 	path: '/theme-editor',
 	component: page(() => import('./pages/theme-editor.vue')),
diff --git a/packages/client/src/ui/_common_/navbar-for-mobile.vue b/packages/client/src/ui/_common_/navbar-for-mobile.vue
index 0880cd3d7..6cfec41f9 100644
--- a/packages/client/src/ui/_common_/navbar-for-mobile.vue
+++ b/packages/client/src/ui/_common_/navbar-for-mobile.vue
@@ -116,7 +116,7 @@ function openInstanceMenu(ev: MouseEvent) {
 	}, {
 		type: 'link',
 		text: i18n.ts.aboutMisskey,
-		to: '/about-misskey',
+		to: '/about-calckey',
 	}], ev.currentTarget ?? ev.target, {
 		align: 'left',
 	});
diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index 206cd004f..779f3717b 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -142,7 +142,7 @@ function openInstanceMenu(ev: MouseEvent) {
 	}, {
 		type: 'link',
 		text: i18n.ts.aboutMisskey,
-		to: '/about-misskey',
+		to: '/about-calckey',
 	}], ev.currentTarget ?? ev.target, {
 		align: 'left',
 	});
diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue
index d565e3670..5f79a9cf5 100644
--- a/packages/client/src/ui/classic.sidebar.vue
+++ b/packages/client/src/ui/classic.sidebar.vue
@@ -182,7 +182,7 @@ function openInstanceMenu(ev: MouseEvent) {
 	}, {
 		type: 'link',
 		text: i18n.ts.aboutMisskey,
-		to: '/about-misskey',
+		to: '/about-calckey',
 	}], ev.currentTarget ?? ev.target, {
 		align: 'left',
 	});

From b4a19bab0db5377aa3d2b822f90eebc3b96c2f04 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 12 Sep 2022 00:17:07 -0700
Subject: [PATCH 203/245] feat: start work on vue-isyourpasswordsafe
 integration

---
 CALCKEY.md                   |  1 +
 packages/client/package.json |  1 +
 yarn.lock                    | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/CALCKEY.md b/CALCKEY.md
index a3bb4542d..9c5d0b701 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -23,6 +23,7 @@
 
 - Better Messaging UI
   - Videos can be played in DMs
+- Make your password hasn't been pwned
 - OCR image captioning
 - Admin custom CSS
 - Add back time machine (jump to date)
diff --git a/packages/client/package.json b/packages/client/package.json
index ca6dacca3..9a9b4f9bc 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -61,6 +61,7 @@
 		"vanilla-tilt": "1.7.2",
 		"vite": "^3.1.0",
 		"vue": "3.2.39",
+		"vue-isyourpasswordsafe": "^2.0.0",
 		"vue-plyr": "^7.0.0",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vue3-lottie": "^2.3.0",
diff --git a/yarn.lock b/yarn.lock
index 77f851a05..d219e1141 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3875,6 +3875,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"charenc@npm:>= 0.0.1":
+  version: 0.0.2
+  resolution: "charenc@npm:0.0.2"
+  checksum: 81dcadbe57e861d527faf6dd3855dc857395a1c4d6781f4847288ab23cffb7b3ee80d57c15bba7252ffe3e5e8019db767757ee7975663ad2ca0939bb8fcaf2e5
+  languageName: node
+  linkType: hard
+
 "chart.js@npm:3.9.1":
   version: 3.9.1
   resolution: "chart.js@npm:3.9.1"
@@ -4136,6 +4143,7 @@ __metadata:
     vanilla-tilt: 1.7.2
     vite: ^3.1.0
     vue: 3.2.39
+    vue-isyourpasswordsafe: ^2.0.0
     vue-plyr: ^7.0.0
     vue-prism-editor: 2.0.0-alpha.2
     vue3-lottie: ^2.3.0
@@ -4706,6 +4714,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"crypt@npm:>= 0.0.1":
+  version: 0.0.2
+  resolution: "crypt@npm:0.0.2"
+  checksum: baf4c7bbe05df656ec230018af8cf7dbe8c14b36b98726939cef008d473f6fe7a4fad906cfea4062c93af516f1550a3f43ceb4d6615329612c6511378ed9fe34
+  languageName: node
+  linkType: hard
+
 "css-color-names@npm:0.0.4":
   version: 0.0.4
   resolution: "css-color-names@npm:0.0.4"
@@ -13729,6 +13744,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sha1@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "sha1@npm:1.1.1"
+  dependencies:
+    charenc: ">= 0.0.1"
+    crypt: ">= 0.0.1"
+  checksum: da9f47e949988e2f595ef19733fd1dc736866ef6de4e421a55c13b444c03ae532e528b7350ae6ea55d9fb053be61d4648ec2cd5250d46cfdbdf4f6b4e763713d
+  languageName: node
+  linkType: hard
+
 "sharp@npm:0.30.7":
   version: 0.30.7
   resolution: "sharp@npm:0.30.7"
@@ -15785,6 +15810,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vue-isyourpasswordsafe@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "vue-isyourpasswordsafe@npm:2.0.0"
+  dependencies:
+    sha1: ^1.1.1
+  checksum: c85fe2609d12112dd68896e6d33a1138a63d93ca4c4817b4142a89dc71d09f7bf5ff9a55bdcc8220727f9c00ed704376028bd068bd52f24ba020a560d4f13326
+  languageName: node
+  linkType: hard
+
 "vue-plyr@npm:^7.0.0":
   version: 7.0.0
   resolution: "vue-plyr@npm:7.0.0"

From 9007514c00fe01b67851dd2f05436eee99c0a37e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 16:36:58 -0700
Subject: [PATCH 204/245] ex

---
 packages/client/src/pages/explore.vue | 38 +++++++++++++--------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index 5baabd2d6..ac7e96816 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -2,21 +2,21 @@
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
 	<div class="lznhrdub">
-		<swiper
-			:modules="[Virtual]"
-			:space-between="20"
-			:virtual="true"
-			@swiper="setSwiperRef"
-			@slide-change="onSlideChange"
-		>
-			<swiper-slide>
-				<XFeatured/>
-			</swiper-slide>
-			<swiper-slide>
-				<XUsers/>
-			</swiper-slide>
-			<swiper-slide>
-				<MkSpacer :content-max="1200">
+		<MkSpacer :content-max="1200">
+			<swiper
+				:modules="[Virtual]"
+				:space-between="20"
+				:virtual="true"
+				@swiper="setSwiperRef"
+				@slide-change="onSlideChange"
+			>
+				<swiper-slide>
+					<XFeatured/>
+				</swiper-slide>
+				<swiper-slide>
+					<XUsers/>
+				</swiper-slide>
+				<swiper-slide>
 					<div>
 						<MkInput v-model="searchQuery" :debounce="true" type="search" class="_formBlock">
 							<template #prefix><i class="fas fa-search"></i></template>
@@ -29,9 +29,9 @@
 						</MkRadios>
 					</div>
 					<XUserList v-if="searchQuery" ref="searchEl" class="_gap" :pagination="searchPagination"/>
-				</MkSpacer>
-			</swiper-slide>
-		</swiper>
+				</swiper-slide>
+			</swiper>
+		</MkSpacer>
 	</div>
 </MkStickyContainer>
 </template>
@@ -42,7 +42,7 @@ import { Virtual } from 'swiper';
 import { Swiper, SwiperSlide } from 'swiper/vue';
 import XFeatured from './explore.featured.vue';
 import XUsers from './explore.users.vue';
-import MkFolder from '@/components/MkFolder.vue';
+import type MkFolder from '@/components/MkFolder.vue';
 import MkInput from '@/components/form/input.vue';
 import MkRadios from '@/components/form/radios.vue';
 import number from '@/filters/number';

From 70611fd0f327583d0bbef9b2c875ba268a832bb5 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 16:43:59 -0700
Subject: [PATCH 205/245] feat: :sparkles: Attempt to add groups back!

---
 package.json                                  |   2 +-
 packages/client/src/pages/my-groups/group.vue | 177 ++++++++++++++++++
 packages/client/src/pages/my-groups/index.vue | 146 +++++++++++++++
 packages/client/src/router.ts                 |   4 +
 4 files changed, 328 insertions(+), 1 deletion(-)
 create mode 100644 packages/client/src/pages/my-groups/group.vue
 create mode 100644 packages/client/src/pages/my-groups/index.vue

diff --git a/package.json b/package.json
index 17edd1d8c..23e96bc5b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc-rc.1",
+	"version": "12.119.0-calc-rc.4",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
new file mode 100644
index 000000000..48c8eb100
--- /dev/null
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -0,0 +1,177 @@
+<template>
+<div class="mk-group-page">
+	<transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
+		<div v-if="group" class="_section">
+			<div class="_content" style="display: flex; gap: var(--margin); flex-wrap: wrap;">
+				<MkButton inline @click="invite()">{{ $ts.invite }}</MkButton>
+				<MkButton inline @click="renameGroup()">{{ $ts.rename }}</MkButton>
+				<MkButton inline @click="transfer()">{{ $ts.transfer }}</MkButton>
+				<MkButton inline @click="deleteGroup()">{{ $ts.delete }}</MkButton>
+			</div>
+		</div>
+	</transition>
+
+	<transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
+		<div v-if="group" class="_section members _gap">
+			<div class="_title">{{ $ts.members }}</div>
+			<div class="_content">
+				<div class="users">
+					<div v-for="user in users" :key="user.id" class="user _panel">
+						<MkAvatar :user="user" class="avatar" :show-indicator="true"/>
+						<div class="body">
+							<MkUserName :user="user" class="name"/>
+							<MkAcct :user="user" class="acct"/>
+						</div>
+						<div class="action">
+							<button class="_button" @click="removeUser(user)"><i class="fas fa-times"></i></button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</transition>
+</div>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent } from 'vue';
+import MkButton from '@/components/ui/MkButton.vue';
+import * as os from '@/os';
+
+export default defineComponent({
+	components: {
+		MkButton,
+	},
+
+	props: {
+		groupId: {
+			type: String,
+			required: true,
+		},
+	},
+
+	data() {
+		return {
+			[Symbol('Page info')]: computed(() => this.group ? {
+				title: this.group.name,
+				icon: 'fas fa-users',
+			} : null),
+			group: null,
+			users: [],
+		};
+	},
+
+	watch: {
+		groupId: 'fetch',
+	},
+
+	created() {
+		this.fetch();
+	},
+
+	methods: {
+		fetch() {
+			os.api('users/groups/show', {
+				groupId: this.groupId
+			}).then(group => {
+				this.group = group;
+				os.api('users/show', {
+					userIds: this.group.userIds
+				}).then(users => {
+					this.users = users;
+				});
+			});
+		},
+
+		invite() {
+			os.selectUser().then(user => {
+				os.apiWithDialog('users/groups/invite', {
+					groupId: this.group.id,
+					userId: user.id
+				});
+			});
+		},
+
+		removeUser(user) {
+			os.api('users/groups/pull', {
+				groupId: this.group.id,
+				userId: user.id
+			}).then(() => {
+				this.users = this.users.filter(x => x.id !== user.id);
+			});
+		},
+
+		async renameGroup() {
+			const { canceled, result: name } = await os.inputText({
+				title: this.$ts.groupName,
+				default: this.group.name
+			});
+			if (canceled) return;
+
+			await os.api('users/groups/update', {
+				groupId: this.group.id,
+				name: name
+			});
+
+			this.group.name = name;
+		},
+
+		transfer() {
+			os.selectUser().then(user => {
+				os.apiWithDialog('users/groups/transfer', {
+					groupId: this.group.id,
+					userId: user.id
+				});
+			});
+		},
+
+		async deleteGroup() {
+			const { canceled } = await os.confirm({
+				type: 'warning',
+				text: this.$t('removeAreYouSure', { x: this.group.name }),
+			});
+			if (canceled) return;
+
+			await os.apiWithDialog('users/groups/delete', {
+				groupId: this.group.id
+			});
+			this.$router.push('/my/groups');
+		}
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.mk-group-page {
+	> .members {
+		> ._content {
+			> .users {
+				> .user {
+					display: flex;
+					align-items: center;
+					padding: 16px;
+
+					> .avatar {
+						width: 50px;
+						height: 50px;
+					}
+
+					> .body {
+						flex: 1;
+						padding: 8px;
+
+						> .name {
+							display: block;
+							font-weight: bold;
+						}
+
+						> .acct {
+							opacity: 0.5;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/packages/client/src/pages/my-groups/index.vue b/packages/client/src/pages/my-groups/index.vue
new file mode 100644
index 000000000..27bca25df
--- /dev/null
+++ b/packages/client/src/pages/my-groups/index.vue
@@ -0,0 +1,146 @@
+<template>
+<MkSpacer :content-max="700">
+	<div v-if="tab === 'owned'" class="_content">
+		<MkButton primary style="margin: 0 auto var(--margin) auto;" @click="create"><i class="fas fa-plus"></i> {{ $ts.createGroup }}</MkButton>
+
+		<MkPagination v-slot="{items}" ref="owned" :pagination="ownedPagination">
+			<div v-for="group in items" :key="group.id" class="_card">
+				<div class="_title"><MkA :to="`/my/groups/${ group.id }`" class="_link">{{ group.name }}</MkA></div>
+				<div class="_content"><MkAvatars :user-ids="group.userIds"/></div>
+			</div>
+		</MkPagination>
+	</div>
+
+	<div v-else-if="tab === 'joined'" class="_content">
+		<MkPagination v-slot="{items}" ref="joined" :pagination="joinedPagination">
+			<div v-for="group in items" :key="group.id" class="_card">
+				<div class="_title">{{ group.name }}</div>
+				<div class="_content"><MkAvatars :user-ids="group.userIds"/></div>
+				<div class="_footer">
+					<MkButton danger @click="leave(group)">{{ $ts.leaveGroup }}</MkButton>
+				</div>
+			</div>
+		</MkPagination>
+	</div>
+
+	<div v-else-if="tab === 'invites'" class="_content">
+		<MkPagination v-slot="{items}" ref="invitations" :pagination="invitationPagination">
+			<div v-for="invitation in items" :key="invitation.id" class="_card">
+				<div class="_title">{{ invitation.group.name }}</div>
+				<div class="_content"><MkAvatars :user-ids="invitation.group.userIds"/></div>
+				<div class="_footer">
+					<MkButton primary inline @click="acceptInvite(invitation)"><i class="fas fa-check"></i> {{ $ts.accept }}</MkButton>
+					<MkButton primary inline @click="rejectInvite(invitation)"><i class="fas fa-ban"></i> {{ $ts.reject }}</MkButton>
+				</div>
+			</div>
+		</MkPagination>
+	</div>
+</MkSpacer>
+</template>
+
+<script lang="ts">
+import { defineComponent, computed } from 'vue';
+import MkPagination from '@/components/ui/MkPagination.vue';
+import MkButton from '@/components/ui/MkButton.vue';
+import MkContainer from '@/components/ui/MkContainer.vue';
+import MkAvatars from '@/components/ui/MkAvatars.vue';
+import MkTab from '@/components/ui/MkTab.vue';
+import * as os from '@/os';
+
+export default defineComponent({
+	components: {
+		MkPagination,
+		MkButton,
+		MkContainer,
+		MkTab,
+		MkAvatars,
+	},
+
+	data() {
+		return {
+			[Symbol('Page info')]: computed(() => ({
+				title: this.$ts.groups,
+				icon: 'fas fa-users',
+				bg: 'var(--bg)',
+				actions: [{
+					icon: 'fas fa-plus',
+					text: this.$ts.createGroup,
+					handler: this.create,
+				}],
+				tabs: [{
+					active: this.tab === 'owned',
+					title: this.$ts.ownedGroups,
+					icon: 'fas fa-user-tie',
+					onClick: () => { this.tab = 'owned'; },
+				}, {
+					active: this.tab === 'joined',
+					title: this.$ts.joinedGroups,
+					icon: 'fas fa-id-badge',
+					onClick: () => { this.tab = 'joined'; },
+				}, {
+					active: this.tab === 'invites',
+					title: this.$ts.invites,
+					icon: 'fas fa-envelope-open-text',
+					onClick: () => { this.tab = 'invites'; },
+				},]
+			})),
+			tab: 'owned',
+			ownedPagination: {
+				endpoint: 'users/groups/owned' as const,
+				limit: 10,
+			},
+			joinedPagination: {
+				endpoint: 'users/groups/joined' as const,
+				limit: 10,
+			},
+			invitationPagination: {
+				endpoint: 'i/user-group-invites' as const,
+				limit: 10,
+			},
+		};
+	},
+
+	methods: {
+		async create() {
+			const { canceled, result: name } = await os.inputText({
+				title: this.$ts.groupName,
+			});
+			if (canceled) return;
+			await os.api('users/groups/create', { name: name });
+			this.$refs.owned.reload();
+			os.success();
+		},
+		acceptInvite(invitation) {
+			os.api('users/groups/invitations/accept', {
+				invitationId: invitation.id
+			}).then(() => {
+				os.success();
+				this.$refs.invitations.reload();
+				this.$refs.joined.reload();
+			});
+		},
+		rejectInvite(invitation) {
+			os.api('users/groups/invitations/reject', {
+				invitationId: invitation.id
+			}).then(() => {
+				this.$refs.invitations.reload();
+			});
+		},
+		async leave(group) {
+			const { canceled } = await os.confirm({
+				type: 'warning',
+				text: this.$t('leaveGroupConfirm', { name: group.name }),
+			});
+			if (canceled) return;
+			os.apiWithDialog('users/groups/leave', {
+				groupId: group.id,
+			}).then(() => {
+				this.$refs.joined.reload();
+			});
+		}
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts
index eff86b6a5..e5c9f2966 100644
--- a/packages/client/src/router.ts
+++ b/packages/client/src/router.ts
@@ -452,6 +452,10 @@ export const routes = [{
 	path: '/my/clips',
 	component: page(() => import('./pages/my-clips/index.vue')),
 	loginRequired: true,
+}, {
+	path: '/my/groups',
+	component: page(() => import('./pages/my-groups/index.vue')),
+	loginRequired: true,
 }, {
 	path: '/my/antennas/create',
 	component: page(() => import('./pages/my-antennas/create.vue')),

From 13ede288f97575a1829e85b94c2c57de0408a80d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 16:47:35 -0700
Subject: [PATCH 206/245] typo

---
 packages/client/src/pages/my-groups/group.vue |  2 +-
 packages/client/src/pages/my-groups/index.vue | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
index 48c8eb100..0ab31ee80 100644
--- a/packages/client/src/pages/my-groups/group.vue
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -35,7 +35,7 @@
 
 <script lang="ts">
 import { computed, defineComponent } from 'vue';
-import MkButton from '@/components/ui/MkButton.vue';
+import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os';
 
 export default defineComponent({
diff --git a/packages/client/src/pages/my-groups/index.vue b/packages/client/src/pages/my-groups/index.vue
index 27bca25df..add80bb62 100644
--- a/packages/client/src/pages/my-groups/index.vue
+++ b/packages/client/src/pages/my-groups/index.vue
@@ -40,11 +40,11 @@
 
 <script lang="ts">
 import { defineComponent, computed } from 'vue';
-import MkPagination from '@/components/ui/MkPagination.vue';
-import MkButton from '@/components/ui/MkButton.vue';
-import MkContainer from '@/components/ui/MkContainer.vue';
-import MkAvatars from '@/components/ui/MkAvatars.vue';
-import MkTab from '@/components/ui/MkTab.vue';
+import MkPagination from '@/components/MkPagination.vue';
+import MkButton from '@/components/MkButton.vue';
+import MkContainer from '@/components/MkContainer.vue';
+import MkAvatars from '@/components/MkAvatars.vue';
+import MkTab from '@/components/MkTab.vue';
 import * as os from '@/os';
 
 export default defineComponent({

From 1d3f1306b6fdb8ca00af5f718748f559acc5cc2e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 16:53:34 -0700
Subject: [PATCH 207/245] Add `:groupId` to router

---
 package.json                  | 2 +-
 packages/client/src/navbar.ts | 5 +++++
 packages/client/src/router.ts | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 23e96bc5b..84eda2272 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc-rc.4",
+	"version": "12.119.0-calc-rc.5",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/navbar.ts b/packages/client/src/navbar.ts
index 03e00b1c1..1ff9ec768 100644
--- a/packages/client/src/navbar.ts
+++ b/packages/client/src/navbar.ts
@@ -97,6 +97,11 @@ export const navbarItemDef = reactive({
 		icon: 'fas fa-satellite-dish',
 		to: '/channels',
 	},
+	groups: {
+		title: 'groups',
+		icon: 'fas fa-users',
+		to: '/my/groups',
+	},
 	ui: {
 		title: 'switchUi',
 		icon: 'fas fa-columns',
diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts
index e5c9f2966..7aa96da5a 100644
--- a/packages/client/src/router.ts
+++ b/packages/client/src/router.ts
@@ -456,6 +456,10 @@ export const routes = [{
 	path: '/my/groups',
 	component: page(() => import('./pages/my-groups/index.vue')),
 	loginRequired: true,
+}, {
+	path: '/my/groups/:groupId',
+	component: page(() => import('./pages/my-groups/index.vue')),
+	loginRequired: true,
 }, {
 	path: '/my/antennas/create',
 	component: page(() => import('./pages/my-antennas/create.vue')),

From ac7574aff31ec929aade8188524526ff12d8b3dc Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 16:57:09 -0700
Subject: [PATCH 208/245] Fix group routing

---
 package.json                                  |  2 +-
 packages/client/src/pages/my-groups/index.vue | 14 ++++++++++++++
 packages/client/src/router.ts                 |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 84eda2272..d6a8b5bba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc-rc.5",
+	"version": "12.119.0-calc-rc.6",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/my-groups/index.vue b/packages/client/src/pages/my-groups/index.vue
index add80bb62..f9f1ab46b 100644
--- a/packages/client/src/pages/my-groups/index.vue
+++ b/packages/client/src/pages/my-groups/index.vue
@@ -143,4 +143,18 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
+._card {
+	margin-bottom: 1rem;
+	._title {
+		font-size: 1.2rem;
+		font-weight: bold;
+	}
+	._content {
+		margin: 1rem 0;
+	}
+	._footer {
+		display: flex;
+		justify-content: flex-end;
+	}
+}
 </style>
diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts
index 7aa96da5a..d290e0441 100644
--- a/packages/client/src/router.ts
+++ b/packages/client/src/router.ts
@@ -458,7 +458,7 @@ export const routes = [{
 	loginRequired: true,
 }, {
 	path: '/my/groups/:groupId',
-	component: page(() => import('./pages/my-groups/index.vue')),
+	component: page(() => import('./pages/my-groups/group.vue')),
 	loginRequired: true,
 }, {
 	path: '/my/antennas/create',

From 531c15dbaeca026693ee8bd05647a571466a1735 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 16:57:42 -0700
Subject: [PATCH 209/245] formatting

---
 packages/client/src/pages/messaging/messaging-room.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
index b1d900fbc..bbc4f5e40 100644
--- a/packages/client/src/pages/messaging/messaging-room.vue
+++ b/packages/client/src/pages/messaging/messaging-room.vue
@@ -99,7 +99,7 @@ async function fetch() {
 		const acct = Acct.parse(props.userAcct);
 		user = await os.api('users/show', { username: acct.username, host: acct.host || undefined });
 		group = null;
-		
+
 		pagination = {
 			endpoint: 'messaging/messages',
 			limit: 20,

From 7a21709309b3856b059c2524789f9316d483aca9 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 17:08:08 -0700
Subject: [PATCH 210/245] modernize `group.vue`

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

diff --git a/package.json b/package.json
index d6a8b5bba..a3488f869 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc-rc.6",
+	"version": "12.119.0-calc-rc.7",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 031b3661e21fa98582618cb51f7012163edaa716 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 17:08:09 -0700
Subject: [PATCH 211/245] modernize group.vue

---
 packages/client/src/pages/my-groups/group.vue | 119 ++++++++++--------
 1 file changed, 67 insertions(+), 52 deletions(-)

diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
index 0ab31ee80..e44db4250 100644
--- a/packages/client/src/pages/my-groups/group.vue
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -1,41 +1,44 @@
 <template>
-<div class="mk-group-page">
-	<transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
-		<div v-if="group" class="_section">
-			<div class="_content" style="display: flex; gap: var(--margin); flex-wrap: wrap;">
-				<MkButton inline @click="invite()">{{ $ts.invite }}</MkButton>
-				<MkButton inline @click="renameGroup()">{{ $ts.rename }}</MkButton>
-				<MkButton inline @click="transfer()">{{ $ts.transfer }}</MkButton>
-				<MkButton inline @click="deleteGroup()">{{ $ts.delete }}</MkButton>
+<MkStickyContainer>
+	<template #header><MkPageHeader/></template>
+	<div class="mk-group-page">
+		<transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
+			<div v-if="group" class="_section">
+				<div class="_content" style="display: flex; gap: var(--margin); flex-wrap: wrap;">
+					<MkButton inline @click="invite()">{{ $ts.invite }}</MkButton>
+					<MkButton inline @click="renameGroup()">{{ $ts.rename }}</MkButton>
+					<MkButton inline @click="transfer()">{{ $ts.transfer }}</MkButton>
+					<MkButton inline @click="deleteGroup()">{{ $ts.delete }}</MkButton>
+				</div>
 			</div>
-		</div>
-	</transition>
-
-	<transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
-		<div v-if="group" class="_section members _gap">
-			<div class="_title">{{ $ts.members }}</div>
-			<div class="_content">
-				<div class="users">
-					<div v-for="user in users" :key="user.id" class="user _panel">
-						<MkAvatar :user="user" class="avatar" :show-indicator="true"/>
-						<div class="body">
-							<MkUserName :user="user" class="name"/>
-							<MkAcct :user="user" class="acct"/>
-						</div>
-						<div class="action">
-							<button class="_button" @click="removeUser(user)"><i class="fas fa-times"></i></button>
+		</transition>
+		<transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
+			<div v-if="group" class="_section members _gap">
+				<div class="_content">
+					<div class="users">
+						<div v-for="user in users" :key="user.id" class="user _panel">
+							<MkAvatar :user="user" class="avatar" :show-indicator="true"/>
+							<div class="body">
+								<MkUserName :user="user" class="name"/>
+								<MkAcct :user="user" class="acct"/>
+							</div>
+							<div class="action">
+								<button class="_button" @click="removeUser(user)"><i class="fas fa-times"></i></button>
+							</div>
 						</div>
 					</div>
 				</div>
 			</div>
-		</div>
-	</transition>
-</div>
+		</transition>
+	</div>
+</MkStickyContainer>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
 import { computed, defineComponent } from 'vue';
 import MkButton from '@/components/MkButton.vue';
+import { definePageMetadata } from '@/scripts/page-metadata';\
+import { i18n } from '@/i18n';
 import * as os from '@/os';
 
 export default defineComponent({
@@ -139,39 +142,51 @@ export default defineComponent({
 		}
 	}
 });
+
+definePageMetadata(computed(() => ({
+	title: i18n.ts.members,
+	icon: 'fas fa-users',
+})));
+
 </script>
 
 <style lang="scss" scoped>
-.mk-group-page {
-	> .members {
-		> ._content {
-			> .users {
-				> .user {
-					display: flex;
-					align-items: center;
-					padding: 16px;
+	.mk-group-page {
+		> ._section {
+			> ._content {
+				padding-top: 1rem;
+				justify-content: center;
+			}
+		}
+		> .members {
+			> ._content {
+				> .users {
+					> .user {
+						display: flex;
+						align-items: center;
+						padding: 16px;
 
-					> .avatar {
-						width: 50px;
-						height: 50px;
-					}
-
-					> .body {
-						flex: 1;
-						padding: 8px;
-
-						> .name {
-							display: block;
-							font-weight: bold;
+						> .avatar {
+							width: 50px;
+							height: 50px;
 						}
 
-						> .acct {
-							opacity: 0.5;
+						> .body {
+							flex: 1;
+							padding: 8px;
+
+							> .name {
+								display: block;
+								font-weight: bold;
+							}
+
+							> .acct {
+								opacity: 0.5;
+							}
 						}
 					}
 				}
 			}
 		}
 	}
-}
-</style>
+	</style>

From 399f0115be83812b8a9368a2ed7343dbb1e6a1b8 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 17:14:56 -0700
Subject: [PATCH 212/245] setup syntax

---
 packages/client/src/pages/my-groups/group.vue | 173 ++++++++----------
 1 file changed, 75 insertions(+), 98 deletions(-)

diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
index e44db4250..08813f494 100644
--- a/packages/client/src/pages/my-groups/group.vue
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -35,114 +35,91 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, defineComponent } from 'vue';
+import { computed, watch } from 'vue';
 import MkButton from '@/components/MkButton.vue';
-import { definePageMetadata } from '@/scripts/page-metadata';\
+import { definePageMetadata } from '@/scripts/page-metadata';
 import { i18n } from '@/i18n';
 import * as os from '@/os';
 
-export default defineComponent({
-	components: {
-		MkButton,
-	},
-
-	props: {
-		groupId: {
+const props = defineProps<{
+	groupId: {
 			type: String,
 			required: true,
 		},
-	},
+}>();
 
-	data() {
-		return {
-			[Symbol('Page info')]: computed(() => this.group ? {
-				title: this.group.name,
-				icon: 'fas fa-users',
-			} : null),
-			group: null,
-			users: [],
-		};
-	},
-
-	watch: {
-		groupId: 'fetch',
-	},
-
-	created() {
-		this.fetch();
-	},
-
-	methods: {
-		fetch() {
-			os.api('users/groups/show', {
-				groupId: this.groupId
-			}).then(group => {
-				this.group = group;
-				os.api('users/show', {
-					userIds: this.group.userIds
-				}).then(users => {
-					this.users = users;
-				});
-			});
-		},
-
-		invite() {
-			os.selectUser().then(user => {
-				os.apiWithDialog('users/groups/invite', {
-					groupId: this.group.id,
-					userId: user.id
-				});
-			});
-		},
-
-		removeUser(user) {
-			os.api('users/groups/pull', {
-				groupId: this.group.id,
-				userId: user.id
-			}).then(() => {
-				this.users = this.users.filter(x => x.id !== user.id);
-			});
-		},
-
-		async renameGroup() {
-			const { canceled, result: name } = await os.inputText({
-				title: this.$ts.groupName,
-				default: this.group.name
-			});
-			if (canceled) return;
-
-			await os.api('users/groups/update', {
-				groupId: this.group.id,
-				name: name
-			});
-
-			this.group.name = name;
-		},
-
-		transfer() {
-			os.selectUser().then(user => {
-				os.apiWithDialog('users/groups/transfer', {
-					groupId: this.group.id,
-					userId: user.id
-				});
-			});
-		},
-
-		async deleteGroup() {
-			const { canceled } = await os.confirm({
-				type: 'warning',
-				text: this.$t('removeAreYouSure', { x: this.group.name }),
-			});
-			if (canceled) return;
-
-			await os.apiWithDialog('users/groups/delete', {
-				groupId: this.group.id
-			});
-			this.$router.push('/my/groups');
-		}
-	}
+watch(() => props.groupId, () => {
+	fetch();
 });
 
+function fetch() {
+	os.api('users/groups/show', {
+		groupId: this.groupId
+	}).then(group => {
+		this.group = group;
+		os.api('users/show', {
+			userIds: this.group.userIds
+		}).then(users => {
+			this.users = users;
+		});
+	});
+}
+
+function invite() {
+	os.selectUser().then(user => {
+		os.apiWithDialog('users/groups/invite', {
+			groupId: this.group.id,
+			userId: user.id
+		});
+	});
+},
+
+function removeUser(user) {
+	os.api('users/groups/pull', {
+		groupId: this.group.id,
+		userId: user.id
+	}).then(() => {
+		this.users = this.users.filter(x => x.id !== user.id);
+	});
+},
+
+async function renameGroup() {
+	const { canceled, result: name } = await os.inputText({
+		title: this.$ts.groupName,
+		default: this.group.name
+	});
+	if (canceled) return;
+
+	await os.api('users/groups/update', {
+		groupId: this.group.id,
+		name: name
+	});
+
+	this.group.name = name;
+},
+
+function transfer() {
+	os.selectUser().then(user => {
+		os.apiWithDialog('users/groups/transfer', {
+			groupId: this.group.id,
+			userId: user.id
+		});
+	});
+},
+
+async function deleteGroup() {
+	const { canceled } = await os.confirm({
+		type: 'warning',
+		text: this.$t('removeAreYouSure', { x: this.group.name }),
+	});
+	if (canceled) return;
+
+	await os.apiWithDialog('users/groups/delete', {
+		groupId: this.group.id
+	});
+	this.$router.push('/my/groups');
+}
+
 definePageMetadata(computed(() => ({
 	title: i18n.ts.members,
 	icon: 'fas fa-users',

From 2be92040b0f4d0c14f222b4e110742a6106a2a1a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 17:16:27 -0700
Subject: [PATCH 213/245] typo

---
 packages/client/src/pages/my-groups/group.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
index 08813f494..951942a4a 100644
--- a/packages/client/src/pages/my-groups/group.vue
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -72,7 +72,7 @@ function invite() {
 			userId: user.id
 		});
 	});
-},
+}
 
 function removeUser(user) {
 	os.api('users/groups/pull', {
@@ -81,7 +81,7 @@ function removeUser(user) {
 	}).then(() => {
 		this.users = this.users.filter(x => x.id !== user.id);
 	});
-},
+}
 
 async function renameGroup() {
 	const { canceled, result: name } = await os.inputText({
@@ -96,7 +96,7 @@ async function renameGroup() {
 	});
 
 	this.group.name = name;
-},
+}
 
 function transfer() {
 	os.selectUser().then(user => {
@@ -105,7 +105,7 @@ function transfer() {
 			userId: user.id
 		});
 	});
-},
+}
 
 async function deleteGroup() {
 	const { canceled } = await os.confirm({

From 92df522cbc91b8a941e0494a802e6f6cd091b50f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 17:16:43 -0700
Subject: [PATCH 214/245] use `string` type

---
 packages/client/src/pages/my-groups/group.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
index 951942a4a..8a91c32a3 100644
--- a/packages/client/src/pages/my-groups/group.vue
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -43,7 +43,7 @@ import * as os from '@/os';
 
 const props = defineProps<{
 	groupId: {
-			type: String,
+			type: string,
 			required: true,
 		},
 }>();

From 57f6bca9c91d11c48b53ec92e0075bf4b69f3e6c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 17:19:34 -0700
Subject: [PATCH 215/245] fix

---
 package.json                                  |  2 +-
 packages/client/src/pages/my-groups/group.vue | 42 +++++++++----------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index a3488f869..6fc00c2f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc-rc.7",
+	"version": "12.119.0-calc-rc.8",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
index 8a91c32a3..892f368b1 100644
--- a/packages/client/src/pages/my-groups/group.vue
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -2,34 +2,30 @@
 <MkStickyContainer>
 	<template #header><MkPageHeader/></template>
 	<div class="mk-group-page">
-		<transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
-			<div v-if="group" class="_section">
-				<div class="_content" style="display: flex; gap: var(--margin); flex-wrap: wrap;">
-					<MkButton inline @click="invite()">{{ $ts.invite }}</MkButton>
-					<MkButton inline @click="renameGroup()">{{ $ts.rename }}</MkButton>
-					<MkButton inline @click="transfer()">{{ $ts.transfer }}</MkButton>
-					<MkButton inline @click="deleteGroup()">{{ $ts.delete }}</MkButton>
-				</div>
+		<div class="_section">
+			<div class="_content" style="display: flex; gap: var(--margin); flex-wrap: wrap;">
+				<MkButton inline @click="invite()">{{ $ts.invite }}</MkButton>
+				<MkButton inline @click="renameGroup()">{{ $ts.rename }}</MkButton>
+				<MkButton inline @click="transfer()">{{ $ts.transfer }}</MkButton>
+				<MkButton inline @click="deleteGroup()">{{ $ts.delete }}</MkButton>
 			</div>
-		</transition>
-		<transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
-			<div v-if="group" class="_section members _gap">
-				<div class="_content">
-					<div class="users">
-						<div v-for="user in users" :key="user.id" class="user _panel">
-							<MkAvatar :user="user" class="avatar" :show-indicator="true"/>
-							<div class="body">
-								<MkUserName :user="user" class="name"/>
-								<MkAcct :user="user" class="acct"/>
-							</div>
-							<div class="action">
-								<button class="_button" @click="removeUser(user)"><i class="fas fa-times"></i></button>
-							</div>
+		</div>
+		<div class="_section members _gap">
+			<div class="_content">
+				<div class="users">
+					<div v-for="user in users" :key="user.id" class="user _panel">
+						<MkAvatar :user="user" class="avatar" :show-indicator="true"/>
+						<div class="body">
+							<MkUserName :user="user" class="name"/>
+							<MkAcct :user="user" class="acct"/>
+						</div>
+						<div class="action">
+							<button class="_button" @click="removeUser(user)"><i class="fas fa-times"></i></button>
 						</div>
 					</div>
 				</div>
 			</div>
-		</transition>
+		</div>
 	</div>
 </MkStickyContainer>
 </template>

From bb15e6ccbc9968bb5e1b867cfd97213c920bf744 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 17:21:23 -0700
Subject: [PATCH 216/245] docs: :memo: Mention groups

---
 CALCKEY.md | 1 +
 README.md  | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index 9c5d0b701..c082abd06 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -26,6 +26,7 @@
 - Make your password hasn't been pwned
 - OCR image captioning
 - Admin custom CSS
+- Add back groups
 - Add back time machine (jump to date)
 - Improve accesibility score
 <details><summary>Current Misskey score is 57/100</summary>
diff --git a/README.md b/README.md
index 637a14176..2bd90a94b 100644
--- a/README.md
+++ b/README.md
@@ -17,9 +17,13 @@
 - Calckey adds many quality of life changes and bug fixes for users and instance admins alike.
 - Read **[this document](./CALCKEY.md)** all for current and future differences.
 - Notable differences:
-  - Improved UI/UX, notifications, security, and more
+  - Improved UI/UX (especially on mobile)
+  - Improved notifications
+  - Improved instance security
   - Recommended Instances timeline
+  - New and improved Groups
   - Many more user and admin settings
+  - [So much more!](./CALCKEY.md)
 
 </div>
 

From 26e475eb0c25741eb7cc5d4eabf5ed1055962da2 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 17:32:43 -0700
Subject: [PATCH 217/245] attempt to fix lol

---
 package.json                                  |  2 +-
 packages/client/src/pages/my-groups/group.vue | 50 +++++++++++--------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index 6fc00c2f1..026c6e78e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc-rc.8",
+	"version": "12.119.0-calc-rc.9",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
index 892f368b1..1a1694201 100644
--- a/packages/client/src/pages/my-groups/group.vue
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -4,10 +4,10 @@
 	<div class="mk-group-page">
 		<div class="_section">
 			<div class="_content" style="display: flex; gap: var(--margin); flex-wrap: wrap;">
-				<MkButton inline @click="invite()">{{ $ts.invite }}</MkButton>
-				<MkButton inline @click="renameGroup()">{{ $ts.rename }}</MkButton>
-				<MkButton inline @click="transfer()">{{ $ts.transfer }}</MkButton>
-				<MkButton inline @click="deleteGroup()">{{ $ts.delete }}</MkButton>
+				<MkButton inline @click="invite()">{{ i18n.ts.invite }}</MkButton>
+				<MkButton inline @click="renameGroup()">{{ i18n.ts.rename }}</MkButton>
+				<MkButton inline @click="transfer()">{{ i18n.ts.transfer }}</MkButton>
+				<MkButton inline @click="deleteGroup()">{{ i18n.ts.delete }}</MkButton>
 			</div>
 		</div>
 		<div class="_section members _gap">
@@ -35,28 +35,34 @@ import { computed, watch } from 'vue';
 import MkButton from '@/components/MkButton.vue';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { i18n } from '@/i18n';
+import { useRouter } from '@/router';
 import * as os from '@/os';
 
 const props = defineProps<{
 	groupId: {
 			type: string,
 			required: true,
-		},
+		}
 }>();
 
+let users = [];
+let group = null;
+
+const router = useRouter();
+
 watch(() => props.groupId, () => {
 	fetch();
 });
 
 function fetch() {
 	os.api('users/groups/show', {
-		groupId: this.groupId
-	}).then(group => {
-		this.group = group;
+		groupId: props.groupId,
+	}).then(gp => {
+		group = gp;
 		os.api('users/show', {
-			userIds: this.group.userIds
-		}).then(users => {
-			this.users = users;
+			userIds: group.userIds
+		}).then(us => {
+			users = us;
 		});
 	});
 }
@@ -64,7 +70,7 @@ function fetch() {
 function invite() {
 	os.selectUser().then(user => {
 		os.apiWithDialog('users/groups/invite', {
-			groupId: this.group.id,
+			groupId: group.id,
 			userId: user.id
 		});
 	});
@@ -72,32 +78,32 @@ function invite() {
 
 function removeUser(user) {
 	os.api('users/groups/pull', {
-		groupId: this.group.id,
+		groupId: group.id,
 		userId: user.id
 	}).then(() => {
-		this.users = this.users.filter(x => x.id !== user.id);
+		users = users.filter(x => x.id !== user.id);
 	});
 }
 
 async function renameGroup() {
 	const { canceled, result: name } = await os.inputText({
-		title: this.$ts.groupName,
-		default: this.group.name
+		title: i18n.ts.groupName,
+		default: group.name
 	});
 	if (canceled) return;
 
 	await os.api('users/groups/update', {
-		groupId: this.group.id,
+		groupId: group.id,
 		name: name
 	});
 
-	this.group.name = name;
+	group.name = name;
 }
 
 function transfer() {
 	os.selectUser().then(user => {
 		os.apiWithDialog('users/groups/transfer', {
-			groupId: this.group.id,
+			groupId: group.id,
 			userId: user.id
 		});
 	});
@@ -106,14 +112,14 @@ function transfer() {
 async function deleteGroup() {
 	const { canceled } = await os.confirm({
 		type: 'warning',
-		text: this.$t('removeAreYouSure', { x: this.group.name }),
+		text: i18n.ts('removeAreYouSure', { x: group.name }),
 	});
 	if (canceled) return;
 
 	await os.apiWithDialog('users/groups/delete', {
-		groupId: this.group.id
+		groupId: group.id,
 	});
-	this.$router.push('/my/groups');
+	router.push('/my/groups');
 }
 
 definePageMetadata(computed(() => ({

From eb9063fe1955ce761d0c2e79acfefc23e6cb9a07 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 17:35:08 -0700
Subject: [PATCH 218/245] actually fetch the data, oops :P

---
 package.json                                  | 2 +-
 packages/client/src/pages/my-groups/group.vue | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 026c6e78e..114a00dc9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc-rc.9",
+	"version": "12.119.0-calc-rc.10",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
index 1a1694201..d6b182390 100644
--- a/packages/client/src/pages/my-groups/group.vue
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -54,7 +54,8 @@ watch(() => props.groupId, () => {
 	fetch();
 });
 
-function fetch() {
+
+async function fetch() {
 	os.api('users/groups/show', {
 		groupId: props.groupId,
 	}).then(gp => {
@@ -67,6 +68,8 @@ function fetch() {
 	});
 }
 
+fetch();
+
 function invite() {
 	os.selectUser().then(user => {
 		os.apiWithDialog('users/groups/invite', {

From 594e849850f6dfab69971b866a5c4d388a569e65 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 17:40:06 -0700
Subject: [PATCH 219/245] fix??

---
 package.json                                  | 2 +-
 packages/client/src/pages/my-groups/group.vue | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 114a00dc9..4b268081a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc-rc.10",
+	"version": "12.119.0-calc-rc.11",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
index d6b182390..e82c3ce20 100644
--- a/packages/client/src/pages/my-groups/group.vue
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
 import MkButton from '@/components/MkButton.vue';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { i18n } from '@/i18n';
@@ -45,8 +45,8 @@ const props = defineProps<{
 		}
 }>();
 
-let users = [];
-let group = null;
+const users = ref<any[]>([]);
+const group = ref<any>();
 
 const router = useRouter();
 
@@ -115,7 +115,7 @@ function transfer() {
 async function deleteGroup() {
 	const { canceled } = await os.confirm({
 		type: 'warning',
-		text: i18n.ts('removeAreYouSure', { x: group.name }),
+		text: i18n.t('removeAreYouSure', { x: group.name }),
 	});
 	if (canceled) return;
 

From df16580d8796454e62d11c61a31873b98ebd4bc2 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 17:41:58 -0700
Subject: [PATCH 220/245] use ref properly

---
 packages/client/src/pages/my-groups/group.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
index e82c3ce20..dab075ba3 100644
--- a/packages/client/src/pages/my-groups/group.vue
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -45,7 +45,7 @@ const props = defineProps<{
 		}
 }>();
 
-const users = ref<any[]>([]);
+const users.value = ref<any[]>([]);
 const group = ref<any>();
 
 const router = useRouter();
@@ -59,11 +59,11 @@ async function fetch() {
 	os.api('users/groups/show', {
 		groupId: props.groupId,
 	}).then(gp => {
-		group = gp;
+		group.value = gp;
 		os.api('users/show', {
 			userIds: group.userIds
 		}).then(us => {
-			users = us;
+			users.value = us;
 		});
 	});
 }
@@ -84,7 +84,7 @@ function removeUser(user) {
 		groupId: group.id,
 		userId: user.id
 	}).then(() => {
-		users = users.filter(x => x.id !== user.id);
+		users.value = users.filter(x => x.id !== user.id);
 	});
 }
 

From 783c4effa7636d042e4f3148a604089cb96ee7c3 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 17:43:23 -0700
Subject: [PATCH 221/245] typooooooooo

---
 packages/client/src/pages/my-groups/group.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
index dab075ba3..9c894f83f 100644
--- a/packages/client/src/pages/my-groups/group.vue
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -45,7 +45,7 @@ const props = defineProps<{
 		}
 }>();
 
-const users.value = ref<any[]>([]);
+const users = ref<any[]>([]);
 const group = ref<any>();
 
 const router = useRouter();

From 3ce563cdfb2f1e40b40bae96c9c8caab4b5e3e54 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 17:46:53 -0700
Subject: [PATCH 222/245] chore: :loud_sound:

---
 package.json                                  | 2 +-
 packages/client/src/pages/my-groups/group.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 4b268081a..f485e2f05 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc-rc.11",
+	"version": "12.119.0-calc-rc.2.1",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
index 9c894f83f..21cf19283 100644
--- a/packages/client/src/pages/my-groups/group.vue
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -54,12 +54,12 @@ watch(() => props.groupId, () => {
 	fetch();
 });
 
-
 async function fetch() {
 	os.api('users/groups/show', {
 		groupId: props.groupId,
 	}).then(gp => {
 		group.value = gp;
+		console.log(gp);
 		os.api('users/show', {
 			userIds: group.userIds
 		}).then(us => {

From 25b032e1aab1c61469fe61ffe891481e9b414375 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 17:52:31 -0700
Subject: [PATCH 223/245] fix???

---
 package.json                                  |  2 +-
 packages/client/src/pages/my-groups/group.vue | 25 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index f485e2f05..f488bb8da 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc-rc.2.1",
+	"version": "12.119.0-calc-rc.2.2",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
index 21cf19283..ecf4eaea3 100644
--- a/packages/client/src/pages/my-groups/group.vue
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -59,9 +59,8 @@ async function fetch() {
 		groupId: props.groupId,
 	}).then(gp => {
 		group.value = gp;
-		console.log(gp);
 		os.api('users/show', {
-			userIds: group.userIds
+			userIds: group.value.userIds
 		}).then(us => {
 			users.value = us;
 		});
@@ -73,41 +72,41 @@ fetch();
 function invite() {
 	os.selectUser().then(user => {
 		os.apiWithDialog('users/groups/invite', {
-			groupId: group.id,
-			userId: user.id
+			groupId: group.value.id,
+			userId: user.id,
 		});
 	});
 }
 
 function removeUser(user) {
 	os.api('users/groups/pull', {
-		groupId: group.id,
+		groupId: group.value.id,
 		userId: user.id
 	}).then(() => {
-		users.value = users.filter(x => x.id !== user.id);
+		users.value = users.value.filter(x => x.id !== user.id);
 	});
 }
 
 async function renameGroup() {
 	const { canceled, result: name } = await os.inputText({
 		title: i18n.ts.groupName,
-		default: group.name
+		default: group.value.name
 	});
 	if (canceled) return;
 
 	await os.api('users/groups/update', {
-		groupId: group.id,
+		groupId: group.value.id,
 		name: name
 	});
 
-	group.name = name;
+	group.value.name = name;
 }
 
 function transfer() {
 	os.selectUser().then(user => {
 		os.apiWithDialog('users/groups/transfer', {
-			groupId: group.id,
-			userId: user.id
+			groupId: group.value.id,
+			userId: user.id,
 		});
 	});
 }
@@ -115,12 +114,12 @@ function transfer() {
 async function deleteGroup() {
 	const { canceled } = await os.confirm({
 		type: 'warning',
-		text: i18n.t('removeAreYouSure', { x: group.name }),
+		text: i18n.t('removeAreYouSure', { x: group.value.name }),
 	});
 	if (canceled) return;
 
 	await os.apiWithDialog('users/groups/delete', {
-		groupId: group.id,
+		groupId: group.value.id,
 	});
 	router.push('/my/groups');
 }

From 64a96b8f67a654c746227d8ffeecfa8c794175ec Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 17:56:19 -0700
Subject: [PATCH 224/245] formatting

---
 packages/client/src/pages/my-groups/group.vue | 163 ++++++++++--------
 1 file changed, 90 insertions(+), 73 deletions(-)

diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
index ecf4eaea3..e51e6fc7e 100644
--- a/packages/client/src/pages/my-groups/group.vue
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -1,26 +1,36 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader/></template>
+	<template #header><MkPageHeader /></template>
 	<div class="mk-group-page">
 		<div class="_section">
-			<div class="_content" style="display: flex; gap: var(--margin); flex-wrap: wrap;">
+			<div
+				class="_content"
+				style="display: flex; gap: var(--margin); flex-wrap: wrap"
+			>
 				<MkButton inline @click="invite()">{{ i18n.ts.invite }}</MkButton>
-				<MkButton inline @click="renameGroup()">{{ i18n.ts.rename }}</MkButton>
+				<MkButton inline @click="renameGroup()">{{
+					i18n.ts.rename
+				}}</MkButton>
 				<MkButton inline @click="transfer()">{{ i18n.ts.transfer }}</MkButton>
-				<MkButton inline @click="deleteGroup()">{{ i18n.ts.delete }}</MkButton>
+				<MkButton inline @click="deleteGroup()">{{
+					i18n.ts.delete
+				}}
+				</MkButton>
 			</div>
 		</div>
 		<div class="_section members _gap">
 			<div class="_content">
 				<div class="users">
 					<div v-for="user in users" :key="user.id" class="user _panel">
-						<MkAvatar :user="user" class="avatar" :show-indicator="true"/>
+						<MkAvatar :user="user" class="avatar" :show-indicator="true" />
 						<div class="body">
-							<MkUserName :user="user" class="name"/>
-							<MkAcct :user="user" class="acct"/>
+							<MkUserName :user="user" class="name" />
+							<MkAcct :user="user" class="acct" />
 						</div>
 						<div class="action">
-							<button class="_button" @click="removeUser(user)"><i class="fas fa-times"></i></button>
+							<button class="_button" @click="removeUser(user)">
+								<i class="fas fa-times"></i>
+							</button>
 						</div>
 					</div>
 				</div>
@@ -31,18 +41,18 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, ref, watch } from 'vue';
-import MkButton from '@/components/MkButton.vue';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { i18n } from '@/i18n';
-import { useRouter } from '@/router';
-import * as os from '@/os';
+import { computed, ref, watch } from "vue";
+import MkButton from "@/components/MkButton.vue";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { i18n } from "@/i18n";
+import { useRouter } from "@/router";
+import * as os from "@/os";
 
 const props = defineProps<{
 	groupId: {
-			type: string,
-			required: true,
-		}
+		type: string;
+		required: true;
+	};
 }>();
 
 const users = ref<any[]>([]);
@@ -50,18 +60,21 @@ const group = ref<any>();
 
 const router = useRouter();
 
-watch(() => props.groupId, () => {
-	fetch();
-});
+watch(
+	() => props.groupId,
+	() => {
+		fetch();
+	}
+);
 
 async function fetch() {
-	os.api('users/groups/show', {
+	os.api("users/groups/show", {
 		groupId: props.groupId,
-	}).then(gp => {
+	}).then((gp) => {
 		group.value = gp;
-		os.api('users/show', {
-			userIds: group.value.userIds
-		}).then(us => {
+		os.api("users/show", {
+			userIds: group.value.userIds,
+		}).then((us) => {
 			users.value = us;
 		});
 	});
@@ -70,8 +83,8 @@ async function fetch() {
 fetch();
 
 function invite() {
-	os.selectUser().then(user => {
-		os.apiWithDialog('users/groups/invite', {
+	os.selectUser().then((user) => {
+		os.apiWithDialog("users/groups/invite", {
 			groupId: group.value.id,
 			userId: user.id,
 		});
@@ -79,32 +92,32 @@ function invite() {
 }
 
 function removeUser(user) {
-	os.api('users/groups/pull', {
+	os.api("users/groups/pull", {
 		groupId: group.value.id,
-		userId: user.id
+		userId: user.id,
 	}).then(() => {
-		users.value = users.value.filter(x => x.id !== user.id);
+		users.value = users.value.filter((x) => x.id !== user.id);
 	});
 }
 
 async function renameGroup() {
 	const { canceled, result: name } = await os.inputText({
 		title: i18n.ts.groupName,
-		default: group.value.name
+		default: group.value.name,
 	});
 	if (canceled) return;
 
-	await os.api('users/groups/update', {
+	await os.api("users/groups/update", {
 		groupId: group.value.id,
-		name: name
+		name: name,
 	});
 
 	group.value.name = name;
 }
 
 function transfer() {
-	os.selectUser().then(user => {
-		os.apiWithDialog('users/groups/transfer', {
+	os.selectUser().then((user) => {
+		os.apiWithDialog("users/groups/transfer", {
 			groupId: group.value.id,
 			userId: user.id,
 		});
@@ -113,61 +126,65 @@ function transfer() {
 
 async function deleteGroup() {
 	const { canceled } = await os.confirm({
-		type: 'warning',
-		text: i18n.t('removeAreYouSure', { x: group.value.name }),
+		type: "warning",
+		text: i18n.t("removeAreYouSure", { x: group.value.name }),
 	});
 	if (canceled) return;
 
-	await os.apiWithDialog('users/groups/delete', {
+	await os.apiWithDialog("users/groups/delete", {
 		groupId: group.value.id,
 	});
-	router.push('/my/groups');
+	router.push("/my/groups");
 }
 
-definePageMetadata(computed(() => ({
-	title: i18n.ts.members,
-	icon: 'fas fa-users',
-})));
-
+definePageMetadata(
+	computed(() => ({
+		title: i18n.ts.members,
+		icon: "fas fa-users",
+	}))
+);
 </script>
 
 <style lang="scss" scoped>
-	.mk-group-page {
-		> ._section {
-			> ._content {
-				padding-top: 1rem;
-				justify-content: center;
-			}
+.mk-group-page {
+	> ._section {
+		> ._content {
+			padding-top: 1rem;
+			justify-content: center;
 		}
-		> .members {
-			> ._content {
-				> .users {
-					> .user {
-						display: flex;
-						align-items: center;
-						padding: 16px;
+	}
+	> .members {
+		> ._content {
+			> .users {
+				> ._panel {
+					margin: 1rem 2rem;
+				}
+				> .user {
+					display: flex;
+					align-items: center;
+					padding: 16px;
 
-						> .avatar {
-							width: 50px;
-							height: 50px;
+					> .avatar {
+						width: 50px;
+						height: 50px;
+					}
+
+					> .body {
+						flex: 1;
+						padding: 8px;
+
+						> .name {
+							display: block;
+							font-weight: bold;
 						}
 
-						> .body {
-							flex: 1;
-							padding: 8px;
-
-							> .name {
-								display: block;
-								font-weight: bold;
-							}
-
-							> .acct {
-								opacity: 0.5;
-							}
+						> .acct {
+							opacity: 0.5;
 						}
 					}
 				}
 			}
 		}
 	}
-	</style>
+}
+</style>

From 47509e28b112b6ae11395c99855ebfc648a298ca Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 18:57:26 -0700
Subject: [PATCH 225/245] refactor: :recycle: Use setup syntax for groups index

---
 package.json                                  |   2 +-
 packages/client/src/pages/my-groups/group.vue |   4 +-
 packages/client/src/pages/my-groups/index.vue | 291 ++++++++++--------
 packages/sw/src/sw.ts                         |  14 +-
 4 files changed, 170 insertions(+), 141 deletions(-)

diff --git a/package.json b/package.json
index f488bb8da..b86c9e858 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc-rc.2.2",
+	"version": "12.119.0-calc-rc.2.3",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
index e51e6fc7e..df7a3f2f2 100644
--- a/packages/client/src/pages/my-groups/group.vue
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader /></template>
+	<template #header><MkPageHeader/></template>
 	<div class="mk-group-page">
 		<div class="_section">
 			<div
@@ -141,7 +141,7 @@ definePageMetadata(
 	computed(() => ({
 		title: i18n.ts.members,
 		icon: "fas fa-users",
-	}))
+	})),
 );
 </script>
 
diff --git a/packages/client/src/pages/my-groups/index.vue b/packages/client/src/pages/my-groups/index.vue
index f9f1ab46b..f657f6a09 100644
--- a/packages/client/src/pages/my-groups/index.vue
+++ b/packages/client/src/pages/my-groups/index.vue
@@ -1,145 +1,174 @@
 <template>
-<MkSpacer :content-max="700">
-	<div v-if="tab === 'owned'" class="_content">
-		<MkButton primary style="margin: 0 auto var(--margin) auto;" @click="create"><i class="fas fa-plus"></i> {{ $ts.createGroup }}</MkButton>
-
-		<MkPagination v-slot="{items}" ref="owned" :pagination="ownedPagination">
-			<div v-for="group in items" :key="group.id" class="_card">
-				<div class="_title"><MkA :to="`/my/groups/${ group.id }`" class="_link">{{ group.name }}</MkA></div>
-				<div class="_content"><MkAvatars :user-ids="group.userIds"/></div>
-			</div>
-		</MkPagination>
-	</div>
-
-	<div v-else-if="tab === 'joined'" class="_content">
-		<MkPagination v-slot="{items}" ref="joined" :pagination="joinedPagination">
-			<div v-for="group in items" :key="group.id" class="_card">
-				<div class="_title">{{ group.name }}</div>
-				<div class="_content"><MkAvatars :user-ids="group.userIds"/></div>
-				<div class="_footer">
-					<MkButton danger @click="leave(group)">{{ $ts.leaveGroup }}</MkButton>
-				</div>
-			</div>
-		</MkPagination>
-	</div>
-
-	<div v-else-if="tab === 'invites'" class="_content">
-		<MkPagination v-slot="{items}" ref="invitations" :pagination="invitationPagination">
-			<div v-for="invitation in items" :key="invitation.id" class="_card">
-				<div class="_title">{{ invitation.group.name }}</div>
-				<div class="_content"><MkAvatars :user-ids="invitation.group.userIds"/></div>
-				<div class="_footer">
-					<MkButton primary inline @click="acceptInvite(invitation)"><i class="fas fa-check"></i> {{ $ts.accept }}</MkButton>
-					<MkButton primary inline @click="rejectInvite(invitation)"><i class="fas fa-ban"></i> {{ $ts.reject }}</MkButton>
-				</div>
-			</div>
-		</MkPagination>
-	</div>
-</MkSpacer>
+<MkStickyContainer>
+	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
+	<MkSpacer :content-max="1000">
+		<swiper
+			:modules="[Virtual]"
+			:space-between="20"
+			:virtual="true"
+			@swiper="setSwiperRef"
+			@slide-change="onSlideChange"
+		>
+			<swiper-slide class="_content">
+				<MkButton primary style="margin: 0 auto var(--margin) auto;" @click="create"><i class="fas fa-plus"></i> {{ i18n.ts.createGroup }}</MkButton>
+				<MkPagination v-slot="{items}" ref="owned" :pagination="ownedPagination">
+					<div v-for="group in items" :key="group.id" class="_card">
+						<div class="_title"><MkA :to="`/my/groups/${ group.id }`" class="_link">{{ group.name }}</MkA></div>
+						<div class="_content">
+							<MkAvatars :user-ids="group.userIds"/>
+						</div>
+					</div>
+				</MkPagination>
+			</swiper-slide>
+			<swiper-slide class="_content">
+				<MkPagination v-slot="{items}" ref="joined" :pagination="joinedPagination">
+					<div v-for="group in items" :key="group.id" class="_card">
+						<div class="_title">{{ group.name }}</div>
+						<div class="_content">
+							<MkAvatars :user-ids="group.userIds"/>
+						</div>
+						<div class="_footer">
+							<MkButton danger @click="leave(group)">{{ i18n.ts.leaveGroup }}</MkButton>
+						</div>
+					</div>
+				</MkPagination>
+			</swiper-slide>
+			<swiper-slide class="_content">
+				<MkPagination v-slot="{items}" ref="invitations" :pagination="invitationPagination">
+					<div v-for="invitation in items" :key="invitation.id" class="_card">
+						<div class="_title">{{ invitation.group.name }}</div>
+						<div class="_content">
+							<MkAvatars :user-ids="invitation.group.userIds"/>
+						</div>
+						<div class="_footer">
+							<MkButton primary inline @click="acceptInvite(invitation)"><i class="fas fa-check"></i> {{ i18n.ts.accept }}</MkButton>
+							<MkButton primary inline @click="rejectInvite(invitation)"><i class="fas fa-ban"></i> {{ i18n.ts.reject }}</MkButton>
+						</div>
+					</div>
+				</MkPagination>
+			</swiper-slide>
+		</swiper>
+	</MkSpacer>
+</MkStickyContainer>
 </template>
 
-<script lang="ts">
-import { defineComponent, computed } from 'vue';
+<script lang="ts" setup>
+import { computed, ref } from 'vue';
+import { Virtual } from 'swiper';
+import { Swiper, SwiperSlide } from 'swiper/vue';
 import MkPagination from '@/components/MkPagination.vue';
 import MkButton from '@/components/MkButton.vue';
-import MkContainer from '@/components/MkContainer.vue';
 import MkAvatars from '@/components/MkAvatars.vue';
-import MkTab from '@/components/MkTab.vue';
 import * as os from '@/os';
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { i18n } from '@/i18n';
+import MkStickyContainer from '@/components/global/MkStickyContainer.vue';
 
-export default defineComponent({
-	components: {
-		MkPagination,
-		MkButton,
-		MkContainer,
-		MkTab,
-		MkAvatars,
-	},
+const tabs = ['owned', 'joined', 'invites'];
+let tab = $ref('owned');
+const owned = ref('owned');
+const joined = ref('joined');
+const invitations = ref('invitations');
 
-	data() {
-		return {
-			[Symbol('Page info')]: computed(() => ({
-				title: this.$ts.groups,
-				icon: 'fas fa-users',
-				bg: 'var(--bg)',
-				actions: [{
-					icon: 'fas fa-plus',
-					text: this.$ts.createGroup,
-					handler: this.create,
-				}],
-				tabs: [{
-					active: this.tab === 'owned',
-					title: this.$ts.ownedGroups,
-					icon: 'fas fa-user-tie',
-					onClick: () => { this.tab = 'owned'; },
-				}, {
-					active: this.tab === 'joined',
-					title: this.$ts.joinedGroups,
-					icon: 'fas fa-id-badge',
-					onClick: () => { this.tab = 'joined'; },
-				}, {
-					active: this.tab === 'invites',
-					title: this.$ts.invites,
-					icon: 'fas fa-envelope-open-text',
-					onClick: () => { this.tab = 'invites'; },
-				},]
-			})),
-			tab: 'owned',
-			ownedPagination: {
-				endpoint: 'users/groups/owned' as const,
-				limit: 10,
-			},
-			joinedPagination: {
-				endpoint: 'users/groups/joined' as const,
-				limit: 10,
-			},
-			invitationPagination: {
-				endpoint: 'i/user-group-invites' as const,
-				limit: 10,
-			},
-		};
-	},
+const ownedPagination = {
+	endpoint: 'users/groups/owned' as const,
+	limit: 12,
+};
 
-	methods: {
-		async create() {
-			const { canceled, result: name } = await os.inputText({
-				title: this.$ts.groupName,
-			});
-			if (canceled) return;
-			await os.api('users/groups/create', { name: name });
-			this.$refs.owned.reload();
-			os.success();
-		},
-		acceptInvite(invitation) {
-			os.api('users/groups/invitations/accept', {
-				invitationId: invitation.id
-			}).then(() => {
-				os.success();
-				this.$refs.invitations.reload();
-				this.$refs.joined.reload();
-			});
-		},
-		rejectInvite(invitation) {
-			os.api('users/groups/invitations/reject', {
-				invitationId: invitation.id
-			}).then(() => {
-				this.$refs.invitations.reload();
-			});
-		},
-		async leave(group) {
-			const { canceled } = await os.confirm({
-				type: 'warning',
-				text: this.$t('leaveGroupConfirm', { name: group.name }),
-			});
-			if (canceled) return;
-			os.apiWithDialog('users/groups/leave', {
-				groupId: group.id,
-			}).then(() => {
-				this.$refs.joined.reload();
-			});
-		}
+const joinedPagination = {
+	endpoint: 'users/groups/joined' as const,
+	limit: 12,
+};
+
+const invitationPagination = {
+	endpoint: 'i/user-group-invites' as const,
+	limit: 12,
+};
+
+const headerActions = $computed(() => [
+	{
+		icon: 'fas fa-plus',
+		text: i18n.ts.createGroup,
+		handler: create,
 	}
-});
+]);
+
+const headerTabs = $computed(() => [{
+	key: 'owned',
+	icon: 'fas fa-crown',
+	title: i18n.ts.ownedGroups,
+}, {
+	key: 'joined',
+	icon: 'fas fa-hand',
+	title: i18n.ts.joinedGroups,
+}, {
+	key: 'invites',
+	icon: 'fas fa-envelope-open-text',
+	title: i18n.ts.invites,
+}]);
+
+definePageMetadata(
+	computed(() => ({
+		title: i18n.ts.groups,
+		icon: "fas fa-users",
+	})),
+);
+
+async function create() {
+	const { canceled, result: name } = await os.inputText({
+		title: i18n.ts.groupName,
+	});
+	if (canceled) return;
+	await os.api('users/groups/create', { name: name });
+	owned.value.reload();
+	os.success();
+}
+
+function acceptInvite(invitation) {
+	os.api('users/groups/invitations/accept', {
+		invitationId: invitation.id,
+	}).then(() => {
+		os.success();
+		invitations.value.reload();
+		joined.value.reload();
+	});
+}
+
+function rejectInvite(invitation) {
+	os.api('users/groups/invitations/reject', {
+		invitationId: invitation.id,
+	}).then(() => {
+		invitations.value.reload();
+	});
+}
+
+async function leave(group) {
+	const { canceled } = await os.confirm({
+		type: 'warning',
+		text: i18n.t('leaveGroupConfirm', { name: group.name }),
+	});
+	if (canceled) return;
+	os.apiWithDialog('users/groups/leave', {
+		groupId: group.id,
+	}).then(() => {
+		joined.value.reload();
+	});
+}
+
+let swiperRef = null;
+
+function setSwiperRef(swiper) {
+	swiperRef = swiper;
+	syncSlide(tabs.indexOf(tab));
+}
+
+function onSlideChange() {
+	tab = tabs[swiperRef.activeIndex];
+}
+
+function syncSlide(index) {
+	swiperRef.slideTo(index);
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/sw/src/sw.ts b/packages/sw/src/sw.ts
index 92391f1fb..019ceece1 100644
--- a/packages/sw/src/sw.ts
+++ b/packages/sw/src/sw.ts
@@ -98,12 +98,12 @@ self.addEventListener('notificationclick', <K extends keyof pushNotificationData
 		if (_DEV_) {
 			console.log('notificationclick', ev.action, ev.notification.data);
 		}
-	
+
 		const { action, notification } = ev;
 		const data: pushNotificationDataMap[K] = notification.data;
 		const { userId: id } = data;
 		let client: WindowClient | null = null;
-	
+
 		switch (data.type) {
 			case 'notification':
 				switch (action) {
@@ -167,16 +167,16 @@ self.addEventListener('notificationclick', <K extends keyof pushNotificationData
 				client = await swos.openChat(data.body, id);
 				break;
 		}
-	
+
 		if (client) {
 			client.focus();
 		}
 		if (data.type === 'notification') {
 			swNotificationRead.then(that => that.read(data));
 		}
-	
+
 		notification.close();
-	
+
 	})());
 });
 
@@ -199,11 +199,11 @@ self.addEventListener('message', (ev: ServiceWorkerGlobalScopeEventMap['message'
 					));
 				return; // TODO
 		}
-	
+
 		if (typeof ev.data === 'object') {
 			// E.g. '[object Array]' → 'array'
 			const otype = Object.prototype.toString.call(ev.data).slice(8, -1).toLowerCase();
-	
+
 			if (otype === 'object') {
 				if (ev.data.msg === 'initialize') {
 					swLang.setLang(ev.data.lang);

From fa4b8aca633857afd40de1d55079fd56616bd7ac Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 19:14:28 -0700
Subject: [PATCH 226/245] refactor: :sparkles: Move group actions to header bar

---
 package.json                                  |  2 +-
 packages/client/src/pages/my-groups/group.vue | 45 +++++++++----------
 packages/client/src/pages/my-groups/index.vue |  2 +-
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index b86c9e858..997eb9c57 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc-rc.2.3",
+	"version": "12.119.0-calc-rc.2.4",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
index df7a3f2f2..ca9f545c3 100644
--- a/packages/client/src/pages/my-groups/group.vue
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -1,23 +1,7 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader/></template>
+	<template #header><MkPageHeader :actions="headerActions"/></template>
 	<div class="mk-group-page">
-		<div class="_section">
-			<div
-				class="_content"
-				style="display: flex; gap: var(--margin); flex-wrap: wrap"
-			>
-				<MkButton inline @click="invite()">{{ i18n.ts.invite }}</MkButton>
-				<MkButton inline @click="renameGroup()">{{
-					i18n.ts.rename
-				}}</MkButton>
-				<MkButton inline @click="transfer()">{{ i18n.ts.transfer }}</MkButton>
-				<MkButton inline @click="deleteGroup()">{{
-					i18n.ts.delete
-				}}
-				</MkButton>
-			</div>
-		</div>
 		<div class="_section members _gap">
 			<div class="_content">
 				<div class="users">
@@ -143,16 +127,31 @@ definePageMetadata(
 		icon: "fas fa-users",
 	})),
 );
+
+const headerActions = $computed(() => [
+	{
+		icon: 'fas fa-plus',
+		text: i18n.ts.invite,
+		handler: invite,
+	}, {
+		icon: 'fas fa-i-cursor',
+		text: i18n.ts.rename,
+		handler: renameGroup,
+	}, {
+		icon: 'fas fa-right-left',
+		text: i18n.ts.transfer,
+		handler: transfer,
+	}, {
+		icon: 'fas fa-trash-alt',
+		text: i18n.ts.delete,
+		handler: deleteGroup,
+	},
+]);
+
 </script>
 
 <style lang="scss" scoped>
 .mk-group-page {
-	> ._section {
-		> ._content {
-			padding-top: 1rem;
-			justify-content: center;
-		}
-	}
 	> .members {
 		> ._content {
 			> .users {
diff --git a/packages/client/src/pages/my-groups/index.vue b/packages/client/src/pages/my-groups/index.vue
index f657f6a09..4909765ae 100644
--- a/packages/client/src/pages/my-groups/index.vue
+++ b/packages/client/src/pages/my-groups/index.vue
@@ -90,7 +90,7 @@ const headerActions = $computed(() => [
 		icon: 'fas fa-plus',
 		text: i18n.ts.createGroup,
 		handler: create,
-	}
+	},
 ]);
 
 const headerTabs = $computed(() => [{

From b293d92b5673b9946f296064b98025a723605337 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 19:25:36 -0700
Subject: [PATCH 227/245] =?UTF-8?q?feat:=20show=20=F0=9F=93=8E=20in=20chat?=
 =?UTF-8?q?s=20if=20only=20attachment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/client/src/pages/messaging/index.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index a1ccaf320..79c59dd7e 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -27,7 +27,11 @@
 							<MkTime :time="message.createdAt" class="time"/>
 						</header>
 						<div class="body">
-							<p class="text"><span v-if="isMe(message)" class="me">{{ $ts.you }}:</span>{{ message.text }}</p>
+							<p class="text">
+								<span v-if="isMe(message)" class="me">{{ $ts.you }}:</span>
+								<span v-if="message.text != null && message.text.length > 0">{{ message.text }}</span>
+								<span v-else> 📎</span>
+							</p>
 						</div>
 					</div>
 				</MkA>

From db16ff4950b86de1929f784360086dcf9d48416f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 19:26:56 -0700
Subject: [PATCH 228/245] chore: spacing between icons in gallery index

---
 packages/client/src/pages/gallery/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/pages/gallery/index.vue b/packages/client/src/pages/gallery/index.vue
index 598383217..909af495c 100644
--- a/packages/client/src/pages/gallery/index.vue
+++ b/packages/client/src/pages/gallery/index.vue
@@ -5,7 +5,7 @@
 		<div class="_root">
 			<div v-if="tab === 'explore'">
 				<MkFolder class="_gap">
-					<template #header><i class="fas fa-clock"></i>{{ i18n.ts.recentPosts }}</template>
+					<template #header><i class="fas fa-clock"></i> {{ i18n.ts.recentPosts }}</template>
 					<MkPagination v-slot="{items}" :pagination="recentPostsPagination" :disable-auto-load="true">
 						<div class="vfpdbgtk">
 							<MkGalleryPostPreview v-for="post in items" :key="post.id" :post="post" class="post"/>
@@ -13,7 +13,7 @@
 					</MkPagination>
 				</MkFolder>
 				<MkFolder class="_gap">
-					<template #header><i class="fas fa-fire-alt"></i>{{ i18n.ts.popularPosts }}</template>
+					<template #header><i class="fas fa-fire-alt"></i> {{ i18n.ts.popularPosts }}</template>
 					<MkPagination v-slot="{items}" :pagination="popularPostsPagination" :disable-auto-load="true">
 						<div class="vfpdbgtk">
 							<MkGalleryPostPreview v-for="post in items" :key="post.id" :post="post" class="post"/>

From b65cc2935a82781d5486e33dfa46471a06145969 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 19:37:38 -0700
Subject: [PATCH 229/245] only scroll to bottom in messaging IF in DM

---
 packages/client/src/pages/messaging/messaging-room.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
index bbc4f5e40..fb0b4c437 100644
--- a/packages/client/src/pages/messaging/messaging-room.vue
+++ b/packages/client/src/pages/messaging/messaging-room.vue
@@ -240,7 +240,9 @@ function onDeleted(id) {
 }
 
 function thisScrollToBottom() {
-	scrollToBottom($$(rootEl).value, { behavior: 'smooth' });
+	if (window.location.href.includes('my/messaging/')) {
+		scrollToBottom($$(rootEl).value, { behavior: 'smooth' });
+	}
 }
 
 function onIndicatorClick() {

From f2d41fd9eedc20190143a585a346b5cb4344f187 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 19:37:50 -0700
Subject: [PATCH 230/245] =?UTF-8?q?=F0=9F=94=96=20.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/package.json b/package.json
index 997eb9c57..41e8d2d0a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc-rc.2.4",
+	"version": "12.119.0-calc-rc.3",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From e3beea02a920511eee499d39818e88cd254ce8a1 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 19:40:20 -0700
Subject: [PATCH 231/245] a

---
 packages/client/src/pages/messaging/messaging-room.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
index fb0b4c437..b3d2fe2a6 100644
--- a/packages/client/src/pages/messaging/messaging-room.vue
+++ b/packages/client/src/pages/messaging/messaging-room.vue
@@ -140,7 +140,7 @@ async function fetch() {
 	document.addEventListener('visibilitychange', onVisibilitychange);
 
 	nextTick(() => {
-		thisScrollToBottom();
+		// thisScrollToBottom();
 		window.setTimeout(() => {
 			fetching = false;
 		}, 300);

From 91ceb10ea939c952cac5fac73a6f027f3e5230f5 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 19:44:03 -0700
Subject: [PATCH 232/245] =?UTF-8?q?docs:=20=F0=9F=93=9D=20cl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/CALCKEY.md b/CALCKEY.md
index c082abd06..888222561 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -74,6 +74,7 @@
 - Reply limit bug fixed
 - Make showing the update popup optional
 - Improve PWA manifest
+- Fix incoming chat scrolling globally
 - Obliteration of Ai-chan
 - [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996)
 - [Tapping avatar in mobile opens account modal](https://github.com/misskey-dev/misskey/pull/9056)

From f5277973de89fcf92446b2f9db619fcb54a200b8 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 19:58:43 -0700
Subject: [PATCH 233/245] message room style overhaul

---
 package.json                                             | 2 +-
 .../client/src/pages/messaging/messaging-room.form.vue   | 9 ++++-----
 .../src/pages/messaging/messaging-room.message.vue       | 3 ++-
 packages/client/src/pages/messaging/messaging-room.vue   | 4 ++++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 41e8d2d0a..23e96bc5b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc-rc.3",
+	"version": "12.119.0-calc-rc.4",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/messaging/messaging-room.form.vue b/packages/client/src/pages/messaging/messaging-room.form.vue
index 096f07fb4..65b2b2275 100644
--- a/packages/client/src/pages/messaging/messaging-room.form.vue
+++ b/packages/client/src/pages/messaging/messaging-room.form.vue
@@ -234,15 +234,14 @@ defineExpose({
 
 <style lang="scss" scoped>
 .pemppnzi {
-	position: relative;
+	position: fixed;
 
 	> textarea {
 		cursor: auto;
 		display: block;
-		width: 100%;
-		min-width: 100%;
-		max-width: 100%;
-		min-height: 80px;
+		width: 80%;
+		min-width: 80%;
+		max-width: 80%;
 		margin: 0;
 		padding: 16px 16px 0 16px;
 		resize: none;
diff --git a/packages/client/src/pages/messaging/messaging-room.message.vue b/packages/client/src/pages/messaging/messaging-room.message.vue
index 19e37cd94..2495d0798 100644
--- a/packages/client/src/pages/messaging/messaging-room.message.vue
+++ b/packages/client/src/pages/messaging/messaging-room.message.vue
@@ -9,7 +9,7 @@
 			<div v-if="!message.isDeleted" class="content">
 				<Mfm v-if="message.text" ref="text" class="text" :text="message.text" :i="$i"/>
 				<div v-if="message.file" class="file">
-					<img v-if="message.file.type.split('/')[0] == 'image'" :src="message.file.url" :alt="message.file.name"/>
+					<img v-if="message.file.type.split('/')[0] == 'image'" :src="message.file.url" :alt="message.file.name" max-width="400"/>
 					<VuePlyr v-else-if="message.file.type.split('/')[0] == 'video'">
 						<video
 							:alt="message.file.name"
@@ -52,6 +52,7 @@
 import { } from 'vue';
 import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
+import XImage from '@/components/MkMediaImage.vue';
 import VuePlyr from 'vue-plyr';
 import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm';
 import MkUrlPreview from '@/components/MkUrlPreview.vue';
diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
index b3d2fe2a6..82c0eeb89 100644
--- a/packages/client/src/pages/messaging/messaging-room.vue
+++ b/packages/client/src/pages/messaging/messaging-room.vue
@@ -296,6 +296,10 @@ definePageMetadata(computed(() => !fetching ? user ? {
 	position: relative;
 	overflow: auto;
 
+	XMessage:last-of-type {
+		margin-bottom: 4rem;
+	}
+
 	> .body {
 		.more {
 			display: block;

From fe7ceb481c84c3cdc78a01c424806bef7dca7994 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 20:01:22 -0700
Subject: [PATCH 234/245] spacve

---
 packages/client/src/pages/messaging/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index 79c59dd7e..db0652bef 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -28,7 +28,7 @@
 						</header>
 						<div class="body">
 							<p class="text">
-								<span v-if="isMe(message)" class="me">{{ $ts.you }}:</span>
+								<span v-if="isMe(message)" class="me">{{ $ts.you }}: </span>
 								<span v-if="message.text != null && message.text.length > 0">{{ message.text }}</span>
 								<span v-else> 📎</span>
 							</p>

From e4254894118f11b560d89eb9db478112aadeedb5 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 20:07:19 -0700
Subject: [PATCH 235/245] undo fuckup

---
 package.json                                             | 2 +-
 .../client/src/pages/messaging/messaging-room.form.vue   | 9 +++++----
 packages/client/src/pages/messaging/messaging-room.vue   | 9 +++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 23e96bc5b..c078ef0d2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc-rc.4",
+	"version": "12.119.0-calc-rc.4.1",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/messaging/messaging-room.form.vue b/packages/client/src/pages/messaging/messaging-room.form.vue
index 65b2b2275..096f07fb4 100644
--- a/packages/client/src/pages/messaging/messaging-room.form.vue
+++ b/packages/client/src/pages/messaging/messaging-room.form.vue
@@ -234,14 +234,15 @@ defineExpose({
 
 <style lang="scss" scoped>
 .pemppnzi {
-	position: fixed;
+	position: relative;
 
 	> textarea {
 		cursor: auto;
 		display: block;
-		width: 80%;
-		min-width: 80%;
-		max-width: 80%;
+		width: 100%;
+		min-width: 100%;
+		max-width: 100%;
+		min-height: 80px;
 		margin: 0;
 		padding: 16px 16px 0 16px;
 		resize: none;
diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
index 82c0eeb89..094d04a50 100644
--- a/packages/client/src/pages/messaging/messaging-room.vue
+++ b/packages/client/src/pages/messaging/messaging-room.vue
@@ -292,14 +292,15 @@ definePageMetadata(computed(() => !fetching ? user ? {
 </script>
 
 <style lang="scss" scoped>
+
+XMessage:last-of-type {
+	margin-bottom: 4rem;
+}
+
 .mk-messaging-room {
 	position: relative;
 	overflow: auto;
 
-	XMessage:last-of-type {
-		margin-bottom: 4rem;
-	}
-
 	> .body {
 		.more {
 			display: block;

From b0e1c3d8662eb3faed0dde8985c08bc9684eb62b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 20:23:52 -0700
Subject: [PATCH 236/245] meta

---
 packages/backend/src/models/entities/meta.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/models/entities/meta.ts b/packages/backend/src/models/entities/meta.ts
index 0741dd5e9..a6e4103a3 100644
--- a/packages/backend/src/models/entities/meta.ts
+++ b/packages/backend/src/models/entities/meta.ts
@@ -1,7 +1,7 @@
 import { Entity, Column, PrimaryColumn, ManyToOne, JoinColumn } from 'typeorm';
 import { id } from '../id.js';
 import { User } from './user.js';
-import { Clip } from './clip.js';
+import type { Clip } from './clip.js';
 
 @Entity()
 export class Meta {
@@ -98,17 +98,17 @@ export class Meta {
 	public blockedHosts: string[];
 
 	@Column('boolean', {
-		default: false
+		default: false,
 	})
 	public secureMode: boolean;
 
 	@Column('boolean', {
-		default: false
+		default: false,
 	})
 	public privateMode: boolean;
 
 	@Column('varchar', {
-		length: 256, array: true, default: '{}'
+		length: 256, array: true, default: '{}',
 	})
 	public allowedHosts: string[];
 

From 0d28fd427783574b7e92f2a2e421b31c22775397 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 20:34:14 -0700
Subject: [PATCH 237/245] fix

---
 packages/client/src/pages/admin/security.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/client/src/pages/admin/security.vue b/packages/client/src/pages/admin/security.vue
index 735c7dc3e..be3d27aba 100644
--- a/packages/client/src/pages/admin/security.vue
+++ b/packages/client/src/pages/admin/security.vue
@@ -133,7 +133,6 @@ import FormRange from '@/components/form/range.vue';
 import FormInput from '@/components/form/input.vue';
 import FormTextarea from '@/components/form/textarea.vue';
 import FormButton from '@/components/MkButton.vue';
-import FormTextarea from '@/components/form/textarea.vue';
 import * as os from '@/os';
 import { fetchInstance } from '@/instance';
 import { i18n } from '@/i18n';

From 4c021e196f95b0b925594631e90c74e017dd2021 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 20:41:45 -0700
Subject: [PATCH 238/245] fix motd

---
 packages/backend/src/server/web/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts
index 975cb6b66..8dedae5b3 100644
--- a/packages/backend/src/server/web/index.ts
+++ b/packages/backend/src/server/web/index.ts
@@ -534,6 +534,7 @@ router.get('(.*)', async ctx => {
 		icon: meta.iconUrl,
 		splashIcon: splashIconUrl,
 		themeColor: meta.themeColor,
+		randomMOTD: motd,
 		privateMode: meta.privateMode,
 	});
 	ctx.set('Cache-Control', 'public, max-age=3');

From 5001e27f49efdcc5e39b03562c18ce77e22b0f0b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 20:57:39 -0700
Subject: [PATCH 239/245] Simplify groups index

---
 package.json                                  |   2 +-
 packages/client/src/pages/my-groups/index.vue | 112 ++++--------------
 2 files changed, 24 insertions(+), 90 deletions(-)

diff --git a/package.json b/package.json
index c078ef0d2..84eda2272 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc-rc.4.1",
+	"version": "12.119.0-calc-rc.5",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/my-groups/index.vue b/packages/client/src/pages/my-groups/index.vue
index 4909765ae..e5d58ea29 100644
--- a/packages/client/src/pages/my-groups/index.vue
+++ b/packages/client/src/pages/my-groups/index.vue
@@ -1,61 +1,33 @@
 <template>
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="1000">
-		<swiper
-			:modules="[Virtual]"
-			:space-between="20"
-			:virtual="true"
-			@swiper="setSwiperRef"
-			@slide-change="onSlideChange"
-		>
-			<swiper-slide class="_content">
-				<MkButton primary style="margin: 0 auto var(--margin) auto;" @click="create"><i class="fas fa-plus"></i> {{ i18n.ts.createGroup }}</MkButton>
-				<MkPagination v-slot="{items}" ref="owned" :pagination="ownedPagination">
-					<div v-for="group in items" :key="group.id" class="_card">
-						<div class="_title"><MkA :to="`/my/groups/${ group.id }`" class="_link">{{ group.name }}</MkA></div>
-						<div class="_content">
-							<MkAvatars :user-ids="group.userIds"/>
-						</div>
-					</div>
-				</MkPagination>
-			</swiper-slide>
-			<swiper-slide class="_content">
-				<MkPagination v-slot="{items}" ref="joined" :pagination="joinedPagination">
-					<div v-for="group in items" :key="group.id" class="_card">
-						<div class="_title">{{ group.name }}</div>
-						<div class="_content">
-							<MkAvatars :user-ids="group.userIds"/>
-						</div>
-						<div class="_footer">
-							<MkButton danger @click="leave(group)">{{ i18n.ts.leaveGroup }}</MkButton>
-						</div>
-					</div>
-				</MkPagination>
-			</swiper-slide>
-			<swiper-slide class="_content">
-				<MkPagination v-slot="{items}" ref="invitations" :pagination="invitationPagination">
-					<div v-for="invitation in items" :key="invitation.id" class="_card">
-						<div class="_title">{{ invitation.group.name }}</div>
-						<div class="_content">
-							<MkAvatars :user-ids="invitation.group.userIds"/>
-						</div>
-						<div class="_footer">
-							<MkButton primary inline @click="acceptInvite(invitation)"><i class="fas fa-check"></i> {{ i18n.ts.accept }}</MkButton>
-							<MkButton primary inline @click="rejectInvite(invitation)"><i class="fas fa-ban"></i> {{ i18n.ts.reject }}</MkButton>
-						</div>
-					</div>
-				</MkPagination>
-			</swiper-slide>
-		</swiper>
+	<MkSpacer :content-max="800" :margin-min="20">
+		<MkButton primary style="margin: 0 auto var(--margin) auto;" @click="create"><i class="fas fa-plus"></i> {{ i18n.ts.createGroup }}</MkButton>
+		<MkPagination v-slot="{items}" ref="owned" :pagination="ownedPagination">
+			<div v-for="group in items" :key="group.id" class="_card">
+				<div class="_title"><MkA :to="`/my/groups/${ group.id }`" class="_link">{{ group.name }}</MkA></div>
+				<div class="_content">
+					<MkAvatars :user-ids="group.userIds"/>
+				</div>
+			</div>
+		</MkPagination>
+		<MkPagination v-slot="{items}" ref="joined" :pagination="joinedPagination">
+			<div v-for="group in items" :key="group.id" class="_card">
+				<div class="_title">{{ group.name }}</div>
+				<div class="_content">
+					<MkAvatars :user-ids="group.userIds"/>
+				</div>
+				<div class="_footer">
+					<MkButton danger @click="leave(group)">{{ i18n.ts.leaveGroup }}</MkButton>
+				</div>
+			</div>
+		</MkPagination>
 	</MkSpacer>
 </MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
-import { Virtual } from 'swiper';
-import { Swiper, SwiperSlide } from 'swiper/vue';
 import MkPagination from '@/components/MkPagination.vue';
 import MkButton from '@/components/MkButton.vue';
 import MkAvatars from '@/components/MkAvatars.vue';
@@ -72,17 +44,12 @@ const invitations = ref('invitations');
 
 const ownedPagination = {
 	endpoint: 'users/groups/owned' as const,
-	limit: 12,
+	limit: 10,
 };
 
 const joinedPagination = {
 	endpoint: 'users/groups/joined' as const,
-	limit: 12,
-};
-
-const invitationPagination = {
-	endpoint: 'i/user-group-invites' as const,
-	limit: 12,
+	limit: 10,
 };
 
 const headerActions = $computed(() => [
@@ -124,24 +91,6 @@ async function create() {
 	os.success();
 }
 
-function acceptInvite(invitation) {
-	os.api('users/groups/invitations/accept', {
-		invitationId: invitation.id,
-	}).then(() => {
-		os.success();
-		invitations.value.reload();
-		joined.value.reload();
-	});
-}
-
-function rejectInvite(invitation) {
-	os.api('users/groups/invitations/reject', {
-		invitationId: invitation.id,
-	}).then(() => {
-		invitations.value.reload();
-	});
-}
-
 async function leave(group) {
 	const { canceled } = await os.confirm({
 		type: 'warning',
@@ -154,21 +103,6 @@ async function leave(group) {
 		joined.value.reload();
 	});
 }
-
-let swiperRef = null;
-
-function setSwiperRef(swiper) {
-	swiperRef = swiper;
-	syncSlide(tabs.indexOf(tab));
-}
-
-function onSlideChange() {
-	tab = tabs[swiperRef.activeIndex];
-}
-
-function syncSlide(index) {
-	swiperRef.slideTo(index);
-}
 </script>
 
 <style lang="scss" scoped>

From 5368a231c829b54fd328c506834791acbaf6d851 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 21:01:31 -0700
Subject: [PATCH 240/245] =?UTF-8?q?I=20forgor=20=F0=9F=92=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  | 2 +-
 packages/client/src/pages/my-groups/index.vue | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 84eda2272..dd532f653 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc-rc.5",
+	"version": "12.119.0-calc-rc.5.1",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/my-groups/index.vue b/packages/client/src/pages/my-groups/index.vue
index e5d58ea29..f2cf4106b 100644
--- a/packages/client/src/pages/my-groups/index.vue
+++ b/packages/client/src/pages/my-groups/index.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader :actions="headerActions"/></template>
 	<MkSpacer :content-max="800" :margin-min="20">
 		<MkButton primary style="margin: 0 auto var(--margin) auto;" @click="create"><i class="fas fa-plus"></i> {{ i18n.ts.createGroup }}</MkButton>
 		<MkPagination v-slot="{items}" ref="owned" :pagination="ownedPagination">
@@ -36,11 +36,8 @@ import { definePageMetadata } from "@/scripts/page-metadata";
 import { i18n } from '@/i18n';
 import MkStickyContainer from '@/components/global/MkStickyContainer.vue';
 
-const tabs = ['owned', 'joined', 'invites'];
-let tab = $ref('owned');
 const owned = ref('owned');
 const joined = ref('joined');
-const invitations = ref('invitations');
 
 const ownedPagination = {
 	endpoint: 'users/groups/owned' as const,

From 1e5f9c68b38c1787f4e6e376238088f6996fb0ae Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 21:09:35 -0700
Subject: [PATCH 241/245] chore: rm unused import

---
 packages/client/src/pages/my-groups/group.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
index ca9f545c3..5e5ba034d 100644
--- a/packages/client/src/pages/my-groups/group.vue
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -26,7 +26,6 @@
 
 <script lang="ts" setup>
 import { computed, ref, watch } from "vue";
-import MkButton from "@/components/MkButton.vue";
 import { definePageMetadata } from "@/scripts/page-metadata";
 import { i18n } from "@/i18n";
 import { useRouter } from "@/router";

From caa072cf49d87c25b10e588e38234fb86cf0bd9f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 21:10:21 -0700
Subject: [PATCH 242/245] chore: :fire: rm tabs

---
 packages/client/src/pages/my-groups/index.vue | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/packages/client/src/pages/my-groups/index.vue b/packages/client/src/pages/my-groups/index.vue
index f2cf4106b..84d1fa5ff 100644
--- a/packages/client/src/pages/my-groups/index.vue
+++ b/packages/client/src/pages/my-groups/index.vue
@@ -57,20 +57,6 @@ const headerActions = $computed(() => [
 	},
 ]);
 
-const headerTabs = $computed(() => [{
-	key: 'owned',
-	icon: 'fas fa-crown',
-	title: i18n.ts.ownedGroups,
-}, {
-	key: 'joined',
-	icon: 'fas fa-hand',
-	title: i18n.ts.joinedGroups,
-}, {
-	key: 'invites',
-	icon: 'fas fa-envelope-open-text',
-	title: i18n.ts.invites,
-}]);
-
 definePageMetadata(
 	computed(() => ({
 		title: i18n.ts.groups,

From 873ebcba8372a64c65f1ad1aef908ef7a1ae803f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 21:33:03 -0700
Subject: [PATCH 243/245] feat: :bookmark: v12.119.0

---
 package.json                                |  2 +-
 packages/client/src/pages/gallery/index.vue | 61 +++++++++--------
 packages/client/src/pages/user/index.vue    | 74 ++++++++++++++++-----
 3 files changed, 94 insertions(+), 43 deletions(-)

diff --git a/package.json b/package.json
index dd532f653..89095852b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc-rc.5.1",
+	"version": "12.119.0-calc",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/gallery/index.vue b/packages/client/src/pages/gallery/index.vue
index 909af495c..9457e2ea1 100644
--- a/packages/client/src/pages/gallery/index.vue
+++ b/packages/client/src/pages/gallery/index.vue
@@ -1,9 +1,15 @@
 <template>
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="1400">
-		<div class="_root">
-			<div v-if="tab === 'explore'">
+	<MkSpacer :content-max="1200">
+		<swiper
+			:modules="[Virtual]"
+			:space-between="20"
+			:virtual="true"
+			@swiper="setSwiperRef"
+			@slide-change="onSlideChange"
+		>
+			<swiper-slide>
 				<MkFolder class="_gap">
 					<template #header><i class="fas fa-clock"></i> {{ i18n.ts.recentPosts }}</template>
 					<MkPagination v-slot="{items}" :pagination="recentPostsPagination" :disable-auto-load="true">
@@ -20,41 +26,39 @@
 						</div>
 					</MkPagination>
 				</MkFolder>
-			</div>
-			<div v-else-if="tab === 'liked'">
+			</swiper-slide>
+			<swiper-slide>
 				<MkPagination v-slot="{items}" :pagination="likedPostsPagination">
 					<div class="vfpdbgtk">
 						<MkGalleryPostPreview v-for="like in items" :key="like.id" :post="like.post" class="post"/>
 					</div>
 				</MkPagination>
-			</div>
-			<div v-else-if="tab === 'my'">
+			</swiper-slide>
+			<swiper-slide>
 				<MkA to="/gallery/new" class="_link" style="margin: 16px;"><i class="fas fa-plus"></i> {{ i18n.ts.postToGallery }}</MkA>
 				<MkPagination v-slot="{items}" :pagination="myPostsPagination">
 					<div class="vfpdbgtk">
 						<MkGalleryPostPreview v-for="post in items" :key="post.id" :post="post" class="post"/>
 					</div>
 				</MkPagination>
-			</div>
-		</div>
+			</swiper-slide>
+		</swiper>
 	</MkSpacer>
 </MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
 import { computed, defineComponent, watch } from 'vue';
-import XUserList from '@/components/MkUserList.vue';
+import { Virtual } from 'swiper';
+import { Swiper, SwiperSlide } from 'swiper/vue';
 import MkFolder from '@/components/MkFolder.vue';
-import MkInput from '@/components/form/input.vue';
-import MkButton from '@/components/MkButton.vue';
-import MkTab from '@/components/MkTab.vue';
 import MkPagination from '@/components/MkPagination.vue';
 import MkGalleryPostPreview from '@/components/MkGalleryPostPreview.vue';
-import number from '@/filters/number';
-import * as os from '@/os';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { i18n } from '@/i18n';
 import { useRouter } from '@/router';
+import 'swiper/scss';
+import 'swiper/scss/virtual';
 
 const router = useRouter();
 
@@ -63,7 +67,7 @@ const props = defineProps<{
 }>();
 
 let tab = $ref('explore');
-let tags = $ref([]);
+const tabs = ['explore', 'liked', 'my'];
 let tagsRef = $ref();
 
 const recentPostsPagination = {
@@ -83,16 +87,6 @@ const likedPostsPagination = {
 	limit: 5,
 };
 
-const tagUsersPagination = $computed(() => ({
-	endpoint: 'hashtags/users' as const,
-	limit: 30,
-	params: {
-		tag: this.tag,
-		origin: 'combined',
-		sort: '+follower',
-	},
-}));
-
 watch(() => props.tag, () => {
 	if (tagsRef) tagsRef.tags.toggleContent(props.tag == null);
 });
@@ -123,6 +117,21 @@ definePageMetadata({
 	title: i18n.ts.gallery,
 	icon: 'fas fa-icons',
 });
+
+let swiperRef = null;
+
+function setSwiperRef(swiper) {
+	swiperRef = swiper;
+	syncSlide(tabs.indexOf(tab));
+}
+
+function onSlideChange() {
+	tab = tabs[swiperRef.activeIndex];
+}
+
+function syncSlide(index) {
+	swiperRef.slideTo(index);
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/pages/user/index.vue b/packages/client/src/pages/user/index.vue
index 7e635f8b2..b1bbd2dd4 100644
--- a/packages/client/src/pages/user/index.vue
+++ b/packages/client/src/pages/user/index.vue
@@ -1,35 +1,55 @@
 <template>
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<div>
-		<transition name="fade" mode="out-in">
-			<div v-if="user">
-				<XHome v-if="tab === 'home'" :user="user"/>
-				<XReactions v-else-if="tab === 'reactions'" :user="user"/>
-				<XClips v-else-if="tab === 'clips'" :user="user"/>
-				<XPages v-else-if="tab === 'pages'" :user="user"/>
-				<XGallery v-else-if="tab === 'gallery'" :user="user"/>
-			</div>
-			<MkError v-else-if="error" @retry="fetchUser()"/>
-			<MkLoading v-else/>
-		</transition>
+	<div v-if="user">
+		<swiper
+			:modules="[Virtual]"
+			:space-between="20"
+			:virtual="true"
+			@swiper="setSwiperRef"
+			@slide-change="onSlideChange"
+		>
+			<swiper-slide>
+				<XHome :user="user"/>
+			</swiper-slide>
+			<swiper-slide>
+				<XLikedPosts :user="user"/>
+			</swiper-slide>
+			<swiper-slide>
+				<XReactions :user="user"/>
+			</swiper-slide>
+			<swiper-slide>
+				<XClips :user="user"/>
+			</swiper-slide>
+			<swiper-slide>
+				<XPages :user="user"/>
+			</swiper-slide>
+			<swiper-slide>
+				<XGallery :user="user"/>
+			</swiper-slide>
+		</swiper>
+	</div>
+	<MkError v-else-if="error" @retry="fetchUser()"/>
+	<MkLoading v-else/>
+	</swiper>
 	</div>
 </MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
 import { defineAsyncComponent, computed, inject, onMounted, onUnmounted, watch } from 'vue';
-import calcAge from 's-age';
+import { Virtual } from 'swiper';
+import { Swiper, SwiperSlide } from 'swiper/vue';
 import * as Acct from 'misskey-js/built/acct';
-import * as misskey from 'misskey-js';
-import { getScrollPosition } from '@/scripts/scroll';
-import number from '@/filters/number';
+import type * as misskey from 'misskey-js';
 import { userPage, acct as getAcct } from '@/filters/user';
 import * as os from '@/os';
 import { useRouter } from '@/router';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { i18n } from '@/i18n';
 import { $i } from '@/account';
+import 'swiper/scss';
+import 'swiper/scss/virtual';
 
 const XHome = defineAsyncComponent(() => import('./home.vue'));
 const XReactions = defineAsyncComponent(() => import('./reactions.vue'));
@@ -47,7 +67,14 @@ const props = withDefaults(defineProps<{
 const router = useRouter();
 
 let tab = $ref(props.page);
+let tabs = ['home'];
 let user = $ref<null | misskey.entities.UserDetailed>(null);
+if (($i && ($i.id === user?.id)) || user?.publicReactions) {
+	tabs.push('reactions');
+}
+if ((user?.instance != null)) {
+	tabs.push('clips', 'pages', 'gallery');
+}
 let error = $ref(null);
 
 function fetchUser(): void {
@@ -99,6 +126,21 @@ definePageMetadata(computed(() => user ? {
 		title: user.name,
 	},
 } : null));
+
+let swiperRef = null;
+
+function setSwiperRef(swiper) {
+	swiperRef = swiper;
+	syncSlide(tabs.indexOf(tab));
+}
+
+function onSlideChange() {
+	tab = tabs[swiperRef.activeIndex];
+}
+
+function syncSlide(index) {
+	swiperRef.slideTo(index);
+}
 </script>
 
 <style lang="scss" scoped>

From 790e4361dc7c8a94e7edbecbe9790b8c5c855e0a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 21:38:02 -0700
Subject: [PATCH 244/245] fix: :bug: motd

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

diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts
index 8dedae5b3..c81506384 100644
--- a/packages/backend/src/server/web/index.ts
+++ b/packages/backend/src/server/web/index.ts
@@ -534,7 +534,7 @@ router.get('(.*)', async ctx => {
 		icon: meta.iconUrl,
 		splashIcon: splashIconUrl,
 		themeColor: meta.themeColor,
-		randomMOTD: motd,
+		randomMOTD: motd[Math.floor(Math.random() * motd.length)],
 		privateMode: meta.privateMode,
 	});
 	ctx.set('Cache-Control', 'public, max-age=3');

From b62f4299d791d31917d4337d9e3ccf76eab5f4c3 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 13 Sep 2022 21:39:47 -0700
Subject: [PATCH 245/245] =?UTF-8?q?docs:=20=F0=9F=93=9D=20Move=20add=20gro?=
 =?UTF-8?q?ups=20back=20to=20Implemented?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CALCKEY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index 888222561..d2ab61372 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -26,7 +26,6 @@
 - Make your password hasn't been pwned
 - OCR image captioning
 - Admin custom CSS
-- Add back groups
 - Add back time machine (jump to date)
 - Improve accesibility score
 <details><summary>Current Misskey score is 57/100</summary>
@@ -49,6 +48,7 @@
 - Star as default reaction
 - Rosé Pine by default (+ non-themable elements made Rosé Pine)
 - Better sidebar/navbar
+- Add back groups
 - MOTD (customizable by admins!)
 - Custom randomized splash icons
 - Self hosted, newly designed error images