From d3466948d1746b581f741ea895f8295f17d12bc7 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 6 Feb 2023 15:52:00 -0500
Subject: [PATCH 01/90] =?UTF-8?q?Improving=20keyboard=20support,=20part=20?=
 =?UTF-8?q?1=E2=84=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/client/src/components/MkButton.vue   |  3 +-
 packages/client/src/components/form/radio.vue |  3 ++
 .../client/src/components/form/switch.vue     |  3 ++
 packages/client/src/directives/tooltip.ts     | 33 ++++++++++++-------
 packages/client/src/pages/admin/_header_.vue  |  6 +---
 packages/client/src/style.scss                |  4 ---
 packages/client/src/ui/_common_/navbar.vue    | 13 ++++++--
 7 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/packages/client/src/components/MkButton.vue b/packages/client/src/components/MkButton.vue
index 9042500b4..5220e8c95 100644
--- a/packages/client/src/components/MkButton.vue
+++ b/packages/client/src/components/MkButton.vue
@@ -184,8 +184,7 @@ function onMousedown(evt: MouseEvent): void {
 	}
 
 	&:focus-visible {
-		outline: solid 2px var(--focus);
-		outline-offset: 2px;
+		outline: auto;
 	}
 
 	&.inline {
diff --git a/packages/client/src/components/form/radio.vue b/packages/client/src/components/form/radio.vue
index b36f7e9fd..406038582 100644
--- a/packages/client/src/components/form/radio.vue
+++ b/packages/client/src/components/form/radio.vue
@@ -68,6 +68,9 @@ function toggle(): void {
 	&:hover {
 		border-color: var(--inputBorderHover) !important;
 	}
+	&:focus-within {
+		outline: auto;
+	}
 
 	&.checked {
 		background-color: var(--accentedBg) !important;
diff --git a/packages/client/src/components/form/switch.vue b/packages/client/src/components/form/switch.vue
index 1ed00ae65..ef717ab6f 100644
--- a/packages/client/src/components/form/switch.vue
+++ b/packages/client/src/components/form/switch.vue
@@ -98,6 +98,9 @@ const toggle = () => {
 			border-color: var(--inputBorderHover) !important;
 		}
 	}
+	&:focus-within > .button {
+		outline: auto;
+	}
 
 	> .label {
 		margin-left: 12px;
diff --git a/packages/client/src/directives/tooltip.ts b/packages/client/src/directives/tooltip.ts
index 7738d14e8..91024a6e3 100644
--- a/packages/client/src/directives/tooltip.ts
+++ b/packages/client/src/directives/tooltip.ts
@@ -76,23 +76,32 @@ export default {
 			ev.preventDefault();
 		});
 
+		function showTooltip() {
+			window.clearTimeout(self.showTimer);
+			window.clearTimeout(self.hideTimer);
+			self.showTimer = window.setTimeout(self.show, delay);
+		}
+		function hideTooltip() {
+			window.clearTimeout(self.showTimer);
+			window.clearTimeout(self.hideTimer);
+			self.hideTimer = window.setTimeout(self.close, delay);
+		}
+
 		el.addEventListener(
-			start,
-			() => {
-				window.clearTimeout(self.showTimer);
-				window.clearTimeout(self.hideTimer);
-				self.showTimer = window.setTimeout(self.show, delay);
-			},
+			start, showTooltip,
+			{ passive: true },
+		);
+		el.addEventListener(
+			"focusin", showTooltip,
 			{ passive: true },
 		);
 
 		el.addEventListener(
-			end,
-			() => {
-				window.clearTimeout(self.showTimer);
-				window.clearTimeout(self.hideTimer);
-				self.hideTimer = window.setTimeout(self.close, delay);
-			},
+			end, hideTooltip,
+			{ passive: true },
+		);
+		el.addEventListener(
+			"focusout", hideTooltip,
 			{ passive: true },
 		);
 
diff --git a/packages/client/src/pages/admin/_header_.vue b/packages/client/src/pages/admin/_header_.vue
index bdb41b2d2..12702790e 100644
--- a/packages/client/src/pages/admin/_header_.vue
+++ b/packages/client/src/pages/admin/_header_.vue
@@ -265,11 +265,7 @@ onUnmounted(() => {
 			font-weight: normal;
 			opacity: 0.7;
 
-			&:hover {
-				opacity: 1;
-			}
-
-			&.active {
+			&:hover, &:focus-visible, &.active {
 				opacity: 1;
 			}
 
diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index ca8bd8b43..01bff888a 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -178,10 +178,6 @@ hr {
 		pointer-events: none;
 	}
 
-	&:focus-visible {
-		outline: none;
-	}
-
 	&:disabled {
 		opacity: 0.5;
 		cursor: default;
diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index c44c766b3..e99656ed6 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -341,8 +341,6 @@ function more(ev: MouseEvent) {
 					padding-left: 30px;
 					line-height: 2.85rem;
 					margin-bottom: 0.5rem;
-					text-overflow: ellipsis;
-					overflow: hidden;
 					white-space: nowrap;
 					width: 100%;
 					text-align: left;
@@ -368,6 +366,8 @@ function more(ev: MouseEvent) {
 					> .text {
 						position: relative;
 						font-size: 0.9em;
+						overflow: hidden;
+						text-overflow: ellipsis;
 					}
 
 					&:hover {
@@ -380,7 +380,7 @@ function more(ev: MouseEvent) {
 						color: var(--navActive);
 					}
 
-					&:hover, &.active {
+					&:hover, &:focus-within, &.active {
 						color: var(--accent);
 						transition: all 0.4s ease;
 
@@ -562,5 +562,12 @@ function more(ev: MouseEvent) {
 			}
 		}
 	}
+
+	.item {
+		outline: none;
+		&:focus-visible:before {
+			outline: auto;
+		}
+	}
 }
 </style>

From 49ea503fe6a8167c4fa22ccff83c9971f493e928 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 6 Feb 2023 23:23:56 -0500
Subject: [PATCH 02/90] Fix tabbing orders & allow closing modals w/ esc

---
 packages/client/src/components/MkMenu.vue      | 14 +++++++-------
 packages/client/src/components/MkModal.vue     |  8 ++++++--
 packages/client/src/components/MkPopupMenu.vue |  2 +-
 packages/client/src/components/MkSuperMenu.vue |  6 +++---
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index 78c1ff223..c9f8dbfd6 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -12,33 +12,33 @@
 			<span v-else-if="item.type === 'label'" class="label item">
 				<span>{{ item.text }}</span>
 			</span>
-			<span v-else-if="item.type === 'pending'" :tabindex="i" class="pending item">
+			<span v-else-if="item.type === 'pending'" :tabindex="0" class="pending item">
 				<span><MkEllipsis/></span>
 			</span>
-			<MkA v-else-if="item.type === 'link'" :to="item.to" :tabindex="i" class="_button item" @click.passive="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<MkA v-else-if="item.type === 'link'" :to="item.to" :tabindex="0" class="_button item" @click.passive="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
 				<MkAvatar v-if="item.avatar" :user="item.avatar" class="avatar"/>
 				<span>{{ item.text }}</span>
 				<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
 			</MkA>
-			<a v-else-if="item.type === 'a'" :href="item.href" :target="item.target" :download="item.download" :tabindex="i" class="_button item" @click="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<a v-else-if="item.type === 'a'" :href="item.href" :target="item.target" :download="item.download" :tabindex="0" class="_button item" @click="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
 				<span>{{ item.text }}</span>
 				<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
 			</a>
-			<button v-else-if="item.type === 'user'" :tabindex="i" class="_button item" :class="{ active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<button v-else-if="item.type === 'user'" :tabindex="0" class="_button item" :class="{ active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<MkAvatar :user="item.user" class="avatar"/><MkUserName :user="item.user"/>
 				<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
 			</button>
-			<span v-else-if="item.type === 'switch'" :tabindex="i" class="item" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<span v-else-if="item.type === 'switch'" :tabindex="0" class="item" @click.passive="onItemMouseEnter(item)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<FormSwitch v-model="item.ref" :disabled="item.disabled" class="form-switch">{{ item.text }}</FormSwitch>
 			</span>
-			<button v-else-if="item.type === 'parent'" :tabindex="i" class="_button item parent" :class="{ childShowing: childShowingItem === item }" @mouseenter="showChildren(item, $event)">
+			<button v-else-if="item.type === 'parent'" :tabindex="0" class="_button item parent" :class="{ childShowing: childShowingItem === item }" @mouseenter="showChildren(item, $event)" @click="showChildren(item, $event)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
 				<span>{{ item.text }}</span>
 				<span class="caret"><i class="ph-caret-right-bold ph-lg ph-fw ph-lg"></i></span>
 			</button>
-			<button v-else :tabindex="i" class="_button item" :class="{ danger: item.danger, active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<button v-else :tabindex="0" class="_button item" :class="{ danger: item.danger, active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
 				<MkAvatar v-if="item.avatar" :user="item.avatar" class="avatar"/>
 				<span>{{ item.text }}</span>
diff --git a/packages/client/src/components/MkModal.vue b/packages/client/src/components/MkModal.vue
index ed0e7f59d..62f67a380 100644
--- a/packages/client/src/components/MkModal.vue
+++ b/packages/client/src/components/MkModal.vue
@@ -1,8 +1,8 @@
 <template>
-<transition :name="$store.state.animation ? (type === 'drawer') ? 'modal-drawer' : (type === 'popup') ? 'modal-popup' : 'modal' : ''" :duration="$store.state.animation ? 200 : 0" appear @after-leave="emit('closed')" @enter="emit('opening')" @after-enter="onOpened">
+<transition :name="$store.state.animation ? (type === 'drawer') ? 'modal-drawer' : (type === 'popup') ? 'modal-popup' : 'modal' : ''" :duration="$store.state.animation ? 200 : 0" appear @after-leave="emit('closed')" @enter="emit('opening')" @keyup.esc="emit('click')" @after-enter="onOpened">
 	<div v-show="manualShowing != null ? manualShowing : showing" v-hotkey.global="keymap" class="qzhlnise" :class="{ drawer: type === 'drawer', dialog: type === 'dialog' || type === 'dialog:top', popup: type === 'popup' }" :style="{ zIndex, pointerEvents: (manualShowing != null ? manualShowing : showing) ? 'auto' : 'none', '--transformOrigin': transformOrigin }">
 		<div class="bg _modalBg" :class="{ transparent: transparentBg && (type === 'popup') }" :style="{ zIndex }" @click="onBgClick" @contextmenu.prevent.stop="() => {}"></div>
-		<div ref="content" class="content" :class="{ fixed, top: type === 'dialog:top' }" :style="{ zIndex }" @click.self="onBgClick">
+		<div ref="content" class="content" :class="{ fixed, top: type === 'dialog:top' }" :style="{ zIndex }" @click.self="onBgClick" tabindex="-1">
 			<slot :max-height="maxHeight" :type="type"></slot>
 		</div>
 	</div>
@@ -214,6 +214,7 @@ const align = () => {
 const onOpened = () => {
 	emit('opened');
 
+	content?.focus()
 	// モーダルコンテンツにマウスボタンが押され、コンテンツ外でマウスボタンが離されたときにモーダルバックグラウンドクリックと判定させないためにマウスイベントを監視しフラグ管理する
 	const el = content!.children[0];
 	el.addEventListener('mousedown', ev => {
@@ -328,6 +329,9 @@ defineExpose({
 }
 
 .qzhlnise {
+	> .content {
+		border-radius: 16px;
+	}
 	> .bg {
 		&.transparent {
 			background: transparent;
diff --git a/packages/client/src/components/MkPopupMenu.vue b/packages/client/src/components/MkPopupMenu.vue
index f04c7f561..95234d7ce 100644
--- a/packages/client/src/components/MkPopupMenu.vue
+++ b/packages/client/src/components/MkPopupMenu.vue
@@ -1,5 +1,5 @@
 <template>
-<MkModal ref="modal" v-slot="{ type, maxHeight }" :z-priority="'high'" :src="src" :transparent-bg="true" @click="modal.close()" @closed="emit('closed')">
+<MkModal ref="modal" v-slot="{ type, maxHeight }" :z-priority="'high'" :src="src" :transparent-bg="true" @click="modal.close()" @closed="emit('closed')" tabindex="-1">
 	<MkMenu :items="items" :align="align" :width="width" :max-height="maxHeight" :as-drawer="type === 'drawer'" class="sfhdhdhq" :class="{ drawer: type === 'drawer' }" @close="modal.close()"/>
 </MkModal>
 </template>
diff --git a/packages/client/src/components/MkSuperMenu.vue b/packages/client/src/components/MkSuperMenu.vue
index 6e73b4959..b784d5239 100644
--- a/packages/client/src/components/MkSuperMenu.vue
+++ b/packages/client/src/components/MkSuperMenu.vue
@@ -5,15 +5,15 @@
 
 		<div class="items">
 			<template v-for="(item, i) in group.items">
-				<a v-if="item.type === 'a'" :href="item.href" :target="item.target" :tabindex="i" class="_button item" :class="{ danger: item.danger, active: item.active }">
+				<a v-if="item.type === 'a'" :href="item.href" :target="item.target" class="_button item" :class="{ danger: item.danger, active: item.active }">
 					<i v-if="item.icon" class="icon ph-fw ph-lg" :class="item.icon"></i>
 					<span class="text">{{ item.text }}</span>
 				</a>
-				<button v-else-if="item.type === 'button'" :tabindex="i" class="_button item" :class="{ danger: item.danger, active: item.active }" :disabled="item.active" @click="ev => item.action(ev)">
+				<button v-else-if="item.type === 'button'" class="_button item" :class="{ danger: item.danger, active: item.active }" :disabled="item.active" @click="ev => item.action(ev)">
 					<i v-if="item.icon" class="icon ph-fw ph-lg" :class="item.icon"></i>
 					<span class="text">{{ item.text }}</span>
 				</button>
-				<MkA v-else :to="item.to" :tabindex="i" class="_button item" :class="{ danger: item.danger, active: item.active }">
+				<MkA v-else :to="item.to" class="_button item" :class="{ danger: item.danger, active: item.active }">
 					<i v-if="item.icon" class="icon ph-fw ph-lg" :class="item.icon"></i>
 					<span class="text">{{ item.text }}</span>
 				</MkA>

From c99586cfcb3b28fed0cd15c6918d4aa91ac7cf72 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 8 Feb 2023 19:53:38 -0500
Subject: [PATCH 03/90] Use v-bind instead for focus, change tabindex's

---
 packages/client/src/components/MkMenu.vue  | 16 ++++++++--------
 packages/client/src/components/MkModal.vue |  6 +++---
 packages/client/src/directives/focus.ts    |  3 +++
 packages/client/src/directives/index.ts    |  2 ++
 4 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 packages/client/src/directives/focus.ts

diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index c9f8dbfd6..dd9939dcf 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -1,5 +1,5 @@
 <template>
-<div>
+<div tabindex="-1" v-focus>
 	<div
 		ref="itemsEl" v-hotkey="keymap"
 		class="rrevdjwt _popup _shadow"
@@ -12,33 +12,33 @@
 			<span v-else-if="item.type === 'label'" class="label item">
 				<span>{{ item.text }}</span>
 			</span>
-			<span v-else-if="item.type === 'pending'" :tabindex="0" class="pending item">
+			<span v-else-if="item.type === 'pending'" :tabindex="-1" class="pending item">
 				<span><MkEllipsis/></span>
 			</span>
-			<MkA v-else-if="item.type === 'link'" :to="item.to" :tabindex="0" class="_button item" @click.passive="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<MkA v-else-if="item.type === 'link'" :to="item.to" :tabindex="-1" class="_button item" @click.passive="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
 				<MkAvatar v-if="item.avatar" :user="item.avatar" class="avatar"/>
 				<span>{{ item.text }}</span>
 				<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
 			</MkA>
-			<a v-else-if="item.type === 'a'" :href="item.href" :target="item.target" :download="item.download" :tabindex="0" class="_button item" @click="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<a v-else-if="item.type === 'a'" :href="item.href" :target="item.target" :download="item.download" :tabindex="-1" class="_button item" @click="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
 				<span>{{ item.text }}</span>
 				<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
 			</a>
-			<button v-else-if="item.type === 'user'" :tabindex="0" class="_button item" :class="{ active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<button v-else-if="item.type === 'user'" :tabindex="-1" class="_button item" :class="{ active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<MkAvatar :user="item.user" class="avatar"/><MkUserName :user="item.user"/>
 				<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
 			</button>
-			<span v-else-if="item.type === 'switch'" :tabindex="0" class="item" @click.passive="onItemMouseEnter(item)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<span v-else-if="item.type === 'switch'" :tabindex="-1" class="item" @click.passive="onItemMouseEnter(item)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<FormSwitch v-model="item.ref" :disabled="item.disabled" class="form-switch">{{ item.text }}</FormSwitch>
 			</span>
-			<button v-else-if="item.type === 'parent'" :tabindex="0" class="_button item parent" :class="{ childShowing: childShowingItem === item }" @mouseenter="showChildren(item, $event)" @click="showChildren(item, $event)">
+			<button v-else-if="item.type === 'parent'" :tabindex="-1" class="_button item parent" :class="{ childShowing: childShowingItem === item }" @mouseenter="showChildren(item, $event)" @click="showChildren(item, $event)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
 				<span>{{ item.text }}</span>
 				<span class="caret"><i class="ph-caret-right-bold ph-lg ph-fw ph-lg"></i></span>
 			</button>
-			<button v-else :tabindex="0" class="_button item" :class="{ danger: item.danger, active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<button v-else :tabindex="-1" class="_button item" :class="{ danger: item.danger, active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
 				<MkAvatar v-if="item.avatar" :user="item.avatar" class="avatar"/>
 				<span>{{ item.text }}</span>
diff --git a/packages/client/src/components/MkModal.vue b/packages/client/src/components/MkModal.vue
index 62f67a380..6a0744487 100644
--- a/packages/client/src/components/MkModal.vue
+++ b/packages/client/src/components/MkModal.vue
@@ -2,7 +2,7 @@
 <transition :name="$store.state.animation ? (type === 'drawer') ? 'modal-drawer' : (type === 'popup') ? 'modal-popup' : 'modal' : ''" :duration="$store.state.animation ? 200 : 0" appear @after-leave="emit('closed')" @enter="emit('opening')" @keyup.esc="emit('click')" @after-enter="onOpened">
 	<div v-show="manualShowing != null ? manualShowing : showing" v-hotkey.global="keymap" class="qzhlnise" :class="{ drawer: type === 'drawer', dialog: type === 'dialog' || type === 'dialog:top', popup: type === 'popup' }" :style="{ zIndex, pointerEvents: (manualShowing != null ? manualShowing : showing) ? 'auto' : 'none', '--transformOrigin': transformOrigin }">
 		<div class="bg _modalBg" :class="{ transparent: transparentBg && (type === 'popup') }" :style="{ zIndex }" @click="onBgClick" @contextmenu.prevent.stop="() => {}"></div>
-		<div ref="content" class="content" :class="{ fixed, top: type === 'dialog:top' }" :style="{ zIndex }" @click.self="onBgClick" tabindex="-1">
+		<div ref="content" class="content" :class="{ fixed, top: type === 'dialog:top' }" :style="{ zIndex }" @click.self="onBgClick" tabindex="-1" v-focus>
 			<slot :max-height="maxHeight" :type="type"></slot>
 		</div>
 	</div>
@@ -214,7 +214,7 @@ const align = () => {
 const onOpened = () => {
 	emit('opened');
 
-	content?.focus()
+	// content?.focus()
 	// モーダルコンテンツにマウスボタンが押され、コンテンツ外でマウスボタンが離されたときにモーダルバックグラウンドクリックと判定させないためにマウスイベントを監視しフラグ管理する
 	const el = content!.children[0];
 	el.addEventListener('mousedown', ev => {
@@ -330,7 +330,7 @@ defineExpose({
 
 .qzhlnise {
 	> .content {
-		border-radius: 16px;
+		border-radius: var(--radius);
 	}
 	> .bg {
 		&.transparent {
diff --git a/packages/client/src/directives/focus.ts b/packages/client/src/directives/focus.ts
new file mode 100644
index 000000000..4d34fbf1f
--- /dev/null
+++ b/packages/client/src/directives/focus.ts
@@ -0,0 +1,3 @@
+export default {
+	mounted: (el) => el.focus()
+}
diff --git a/packages/client/src/directives/index.ts b/packages/client/src/directives/index.ts
index 0a5c32326..77639e2f3 100644
--- a/packages/client/src/directives/index.ts
+++ b/packages/client/src/directives/index.ts
@@ -11,6 +11,7 @@ import anim from "./anim";
 import clickAnime from "./click-anime";
 import panel from "./panel";
 import adaptiveBorder from "./adaptive-border";
+import focus from "./focus";
 
 export default function (app: App) {
 	app.directive("userPreview", userPreview);
@@ -25,4 +26,5 @@ export default function (app: App) {
 	app.directive("click-anime", clickAnime);
 	app.directive("panel", panel);
 	app.directive("adaptive-border", adaptiveBorder);
+	app.directive("focus", focus);
 }

From cab1557b90288a1d266145c2a8abf74bc67c72d0 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 8 Feb 2023 19:53:38 -0500
Subject: [PATCH 04/90] Use v-bind instead for focus, allow focusing submenus,
 change tabindex's

---
 packages/client/src/components/MkMenu.vue  | 16 ++++++++--------
 packages/client/src/components/MkModal.vue |  6 +++---
 packages/client/src/directives/focus.ts    |  3 +++
 packages/client/src/directives/index.ts    |  2 ++
 4 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 packages/client/src/directives/focus.ts

diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index c9f8dbfd6..dd9939dcf 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -1,5 +1,5 @@
 <template>
-<div>
+<div tabindex="-1" v-focus>
 	<div
 		ref="itemsEl" v-hotkey="keymap"
 		class="rrevdjwt _popup _shadow"
@@ -12,33 +12,33 @@
 			<span v-else-if="item.type === 'label'" class="label item">
 				<span>{{ item.text }}</span>
 			</span>
-			<span v-else-if="item.type === 'pending'" :tabindex="0" class="pending item">
+			<span v-else-if="item.type === 'pending'" :tabindex="-1" class="pending item">
 				<span><MkEllipsis/></span>
 			</span>
-			<MkA v-else-if="item.type === 'link'" :to="item.to" :tabindex="0" class="_button item" @click.passive="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<MkA v-else-if="item.type === 'link'" :to="item.to" :tabindex="-1" class="_button item" @click.passive="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
 				<MkAvatar v-if="item.avatar" :user="item.avatar" class="avatar"/>
 				<span>{{ item.text }}</span>
 				<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
 			</MkA>
-			<a v-else-if="item.type === 'a'" :href="item.href" :target="item.target" :download="item.download" :tabindex="0" class="_button item" @click="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<a v-else-if="item.type === 'a'" :href="item.href" :target="item.target" :download="item.download" :tabindex="-1" class="_button item" @click="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
 				<span>{{ item.text }}</span>
 				<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
 			</a>
-			<button v-else-if="item.type === 'user'" :tabindex="0" class="_button item" :class="{ active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<button v-else-if="item.type === 'user'" :tabindex="-1" class="_button item" :class="{ active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<MkAvatar :user="item.user" class="avatar"/><MkUserName :user="item.user"/>
 				<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
 			</button>
-			<span v-else-if="item.type === 'switch'" :tabindex="0" class="item" @click.passive="onItemMouseEnter(item)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<span v-else-if="item.type === 'switch'" :tabindex="-1" class="item" @click.passive="onItemMouseEnter(item)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<FormSwitch v-model="item.ref" :disabled="item.disabled" class="form-switch">{{ item.text }}</FormSwitch>
 			</span>
-			<button v-else-if="item.type === 'parent'" :tabindex="0" class="_button item parent" :class="{ childShowing: childShowingItem === item }" @mouseenter="showChildren(item, $event)" @click="showChildren(item, $event)">
+			<button v-else-if="item.type === 'parent'" :tabindex="-1" class="_button item parent" :class="{ childShowing: childShowingItem === item }" @mouseenter="showChildren(item, $event)" @click="showChildren(item, $event)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
 				<span>{{ item.text }}</span>
 				<span class="caret"><i class="ph-caret-right-bold ph-lg ph-fw ph-lg"></i></span>
 			</button>
-			<button v-else :tabindex="0" class="_button item" :class="{ danger: item.danger, active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<button v-else :tabindex="-1" class="_button item" :class="{ danger: item.danger, active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
 				<MkAvatar v-if="item.avatar" :user="item.avatar" class="avatar"/>
 				<span>{{ item.text }}</span>
diff --git a/packages/client/src/components/MkModal.vue b/packages/client/src/components/MkModal.vue
index 62f67a380..6a0744487 100644
--- a/packages/client/src/components/MkModal.vue
+++ b/packages/client/src/components/MkModal.vue
@@ -2,7 +2,7 @@
 <transition :name="$store.state.animation ? (type === 'drawer') ? 'modal-drawer' : (type === 'popup') ? 'modal-popup' : 'modal' : ''" :duration="$store.state.animation ? 200 : 0" appear @after-leave="emit('closed')" @enter="emit('opening')" @keyup.esc="emit('click')" @after-enter="onOpened">
 	<div v-show="manualShowing != null ? manualShowing : showing" v-hotkey.global="keymap" class="qzhlnise" :class="{ drawer: type === 'drawer', dialog: type === 'dialog' || type === 'dialog:top', popup: type === 'popup' }" :style="{ zIndex, pointerEvents: (manualShowing != null ? manualShowing : showing) ? 'auto' : 'none', '--transformOrigin': transformOrigin }">
 		<div class="bg _modalBg" :class="{ transparent: transparentBg && (type === 'popup') }" :style="{ zIndex }" @click="onBgClick" @contextmenu.prevent.stop="() => {}"></div>
-		<div ref="content" class="content" :class="{ fixed, top: type === 'dialog:top' }" :style="{ zIndex }" @click.self="onBgClick" tabindex="-1">
+		<div ref="content" class="content" :class="{ fixed, top: type === 'dialog:top' }" :style="{ zIndex }" @click.self="onBgClick" tabindex="-1" v-focus>
 			<slot :max-height="maxHeight" :type="type"></slot>
 		</div>
 	</div>
@@ -214,7 +214,7 @@ const align = () => {
 const onOpened = () => {
 	emit('opened');
 
-	content?.focus()
+	// content?.focus()
 	// モーダルコンテンツにマウスボタンが押され、コンテンツ外でマウスボタンが離されたときにモーダルバックグラウンドクリックと判定させないためにマウスイベントを監視しフラグ管理する
 	const el = content!.children[0];
 	el.addEventListener('mousedown', ev => {
@@ -330,7 +330,7 @@ defineExpose({
 
 .qzhlnise {
 	> .content {
-		border-radius: 16px;
+		border-radius: var(--radius);
 	}
 	> .bg {
 		&.transparent {
diff --git a/packages/client/src/directives/focus.ts b/packages/client/src/directives/focus.ts
new file mode 100644
index 000000000..4d34fbf1f
--- /dev/null
+++ b/packages/client/src/directives/focus.ts
@@ -0,0 +1,3 @@
+export default {
+	mounted: (el) => el.focus()
+}
diff --git a/packages/client/src/directives/index.ts b/packages/client/src/directives/index.ts
index 0a5c32326..77639e2f3 100644
--- a/packages/client/src/directives/index.ts
+++ b/packages/client/src/directives/index.ts
@@ -11,6 +11,7 @@ import anim from "./anim";
 import clickAnime from "./click-anime";
 import panel from "./panel";
 import adaptiveBorder from "./adaptive-border";
+import focus from "./focus";
 
 export default function (app: App) {
 	app.directive("userPreview", userPreview);
@@ -25,4 +26,5 @@ export default function (app: App) {
 	app.directive("click-anime", clickAnime);
 	app.directive("panel", panel);
 	app.directive("adaptive-border", adaptiveBorder);
+	app.directive("focus", focus);
 }

From d96f9bbef003885e0fb4dd9fd83d10cbc2b1930d Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 8 Feb 2023 19:56:35 -0500
Subject: [PATCH 05/90] forgot to remove comment

---
 packages/client/src/components/MkModal.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/client/src/components/MkModal.vue b/packages/client/src/components/MkModal.vue
index 6a0744487..029e03939 100644
--- a/packages/client/src/components/MkModal.vue
+++ b/packages/client/src/components/MkModal.vue
@@ -214,7 +214,6 @@ const align = () => {
 const onOpened = () => {
 	emit('opened');
 
-	// content?.focus()
 	// モーダルコンテンツにマウスボタンが押され、コンテンツ外でマウスボタンが離されたときにモーダルバックグラウンドクリックと判定させないためにマウスイベントを監視しフラグ管理する
 	const el = content!.children[0];
 	el.addEventListener('mousedown', ev => {

From 93539615f8b459976994749b59743c913c89fc7e Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 8 Feb 2023 20:25:22 -0500
Subject: [PATCH 06/90] oops

---
 packages/client/src/components/MkModal.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/client/src/components/MkModal.vue b/packages/client/src/components/MkModal.vue
index 9bea5dfc0..029e03939 100644
--- a/packages/client/src/components/MkModal.vue
+++ b/packages/client/src/components/MkModal.vue
@@ -2,7 +2,6 @@
 <transition :name="$store.state.animation ? (type === 'drawer') ? 'modal-drawer' : (type === 'popup') ? 'modal-popup' : 'modal' : ''" :duration="$store.state.animation ? 200 : 0" appear @after-leave="emit('closed')" @enter="emit('opening')" @keyup.esc="emit('click')" @after-enter="onOpened">
 	<div v-show="manualShowing != null ? manualShowing : showing" v-hotkey.global="keymap" class="qzhlnise" :class="{ drawer: type === 'drawer', dialog: type === 'dialog' || type === 'dialog:top', popup: type === 'popup' }" :style="{ zIndex, pointerEvents: (manualShowing != null ? manualShowing : showing) ? 'auto' : 'none', '--transformOrigin': transformOrigin }">
 		<div class="bg _modalBg" :class="{ transparent: transparentBg && (type === 'popup') }" :style="{ zIndex }" @click="onBgClick" @contextmenu.prevent.stop="() => {}"></div>
-		<div ref="content" class="content" :class="{ fixed, top: type === 'dialog:top' }" :style="{ zIndex }" @click.self="onBgClick" tabindex="-1" v-focus>
 		<div ref="content" class="content" :class="{ fixed, top: type === 'dialog:top' }" :style="{ zIndex }" @click.self="onBgClick" tabindex="-1" v-focus>
 			<slot :max-height="maxHeight" :type="type"></slot>
 		</div>
@@ -331,7 +330,6 @@ defineExpose({
 .qzhlnise {
 	> .content {
 		border-radius: var(--radius);
-		border-radius: var(--radius);
 	}
 	> .bg {
 		&.transparent {

From 34f2c957c5d305a4b767a57d262b64ba1f079c1b Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 8 Feb 2023 21:19:37 -0500
Subject: [PATCH 07/90] fixes

---
 packages/client/src/components/MkMenu.vue     | 22 ++++++++++---------
 .../client/src/components/MkPopupMenu.vue     |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index dd9939dcf..2037f205d 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -12,33 +12,33 @@
 			<span v-else-if="item.type === 'label'" class="label item">
 				<span>{{ item.text }}</span>
 			</span>
-			<span v-else-if="item.type === 'pending'" :tabindex="-1" class="pending item">
+			<span v-else-if="item.type === 'pending'" :tabindex="0" class="pending item">
 				<span><MkEllipsis/></span>
 			</span>
-			<MkA v-else-if="item.type === 'link'" :to="item.to" :tabindex="-1" class="_button item" @click.passive="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<MkA v-else-if="item.type === 'link'" :to="item.to" :tabindex="0" class="_button item" @click.passive="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
 				<MkAvatar v-if="item.avatar" :user="item.avatar" class="avatar"/>
 				<span>{{ item.text }}</span>
 				<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
 			</MkA>
-			<a v-else-if="item.type === 'a'" :href="item.href" :target="item.target" :download="item.download" :tabindex="-1" class="_button item" @click="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<a v-else-if="item.type === 'a'" :href="item.href" :target="item.target" :download="item.download" :tabindex="0" class="_button item" @click="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
 				<span>{{ item.text }}</span>
 				<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
 			</a>
-			<button v-else-if="item.type === 'user'" :tabindex="-1" class="_button item" :class="{ active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<button v-else-if="item.type === 'user'" :tabindex="0" class="_button item" :class="{ active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<MkAvatar :user="item.user" class="avatar"/><MkUserName :user="item.user"/>
 				<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
 			</button>
-			<span v-else-if="item.type === 'switch'" :tabindex="-1" class="item" @click.passive="onItemMouseEnter(item)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<span v-else-if="item.type === 'switch'" :tabindex="0" class="item" @click.passive="onItemMouseEnter(item)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<FormSwitch v-model="item.ref" :disabled="item.disabled" class="form-switch">{{ item.text }}</FormSwitch>
 			</span>
-			<button v-else-if="item.type === 'parent'" :tabindex="-1" class="_button item parent" :class="{ childShowing: childShowingItem === item }" @mouseenter="showChildren(item, $event)" @click="showChildren(item, $event)">
+			<button v-else-if="item.type === 'parent'" :tabindex="0" class="_button item parent" :class="{ childShowing: childShowingItem === item }" @mouseenter="showChildren(item, $event)" @click="showChildren(item, $event)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
 				<span>{{ item.text }}</span>
 				<span class="caret"><i class="ph-caret-right-bold ph-lg ph-fw ph-lg"></i></span>
 			</button>
-			<button v-else :tabindex="-1" class="_button item" :class="{ danger: item.danger, active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<button v-else :tabindex="0" class="_button item" :class="{ danger: item.danger, active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
 				<MkAvatar v-if="item.avatar" :user="item.avatar" class="avatar"/>
 				<span>{{ item.text }}</span>
@@ -207,8 +207,7 @@ onBeforeUnmount(() => {
 		font-size: 0.9em;
 		line-height: 20px;
 		text-align: left;
-		overflow: hidden;
-		text-overflow: ellipsis;
+		outline: none;
 
 		&:before {
 			content: "";
@@ -232,7 +231,7 @@ onBeforeUnmount(() => {
 			transform: translateY(0em);
 		}
 
-		&:not(:disabled):hover {
+		&:not(:disabled):hover, &:focus-visible {
 			color: var(--accent);
 			text-decoration: none;
 
@@ -240,6 +239,9 @@ onBeforeUnmount(() => {
 				background: var(--accentedBg);
 			}
 		}
+		&:focus-visible:before {
+			outline: auto;
+		}
 
 		&.danger {
 			color: #eb6f92;
diff --git a/packages/client/src/components/MkPopupMenu.vue b/packages/client/src/components/MkPopupMenu.vue
index 95234d7ce..386330f15 100644
--- a/packages/client/src/components/MkPopupMenu.vue
+++ b/packages/client/src/components/MkPopupMenu.vue
@@ -1,5 +1,5 @@
 <template>
-<MkModal ref="modal" v-slot="{ type, maxHeight }" :z-priority="'high'" :src="src" :transparent-bg="true" @click="modal.close()" @closed="emit('closed')" tabindex="-1">
+<MkModal ref="modal" v-slot="{ type, maxHeight }" :z-priority="'high'" :src="src" :transparent-bg="true" @click="modal.close()" @closed="emit('closed')" tabindex="-1" v-focus>
 	<MkMenu :items="items" :align="align" :width="width" :max-height="maxHeight" :as-drawer="type === 'drawer'" class="sfhdhdhq" :class="{ drawer: type === 'drawer' }" @close="modal.close()"/>
 </MkModal>
 </template>

From 8f43786bee84acd315790c34ac91f63984ff76ac Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 8 Feb 2023 21:55:07 -0500
Subject: [PATCH 08/90] focus selected page

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

diff --git a/packages/client/src/components/global/RouterView.vue b/packages/client/src/components/global/RouterView.vue
index e21a57471..31de1e337 100644
--- a/packages/client/src/components/global/RouterView.vue
+++ b/packages/client/src/components/global/RouterView.vue
@@ -1,7 +1,7 @@
 <template>
 <KeepAlive :max="defaultStore.state.numberOfPageCache">
 	<Suspense>
-		<component :is="currentPageComponent" :key="key" v-bind="Object.fromEntries(currentPageProps)"/>
+		<component :is="currentPageComponent" :key="key" v-bind="Object.fromEntries(currentPageProps)" tabindex="-1" v-focus/>
 
 		<template #fallback>
 			<MkLoading/>

From 2c837da3e36ba27ed758f035acd1922c6acbafc6 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 10 Feb 2023 11:43:47 -0500
Subject: [PATCH 09/90] Change line-height to w3c recommend

https://www.w3.org/TR/WCAG21/#text-spacing
---
 packages/client/src/style.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index 01bff888a..2e53aadd7 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -32,7 +32,7 @@ html {
 	overflow-wrap: break-word;
 	font-family: "BIZ UDGothic", Roboto, HelveticaNeue, Arial, sans-serif;
 	font-size: 14px;
-	line-height: 1.35;
+	line-height: 1.6;
 	text-size-adjust: 100%;
 	tab-size: 2;
 

From 9bd958e692eaa03213d8e9b4e2c6a65f0562f3d5 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 11 Feb 2023 14:11:25 -0500
Subject: [PATCH 10/90] focus to more elements

---
 packages/client/src/components/MkLaunchPad.vue | 2 +-
 packages/client/src/components/MkSuperMenu.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkLaunchPad.vue b/packages/client/src/components/MkLaunchPad.vue
index a88700131..ae3f3dcbe 100644
--- a/packages/client/src/components/MkLaunchPad.vue
+++ b/packages/client/src/components/MkLaunchPad.vue
@@ -96,7 +96,7 @@ function close() {
 			height: 100px;
 			border-radius: 10px;
 
-			&:hover {
+			&:hover, &:focus-visible {
 				color: var(--accent);
 				background: var(--accentedBg);
 				text-decoration: none;
diff --git a/packages/client/src/components/MkSuperMenu.vue b/packages/client/src/components/MkSuperMenu.vue
index b784d5239..b58906929 100644
--- a/packages/client/src/components/MkSuperMenu.vue
+++ b/packages/client/src/components/MkSuperMenu.vue
@@ -67,7 +67,7 @@ export default defineComponent({
 				font-size: 0.9em;
 				margin-bottom: 0.3rem;
 
-				&:hover {
+				&:hover, &:focus-visible {
 					text-decoration: none;
 					background: var(--panelHighlight);
 				}

From 655094062583fc16a716352314ea47a3c088a7a0 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 12 Feb 2023 20:49:41 -0500
Subject: [PATCH 11/90] Focus last element when exiting modal

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

diff --git a/packages/client/src/components/MkModal.vue b/packages/client/src/components/MkModal.vue
index 029e03939..bc4478def 100644
--- a/packages/client/src/components/MkModal.vue
+++ b/packages/client/src/components/MkModal.vue
@@ -77,10 +77,12 @@ const type = $computed(() => {
 
 let contentClicking = false;
 
+const focusedElement = document.activeElement;
 const close = () => {
 	if (props.src) props.src.style.pointerEvents = 'auto';
 	showing = false;
 	emit('close');
+	focusedElement.focus();
 };
 
 const onBgClick = () => {

From b818e97c672a34ea279de260b7013363e2dbd219 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 12 Feb 2023 20:59:11 -0500
Subject: [PATCH 12/90] Allow focusing of elements inside notes/posts

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

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index ee6c5770f..fc33e649b 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -193,8 +193,8 @@ const keymap = {
 	'r': () => reply(true),
 	'e|a|plus': () => react(true),
 	'q': () => renoteButton.value.renote(true),
-	'up|k|shift+tab': focusBefore,
-	'down|j|tab': focusAfter,
+	'up|k': focusBefore,
+	'down|j': focusAfter,
 	'esc': blur,
 	'm|o': () => menu(true),
 	's': () => showContent.value !== showContent.value,

From b3c0c6124e4970605cf89a3c7985e499cd171590 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 12 Feb 2023 21:56:01 -0500
Subject: [PATCH 13/90] FOCUS TRAPPING!!!!

---
 package.json                                  |  2 +
 .../client/src/components/MkMenu.child.vue    |  5 ++-
 packages/client/src/components/MkMenu.vue     |  8 +---
 packages/client/src/components/MkModal.vue    | 13 ++++---
 .../client/src/components/MkModalWindow.vue   | 29 +++++++-------
 pnpm-lock.yaml                                | 38 ++++++++++++++++++-
 6 files changed, 68 insertions(+), 27 deletions(-)

diff --git a/package.json b/package.json
index e8da6c5a7..34015128b 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,8 @@
 		"@bull-board/ui": "^4.10.2",
 		"@tensorflow/tfjs": "^3.21.0",
 		"calckey-js": "^0.0.22",
+		"focus-trap": "^7.2.0",
+		"focus-trap-vue": "^4.0.1",
 		"js-yaml": "4.1.0",
 		"phosphor-icons": "^1.4.2",
 		"seedrandom": "^3.0.5"
diff --git a/packages/client/src/components/MkMenu.child.vue b/packages/client/src/components/MkMenu.child.vue
index 3ada4afbd..ee0514aab 100644
--- a/packages/client/src/components/MkMenu.child.vue
+++ b/packages/client/src/components/MkMenu.child.vue
@@ -1,6 +1,8 @@
 <template>
 <div ref="el" class="sfhdhdhr">
-	<MkMenu ref="menu" :items="items" :align="align" :width="width" :as-drawer="false" @close="onChildClosed"/>
+	<FocusTrap v-bind:active="isActive">
+		<MkMenu ref="menu" :items="items" :align="align" :width="width" :as-drawer="false" @close="onChildClosed"/>
+	</FocusTrap>
 </div>
 </template>
 
@@ -9,6 +11,7 @@ import { on } from 'events';
 import { nextTick, onBeforeUnmount, onMounted, onUnmounted, ref, watch } from 'vue';
 import MkMenu from './MkMenu.vue';
 import { MenuItem } from '@/types/menu';
+import { FocusTrap } from 'focus-trap-vue';
 import * as os from '@/os';
 
 const props = defineProps<{
diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index be7cd72bd..b7fd75478 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -1,7 +1,7 @@
 <template>
 <div tabindex="-1" v-focus>
 	<div
-		ref="itemsEl" v-hotkey="keymap"
+		ref="itemsEl"
 		class="rrevdjwt _popup _shadow"
 		:class="{ center: align === 'center', asDrawer }"
 		:style="{ width: (width && !asDrawer) ? width + 'px' : '', maxHeight: maxHeight ? maxHeight + 'px' : '' }"
@@ -84,12 +84,6 @@ let items2: InnerMenuItem[] = $ref([]);
 
 let child = $ref<InstanceType<typeof XChild>>();
 
-let keymap = computed(() => ({
-	'up|k|shift+tab': focusUp,
-	'down|j|tab': focusDown,
-	'esc': close,
-}));
-
 let childShowingItem = $ref<MenuItem | null>();
 
 watch(() => props.items, () => {
diff --git a/packages/client/src/components/MkModal.vue b/packages/client/src/components/MkModal.vue
index bc4478def..e31818877 100644
--- a/packages/client/src/components/MkModal.vue
+++ b/packages/client/src/components/MkModal.vue
@@ -1,11 +1,13 @@
 <template>
 <transition :name="$store.state.animation ? (type === 'drawer') ? 'modal-drawer' : (type === 'popup') ? 'modal-popup' : 'modal' : ''" :duration="$store.state.animation ? 200 : 0" appear @after-leave="emit('closed')" @enter="emit('opening')" @keyup.esc="emit('click')" @after-enter="onOpened">
-	<div v-show="manualShowing != null ? manualShowing : showing" v-hotkey.global="keymap" class="qzhlnise" :class="{ drawer: type === 'drawer', dialog: type === 'dialog' || type === 'dialog:top', popup: type === 'popup' }" :style="{ zIndex, pointerEvents: (manualShowing != null ? manualShowing : showing) ? 'auto' : 'none', '--transformOrigin': transformOrigin }">
-		<div class="bg _modalBg" :class="{ transparent: transparentBg && (type === 'popup') }" :style="{ zIndex }" @click="onBgClick" @contextmenu.prevent.stop="() => {}"></div>
-		<div ref="content" class="content" :class="{ fixed, top: type === 'dialog:top' }" :style="{ zIndex }" @click.self="onBgClick" tabindex="-1" v-focus>
-			<slot :max-height="maxHeight" :type="type"></slot>
+	<focus-trap v-model:active="isActive">
+		<div v-show="manualShowing != null ? manualShowing : showing" v-hotkey.global="keymap" class="qzhlnise" :class="{ drawer: type === 'drawer', dialog: type === 'dialog' || type === 'dialog:top', popup: type === 'popup' }" :style="{ zIndex, pointerEvents: (manualShowing != null ? manualShowing : showing) ? 'auto' : 'none', '--transformOrigin': transformOrigin }">
+			<div class="bg _modalBg" :class="{ transparent: transparentBg && (type === 'popup') }" :style="{ zIndex }" @click="onBgClick" @contextmenu.prevent.stop="() => {}"></div>
+			<div ref="content" class="content" :class="{ fixed, top: type === 'dialog:top' }" :style="{ zIndex }" @click.self="onBgClick" tabindex="-1" v-focus>
+				<slot :max-height="maxHeight" :type="type"></slot>
+			</div>
 		</div>
-	</div>
+	</focus-trap>
 </transition>
 </template>
 
@@ -15,6 +17,7 @@ import * as os from '@/os';
 import { isTouchUsing } from '@/scripts/touch';
 import { defaultStore } from '@/store';
 import { deviceKind } from '@/scripts/device-kind';
+import { FocusTrap } from 'focus-trap-vue';
 
 function getFixedContainer(el: Element | null): Element | null {
 	if (el == null || el.tagName === 'BODY') return null;
diff --git a/packages/client/src/components/MkModalWindow.vue b/packages/client/src/components/MkModalWindow.vue
index 666382466..77ae1bd8c 100644
--- a/packages/client/src/components/MkModalWindow.vue
+++ b/packages/client/src/components/MkModalWindow.vue
@@ -1,23 +1,26 @@
 <template>
-<MkModal ref="modal" :prefer-type="'dialog'" @click="onBgClick" @closed="$emit('closed')">
-	<div ref="rootEl" class="ebkgoccj _narrow_" :style="{ width: `${width}px`, height: scroll ? (height ? `${height}px` : null) : (height ? `min(${height}px, 100%)` : '100%') }" @keydown="onKeydown">
-		<div ref="headerEl" class="header">
-			<button v-if="withOkButton" class="_button" @click="$emit('close')"><i class="ph-x-bold ph-lg"></i></button>
-			<span class="title">
-				<slot name="header"></slot>
-			</span>
-			<button v-if="!withOkButton" class="_button" @click="$emit('close')"><i class="ph-x-bold ph-lg"></i></button>
-			<button v-if="withOkButton" class="_button" :disabled="okButtonDisabled" @click="$emit('ok')"><i class="ph-check-bold ph-lg"></i></button>
+<MkModal ref="modal" :prefer-type="'dialog'" @click="onBgClick" @keyup.esc="$emit('close')" @closed="$emit('closed')">
+	<FocusTrap v-model:active="isActive">
+		<div ref="rootEl" class="ebkgoccj _narrow_" :style="{ width: `${width}px`, height: scroll ? (height ? `${height}px` : null) : (height ? `min(${height}px, 100%)` : '100%') }" @keydown="onKeydown">
+			<div ref="headerEl" class="header">
+				<button v-if="withOkButton" class="_button" @click="$emit('close')"><i class="ph-x-bold ph-lg"></i></button>
+				<span class="title">
+					<slot name="header"></slot>
+				</span>
+				<button v-if="!withOkButton" class="_button" @click="$emit('close')"><i class="ph-x-bold ph-lg"></i></button>
+				<button v-if="withOkButton" class="_button" :disabled="okButtonDisabled" @click="$emit('ok')"><i class="ph-check-bold ph-lg"></i></button>
+			</div>
+			<div class="body">
+				<slot :width="bodyWidth" :height="bodyHeight"></slot>
+			</div>
 		</div>
-		<div class="body">
-			<slot :width="bodyWidth" :height="bodyHeight"></slot>
-		</div>
-	</div>
+	</FocusTrap>
 </MkModal>
 </template>
 
 <script lang="ts" setup>
 import { onMounted, onUnmounted } from 'vue';
+import { FocusTrap } from 'focus-trap-vue';
 import MkModal from './MkModal.vue';
 
 const props = withDefaults(defineProps<{
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ee8486978..f295e1c1e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -16,6 +16,8 @@ importers:
       cross-env: 7.0.3
       cypress: 10.11.0
       execa: 5.1.1
+      focus-trap: ^7.2.0
+      focus-trap-vue: ^4.0.1
       gulp: 4.0.2
       gulp-cssnano: 2.1.3
       gulp-rename: 2.0.0
@@ -33,6 +35,8 @@ importers:
       '@bull-board/ui': 4.10.2
       '@tensorflow/tfjs': 3.21.0_seedrandom@3.0.5
       calckey-js: 0.0.22
+      focus-trap: 7.2.0
+      focus-trap-vue: 4.0.1_focus-trap@7.2.0
       js-yaml: 4.1.0
       phosphor-icons: 1.4.2
       seedrandom: 3.0.5
@@ -3387,7 +3391,7 @@ packages:
   /axios/0.25.0_debug@4.3.4:
     resolution: {integrity: sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==}
     dependencies:
-      follow-redirects: 1.15.2
+      follow-redirects: 1.15.2_debug@4.3.4
     transitivePeerDependencies:
       - debug
     dev: true
@@ -6364,6 +6368,21 @@ packages:
       readable-stream: 2.3.7
     dev: true
 
+  /focus-trap-vue/4.0.1_focus-trap@7.2.0:
+    resolution: {integrity: sha512-2iqOeoSvgq7Um6aL+255a/wXPskj6waLq2oKCa4gOnMORPo15JX7wN6J5bl1SMhMlTlkHXGSrQ9uJPJLPZDl5w==}
+    peerDependencies:
+      focus-trap: ^7.0.0
+      vue: ^3.0.0
+    dependencies:
+      focus-trap: 7.2.0
+    dev: false
+
+  /focus-trap/7.2.0:
+    resolution: {integrity: sha512-v4wY6HDDYvzkBy4735kW5BUEuw6Yz9ABqMYLuTNbzAFPcBOGiGHwwcNVMvUz4G0kgSYh13wa/7TG3XwTeT4O/A==}
+    dependencies:
+      tabbable: 6.0.1
+    dev: false
+
   /follow-redirects/1.15.2:
     resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
     engines: {node: '>=4.0'}
@@ -6372,6 +6391,19 @@ packages:
     peerDependenciesMeta:
       debug:
         optional: true
+    dev: false
+
+  /follow-redirects/1.15.2_debug@4.3.4:
+    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
+    dependencies:
+      debug: 4.3.4
+    dev: true
 
   /for-each/0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
@@ -11986,6 +12018,10 @@ packages:
     resolution: {integrity: sha512-g9rPT3V1Q4WjWFZ/t5BdGC1mT/FpYnsLdBl+M5e6MlRkuE1RSR+R43wcY/3mKI59B9KEr+vxdWCuWNMD3oNHKA==}
     dev: true
 
+  /tabbable/6.0.1:
+    resolution: {integrity: sha512-SYJSIgeyXW7EuX1ytdneO5e8jip42oHWg9xl/o3oTYhmXusZVgiA+VlPvjIN+kHii9v90AmzTZEBcsEvuAY+TA==}
+    dev: false
+
   /tapable/2.2.1:
     resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
     engines: {node: '>=6'}

From aac8246e1003ecd693c6bdb1b9a326f150752a38 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 12 Feb 2023 22:16:15 -0500
Subject: [PATCH 14/90] foxes

---
 packages/client/src/components/MkMenu.vue  | 99 +++++++++++-----------
 packages/client/src/components/MkModal.vue |  4 +-
 2 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index b7fd75478..acfaf9459 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -1,54 +1,56 @@
 <template>
 <div tabindex="-1" v-focus>
-	<div
-		ref="itemsEl"
-		class="rrevdjwt _popup _shadow"
-		:class="{ center: align === 'center', asDrawer }"
-		:style="{ width: (width && !asDrawer) ? width + 'px' : '', maxHeight: maxHeight ? maxHeight + 'px' : '' }"
-		@contextmenu.self="e => e.preventDefault()"
-	>
-		<template v-for="(item, i) in items2">
-			<div v-if="item === null" class="divider"></div>
-			<span v-else-if="item.type === 'label'" class="label item">
-				<span>{{ item.text }}</span>
+	<FocusTrap v-bind:active="isActive">
+		<div
+			ref="itemsEl"
+			class="rrevdjwt _popup _shadow"
+			:class="{ center: align === 'center', asDrawer }"
+			:style="{ width: (width && !asDrawer) ? width + 'px' : '', maxHeight: maxHeight ? maxHeight + 'px' : '' }"
+			@contextmenu.self="e => e.preventDefault()"
+		>
+			<template v-for="(item, i) in items2">
+				<div v-if="item === null" class="divider"></div>
+				<span v-else-if="item.type === 'label'" class="label item">
+					<span>{{ item.text }}</span>
+				</span>
+				<span v-else-if="item.type === 'pending'" :tabindex="0" class="pending item">
+					<span><MkEllipsis/></span>
+				</span>
+				<MkA v-else-if="item.type === 'link'" :to="item.to" :tabindex="0" class="_button item" @click.passive="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+					<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
+					<MkAvatar v-if="item.avatar" :user="item.avatar" class="avatar"/>
+					<span>{{ item.text }}</span>
+					<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
+				</MkA>
+				<a v-else-if="item.type === 'a'" :href="item.href" :target="item.target" :download="item.download" :tabindex="0" class="_button item" @click="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+					<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
+					<span>{{ item.text }}</span>
+					<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
+				</a>
+				<button v-else-if="item.type === 'user' && !items.hidden" :tabindex="0" class="_button item" :class="{ active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+					<MkAvatar :user="item.user" class="avatar"/><MkUserName :user="item.user"/>
+					<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
+				</button>
+				<span v-else-if="item.type === 'switch'" :tabindex="0" class="item" @click.passive="onItemMouseEnter(item)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+					<FormSwitch v-model="item.ref" :disabled="item.disabled" class="form-switch">{{ item.text }}</FormSwitch>
+				</span>
+				<button v-else-if="item.type === 'parent'" :tabindex="0" class="_button item parent" :class="{ childShowing: childShowingItem === item }" @mouseenter="showChildren(item, $event)" @click="showChildren(item, $event)">
+					<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
+					<span>{{ item.text }}</span>
+					<span class="caret"><i class="ph-caret-right-bold ph-lg ph-fw ph-lg"></i></span>
+				</button>
+				<button v-else-if="!item.hidden" :tabindex="0" class="_button item" :class="{ danger: item.danger, active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+					<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
+					<MkAvatar v-if="item.avatar" :user="item.avatar" class="avatar"/>
+					<span>{{ item.text }}</span>
+					<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
+				</button>
+			</template>
+			<span v-if="items2.length === 0" class="none item">
+				<span>{{ i18n.ts.none }}</span>
 			</span>
-			<span v-else-if="item.type === 'pending'" :tabindex="0" class="pending item">
-				<span><MkEllipsis/></span>
-			</span>
-			<MkA v-else-if="item.type === 'link'" :to="item.to" :tabindex="0" class="_button item" @click.passive="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
-				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
-				<MkAvatar v-if="item.avatar" :user="item.avatar" class="avatar"/>
-				<span>{{ item.text }}</span>
-				<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
-			</MkA>
-			<a v-else-if="item.type === 'a'" :href="item.href" :target="item.target" :download="item.download" :tabindex="0" class="_button item" @click="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
-				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
-				<span>{{ item.text }}</span>
-				<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
-			</a>
-			<button v-else-if="item.type === 'user' && !items.hidden" :tabindex="0" class="_button item" :class="{ active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
-				<MkAvatar :user="item.user" class="avatar"/><MkUserName :user="item.user"/>
-				<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
-			</button>
-			<span v-else-if="item.type === 'switch'" :tabindex="0" class="item" @click.passive="onItemMouseEnter(item)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
-				<FormSwitch v-model="item.ref" :disabled="item.disabled" class="form-switch">{{ item.text }}</FormSwitch>
-			</span>
-			<button v-else-if="item.type === 'parent'" :tabindex="0" class="_button item parent" :class="{ childShowing: childShowingItem === item }" @mouseenter="showChildren(item, $event)" @click="showChildren(item, $event)">
-				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
-				<span>{{ item.text }}</span>
-				<span class="caret"><i class="ph-caret-right-bold ph-lg ph-fw ph-lg"></i></span>
-			</button>
-			<button v-else-if="!item.hidden" :tabindex="0" class="_button item" :class="{ danger: item.danger, active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
-				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
-				<MkAvatar v-if="item.avatar" :user="item.avatar" class="avatar"/>
-				<span>{{ item.text }}</span>
-				<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
-			</button>
-		</template>
-		<span v-if="items2.length === 0" class="none item">
-			<span>{{ i18n.ts.none }}</span>
-		</span>
-	</div>
+		</div>
+	</FocusTrap>
 	<div v-if="childMenu" class="child">
 		<XChild ref="child" :items="childMenu" :target-element="childTarget" :root-element="itemsEl" showing @actioned="childActioned"/>
 	</div>
@@ -62,6 +64,7 @@ import FormSwitch from '@/components/form/switch.vue';
 import { MenuItem, InnerMenuItem, MenuPending, MenuAction } from '@/types/menu';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
+import { FocusTrap } from 'focus-trap-vue';
 
 const XChild = defineAsyncComponent(() => import('./MkMenu.child.vue'));
 
diff --git a/packages/client/src/components/MkModal.vue b/packages/client/src/components/MkModal.vue
index e31818877..32bffa038 100644
--- a/packages/client/src/components/MkModal.vue
+++ b/packages/client/src/components/MkModal.vue
@@ -1,9 +1,9 @@
 <template>
 <transition :name="$store.state.animation ? (type === 'drawer') ? 'modal-drawer' : (type === 'popup') ? 'modal-popup' : 'modal' : ''" :duration="$store.state.animation ? 200 : 0" appear @after-leave="emit('closed')" @enter="emit('opening')" @keyup.esc="emit('click')" @after-enter="onOpened">
 	<focus-trap v-model:active="isActive">
-		<div v-show="manualShowing != null ? manualShowing : showing" v-hotkey.global="keymap" class="qzhlnise" :class="{ drawer: type === 'drawer', dialog: type === 'dialog' || type === 'dialog:top', popup: type === 'popup' }" :style="{ zIndex, pointerEvents: (manualShowing != null ? manualShowing : showing) ? 'auto' : 'none', '--transformOrigin': transformOrigin }">
+		<div v-show="manualShowing != null ? manualShowing : showing" v-hotkey.global="keymap" class="qzhlnise" :class="{ drawer: type === 'drawer', dialog: type === 'dialog' || type === 'dialog:top', popup: type === 'popup' }" :style="{ zIndex, pointerEvents: (manualShowing != null ? manualShowing : showing) ? 'auto' : 'none', '--transformOrigin': transformOrigin }" tabindex="-1" v-focus>
 			<div class="bg _modalBg" :class="{ transparent: transparentBg && (type === 'popup') }" :style="{ zIndex }" @click="onBgClick" @contextmenu.prevent.stop="() => {}"></div>
-			<div ref="content" class="content" :class="{ fixed, top: type === 'dialog:top' }" :style="{ zIndex }" @click.self="onBgClick" tabindex="-1" v-focus>
+			<div ref="content" class="content" :class="{ fixed, top: type === 'dialog:top' }" :style="{ zIndex }" @click.self="onBgClick">
 				<slot :max-height="maxHeight" :type="type"></slot>
 			</div>
 		</div>

From b51d24d31a2ecf59ece5f66c443dd88e05f31e49 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 12 Feb 2023 22:19:40 -0500
Subject: [PATCH 15/90] focus trap emoji picker (also fixes closing w/ esc)

---
 .../client/src/components/MkEmojiPicker.vue   | 131 +++++++++---------
 1 file changed, 67 insertions(+), 64 deletions(-)

diff --git a/packages/client/src/components/MkEmojiPicker.vue b/packages/client/src/components/MkEmojiPicker.vue
index b26eb1206..578407d76 100644
--- a/packages/client/src/components/MkEmojiPicker.vue
+++ b/packages/client/src/components/MkEmojiPicker.vue
@@ -1,80 +1,82 @@
 <template>
-<div class="omfetrab" :class="['s' + size, 'w' + width, 'h' + height, { asDrawer }]" :style="{ maxHeight: maxHeight ? maxHeight + 'px' : undefined }">
-	<input ref="search" v-model.trim="q" class="search" data-prevent-emoji-insert :class="{ filled: q != null && q != '' }" :placeholder="i18n.ts.search" type="search" @paste.stop="paste" @keyup.enter="done()">
-	<div ref="emojis" class="emojis">
-		<section class="result">
-			<div v-if="searchResultCustom.length > 0" class="body">
-				<button
-					v-for="emoji in searchResultCustom"
-					:key="emoji.id"
-					class="_button item"
-					:title="emoji.name"
-					tabindex="0"
-					@click="chosen(emoji, $event)"
-				>
-					<!--<MkEmoji v-if="emoji.char != null" :emoji="emoji.char"/>-->
-					<img class="emoji" :src="disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url"/>
-				</button>
-			</div>
-			<div v-if="searchResultUnicode.length > 0" class="body">
-				<button
-					v-for="emoji in searchResultUnicode"
-					:key="emoji.name"
-					class="_button item"
-					:title="emoji.name"
-					tabindex="0"
-					@click="chosen(emoji, $event)"
-				>
-					<MkEmoji class="emoji" :emoji="emoji.char"/>
-				</button>
-			</div>
-		</section>
-
-		<div v-if="tab === 'index'" class="group index">
-			<section v-if="showPinned">
-				<div class="body">
+<FocusTrap v-bind:active="isActive">
+	<div class="omfetrab" :class="['s' + size, 'w' + width, 'h' + height, { asDrawer }]" :style="{ maxHeight: maxHeight ? maxHeight + 'px' : undefined }">
+		<input ref="search" v-model.trim="q" class="search" data-prevent-emoji-insert :class="{ filled: q != null && q != '' }" :placeholder="i18n.ts.search" type="search" @paste.stop="paste" @keyup.enter="done()">
+		<div ref="emojis" class="emojis">
+			<section class="result">
+				<div v-if="searchResultCustom.length > 0" class="body">
 					<button
-						v-for="emoji in pinned"
-						:key="emoji"
+						v-for="emoji in searchResultCustom"
+						:key="emoji.id"
 						class="_button item"
+						:title="emoji.name"
 						tabindex="0"
 						@click="chosen(emoji, $event)"
 					>
-						<MkEmoji class="emoji" :emoji="emoji" :normal="true"/>
+						<!--<MkEmoji v-if="emoji.char != null" :emoji="emoji.char"/>-->
+						<img class="emoji" :src="disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url"/>
+					</button>
+				</div>
+				<div v-if="searchResultUnicode.length > 0" class="body">
+					<button
+						v-for="emoji in searchResultUnicode"
+						:key="emoji.name"
+						class="_button item"
+						:title="emoji.name"
+						tabindex="0"
+						@click="chosen(emoji, $event)"
+					>
+						<MkEmoji class="emoji" :emoji="emoji.char"/>
 					</button>
 				</div>
 			</section>
 
-			<section>
-				<header><i class="ph-alarm-bold ph-fw ph-lg"></i> {{ i18n.ts.recentUsed }}</header>
-				<div class="body">
-					<button
-						v-for="emoji in recentlyUsedEmojis"
-						:key="emoji"
-						class="_button item"
-						@click="chosen(emoji, $event)"
-					>
-						<MkEmoji class="emoji" :emoji="emoji" :normal="true"/>
-					</button>
-				</div>
-			</section>
+			<div v-if="tab === 'index'" class="group index">
+				<section v-if="showPinned">
+					<div class="body">
+						<button
+							v-for="emoji in pinned"
+							:key="emoji"
+							class="_button item"
+							tabindex="0"
+							@click="chosen(emoji, $event)"
+						>
+							<MkEmoji class="emoji" :emoji="emoji" :normal="true"/>
+						</button>
+					</div>
+				</section>
+
+				<section>
+					<header><i class="ph-alarm-bold ph-fw ph-lg"></i> {{ i18n.ts.recentUsed }}</header>
+					<div class="body">
+						<button
+							v-for="emoji in recentlyUsedEmojis"
+							:key="emoji"
+							class="_button item"
+							@click="chosen(emoji, $event)"
+						>
+							<MkEmoji class="emoji" :emoji="emoji" :normal="true"/>
+						</button>
+					</div>
+				</section>
+			</div>
+			<div v-once class="group">
+				<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>{{ 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>
-		<div v-once class="group">
-			<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>{{ 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 class="tabs">
+			<button class="_button tab" :class="{ active: tab === 'index' }" @click="tab = 'index'"><i class="ph-asterisk-bold ph-lg ph-fw ph-lg"></i></button>
+			<button class="_button tab" :class="{ active: tab === 'custom' }" @click="tab = 'custom'"><i class="ph-smiley-bold ph-lg ph-fw ph-lg"></i></button>
+			<button class="_button tab" :class="{ active: tab === 'unicode' }" @click="tab = 'unicode'"><i class="ph-leaf-bold ph-lg ph-fw ph-lg"></i></button>
+			<button class="_button tab" :class="{ active: tab === 'tags' }" @click="tab = 'tags'"><i class="ph-hash-bold ph-lg ph-fw ph-lg"></i></button>
 		</div>
 	</div>
-	<div class="tabs">
-		<button class="_button tab" :class="{ active: tab === 'index' }" @click="tab = 'index'"><i class="ph-asterisk-bold ph-lg ph-fw ph-lg"></i></button>
-		<button class="_button tab" :class="{ active: tab === 'custom' }" @click="tab = 'custom'"><i class="ph-smiley-bold ph-lg ph-fw ph-lg"></i></button>
-		<button class="_button tab" :class="{ active: tab === 'unicode' }" @click="tab = 'unicode'"><i class="ph-leaf-bold ph-lg ph-fw ph-lg"></i></button>
-		<button class="_button tab" :class="{ active: tab === 'tags' }" @click="tab = 'tags'"><i class="ph-hash-bold ph-lg ph-fw ph-lg"></i></button>
-	</div>
-</div>
+</FocusTrap>
 </template>
 
 <script lang="ts" setup>
@@ -90,6 +92,7 @@ import { deviceKind } from '@/scripts/device-kind';
 import { emojiCategories, instance } from '@/instance';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
+import { FocusTrap } from 'focus-trap-vue';
 
 const props = withDefaults(defineProps<{
 	showPinned?: boolean;

From 06b37eccdd2113c48b6e73447628e0ef0b93945e Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 12 Feb 2023 22:24:12 -0500
Subject: [PATCH 16/90] fix submenu positioning

---
 packages/client/src/components/MkMenu.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index acfaf9459..fe7ebbe1a 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -1,13 +1,13 @@
 <template>
 <div tabindex="-1" v-focus>
-	<FocusTrap v-bind:active="isActive">
-		<div
-			ref="itemsEl"
-			class="rrevdjwt _popup _shadow"
-			:class="{ center: align === 'center', asDrawer }"
-			:style="{ width: (width && !asDrawer) ? width + 'px' : '', maxHeight: maxHeight ? maxHeight + 'px' : '' }"
-			@contextmenu.self="e => e.preventDefault()"
-		>
+	<div
+	ref="itemsEl"
+	class="rrevdjwt _popup _shadow"
+	:class="{ center: align === 'center', asDrawer }"
+	:style="{ width: (width && !asDrawer) ? width + 'px' : '', maxHeight: maxHeight ? maxHeight + 'px' : '' }"
+	@contextmenu.self="e => e.preventDefault()"
+	>
+		<FocusTrap v-bind:active="isActive">
 			<template v-for="(item, i) in items2">
 				<div v-if="item === null" class="divider"></div>
 				<span v-else-if="item.type === 'label'" class="label item">
@@ -49,8 +49,8 @@
 			<span v-if="items2.length === 0" class="none item">
 				<span>{{ i18n.ts.none }}</span>
 			</span>
-		</div>
-	</FocusTrap>
+		</FocusTrap>
+	</div>
 	<div v-if="childMenu" class="child">
 		<XChild ref="child" :items="childMenu" :target-element="childTarget" :root-element="itemsEl" showing @actioned="childActioned"/>
 	</div>

From a5a6d907718d5b3c9d9893877fb0d64f9dbf5ccb Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 12 Feb 2023 22:31:55 -0500
Subject: [PATCH 17/90] actually fix submenu pos

---
 packages/client/src/components/MkMenu.vue | 26 +++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index fe7ebbe1a..2e25843cd 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -1,13 +1,13 @@
 <template>
 <div tabindex="-1" v-focus>
-	<div
-	ref="itemsEl"
-	class="rrevdjwt _popup _shadow"
-	:class="{ center: align === 'center', asDrawer }"
-	:style="{ width: (width && !asDrawer) ? width + 'px' : '', maxHeight: maxHeight ? maxHeight + 'px' : '' }"
-	@contextmenu.self="e => e.preventDefault()"
-	>
-		<FocusTrap v-bind:active="isActive">
+	<FocusTrap v-bind:active="isActive">
+		<div
+			ref="itemsEl"
+			class="rrevdjwt _popup _shadow"
+			:class="{ center: align === 'center', asDrawer }"
+			:style="{ width: (width && !asDrawer) ? width + 'px' : '', maxHeight: maxHeight ? maxHeight + 'px' : '' }"
+			@contextmenu.self="e => e.preventDefault()"
+		>
 			<template v-for="(item, i) in items2">
 				<div v-if="item === null" class="divider"></div>
 				<span v-else-if="item.type === 'label'" class="label item">
@@ -49,11 +49,11 @@
 			<span v-if="items2.length === 0" class="none item">
 				<span>{{ i18n.ts.none }}</span>
 			</span>
-		</FocusTrap>
-	</div>
-	<div v-if="childMenu" class="child">
-		<XChild ref="child" :items="childMenu" :target-element="childTarget" :root-element="itemsEl" showing @actioned="childActioned"/>
-	</div>
+		</div>
+		<div v-if="childMenu" class="child">
+			<XChild ref="child" :items="childMenu" :target-element="childTarget" :root-element="itemsEl" showing @actioned="childActioned"/>
+		</div>
+	</FocusTrap>
 </div>
 </template>
 

From 56b6b450c08dadc193fdca7e8730367e808bca68 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 19:06:29 -0400
Subject: [PATCH 18/90] forgot to add this

---
 pnpm-lock.yaml | 41 ++++++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cf4c29c06..9c5079f98 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -19,6 +19,12 @@ importers:
       '@tensorflow/tfjs':
         specifier: ^3.21.0
         version: 3.21.0(seedrandom@3.0.5)
+      focus-trap:
+        specifier: ^7.2.0
+        version: 7.2.0
+      focus-trap-vue:
+        specifier: ^4.0.1
+        version: 4.0.1(focus-trap@7.2.0)(vue@3.2.45)
       js-yaml:
         specifier: 4.1.0
         version: 4.1.0
@@ -3803,14 +3809,12 @@ packages:
       '@vue/shared': 3.2.45
       estree-walker: 2.0.2
       source-map: 0.6.1
-    dev: true
 
   /@vue/compiler-dom@3.2.45:
     resolution: {integrity: sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==}
     dependencies:
       '@vue/compiler-core': 3.2.45
       '@vue/shared': 3.2.45
-    dev: true
 
   /@vue/compiler-sfc@2.7.14:
     resolution: {integrity: sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==}
@@ -3833,14 +3837,12 @@ packages:
       magic-string: 0.25.9
       postcss: 8.4.21
       source-map: 0.6.1
-    dev: true
 
   /@vue/compiler-ssr@3.2.45:
     resolution: {integrity: sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ==}
     dependencies:
       '@vue/compiler-dom': 3.2.45
       '@vue/shared': 3.2.45
-    dev: true
 
   /@vue/reactivity-transform@3.2.45:
     resolution: {integrity: sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==}
@@ -3850,20 +3852,17 @@ packages:
       '@vue/shared': 3.2.45
       estree-walker: 2.0.2
       magic-string: 0.25.9
-    dev: true
 
   /@vue/reactivity@3.2.45:
     resolution: {integrity: sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==}
     dependencies:
       '@vue/shared': 3.2.45
-    dev: true
 
   /@vue/runtime-core@3.2.45:
     resolution: {integrity: sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==}
     dependencies:
       '@vue/reactivity': 3.2.45
       '@vue/shared': 3.2.45
-    dev: true
 
   /@vue/runtime-dom@3.2.45:
     resolution: {integrity: sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==}
@@ -3871,7 +3870,6 @@ packages:
       '@vue/runtime-core': 3.2.45
       '@vue/shared': 3.2.45
       csstype: 2.6.21
-    dev: true
 
   /@vue/server-renderer@3.2.45(vue@3.2.45):
     resolution: {integrity: sha512-ebiMq7q24WBU1D6uhPK//2OTR1iRIyxjF5iVq/1a5I1SDMDyDu4Ts6fJaMnjrvD3MqnaiFkKQj+LKAgz5WIK3g==}
@@ -3881,11 +3879,9 @@ packages:
       '@vue/compiler-ssr': 3.2.45
       '@vue/shared': 3.2.45
       vue: 3.2.45
-    dev: true
 
   /@vue/shared@3.2.45:
     resolution: {integrity: sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==}
-    dev: true
 
   /@webassemblyjs/ast@1.11.1:
     resolution: {integrity: sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==}
@@ -6074,7 +6070,6 @@ packages:
 
   /csstype@2.6.21:
     resolution: {integrity: sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==}
-    dev: true
 
   /csstype@3.1.1:
     resolution: {integrity: sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==}
@@ -6979,7 +6974,6 @@ packages:
 
   /estree-walker@2.0.2:
     resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
-    dev: true
 
   /esutils@2.0.3:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
@@ -7445,6 +7439,22 @@ packages:
       readable-stream: 2.3.7
     dev: true
 
+  /focus-trap-vue@4.0.1(focus-trap@7.2.0)(vue@3.2.45):
+    resolution: {integrity: sha512-2iqOeoSvgq7Um6aL+255a/wXPskj6waLq2oKCa4gOnMORPo15JX7wN6J5bl1SMhMlTlkHXGSrQ9uJPJLPZDl5w==}
+    peerDependencies:
+      focus-trap: ^7.0.0
+      vue: ^3.0.0
+    dependencies:
+      focus-trap: 7.2.0
+      vue: 3.2.45
+    dev: false
+
+  /focus-trap@7.2.0:
+    resolution: {integrity: sha512-v4wY6HDDYvzkBy4735kW5BUEuw6Yz9ABqMYLuTNbzAFPcBOGiGHwwcNVMvUz4G0kgSYh13wa/7TG3XwTeT4O/A==}
+    dependencies:
+      tabbable: 6.1.1
+    dev: false
+
   /follow-redirects@1.15.2(debug@4.3.4):
     resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
     engines: {node: '>=4.0'}
@@ -10350,7 +10360,6 @@ packages:
     resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==}
     dependencies:
       sourcemap-codec: 1.4.8
-    dev: true
 
   /mailcheck@1.1.1:
     resolution: {integrity: sha512-3WjL8+ZDouZwKlyJBMp/4LeziLFXgleOdsYu87piGcMLqhBzCsy2QFdbtAwv757TFC/rtqd738fgJw1tFQCSgA==}
@@ -13267,7 +13276,6 @@ packages:
   /sourcemap-codec@1.4.8:
     resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
     deprecated: Please use @jridgewell/sourcemap-codec instead
-    dev: true
 
   /sparkles@1.0.1:
     resolution: {integrity: sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==}
@@ -13686,6 +13694,10 @@ packages:
     resolution: {integrity: sha512-g9rPT3V1Q4WjWFZ/t5BdGC1mT/FpYnsLdBl+M5e6MlRkuE1RSR+R43wcY/3mKI59B9KEr+vxdWCuWNMD3oNHKA==}
     dev: true
 
+  /tabbable@6.1.1:
+    resolution: {integrity: sha512-4kl5w+nCB44EVRdO0g/UGoOp3vlwgycUVtkk/7DPyeLZUCuNFFKCFG6/t/DgHLrUPHjrZg6s5tNm+56Q2B0xyg==}
+    dev: false
+
   /tapable@2.2.1:
     resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
     engines: {node: '>=6'}
@@ -14776,7 +14788,6 @@ packages:
       '@vue/runtime-dom': 3.2.45
       '@vue/server-renderer': 3.2.45(vue@3.2.45)
       '@vue/shared': 3.2.45
-    dev: true
 
   /vuedraggable@4.1.0(vue@3.2.45):
     resolution: {integrity: sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==}

From 6498a90dc1f21eaa503550ce7b03874945fbfa04 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 19:28:25 -0400
Subject: [PATCH 19/90] Fix focusing inside of CW's

---
 packages/client/src/components/MkCwButton.vue | 15 ++++++++--
 packages/client/src/components/MkNote.vue     |  4 ++-
 .../src/components/MkSubNoteContent.vue       | 30 ++++++++++++++++---
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/components/MkCwButton.vue b/packages/client/src/components/MkCwButton.vue
index 35af48874..01ab11351 100644
--- a/packages/client/src/components/MkCwButton.vue
+++ b/packages/client/src/components/MkCwButton.vue
@@ -1,5 +1,6 @@
 <template>
 	<button
+		ref="el"
 		class="_button"
 		:class="{ showLess: modelValue, fade: !modelValue }"
 		@click.stop="toggle"
@@ -12,7 +13,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed } from "vue";
+import { computed, ref } from "vue";
 import { length } from "stringz";
 import * as misskey from "calckey-js";
 import { concat } from "@/scripts/array";
@@ -27,6 +28,8 @@ const emit = defineEmits<{
 	(ev: "update:modelValue", v: boolean): void;
 }>();
 
+const el = ref<HTMLElement>(); 
+
 const label = computed(() => {
 	return concat([
 		props.note.text
@@ -43,6 +46,14 @@ const label = computed(() => {
 const toggle = () => {
 	emit("update:modelValue", !props.modelValue);
 };
+
+function focus() {
+	el.value.focus();
+}
+
+defineExpose({
+	focus
+});
 </script>
 
 <style lang="scss" scoped>
@@ -62,7 +73,7 @@ const toggle = () => {
 			}
 		}
 	}
-	&:hover > span {
+	&:hover > span, &:focus > span {
 		background: var(--cwFg) !important;
 		color: var(--cwBg) !important;
 	}
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index f49105e81..5d9c40d38 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -84,6 +84,7 @@
 						:detailedView="detailedView"
 						:parentId="appearNote.parentId"
 						@push="(e) => router.push(notePage(e))"
+						@focusfooter="footerEl.focus()"
 					></MkSubNoteContent>
 					<div v-if="translating || translation" class="translation">
 						<MkLoading v-if="translating" mini />
@@ -117,7 +118,7 @@
 						<MkTime :time="appearNote.createdAt" mode="absolute" />
 					</MkA>
 				</div>
-				<footer ref="el" class="footer" @click.stop>
+				<footer ref="footerEl" class="footer" @click.stop tabindex="-1">
 					<XReactionsViewer
 						v-if="enableEmojiReactions"
 						ref="reactionsViewer"
@@ -278,6 +279,7 @@ const isRenote =
 	note.poll == null;
 
 const el = ref<HTMLElement>();
+const footerEl = ref<HTMLElement>(); 
 const menuButton = ref<HTMLElement>();
 const starButton = ref<InstanceType<typeof XStarButton>>();
 const renoteButton = ref<InstanceType<typeof XRenoteButton>>();
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index a345b23f5..a20afc39b 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -35,7 +35,11 @@
 			class="content"
 			:class="{ collapsed, isLong, showContent: note.cw && !showContent }"
 		>
-			<div class="body">
+			<XCwButton ref="cwButton" v-if="note.cw && !showContent" v-model="showContent" :note="note" v-on:keydown="focusFooter" />
+			<div 
+				class="body"
+				v-bind="{ 'aria-label': !showContent ? '' : null, 'tabindex': !showContent ? '-1' : null }"
+			>
 				<span v-if="note.deletedAt" style="opacity: 0.5"
 					>({{ i18n.ts.deleted }})</span
 				>
@@ -96,6 +100,11 @@
 						<XNoteSimple :note="note.renote" />
 					</div>
 				</template>
+				<div
+					v-if="!showContent"
+					tabindex="0"
+					v-on:focus="cwButton?.focus()"
+				></div>
 			</div>
 			<button
 				v-if="isLong && collapsed"
@@ -111,13 +120,13 @@
 			>
 				<span>{{ i18n.ts.showLess }}</span>
 			</button>
-			<XCwButton v-if="note.cw" v-model="showContent" :note="note" />
+			<XCwButton v-if="note.cw && showContent" v-model="showContent" :note="note" />
 		</div>
 	</div>
 </template>
 
 <script lang="ts" setup>
-import {} from "vue";
+import { ref } from "vue"; 
 import * as misskey from "calckey-js";
 import * as mfm from "mfm-js";
 import XNoteSimple from "@/components/MkNoteSimple.vue";
@@ -138,8 +147,10 @@ const props = defineProps<{
 
 const emit = defineEmits<{
 	(ev: "push", v): void;
+	(ev: "focusfooter"): void;
 }>();
 
+const cwButton = ref<HTMLElement>(); 
 const isLong =
 	!props.detailedView &&
 	props.note.cw == null &&
@@ -151,6 +162,13 @@ const urls = props.note.text
 	: null;
 
 let showContent = $ref(false);
+
+
+function focusFooter(ev) {
+	if (ev.key == "Tab" && !ev.getModifierState("Shift")) {
+		emit("focusfooter");
+	}
+}
 </script>
 
 <style lang="scss" scoped>
@@ -242,6 +260,9 @@ let showContent = $ref(false);
 				margin-top: -50px;
 				padding-top: 50px;
 				overflow: hidden;
+				user-select: none;
+				-webkit-user-select: none;
+				-moz-user-select: none;
 			}
 			&.collapsed > .body {
 				box-sizing: border-box;
@@ -271,6 +292,7 @@ let showContent = $ref(false);
 				bottom: 0;
 				left: 0;
 				width: 100%;
+				z-index: 2;
 				> span {
 					display: inline-block;
 					background: var(--panel);
@@ -279,7 +301,7 @@ let showContent = $ref(false);
 					border-radius: 999px;
 					box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
 				}
-				&:hover {
+				&:hover, &:focus {
 					> span {
 						background: var(--panelHighlight);
 					}

From 3be2147397e1f395ea74887a24b5ec8f320e3a60 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 19:57:19 -0400
Subject: [PATCH 20/90] add the focus trap thingies again

---
 .../client/src/components/MkEmojiPicker.vue   | 277 ++++++-------
 packages/client/src/components/MkMenu.vue     | 366 +++++++++---------
 packages/client/src/components/MkModal.vue    |  26 +-
 .../client/src/components/MkModalWindow.vue   |  93 ++---
 4 files changed, 380 insertions(+), 382 deletions(-)

diff --git a/packages/client/src/components/MkEmojiPicker.vue b/packages/client/src/components/MkEmojiPicker.vue
index a22006951..6c18e92f0 100644
--- a/packages/client/src/components/MkEmojiPicker.vue
+++ b/packages/client/src/components/MkEmojiPicker.vue
@@ -1,157 +1,159 @@
 <template>
-	<div
-		class="omfetrab"
-		:class="['s' + size, 'w' + width, 'h' + height, { asDrawer }]"
-		:style="{ maxHeight: maxHeight ? maxHeight + 'px' : undefined }"
-	>
-		<input
-			ref="search"
-			v-model.trim="q"
-			class="search"
-			data-prevent-emoji-insert
-			:class="{ filled: q != null && q != '' }"
-			:placeholder="i18n.ts.search"
-			type="search"
-			@paste.stop="paste"
-			@keyup.enter="done()"
-		/>
-		<div ref="emojis" class="emojis">
-			<section class="result">
-				<div v-if="searchResultCustom.length > 0" class="body">
-					<button
-						v-for="emoji in searchResultCustom"
-						:key="emoji.id"
-						class="_button item"
-						:title="emoji.name"
-						tabindex="0"
-						@click="chosen(emoji, $event)"
-					>
-						<!--<MkEmoji v-if="emoji.char != null" :emoji="emoji.char"/>-->
-						<img
-							class="emoji"
-							:src="
-								disableShowingAnimatedImages
-									? getStaticImageUrl(emoji.url)
-									: emoji.url
-							"
-						/>
-					</button>
-				</div>
-				<div v-if="searchResultUnicode.length > 0" class="body">
-					<button
-						v-for="emoji in searchResultUnicode"
-						:key="emoji.name"
-						class="_button item"
-						:title="emoji.name"
-						tabindex="0"
-						@click="chosen(emoji, $event)"
-					>
-						<MkEmoji class="emoji" :emoji="emoji.char" />
-					</button>
-				</div>
-			</section>
-
-			<div v-if="tab === 'index'" class="group index">
-				<section v-if="showPinned">
-					<div class="body">
+	<FocusTrap v-bind:active="isActive">
+		<div
+			class="omfetrab"
+			:class="['s' + size, 'w' + width, 'h' + height, { asDrawer }]"
+			:style="{ maxHeight: maxHeight ? maxHeight + 'px' : undefined }"
+		>
+			<input
+				ref="search"
+				v-model.trim="q"
+				class="search"
+				data-prevent-emoji-insert
+				:class="{ filled: q != null && q != '' }"
+				:placeholder="i18n.ts.search"
+				type="search"
+				@paste.stop="paste"
+				@keyup.enter="done()"
+			/>
+			<div ref="emojis" class="emojis">
+				<section class="result">
+					<div v-if="searchResultCustom.length > 0" class="body">
 						<button
-							v-for="emoji in pinned"
-							:key="emoji"
+							v-for="emoji in searchResultCustom"
+							:key="emoji.id"
 							class="_button item"
+							:title="emoji.name"
 							tabindex="0"
 							@click="chosen(emoji, $event)"
 						>
-							<MkEmoji
+							<!--<MkEmoji v-if="emoji.char != null" :emoji="emoji.char"/>-->
+							<img
 								class="emoji"
-								:emoji="emoji"
-								:normal="true"
+								:src="
+									disableShowingAnimatedImages
+										? getStaticImageUrl(emoji.url)
+										: emoji.url
+								"
 							/>
 						</button>
 					</div>
+					<div v-if="searchResultUnicode.length > 0" class="body">
+						<button
+							v-for="emoji in searchResultUnicode"
+							:key="emoji.name"
+							class="_button item"
+							:title="emoji.name"
+							tabindex="0"
+							@click="chosen(emoji, $event)"
+						>
+							<MkEmoji class="emoji" :emoji="emoji.char" />
+						</button>
+					</div>
 				</section>
 
-				<section>
-					<header class="_acrylic">
-						<i class="ph-alarm ph-bold ph-fw ph-lg"></i>
-						{{ i18n.ts.recentUsed }}
-					</header>
-					<div class="body">
-						<button
-							v-for="emoji in recentlyUsedEmojis"
-							:key="emoji"
-							class="_button item"
-							@click="chosen(emoji, $event)"
-						>
-							<MkEmoji
-								class="emoji"
-								:emoji="emoji"
-								:normal="true"
-							/>
-						</button>
-					</div>
-				</section>
+				<div v-if="tab === 'index'" class="group index">
+					<section v-if="showPinned">
+						<div class="body">
+							<button
+								v-for="emoji in pinned"
+								:key="emoji"
+								class="_button item"
+								tabindex="0"
+								@click="chosen(emoji, $event)"
+							>
+								<MkEmoji
+									class="emoji"
+									:emoji="emoji"
+									:normal="true"
+								/>
+							</button>
+						</div>
+					</section>
+
+					<section>
+						<header class="_acrylic">
+							<i class="ph-alarm ph-bold ph-fw ph-lg"></i>
+							{{ i18n.ts.recentUsed }}
+						</header>
+						<div class="body">
+							<button
+								v-for="emoji in recentlyUsedEmojis"
+								:key="emoji"
+								class="_button item"
+								@click="chosen(emoji, $event)"
+							>
+								<MkEmoji
+									class="emoji"
+									:emoji="emoji"
+									:normal="true"
+								/>
+							</button>
+						</div>
+					</section>
+				</div>
+				<div v-once class="group">
+					<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>{{ 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>
-			<div v-once class="group">
-				<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 class="tabs">
+				<button
+					class="_button tab"
+					:class="{ active: tab === 'index' }"
+					@click="tab = 'index'"
 				>
-			</div>
-			<div v-once class="group">
-				<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
+					<i class="ph-asterisk ph-bold ph-lg ph-fw ph-lg"></i>
+				</button>
+				<button
+					class="_button tab"
+					:class="{ active: tab === 'custom' }"
+					@click="tab = 'custom'"
 				>
+					<i class="ph-smiley ph-bold ph-lg ph-fw ph-lg"></i>
+				</button>
+				<button
+					class="_button tab"
+					:class="{ active: tab === 'unicode' }"
+					@click="tab = 'unicode'"
+				>
+					<i class="ph-leaf ph-bold ph-lg ph-fw ph-lg"></i>
+				</button>
+				<button
+					class="_button tab"
+					:class="{ active: tab === 'tags' }"
+					@click="tab = 'tags'"
+				>
+					<i class="ph-hash ph-bold ph-lg ph-fw ph-lg"></i>
+				</button>
 			</div>
 		</div>
-		<div class="tabs">
-			<button
-				class="_button tab"
-				:class="{ active: tab === 'index' }"
-				@click="tab = 'index'"
-			>
-				<i class="ph-asterisk ph-bold ph-lg ph-fw ph-lg"></i>
-			</button>
-			<button
-				class="_button tab"
-				:class="{ active: tab === 'custom' }"
-				@click="tab = 'custom'"
-			>
-				<i class="ph-smiley ph-bold ph-lg ph-fw ph-lg"></i>
-			</button>
-			<button
-				class="_button tab"
-				:class="{ active: tab === 'unicode' }"
-				@click="tab = 'unicode'"
-			>
-				<i class="ph-leaf ph-bold ph-lg ph-fw ph-lg"></i>
-			</button>
-			<button
-				class="_button tab"
-				:class="{ active: tab === 'tags' }"
-				@click="tab = 'tags'"
-			>
-				<i class="ph-hash ph-bold ph-lg ph-fw ph-lg"></i>
-			</button>
-		</div>
-	</div>
+	</FocusTrap>
 </template>
 
 <script lang="ts" setup>
@@ -171,6 +173,7 @@ import { deviceKind } from "@/scripts/device-kind";
 import { emojiCategories, instance } from "@/instance";
 import { i18n } from "@/i18n";
 import { defaultStore } from "@/store";
+import { FocusTrap } from 'focus-trap-vue';
 
 const props = withDefaults(
 	defineProps<{
diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index 45b69a23f..af2613b8c 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -1,191 +1,185 @@
 <template>
-	<div>
-		<div
-			ref="itemsEl"
-			v-hotkey="keymap"
-			class="rrevdjwt _popup _shadow"
-			:class="{ center: align === 'center', asDrawer }"
-			:style="{
-				width: width && !asDrawer ? width + 'px' : '',
-				maxHeight: maxHeight ? maxHeight + 'px' : '',
-			}"
-			@contextmenu.self="(e) => e.preventDefault()"
-		>
-			<template v-for="(item, i) in items2">
-				<div v-if="item === null" class="divider"></div>
-				<span v-else-if="item.type === 'label'" class="label item">
-					<span :style="item.textStyle || ''">{{ item.text }}</span>
-				</span>
-				<span
-					v-else-if="item.type === 'pending'"
-					:tabindex="i"
-					class="pending item"
-				>
-					<span><MkEllipsis /></span>
-				</span>
-				<MkA
-					v-else-if="item.type === 'link'"
-					:to="item.to"
-					:tabindex="i"
-					class="_button item"
-					@click.passive="close(true)"
-					@mouseenter.passive="onItemMouseEnter(item)"
-					@mouseleave.passive="onItemMouseLeave(item)"
-				>
-					<i
-						v-if="item.icon"
-						class="ph-fw ph-lg"
-						:class="item.icon"
-					></i>
-					<span v-else-if="item.icons">
-						<i
-							v-for="icon in item.icons"
-							class="ph-fw ph-lg"
-							:class="icon"
-						></i>
+	<FocusTrap v-bind:active="isActive">
+	<div tabindex="-1" v-focus>
+			<div
+				ref="itemsEl"
+				class="rrevdjwt _popup _shadow"
+				:class="{ center: align === 'center', asDrawer }"
+				:style="{
+					width: width && !asDrawer ? width + 'px' : '',
+					maxHeight: maxHeight ? maxHeight + 'px' : '',
+				}"
+				@contextmenu.self="(e) => e.preventDefault()"
+			>
+				<template v-for="(item, i) in items2">
+					<div v-if="item === null" class="divider"></div>
+					<span v-else-if="item.type === 'label'" class="label item">
+						<span :style="item.textStyle || ''">{{ item.text }}</span>
 					</span>
-					<MkAvatar
-						v-if="item.avatar"
-						:user="item.avatar"
-						class="avatar"
-					/>
-					<span :style="item.textStyle || ''">{{ item.text }}</span>
-					<span v-if="item.indicate" class="indicator"
-						><i class="ph-circle ph-fill"></i
-					></span>
-				</MkA>
-				<a
-					v-else-if="item.type === 'a'"
-					:href="item.href"
-					:target="item.target"
-					:download="item.download"
-					:tabindex="i"
-					class="_button item"
-					@click="close(true)"
-					@mouseenter.passive="onItemMouseEnter(item)"
-					@mouseleave.passive="onItemMouseLeave(item)"
-				>
-					<i
-						v-if="item.icon"
-						class="ph-fw ph-lg"
-						:class="item.icon"
-					></i>
-					<span v-else-if="item.icons">
-						<i
-							v-for="icon in item.icons"
-							class="ph-fw ph-lg"
-							:class="icon"
-						></i>
-					</span>
-					<span :style="item.textStyle || ''">{{ item.text }}</span>
-					<span v-if="item.indicate" class="indicator"
-						><i class="ph-circle ph-fill"></i
-					></span>
-				</a>
-				<button
-					v-else-if="item.type === 'user' && !items.hidden"
-					:tabindex="i"
-					class="_button item"
-					:class="{ active: item.active }"
-					:disabled="item.active"
-					@click="clicked(item.action, $event)"
-					@mouseenter.passive="onItemMouseEnter(item)"
-					@mouseleave.passive="onItemMouseLeave(item)"
-				>
-					<MkAvatar :user="item.user" class="avatar" /><MkUserName
-						:user="item.user"
-					/>
-					<span v-if="item.indicate" class="indicator"
-						><i class="ph-circle ph-fill"></i
-					></span>
-				</button>
-				<span
-					v-else-if="item.type === 'switch'"
-					:tabindex="i"
-					class="item"
-					@mouseenter.passive="onItemMouseEnter(item)"
-					@mouseleave.passive="onItemMouseLeave(item)"
-				>
-					<FormSwitch
-						v-model="item.ref"
-						:disabled="item.disabled"
-						class="form-switch"
-						:style="item.textStyle || ''"
-						>{{ item.text }}</FormSwitch
+					<span
+						v-else-if="item.type === 'pending'"
+						class="pending item"
 					>
+						<span><MkEllipsis /></span>
+					</span>
+					<MkA
+						v-else-if="item.type === 'link'"
+						:to="item.to"
+						class="_button item"
+						@click.passive="close(true)"
+						@mouseenter.passive="onItemMouseEnter(item)"
+						@mouseleave.passive="onItemMouseLeave(item)"
+					>
+						<i
+							v-if="item.icon"
+							class="ph-fw ph-lg"
+							:class="item.icon"
+						></i>
+						<span v-else-if="item.icons">
+							<i
+								v-for="icon in item.icons"
+								class="ph-fw ph-lg"
+								:class="icon"
+							></i>
+						</span>
+						<MkAvatar
+							v-if="item.avatar"
+							:user="item.avatar"
+							class="avatar"
+						/>
+						<span :style="item.textStyle || ''">{{ item.text }}</span>
+						<span v-if="item.indicate" class="indicator"
+							><i class="ph-circle ph-fill"></i
+						></span>
+					</MkA>
+					<a
+						v-else-if="item.type === 'a'"
+						:href="item.href"
+						:target="item.target"
+						:download="item.download"
+						class="_button item"
+						@click="close(true)"
+						@mouseenter.passive="onItemMouseEnter(item)"
+						@mouseleave.passive="onItemMouseLeave(item)"
+					>
+						<i
+							v-if="item.icon"
+							class="ph-fw ph-lg"
+							:class="item.icon"
+						></i>
+						<span v-else-if="item.icons">
+							<i
+								v-for="icon in item.icons"
+								class="ph-fw ph-lg"
+								:class="icon"
+							></i>
+						</span>
+						<span :style="item.textStyle || ''">{{ item.text }}</span>
+						<span v-if="item.indicate" class="indicator"
+							><i class="ph-circle ph-fill"></i
+						></span>
+					</a>
+					<button
+						v-else-if="item.type === 'user' && !items.hidden"
+						class="_button item"
+						:class="{ active: item.active }"
+						:disabled="item.active"
+						@click="clicked(item.action, $event)"
+						@mouseenter.passive="onItemMouseEnter(item)"
+						@mouseleave.passive="onItemMouseLeave(item)"
+					>
+						<MkAvatar :user="item.user" class="avatar" /><MkUserName
+							:user="item.user"
+						/>
+						<span v-if="item.indicate" class="indicator"
+							><i class="ph-circle ph-fill"></i
+						></span>
+					</button>
+					<span
+						v-else-if="item.type === 'switch'"
+						class="item"
+						@mouseenter.passive="onItemMouseEnter(item)"
+						@mouseleave.passive="onItemMouseLeave(item)"
+					>
+						<FormSwitch
+							v-model="item.ref"
+							:disabled="item.disabled"
+							class="form-switch"
+							:style="item.textStyle || ''"
+							>{{ item.text }}</FormSwitch
+						>
+					</span>
+					<button
+						v-else-if="item.type === 'parent'"
+						class="_button item parent"
+						:class="{ childShowing: childShowingItem === item }"
+						@mouseenter="showChildren(item, $event)"
+					>
+						<i
+							v-if="item.icon"
+							class="ph-fw ph-lg"
+							:class="item.icon"
+						></i>
+						<span v-else-if="item.icons">
+							<i
+								v-for="icon in item.icons"
+								class="ph-fw ph-lg"
+								:class="icon"
+							></i>
+						</span>
+						<span :style="item.textStyle || ''">{{ item.text }}</span>
+						<span class="caret"
+							><i class="ph-caret-right ph-bold ph-lg ph-fw ph-lg"></i
+						></span>
+					</button>
+					<button
+						v-else-if="!item.hidden"
+						class="_button item"
+						:class="{ danger: item.danger, active: item.active }"
+						:disabled="item.active"
+						@click="clicked(item.action, $event)"
+						@mouseenter.passive="onItemMouseEnter(item)"
+						@mouseleave.passive="onItemMouseLeave(item)"
+					>
+						<i
+							v-if="item.icon"
+							class="ph-fw ph-lg"
+							:class="item.icon"
+						></i>
+						<span v-else-if="item.icons">
+							<i
+								v-for="icon in item.icons"
+								class="ph-fw ph-lg"
+								:class="icon"
+							></i>
+						</span>
+						<MkAvatar
+							v-if="item.avatar"
+							:user="item.avatar"
+							class="avatar"
+						/>
+						<span :style="item.textStyle || ''">{{ item.text }}</span>
+						<span v-if="item.indicate" class="indicator"
+							><i class="ph-circle ph-fill"></i
+						></span>
+					</button>
+				</template>
+				<span v-if="items2.length === 0" class="none item">
+					<span>{{ i18n.ts.none }}</span>
 				</span>
-				<button
-					v-else-if="item.type === 'parent'"
-					:tabindex="i"
-					class="_button item parent"
-					:class="{ childShowing: childShowingItem === item }"
-					@mouseenter="showChildren(item, $event)"
-				>
-					<i
-						v-if="item.icon"
-						class="ph-fw ph-lg"
-						:class="item.icon"
-					></i>
-					<span v-else-if="item.icons">
-						<i
-							v-for="icon in item.icons"
-							class="ph-fw ph-lg"
-							:class="icon"
-						></i>
-					</span>
-					<span :style="item.textStyle || ''">{{ item.text }}</span>
-					<span class="caret"
-						><i class="ph-caret-right ph-bold ph-lg ph-fw ph-lg"></i
-					></span>
-				</button>
-				<button
-					v-else-if="!item.hidden"
-					:tabindex="i"
-					class="_button item"
-					:class="{ danger: item.danger, active: item.active }"
-					:disabled="item.active"
-					@click="clicked(item.action, $event)"
-					@mouseenter.passive="onItemMouseEnter(item)"
-					@mouseleave.passive="onItemMouseLeave(item)"
-				>
-					<i
-						v-if="item.icon"
-						class="ph-fw ph-lg"
-						:class="item.icon"
-					></i>
-					<span v-else-if="item.icons">
-						<i
-							v-for="icon in item.icons"
-							class="ph-fw ph-lg"
-							:class="icon"
-						></i>
-					</span>
-					<MkAvatar
-						v-if="item.avatar"
-						:user="item.avatar"
-						class="avatar"
-					/>
-					<span :style="item.textStyle || ''">{{ item.text }}</span>
-					<span v-if="item.indicate" class="indicator"
-						><i class="ph-circle ph-fill"></i
-					></span>
-				</button>
-			</template>
-			<span v-if="items2.length === 0" class="none item">
-				<span>{{ i18n.ts.none }}</span>
-			</span>
+			</div>
+			<div v-if="childMenu" class="child">
+				<XChild
+					ref="child"
+					:items="childMenu"
+					:target-element="childTarget"
+					:root-element="itemsEl"
+					showing
+					@actioned="childActioned"
+				/>
+			</div>
 		</div>
-		<div v-if="childMenu" class="child">
-			<XChild
-				ref="child"
-				:items="childMenu"
-				:target-element="childTarget"
-				:root-element="itemsEl"
-				showing
-				@actioned="childActioned"
-			/>
-		</div>
-	</div>
+	</FocusTrap>
 </template>
 
 <script lang="ts" setup>
@@ -229,12 +223,6 @@ let items2: InnerMenuItem[] = $ref([]);
 
 let child = $ref<InstanceType<typeof XChild>>();
 
-let keymap = computed(() => ({
-	"up|k|shift+tab": focusUp,
-	"down|j|tab": focusDown,
-	esc: close,
-}));
-
 let childShowingItem = $ref<MenuItem | null>();
 
 watch(
diff --git a/packages/client/src/components/MkModal.vue b/packages/client/src/components/MkModal.vue
index 2c5498583..ff001f869 100644
--- a/packages/client/src/components/MkModal.vue
+++ b/packages/client/src/components/MkModal.vue
@@ -35,6 +35,8 @@
 					: 'none',
 				'--transformOrigin': transformOrigin,
 			}"
+			tabindex="-1"
+			v-focus
 		>
 			<div
 				class="_modalBg data-cy-bg"
@@ -50,17 +52,19 @@
 				@mousedown="onBgClick"
 				@contextmenu.prevent.stop="() => {}"
 			></div>
-			<div
-				ref="content"
-				:class="[
-					$style.content,
-					{ [$style.fixed]: fixed, top: type === 'dialog:top' },
-				]"
-				:style="{ zIndex }"
-				@click.self="onBgClick"
-			>
-				<slot :max-height="maxHeight" :type="type"></slot>
-			</div>
+			<focus-trap v-model:active="isActive">
+				<div
+					ref="content"
+					:class="[
+						$style.content,
+						{ [$style.fixed]: fixed, top: type === 'dialog:top' },
+					]"
+					:style="{ zIndex }"
+					@click.self="onBgClick"
+				>
+					<slot :max-height="maxHeight" :type="type"></slot>
+				</div>
+			</focus-trap>
 		</div>
 	</Transition>
 </template>
diff --git a/packages/client/src/components/MkModalWindow.vue b/packages/client/src/components/MkModalWindow.vue
index b425c4625..48028422e 100644
--- a/packages/client/src/components/MkModalWindow.vue
+++ b/packages/client/src/components/MkModalWindow.vue
@@ -3,54 +3,57 @@
 		ref="modal"
 		:prefer-type="'dialog'"
 		@click="onBgClick"
+		@keyup.esc="$emit('close')"
 		@closed="$emit('closed')"
 	>
-		<div
-			ref="rootEl"
-			class="ebkgoccj"
-			:style="{
-				width: `${width}px`,
-				height: scroll
-					? height
-						? `${height}px`
-						: null
-					: height
-					? `min(${height}px, 100%)`
-					: '100%',
-			}"
-			@keydown="onKeydown"
-		>
-			<div ref="headerEl" class="header">
-				<button
-					v-if="withOkButton"
-					class="_button"
-					@click="$emit('close')"
-				>
-					<i class="ph-x ph-bold ph-lg"></i>
-				</button>
-				<span class="title">
-					<slot name="header"></slot>
-				</span>
-				<button
-					v-if="!withOkButton"
-					class="_button"
-					@click="$emit('close')"
-				>
-					<i class="ph-x ph-bold ph-lg"></i>
-				</button>
-				<button
-					v-if="withOkButton"
-					class="_button"
-					:disabled="okButtonDisabled"
-					@click="$emit('ok')"
-				>
-					<i class="ph-check ph-bold ph-lg"></i>
-				</button>
+		<focus-trap v-model:active="isActive">
+			<div
+				ref="rootEl"
+				class="ebkgoccj"
+				:style="{
+					width: `${width}px`,
+					height: scroll
+						? height
+							? `${height}px`
+							: null
+						: height
+						? `min(${height}px, 100%)`
+						: '100%',
+				}"
+				@keydown="onKeydown"
+			>
+				<div ref="headerEl" class="header">
+					<button
+						v-if="withOkButton"
+						class="_button"
+						@click="$emit('close')"
+					>
+						<i class="ph-x ph-bold ph-lg"></i>
+					</button>
+					<span class="title">
+						<slot name="header"></slot>
+					</span>
+					<button
+						v-if="!withOkButton"
+						class="_button"
+						@click="$emit('close')"
+					>
+						<i class="ph-x ph-bold ph-lg"></i>
+					</button>
+					<button
+						v-if="withOkButton"
+						class="_button"
+						:disabled="okButtonDisabled"
+						@click="$emit('ok')"
+					>
+						<i class="ph-check ph-bold ph-lg"></i>
+					</button>
+				</div>
+				<div class="body">
+					<slot :width="bodyWidth" :height="bodyHeight"></slot>
+				</div>
 			</div>
-			<div class="body">
-				<slot :width="bodyWidth" :height="bodyHeight"></slot>
-			</div>
-		</div>
+		</focus-trap>
 	</MkModal>
 </template>
 

From 23beca49e3b6cf13f6614476138a98416a1f8d1a Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 20:26:10 -0400
Subject: [PATCH 21/90] fixes

---
 packages/client/src/components/MkMenu.vue  |  2 +-
 packages/client/src/components/MkModal.vue | 67 +++++++++++-----------
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index af2613b8c..f22f0f9ca 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -1,6 +1,6 @@
 <template>
 	<FocusTrap v-bind:active="isActive">
-	<div tabindex="-1" v-focus>
+		<div tabindex="-1" v-focus>
 			<div
 				ref="itemsEl"
 				class="rrevdjwt _popup _shadow"
diff --git a/packages/client/src/components/MkModal.vue b/packages/client/src/components/MkModal.vue
index ff001f869..c47cd47b3 100644
--- a/packages/client/src/components/MkModal.vue
+++ b/packages/client/src/components/MkModal.vue
@@ -14,45 +14,46 @@
 		:duration="transitionDuration"
 		appear
 		@after-leave="emit('closed')"
+		@keyup.esc="emit('click')"
 		@enter="emit('opening')"
 		@after-enter="onOpened"
 	>
-		<div
-			v-show="manualShowing != null ? manualShowing : showing"
-			v-hotkey.global="keymap"
-			:class="[
-				$style.root,
-				{
-					[$style.drawer]: type === 'drawer',
-					[$style.dialog]: type === 'dialog' || type === 'dialog:top',
-					[$style.popup]: type === 'popup',
-				},
-			]"
-			:style="{
-				zIndex,
-				pointerEvents: (manualShowing != null ? manualShowing : showing)
-					? 'auto'
-					: 'none',
-				'--transformOrigin': transformOrigin,
-			}"
-			tabindex="-1"
-			v-focus
-		>
+		<focus-trap v-model:active="isActive">
 			<div
-				class="_modalBg data-cy-bg"
+				v-show="manualShowing != null ? manualShowing : showing"
+				v-hotkey.global="keymap"
 				:class="[
-					$style.bg,
+					$style.root,
 					{
-						[$style.bgTransparent]: isEnableBgTransparent,
-						'data-cy-transparent': isEnableBgTransparent,
+						[$style.drawer]: type === 'drawer',
+						[$style.dialog]: type === 'dialog' || type === 'dialog:top',
+						[$style.popup]: type === 'popup',
 					},
 				]"
-				:style="{ zIndex }"
-				@click="onBgClick"
-				@mousedown="onBgClick"
-				@contextmenu.prevent.stop="() => {}"
-			></div>
-			<focus-trap v-model:active="isActive">
+				:style="{
+					zIndex,
+					pointerEvents: (manualShowing != null ? manualShowing : showing)
+						? 'auto'
+						: 'none',
+					'--transformOrigin': transformOrigin,
+				}"
+				tabindex="-1"
+				v-focus
+			>
+				<div
+					class="_modalBg data-cy-bg"
+					:class="[
+						$style.bg,
+						{
+							[$style.bgTransparent]: isEnableBgTransparent,
+							'data-cy-transparent': isEnableBgTransparent,
+						},
+					]"
+					:style="{ zIndex }"
+					@click="onBgClick"
+					@mousedown="onBgClick"
+					@contextmenu.prevent.stop="() => {}"
+				></div>
 				<div
 					ref="content"
 					:class="[
@@ -64,8 +65,8 @@
 				>
 					<slot :max-height="maxHeight" :type="type"></slot>
 				</div>
-			</focus-trap>
-		</div>
+			</div>
+		</focus-trap>
 	</Transition>
 </template>
 

From db692fcf83e4b64d9baf8b88d9de774b4bcc6237 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 20:47:57 -0400
Subject: [PATCH 22/90] fixes?

---
 packages/client/src/components/MkEmojiPicker.vue | 1 +
 packages/client/src/components/MkMenu.child.vue  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkEmojiPicker.vue b/packages/client/src/components/MkEmojiPicker.vue
index 6c18e92f0..88d207bab 100644
--- a/packages/client/src/components/MkEmojiPicker.vue
+++ b/packages/client/src/components/MkEmojiPicker.vue
@@ -4,6 +4,7 @@
 			class="omfetrab"
 			:class="['s' + size, 'w' + width, 'h' + height, { asDrawer }]"
 			:style="{ maxHeight: maxHeight ? maxHeight + 'px' : undefined }"
+			tabindex="-1"
 		>
 			<input
 				ref="search"
diff --git a/packages/client/src/components/MkMenu.child.vue b/packages/client/src/components/MkMenu.child.vue
index 52131c5ff..d5e9d774f 100644
--- a/packages/client/src/components/MkMenu.child.vue
+++ b/packages/client/src/components/MkMenu.child.vue
@@ -1,6 +1,6 @@
 <template>
 	<FocusTrap v-bind:active="isActive">
-		<div ref="el" class="sfhdhdhr">
+		<div ref="el" class="sfhdhdhr" tabindex="-1">
 			<MkMenu
 				ref="menu"
 				:items="items"

From 81121533b02f3cd923375204bbce922c56ce93d4 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 20:52:09 -0400
Subject: [PATCH 23/90] focus last element on bg click

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

diff --git a/packages/client/src/components/MkModal.vue b/packages/client/src/components/MkModal.vue
index c47cd47b3..d1a96b4b7 100644
--- a/packages/client/src/components/MkModal.vue
+++ b/packages/client/src/components/MkModal.vue
@@ -188,6 +188,7 @@ function close(opts: { useSendAnimation?: boolean } = {}) {
 function onBgClick() {
 	if (contentClicking) return;
 	emit("click");
+	focusedElement.focus();
 }
 
 if (type === "drawer") {

From 253ba164e54a3c25185fcdbb95f57dd987ef047d Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 21:18:00 -0400
Subject: [PATCH 24/90] consistency + fix

---
 packages/client/src/components/MkModal.vue          | 6 +++---
 packages/client/src/components/MkModalWindow.vue    | 5 +++--
 packages/client/src/components/MkSubNoteContent.vue | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/components/MkModal.vue b/packages/client/src/components/MkModal.vue
index d1a96b4b7..c41fb50c0 100644
--- a/packages/client/src/components/MkModal.vue
+++ b/packages/client/src/components/MkModal.vue
@@ -18,7 +18,7 @@
 		@enter="emit('opening')"
 		@after-enter="onOpened"
 	>
-		<focus-trap v-model:active="isActive">
+		<FocusTrap v-model:active="isActive">
 			<div
 				v-show="manualShowing != null ? manualShowing : showing"
 				v-hotkey.global="keymap"
@@ -66,7 +66,7 @@
 					<slot :max-height="maxHeight" :type="type"></slot>
 				</div>
 			</div>
-		</focus-trap>
+		</FocusTrap>
 	</Transition>
 </template>
 
@@ -187,8 +187,8 @@ function close(opts: { useSendAnimation?: boolean } = {}) {
 
 function onBgClick() {
 	if (contentClicking) return;
-	emit("click");
 	focusedElement.focus();
+	emit("click");
 }
 
 if (type === "drawer") {
diff --git a/packages/client/src/components/MkModalWindow.vue b/packages/client/src/components/MkModalWindow.vue
index 48028422e..017bfae8c 100644
--- a/packages/client/src/components/MkModalWindow.vue
+++ b/packages/client/src/components/MkModalWindow.vue
@@ -6,7 +6,7 @@
 		@keyup.esc="$emit('close')"
 		@closed="$emit('closed')"
 	>
-		<focus-trap v-model:active="isActive">
+		<FocusTrap v-model:active="isActive">
 			<div
 				ref="rootEl"
 				class="ebkgoccj"
@@ -21,6 +21,7 @@
 						: '100%',
 				}"
 				@keydown="onKeydown"
+				tabindex="-1"
 			>
 				<div ref="headerEl" class="header">
 					<button
@@ -53,7 +54,7 @@
 					<slot :width="bodyWidth" :height="bodyHeight"></slot>
 				</div>
 			</div>
-		</focus-trap>
+		</FocusTrap>
 	</MkModal>
 </template>
 
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index a20afc39b..761334e1d 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -101,7 +101,7 @@
 					</div>
 				</template>
 				<div
-					v-if="!showContent"
+					v-if="note.cw && !showContent"
 					tabindex="0"
 					v-on:focus="cwButton?.focus()"
 				></div>

From 609f4cff5b06a8f7f3a99d6fb2223a30d477d251 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 21:22:29 -0400
Subject: [PATCH 25/90] fix subnote

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

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index f5e70891f..a0b70ff1f 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -26,6 +26,7 @@
 						:note="note"
 						:parentId="appearNote.parentId"
 						:conversation="conversation"
+						@focusfooter="footerEl.focus()"
 					/>
 					<div v-if="translating || translation" class="translation">
 						<MkLoading v-if="translating" mini />
@@ -46,7 +47,7 @@
 						</div>
 					</div>
 				</div>
-				<footer class="footer" @click.stop>
+				<footer ref="footerEl" class="footer" @click.stop tabindex="-1">
 					<XReactionsViewer
 						v-if="enableEmojiReactions"
 						ref="reactionsViewer"
@@ -212,6 +213,7 @@ const isRenote =
 	note.poll == null;
 
 const el = ref<HTMLElement>();
+const footerEl = ref<HTMLElement>();
 const menuButton = ref<HTMLElement>();
 const starButton = ref<InstanceType<typeof XStarButton>>();
 const renoteButton = ref<InstanceType<typeof XRenoteButton>>();

From 3a49c3eb37bc396b3bad3682605fe465f4385614 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 21:39:48 -0400
Subject: [PATCH 26/90] Fix focusing avatars in weird places

---
 packages/client/src/components/MkMenu.vue               | 4 +++-
 packages/client/src/components/MkUserSelectDialog.vue   | 2 ++
 packages/client/src/components/MkUsersTooltip.vue       | 2 +-
 packages/client/src/components/global/MkPageHeader.vue  | 2 ++
 packages/client/src/pages/admin/overview.moderators.vue | 2 +-
 packages/client/src/pages/follow-requests.vue           | 1 +
 packages/client/src/ui/_common_/navbar-for-mobile.vue   | 1 +
 packages/client/src/ui/_common_/navbar.vue              | 1 +
 packages/client/src/ui/classic.header.vue               | 1 +
 packages/client/src/ui/classic.sidebar.vue              | 1 +
 10 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index f22f0f9ca..0b5fb7455 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -46,6 +46,7 @@
 							v-if="item.avatar"
 							:user="item.avatar"
 							class="avatar"
+							disableLink
 						/>
 						<span :style="item.textStyle || ''">{{ item.text }}</span>
 						<span v-if="item.indicate" class="indicator"
@@ -88,7 +89,7 @@
 						@mouseenter.passive="onItemMouseEnter(item)"
 						@mouseleave.passive="onItemMouseLeave(item)"
 					>
-						<MkAvatar :user="item.user" class="avatar" /><MkUserName
+						<MkAvatar :user="item.user" class="avatar" disableLink /><MkUserName
 							:user="item.user"
 						/>
 						<span v-if="item.indicate" class="indicator"
@@ -157,6 +158,7 @@
 							v-if="item.avatar"
 							:user="item.avatar"
 							class="avatar"
+							disableLink
 						/>
 						<span :style="item.textStyle || ''">{{ item.text }}</span>
 						<span v-if="item.indicate" class="indicator"
diff --git a/packages/client/src/components/MkUserSelectDialog.vue b/packages/client/src/components/MkUserSelectDialog.vue
index 506f48bd4..14553ca46 100644
--- a/packages/client/src/components/MkUserSelectDialog.vue
+++ b/packages/client/src/components/MkUserSelectDialog.vue
@@ -46,6 +46,7 @@
 							:user="user"
 							class="avatar"
 							:show-indicator="true"
+							disableLink
 						/>
 						<div class="body">
 							<MkUserName :user="user" class="name" />
@@ -73,6 +74,7 @@
 							:user="user"
 							class="avatar"
 							:show-indicator="true"
+							disableLink
 						/>
 						<div class="body">
 							<MkUserName :user="user" class="name" />
diff --git a/packages/client/src/components/MkUsersTooltip.vue b/packages/client/src/components/MkUsersTooltip.vue
index 972864d1f..78a4f90f2 100644
--- a/packages/client/src/components/MkUsersTooltip.vue
+++ b/packages/client/src/components/MkUsersTooltip.vue
@@ -7,7 +7,7 @@
 	>
 		<div class="beaffaef">
 			<div v-for="u in users" :key="u.id" class="user">
-				<MkAvatar class="avatar" :user="u" />
+				<MkAvatar class="avatar" :user="u" disableLink />
 				<MkUserName class="name" :user="u" :nowrap="true" />
 			</div>
 			<div v-if="users.length < count" class="omitted">
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index ad1d80ca6..c78ef0c10 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -19,6 +19,7 @@
 				class="avatar"
 				:user="$i"
 				:disable-preview="true"
+				disableLink
 			/>
 		</div>
 		<template v-if="metadata">
@@ -33,6 +34,7 @@
 					:user="metadata.avatar"
 					:disable-preview="true"
 					:show-indicator="true"
+					disableLink
 				/>
 				<i
 					v-else-if="metadata.icon && !narrow"
diff --git a/packages/client/src/pages/admin/overview.moderators.vue b/packages/client/src/pages/admin/overview.moderators.vue
index 6184cfb10..db953b890 100644
--- a/packages/client/src/pages/admin/overview.moderators.vue
+++ b/packages/client/src/pages/admin/overview.moderators.vue
@@ -12,7 +12,7 @@
 					class="user"
 					:to="`/user-info/${user.id}`"
 				>
-					<MkAvatar :user="user" class="avatar" indicator />
+					<MkAvatar :user="user" class="avatar" indicator disableLink />
 				</MkA>
 			</div>
 		</Transition>
diff --git a/packages/client/src/pages/follow-requests.vue b/packages/client/src/pages/follow-requests.vue
index 2aac52163..35279495b 100644
--- a/packages/client/src/pages/follow-requests.vue
+++ b/packages/client/src/pages/follow-requests.vue
@@ -23,6 +23,7 @@
 								class="avatar"
 								:user="req.follower"
 								:show-indicator="true"
+								disableLink
 							/>
 							<div class="body">
 								<div class="name">
diff --git a/packages/client/src/ui/_common_/navbar-for-mobile.vue b/packages/client/src/ui/_common_/navbar-for-mobile.vue
index 43c91d147..39abb7c26 100644
--- a/packages/client/src/ui/_common_/navbar-for-mobile.vue
+++ b/packages/client/src/ui/_common_/navbar-for-mobile.vue
@@ -18,6 +18,7 @@
 					<MkAvatar
 						:user="$i"
 						class="icon"
+						disableLink
 					/><!-- <MkAcct class="text" :user="$i"/> -->
 				</button>
 			</div>
diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index 1c69067e1..4fb27a071 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -18,6 +18,7 @@
 					<MkAvatar
 						:user="$i"
 						class="icon"
+						disableLink
 					/><!-- <MkAcct class="text" :user="$i"/> -->
 				</button>
 			</div>
diff --git a/packages/client/src/ui/classic.header.vue b/packages/client/src/ui/classic.header.vue
index 5c3e6b702..99a0ab098 100644
--- a/packages/client/src/ui/classic.header.vue
+++ b/packages/client/src/ui/classic.header.vue
@@ -83,6 +83,7 @@
 					<MkAvatar :user="$i" class="avatar" /><MkAcct
 						class="acct"
 						:user="$i"
+						disableLink
 					/>
 				</button>
 				<div class="post" @click="post">
diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue
index b70a3c984..33aa62ed7 100644
--- a/packages/client/src/ui/classic.sidebar.vue
+++ b/packages/client/src/ui/classic.sidebar.vue
@@ -8,6 +8,7 @@
 			<MkAvatar :user="$i" class="avatar" /><MkAcct
 				class="text"
 				:user="$i"
+				disableLink
 			/>
 		</button>
 		<div class="post" data-cy-open-post-form @click="post">

From 4bda4ffffc821c1a5ec1d54f478fd283f2087332 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 21:49:41 -0400
Subject: [PATCH 27/90] Make accounts in account management page focusable

---
 packages/client/src/pages/settings/accounts.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/pages/settings/accounts.vue b/packages/client/src/pages/settings/accounts.vue
index ec2cd2477..3010354b6 100644
--- a/packages/client/src/pages/settings/accounts.vue
+++ b/packages/client/src/pages/settings/accounts.vue
@@ -6,14 +6,14 @@
 				{{ i18n.ts.addAccount }}</FormButton
 			>
 
-			<div
+			<button
 				v-for="account in accounts"
 				:key="account.id"
 				class="_panel _button lcjjdxlm"
 				@click="menu(account, $event)"
 			>
 				<div class="avatar">
-					<MkAvatar :user="account" class="avatar" />
+					<MkAvatar :user="account" class="avatar" disableLink />
 				</div>
 				<div class="body">
 					<div class="name">
@@ -23,7 +23,7 @@
 						<MkAcct :user="account" />
 					</div>
 				</div>
-			</div>
+			</button>
 		</FormSuspense>
 	</div>
 </template>
@@ -158,6 +158,8 @@ definePageMetadata({
 .lcjjdxlm {
 	display: flex;
 	padding: 16px;
+	width: 100%;
+	text-align: unset;
 
 	> .avatar {
 		display: block;

From 1389dd900095eec14fd7754d0f9dc561296dd0d7 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 22:04:35 -0400
Subject: [PATCH 28/90] make folder dropdown focusable

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

diff --git a/packages/client/src/components/form/folder.vue b/packages/client/src/components/form/folder.vue
index 8868f5784..a2fde5341 100644
--- a/packages/client/src/components/form/folder.vue
+++ b/packages/client/src/components/form/folder.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="dwzlatin" :class="{ opened }">
-		<div class="header _button" @click="toggle">
+		<button class="header _button" @click="toggle">
 			<span class="icon"><slot name="icon"></slot></span>
 			<span class="text"><slot name="label"></slot></span>
 			<span class="right">
@@ -8,7 +8,7 @@
 				<i v-if="opened" class="ph-caret-up ph-bold ph-lg icon"></i>
 				<i v-else class="ph-caret-down ph-bold ph-lg icon"></i>
 			</span>
-		</div>
+		</button>
 		<KeepAlive>
 			<div v-if="openedAtLeastOnce" v-show="opened" class="body">
 				<MkSpacer :margin-min="14" :margin-max="22">

From af620735442e64fcb9f6e18639bc49defcfeea59 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 22:17:39 -0400
Subject: [PATCH 29/90] focus to media

---
 packages/client/src/components/MkDriveFileThumbnail.vue | 7 +++++--
 packages/client/src/components/MkMediaImage.vue         | 4 ++++
 packages/client/src/components/MkPostFormAttaches.vue   | 1 -
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/MkDriveFileThumbnail.vue b/packages/client/src/components/MkDriveFileThumbnail.vue
index 39150c10c..48b542817 100644
--- a/packages/client/src/components/MkDriveFileThumbnail.vue
+++ b/packages/client/src/components/MkDriveFileThumbnail.vue
@@ -1,5 +1,5 @@
 <template>
-	<div ref="thumbnail" class="zdjebgpv">
+	<button ref="thumbnail" class="zdjebgpv">
 		<ImgWithBlurhash
 			v-if="isThumbnailAvailable"
 			:hash="file.blurhash"
@@ -36,7 +36,7 @@
 			v-if="isThumbnailAvailable && is === 'video'"
 			class="ph-file-video ph-bold ph-lg icon-sub"
 		></i>
-	</div>
+	</button>
 </template>
 
 <script lang="ts" setup>
@@ -88,6 +88,9 @@ const isThumbnailAvailable = computed(() => {
 	background: var(--panel);
 	border-radius: 8px;
 	overflow: clip;
+	border: 0;
+	padding: 0;
+	cursor: pointer;
 
 	> .icon-sub {
 		position: absolute;
diff --git a/packages/client/src/components/MkMediaImage.vue b/packages/client/src/components/MkMediaImage.vue
index 882908040..055a9e9b1 100644
--- a/packages/client/src/components/MkMediaImage.vue
+++ b/packages/client/src/components/MkMediaImage.vue
@@ -138,6 +138,10 @@ watch(
 		background-position: center;
 		background-size: contain;
 		background-repeat: no-repeat;
+		&:focus {
+			border: 2px solid var(--accent);
+			box-sizing: border-box;
+		}
 
 		> .gif {
 			background-color: var(--fg);
diff --git a/packages/client/src/components/MkPostFormAttaches.vue b/packages/client/src/components/MkPostFormAttaches.vue
index ad2155155..29d5dc79c 100644
--- a/packages/client/src/components/MkPostFormAttaches.vue
+++ b/packages/client/src/components/MkPostFormAttaches.vue
@@ -198,7 +198,6 @@ export default defineComponent({
 			height: 64px;
 			margin-right: 4px;
 			border-radius: 4px;
-			overflow: hidden;
 			cursor: move;
 
 			&:hover > .remove {

From c55b521e57166fc2fc8d794579a1dbb3c4c5d310 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 22:19:02 -0400
Subject: [PATCH 30/90] a

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

diff --git a/packages/client/src/components/MkMediaImage.vue b/packages/client/src/components/MkMediaImage.vue
index 055a9e9b1..3cfb0f465 100644
--- a/packages/client/src/components/MkMediaImage.vue
+++ b/packages/client/src/components/MkMediaImage.vue
@@ -138,9 +138,9 @@ watch(
 		background-position: center;
 		background-size: contain;
 		background-repeat: no-repeat;
-		&:focus {
+		box-sizing: border-box;
+		&:focus-visible {
 			border: 2px solid var(--accent);
-			box-sizing: border-box;
 		}
 
 		> .gif {

From 70c8690623927cfe2130cb24b4e4250f5a23bd6c Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 22:24:40 -0400
Subject: [PATCH 31/90] fix

---
 packages/client/src/components/MkMenu.child.vue | 6 +-----
 packages/client/src/components/MkMenu.vue       | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/components/MkMenu.child.vue b/packages/client/src/components/MkMenu.child.vue
index d5e9d774f..e5ca9e4ee 100644
--- a/packages/client/src/components/MkMenu.child.vue
+++ b/packages/client/src/components/MkMenu.child.vue
@@ -1,6 +1,5 @@
 <template>
-	<FocusTrap v-bind:active="isActive">
-		<div ref="el" class="sfhdhdhr" tabindex="-1">
+	<div ref="el" class="sfhdhdhr" tabindex="-1">
 			<MkMenu
 				ref="menu"
 				:items="items"
@@ -10,7 +9,6 @@
 				@close="onChildClosed"
 			/>
 		</div>
-	</FocusTrap>
 </template>
 
 <script lang="ts" setup>
@@ -25,8 +23,6 @@ import {
 } from "vue";
 import MkMenu from "./MkMenu.vue";
 import { MenuItem } from "@/types/menu";
-import { FocusTrap } from 'focus-trap-vue';
-import * as os from "@/os";
 
 const props = defineProps<{
 	items: MenuItem[];
diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index 0b5fb7455..c71e3ac58 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -115,6 +115,7 @@
 						class="_button item parent"
 						:class="{ childShowing: childShowingItem === item }"
 						@mouseenter="showChildren(item, $event)"
+						@click="showChildren(item, $event)"
 					>
 						<i
 							v-if="item.icon"

From cb017d1006f12a4349eb387f5cf74b996c381078 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 22:40:23 -0400
Subject: [PATCH 32/90] sidebar focus

---
 packages/client/src/ui/_common_/navbar.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index 4fb27a071..20c177f37 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -335,6 +335,7 @@ function more(ev: MouseEvent) {
 					}
 
 					&:hover,
+					&:focus-within,
 					&.active {
 						&:before {
 							background: var(--accentLighten);
@@ -428,7 +429,8 @@ function more(ev: MouseEvent) {
 						text-overflow: ellipsis;
 					}
 
-					&:hover {
+					&:hover,
+					&:focus-within {
 						text-decoration: none;
 						color: var(--navHoverFg);
 						transition: all 0.4s ease;
@@ -530,6 +532,7 @@ function more(ev: MouseEvent) {
 					}
 
 					&:hover,
+					&:focus-within,
 					&.active {
 						&:before {
 							background: var(--accentLighten);
@@ -615,6 +618,7 @@ function more(ev: MouseEvent) {
 					}
 
 					&:hover,
+					&:focus-within,
 					&.active {
 						text-decoration: none;
 						color: var(--accent);

From 9392d84625de11fcd3ae9500f4c8d635cb8cb8cd Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 22:50:32 -0400
Subject: [PATCH 33/90] widgets

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

diff --git a/packages/client/src/components/MkWidgets.vue b/packages/client/src/components/MkWidgets.vue
index 07e845032..d48fc5383 100644
--- a/packages/client/src/components/MkWidgets.vue
+++ b/packages/client/src/components/MkWidgets.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="vjoppmmu">
 		<template v-if="edit">
-			<header>
+			<header tabindex="-1" v-focus>
 				<MkSelect
 					v-model="widgetAdderSelected"
 					style="margin-bottom: var(--margin)"

From ca68d4fd28d64848095b390359e20c1b58668c57 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 23:18:01 -0400
Subject: [PATCH 34/90] classic view fixes

---
 packages/client/src/components/MkModalPageWindow.vue | 1 +
 packages/client/src/ui/classic.sidebar.vue           | 5 +++--
 packages/client/src/ui/classic.vue                   | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkModalPageWindow.vue b/packages/client/src/components/MkModalPageWindow.vue
index 361128464..bf4d8d0bc 100644
--- a/packages/client/src/components/MkModalPageWindow.vue
+++ b/packages/client/src/components/MkModalPageWindow.vue
@@ -158,6 +158,7 @@ function onContextmenu(ev: MouseEvent) {
 	flex-direction: column;
 	contain: content;
 	border-radius: var(--radius);
+	margin: auto;
 
 	--root-margin: 24px;
 
diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue
index 33aa62ed7..fa72c5765 100644
--- a/packages/client/src/ui/classic.sidebar.vue
+++ b/packages/client/src/ui/classic.sidebar.vue
@@ -5,10 +5,9 @@
 			class="item _button account"
 			@click="openAccountMenu"
 		>
-			<MkAvatar :user="$i" class="avatar" /><MkAcct
+			<MkAvatar :user="$i" class="avatar" disableLink /><MkAcct
 				class="text"
 				:user="$i"
-				disableLink
 			/>
 		</button>
 		<div class="post" data-cy-open-post-form @click="post">
@@ -300,6 +299,7 @@ function openInstanceMenu(ev: MouseEvent) {
 				width: 46px;
 				height: 46px;
 				padding: 0;
+				margin-inline: 0 !important;
 			}
 		}
 
@@ -373,6 +373,7 @@ function openInstanceMenu(ev: MouseEvent) {
 
 		> i {
 			width: 32px;
+			justify-content: center;
 		}
 
 		> i,
diff --git a/packages/client/src/ui/classic.vue b/packages/client/src/ui/classic.vue
index a721ffd0b..266effd9a 100644
--- a/packages/client/src/ui/classic.vue
+++ b/packages/client/src/ui/classic.vue
@@ -227,6 +227,8 @@ onMounted(() => {
 }
 
 .gbhvwtnk {
+	display: flex;
+	justify-content: center;
 	$ui-font-size: 1em;
 	$widgets-hide-threshold: 1200px;
 

From 5e01581d0654ef448e6114800364d871bfb706bd Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 23:26:19 -0400
Subject: [PATCH 35/90] outline fixes

---
 packages/client/src/components/MkModal.vue           | 1 +
 packages/client/src/components/global/RouterView.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/client/src/components/MkModal.vue b/packages/client/src/components/MkModal.vue
index c41fb50c0..12e79f428 100644
--- a/packages/client/src/components/MkModal.vue
+++ b/packages/client/src/components/MkModal.vue
@@ -490,6 +490,7 @@ defineExpose({
 }
 
 .root {
+	outline: none;
 	&.dialog {
 		> .content {
 			position: fixed;
diff --git a/packages/client/src/components/global/RouterView.vue b/packages/client/src/components/global/RouterView.vue
index edb3fedaa..437b7c53e 100644
--- a/packages/client/src/components/global/RouterView.vue
+++ b/packages/client/src/components/global/RouterView.vue
@@ -7,6 +7,7 @@
 				v-bind="Object.fromEntries(currentPageProps)"
 				tabindex="-1"
 				v-focus
+				style="outline: none;"
 			/>
 
 			<template #fallback>

From 0b758321babe513e1601a033452a31ecd7a5b8e0 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 23:47:13 -0400
Subject: [PATCH 36/90] a

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

diff --git a/packages/client/src/components/MkNotePreview.vue b/packages/client/src/components/MkNotePreview.vue
index 9d388e71b..6fdd79dc6 100644
--- a/packages/client/src/components/MkNotePreview.vue
+++ b/packages/client/src/components/MkNotePreview.vue
@@ -1,6 +1,6 @@
 <template>
 	<div v-size="{ min: [350, 500] }" class="fefdfafb">
-		<MkAvatar class="avatar" :user="$i" />
+		<MkAvatar class="avatar" :user="$i" disableLink />
 		<div class="main">
 			<div class="header">
 				<MkUserName :user="$i" />

From 544e4bab51e34b6534d36ffea2682656f4f825a9 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 29 Apr 2023 09:56:28 -0400
Subject: [PATCH 37/90] a

---
 packages/client/src/components/MkCwButton.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkCwButton.vue b/packages/client/src/components/MkCwButton.vue
index 3038f97f7..1f6340510 100644
--- a/packages/client/src/components/MkCwButton.vue
+++ b/packages/client/src/components/MkCwButton.vue
@@ -84,6 +84,7 @@ defineExpose({
 		bottom: 0;
 		left: 0;
 		width: 100%;
+		z-index: 2;
 		> span {
 			display: inline-block;
 			background: var(--panel);
@@ -92,7 +93,7 @@ defineExpose({
 			border-radius: 999px;
 			box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
 		}
-		&:hover {
+		&:hover, &:focus {
 			> span {
 				background: var(--panelHighlight);
 			}

From 914355c6445027c17e20cbb31504ab6a6de64dd3 Mon Sep 17 00:00:00 2001
From: Kaity A <kaity@theallans.com.au>
Date: Sun, 30 Apr 2023 11:09:51 +1000
Subject: [PATCH 38/90] Add Libre Translate support

---
 .../migration/1682777547198-LibreTranslate.js | 23 ++++++++++
 packages/backend/src/config/types.ts          |  5 +++
 packages/backend/src/models/entities/meta.ts  | 12 ++++++
 .../api/endpoints/admin/accounts/hosted.ts    | 11 +++++
 .../src/server/api/endpoints/admin/meta.ts    |  5 ++-
 .../server/api/endpoints/admin/update-meta.ts | 18 ++++++++
 .../backend/src/server/api/endpoints/meta.ts  |  3 +-
 .../server/api/endpoints/notes/translate.ts   | 43 ++++++++++++++++++-
 packages/client/src/pages/admin/settings.vue  | 34 +++++++++++++++
 9 files changed, 150 insertions(+), 4 deletions(-)
 create mode 100644 packages/backend/migration/1682777547198-LibreTranslate.js

diff --git a/packages/backend/migration/1682777547198-LibreTranslate.js b/packages/backend/migration/1682777547198-LibreTranslate.js
new file mode 100644
index 000000000..dbaf483e6
--- /dev/null
+++ b/packages/backend/migration/1682777547198-LibreTranslate.js
@@ -0,0 +1,23 @@
+export class LibreTranslate1682777547198 {
+	name = "LibreTranslate1682777547198";
+
+	async up(queryRunner) {
+		await queryRunner.query(`
+				ALTER TABLE "meta"
+				ADD "libreTranslateApiUrl" character varying(512)
+		`);
+		await queryRunner.query(`
+				ALTER TABLE "meta"
+				ADD "libreTranslateApiKey" character varying(128)
+		`);
+	}
+
+	async down(queryRunner) {
+		await queryRunner.query(`
+				ALTER TABLE "meta" DROP COLUMN "libreTranslateApiKey"
+		`);
+		await queryRunner.query(`
+				ALTER TABLE "meta" DROP COLUMN "libreTranslateApiUrl"
+		`);
+	}
+}
diff --git a/packages/backend/src/config/types.ts b/packages/backend/src/config/types.ts
index 4f367debe..0cd8c02ad 100644
--- a/packages/backend/src/config/types.ts
+++ b/packages/backend/src/config/types.ts
@@ -89,6 +89,11 @@ export type Source = {
 		authKey?: string;
 		isPro?: boolean;
 	};
+	libreTranslate: {
+		managed?: boolean;
+		apiUrl?: string;
+		apiKey?: string;
+	};
 	email: {
 		managed?: boolean;
 		address?: string;
diff --git a/packages/backend/src/models/entities/meta.ts b/packages/backend/src/models/entities/meta.ts
index 26a7c9c19..2f77796c4 100644
--- a/packages/backend/src/models/entities/meta.ts
+++ b/packages/backend/src/models/entities/meta.ts
@@ -386,6 +386,18 @@ export class Meta {
 	})
 	public deeplIsPro: boolean;
 
+	@Column('varchar', {
+		length: 512,
+		nullable: true,
+	})
+	public libreTranslateApiUrl: string | null;
+
+	@Column('varchar', {
+		length: 128,
+		nullable: true,
+	})
+	public libreTranslateApiKey: string | null;
+
 	@Column('varchar', {
 		length: 512,
 		nullable: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/hosted.ts b/packages/backend/src/server/api/endpoints/admin/accounts/hosted.ts
index 15ad1f9a1..a7b6e95c2 100644
--- a/packages/backend/src/server/api/endpoints/admin/accounts/hosted.ts
+++ b/packages/backend/src/server/api/endpoints/admin/accounts/hosted.ts
@@ -30,6 +30,17 @@ export default define(meta, paramDef, async (ps, me) => {
 				set.deeplIsPro = config.deepl.isPro;
 			}
 		}
+		if (
+			config.libreTranslate.managed != null &&
+			config.libreTranslate.managed === true
+		) {
+			if (typeof config.libreTranslate.apiUrl === "string") {
+				set.libreTranslateApiUrl = config.libreTranslate.apiUrl;
+			}
+			if (typeof config.libreTranslate.apiKey === "string") {
+				set.libreTranslateApiKey = config.libreTranslate.apiKey;
+			}
+		}
 		if (config.email.managed != null && config.email.managed === true) {
 			set.enableEmail = true;
 			if (typeof config.email.address === "string") {
diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts
index c8c639f50..f0ac57892 100644
--- a/packages/backend/src/server/api/endpoints/admin/meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -512,7 +512,8 @@ export default define(meta, paramDef, async (ps, me) => {
 		enableGithubIntegration: instance.enableGithubIntegration,
 		enableDiscordIntegration: instance.enableDiscordIntegration,
 		enableServiceWorker: instance.enableServiceWorker,
-		translatorAvailable: instance.deeplAuthKey != null,
+		translatorAvailable:
+			instance.deeplAuthKey != null || instance.libreTranslateApiUrl != null,
 		pinnedPages: instance.pinnedPages,
 		pinnedClipId: instance.pinnedClipId,
 		cacheRemoteFiles: instance.cacheRemoteFiles,
@@ -564,6 +565,8 @@ export default define(meta, paramDef, async (ps, me) => {
 		objectStorageS3ForcePathStyle: instance.objectStorageS3ForcePathStyle,
 		deeplAuthKey: instance.deeplAuthKey,
 		deeplIsPro: instance.deeplIsPro,
+		libreTranslateApiUrl: instance.libreTranslateApiUrl,
+		libreTranslateApiKey: instance.libreTranslateApiKey,
 		enableIpLogging: instance.enableIpLogging,
 		enableActiveEmailValidation: instance.enableActiveEmailValidation,
 	};
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 f7e79b64b..a23000732 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -124,6 +124,8 @@ export const paramDef = {
 		summalyProxy: { type: "string", nullable: true },
 		deeplAuthKey: { type: "string", nullable: true },
 		deeplIsPro: { type: "boolean" },
+		libreTranslateApiUrl: { type: "string", nullable: true },
+		libreTranslateApiKey: { type: "string", nullable: true },
 		enableTwitterIntegration: { type: "boolean" },
 		twitterConsumerKey: { type: "string", nullable: true },
 		twitterConsumerSecret: { type: "string", nullable: true },
@@ -515,6 +517,22 @@ export default define(meta, paramDef, async (ps, me) => {
 		set.deeplIsPro = ps.deeplIsPro;
 	}
 
+	if (ps.libreTranslateApiUrl !== undefined) {
+		if (ps.libreTranslateApiUrl === "") {
+			set.libreTranslateApiUrl = null;
+		} else {
+			set.libreTranslateApiUrl = ps.libreTranslateApiUrl;
+		}
+	}
+
+	if (ps.libreTranslateApiKey !== undefined) {
+		if (ps.libreTranslateApiKey === "") {
+			set.libreTranslateApiKey = null;
+		} else {
+			set.libreTranslateApiKey = ps.libreTranslateApiKey;
+		}
+	}
+
 	if (ps.enableIpLogging !== undefined) {
 		set.enableIpLogging = ps.enableIpLogging;
 	}
diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index 4dc1c941e..23989750f 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -482,7 +482,8 @@ export default define(meta, paramDef, async (ps, me) => {
 
 		enableServiceWorker: instance.enableServiceWorker,
 
-		translatorAvailable: instance.deeplAuthKey != null,
+		translatorAvailable:
+			instance.deeplAuthKey != null || instance.libreTranslateApiUrl != null,
 		defaultReaction: instance.defaultReaction,
 
 		...(ps.detail
diff --git a/packages/backend/src/server/api/endpoints/notes/translate.ts b/packages/backend/src/server/api/endpoints/notes/translate.ts
index c6415ceef..d86fc12a2 100644
--- a/packages/backend/src/server/api/endpoints/notes/translate.ts
+++ b/packages/backend/src/server/api/endpoints/notes/translate.ts
@@ -51,15 +51,54 @@ export default define(meta, paramDef, async (ps, user) => {
 
 	const instance = await fetchMeta();
 
-	if (instance.deeplAuthKey == null) {
+	if (instance.deeplAuthKey == null && instance.libreTranslateApiUrl == null) {
 		return 204; // TODO: 良い感じのエラー返す
 	}
 
 	let targetLang = ps.targetLang;
 	if (targetLang.includes("-")) targetLang = targetLang.split("-")[0];
 
+	if (instance.libreTranslateApiUrl != null) {
+		const jsonBody = {
+			q: note.text,
+			source: "auto",
+			target: targetLang,
+			format: "text",
+			api_key: instance.libreTranslateApiKey ?? "",
+		};
+
+		const url = new URL(instance.libreTranslateApiUrl);
+		if (url.pathname.endsWith("/")) {
+			url.pathname = url.pathname.slice(0, -1);
+		}
+		if (!url.pathname.endsWith("/translate")) {
+			url.pathname += "/translate";
+		}
+		const res = await fetch(url.toString(), {
+			method: "POST",
+			headers: {
+				"Content-Type": "application/json",
+			},
+			body: JSON.stringify(jsonBody),
+			agent: getAgentByUrl,
+		});
+
+		const json = (await res.json()) as {
+			detectedLanguage?: {
+				confidence: number;
+				language: string;
+			};
+			translatedText: string;
+		};
+
+		return {
+			sourceLang: json.detectedLanguage?.language,
+			text: json.translatedText,
+		};
+	}
+
 	const params = new URLSearchParams();
-	params.append("auth_key", instance.deeplAuthKey);
+	params.append("auth_key", instance.deeplAuthKey ?? "");
 	params.append("text", note.text);
 	params.append("target_lang", targetLang);
 
diff --git a/packages/client/src/pages/admin/settings.vue b/packages/client/src/pages/admin/settings.vue
index 5349df805..feedaff6d 100644
--- a/packages/client/src/pages/admin/settings.vue
+++ b/packages/client/src/pages/admin/settings.vue
@@ -371,6 +371,34 @@
 								<template #label>Pro account</template>
 							</FormSwitch>
 						</FormSection>
+
+						<FormSection>
+							<template #label>Libre Translate</template>
+
+							<FormInput
+								v-model="libreTranslateApiUrl"
+								class="_formBlock"
+							>
+								<template #prefix
+									><i class="ph-link ph-bold ph-lg"></i
+								></template>
+								<template #label
+									>Libre Translate API URL</template
+								>
+							</FormInput>
+
+							<FormInput
+								v-model="libreTranslateApiKey"
+								class="_formBlock"
+							>
+								<template #prefix
+									><i class="ph-key ph-bold ph-lg"></i
+								></template>
+								<template #label
+									>Libre Translate API Key</template
+								>
+							</FormInput>
+						</FormSection>
 					</div>
 				</FormSuspense>
 			</MkSpacer>
@@ -422,6 +450,8 @@ let swPublicKey: any = $ref(null);
 let swPrivateKey: any = $ref(null);
 let deeplAuthKey: string = $ref("");
 let deeplIsPro: boolean = $ref(false);
+let libreTranslateApiUrl: string = $ref("");
+let libreTranslateApiKey: string = $ref("");
 let defaultReaction: string = $ref("");
 let defaultReactionCustom: string = $ref("");
 
@@ -456,6 +486,8 @@ async function init() {
 	swPrivateKey = meta.swPrivateKey;
 	deeplAuthKey = meta.deeplAuthKey;
 	deeplIsPro = meta.deeplIsPro;
+	libreTranslateApiUrl = meta.libreTranslateApiUrl;
+	libreTranslateApiKey = meta.libreTranslateApiKey;
 	defaultReaction = ["⭐", "👍", "❤️"].includes(meta.defaultReaction)
 		? meta.defaultReaction
 		: "custom";
@@ -498,6 +530,8 @@ function save() {
 		swPrivateKey,
 		deeplAuthKey,
 		deeplIsPro,
+		libreTranslateApiUrl,
+		libreTranslateApiKey,
 		defaultReaction,
 	}).then(() => {
 		fetchInstance();

From 461fdd1408307b1a82acec73698ddb5c8cb0b87f Mon Sep 17 00:00:00 2001
From: Kaitlyn Allan <kaitlyn.allan@enlabs.cloud>
Date: Sat, 29 Apr 2023 21:05:33 +1000
Subject: [PATCH 39/90] Remove eslint from calckey-js (use rome)

---
 packages/calckey-js/.eslintignore |  7 ----
 packages/calckey-js/.eslintrc.js  | 65 -------------------------------
 packages/calckey-js/package.json  |  3 +-
 3 files changed, 1 insertion(+), 74 deletions(-)
 delete mode 100644 packages/calckey-js/.eslintignore
 delete mode 100644 packages/calckey-js/.eslintrc.js

diff --git a/packages/calckey-js/.eslintignore b/packages/calckey-js/.eslintignore
deleted file mode 100644
index f22128f04..000000000
--- a/packages/calckey-js/.eslintignore
+++ /dev/null
@@ -1,7 +0,0 @@
-node_modules
-/built
-/coverage
-/.eslintrc.js
-/jest.config.ts
-/test
-/test-d
diff --git a/packages/calckey-js/.eslintrc.js b/packages/calckey-js/.eslintrc.js
deleted file mode 100644
index 164cf1fbe..000000000
--- a/packages/calckey-js/.eslintrc.js
+++ /dev/null
@@ -1,65 +0,0 @@
-module.exports = {
-	root: true,
-	parser: "@typescript-eslint/parser",
-	parserOptions: {
-		tsconfigRootDir: __dirname,
-		project: ["./tsconfig.json"],
-	},
-	plugins: ["@typescript-eslint"],
-	extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
-	rules: {
-		indent: [
-			"error",
-			"tab",
-			{
-				SwitchCase: 1,
-				MemberExpression: "off",
-				flatTernaryExpressions: true,
-				ArrayExpression: "first",
-				ObjectExpression: "first",
-			},
-		],
-		"eol-last": ["error", "always"],
-		semi: ["error", "always"],
-		quotes: ["error", "single"],
-		"comma-dangle": ["error", "always-multiline"],
-		"keyword-spacing": [
-			"error",
-			{
-				before: true,
-				after: true,
-			},
-		],
-		"key-spacing": [
-			"error",
-			{
-				beforeColon: false,
-				afterColon: true,
-			},
-		],
-		"space-infix-ops": ["error"],
-		"space-before-blocks": ["error", "always"],
-		"object-curly-spacing": ["error", "always"],
-		"nonblock-statement-body-position": ["error", "beside"],
-		eqeqeq: ["error", "always", { null: "ignore" }],
-		"no-multiple-empty-lines": ["error", { max: 1 }],
-		"no-multi-spaces": ["error"],
-		"no-var": ["error"],
-		"prefer-arrow-callback": ["error"],
-		"no-throw-literal": ["error"],
-		"no-param-reassign": ["warn"],
-		"no-constant-condition": ["warn"],
-		"no-empty-pattern": ["warn"],
-		"@typescript-eslint/no-unnecessary-condition": ["error"],
-		"@typescript-eslint/no-inferrable-types": ["warn"],
-		"@typescript-eslint/no-non-null-assertion": ["warn"],
-		"@typescript-eslint/explicit-function-return-type": ["warn"],
-		"@typescript-eslint/no-misused-promises": [
-			"error",
-			{
-				checksVoidReturn: false,
-			},
-		],
-		"@typescript-eslint/consistent-type-imports": "error",
-	},
-};
diff --git a/packages/calckey-js/package.json b/packages/calckey-js/package.json
index d68f24175..598dd1cdb 100644
--- a/packages/calckey-js/package.json
+++ b/packages/calckey-js/package.json
@@ -9,9 +9,8 @@
 		"tsd": "tsd",
 		"api": "pnpm api-extractor run --local --verbose",
 		"api-prod": "pnpm api-extractor run --verbose",
-		"eslint": "eslint . --ext .js,.jsx,.ts,.tsx",
 		"typecheck": "tsc --noEmit",
-		"lint": "pnpm typecheck && pnpm eslint",
+		"lint": "pnpm typecheck && pnpm rome check \"src/*.ts\"",
 		"jest": "jest --coverage --detectOpenHandles",
 		"test": "pnpm jest && pnpm tsd"
 	},

From d1c1d75388b35a7ea5c6a5c57e25ab6c47f1b721 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 29 Apr 2023 19:14:36 -0700
Subject: [PATCH 40/90] Revert "keyboard accessibility (#9725)"

This reverts commit c1d5922acbe7060c0ea779ccf314e9f0e6b91bb3.
---
 package.json                                  |   2 -
 packages/client/src/components/MkButton.vue   |   3 +-
 packages/client/src/components/MkCwButton.vue |  18 +-
 .../src/components/MkDriveFileThumbnail.vue   |   7 +-
 .../client/src/components/MkEmojiPicker.vue   | 278 +++++++------
 .../client/src/components/MkLaunchPad.vue     |   2 +-
 .../client/src/components/MkMediaImage.vue    |   4 -
 .../client/src/components/MkMenu.child.vue    |  21 +-
 packages/client/src/components/MkMenu.vue     | 382 +++++++++---------
 packages/client/src/components/MkModal.vue    |  86 ++--
 .../src/components/MkModalPageWindow.vue      |   1 -
 .../client/src/components/MkModalWindow.vue   |  95 +++--
 packages/client/src/components/MkNote.vue     |   8 +-
 .../client/src/components/MkNotePreview.vue   |   2 +-
 packages/client/src/components/MkNoteSub.vue  |   4 +-
 .../client/src/components/MkPopupMenu.vue     |   2 -
 .../src/components/MkPostFormAttaches.vue     |   1 +
 .../src/components/MkSubNoteContent.vue       |  27 +-
 .../client/src/components/MkSuperMenu.vue     |   5 +-
 .../src/components/MkUserSelectDialog.vue     |   2 -
 .../client/src/components/MkUsersTooltip.vue  |   2 +-
 packages/client/src/components/MkWidgets.vue  |   2 +-
 .../client/src/components/form/folder.vue     |   4 +-
 packages/client/src/components/form/radio.vue |   3 -
 .../client/src/components/form/switch.vue     |   3 -
 .../src/components/global/MkPageHeader.vue    |   2 -
 .../src/components/global/RouterView.vue      |   3 -
 packages/client/src/directives/focus.ts       |   3 -
 packages/client/src/directives/index.ts       |   2 -
 packages/client/src/directives/tooltip.ts     |  33 +-
 packages/client/src/pages/admin/_header_.vue  |   6 +-
 .../src/pages/admin/overview.moderators.vue   |   2 +-
 packages/client/src/pages/follow-requests.vue |   1 -
 .../client/src/pages/settings/accounts.vue    |   8 +-
 packages/client/src/style.scss                |   4 +
 .../src/ui/_common_/navbar-for-mobile.vue     |   1 -
 packages/client/src/ui/_common_/navbar.vue    |  21 +-
 packages/client/src/ui/classic.header.vue     |   1 -
 packages/client/src/ui/classic.sidebar.vue    |   4 +-
 packages/client/src/ui/classic.vue            |   2 -
 pnpm-lock.yaml                                |  41 +-
 41 files changed, 495 insertions(+), 603 deletions(-)
 delete mode 100644 packages/client/src/directives/focus.ts

diff --git a/package.json b/package.json
index 51556dea5..80942ff54 100644
--- a/package.json
+++ b/package.json
@@ -40,8 +40,6 @@
 		"@bull-board/ui": "^4.10.2",
 		"@napi-rs/cli": "^2.15.0",
 		"@tensorflow/tfjs": "^3.21.0",
-		"focus-trap": "^7.2.0",
-		"focus-trap-vue": "^4.0.1",
 		"js-yaml": "4.1.0",
 		"seedrandom": "^3.0.5"
 	},
diff --git a/packages/client/src/components/MkButton.vue b/packages/client/src/components/MkButton.vue
index feac281d9..5f1a5bdb7 100644
--- a/packages/client/src/components/MkButton.vue
+++ b/packages/client/src/components/MkButton.vue
@@ -195,7 +195,8 @@ function onMousedown(evt: MouseEvent): void {
 	}
 
 	&:focus-visible {
-		outline: auto;
+		outline: solid 2px var(--focus);
+		outline-offset: 2px;
 	}
 
 	&.inline {
diff --git a/packages/client/src/components/MkCwButton.vue b/packages/client/src/components/MkCwButton.vue
index 1f6340510..659cb1fbb 100644
--- a/packages/client/src/components/MkCwButton.vue
+++ b/packages/client/src/components/MkCwButton.vue
@@ -1,6 +1,5 @@
 <template>
 	<button
-		ref="el"
 		class="_button"
 		:class="{ showLess: modelValue, fade: !modelValue }"
 		@click.stop="toggle"
@@ -13,7 +12,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, ref } from "vue";
+import { computed } from "vue";
 import { length } from "stringz";
 import * as misskey from "calckey-js";
 import { concat } from "@/scripts/array";
@@ -28,8 +27,6 @@ const emit = defineEmits<{
 	(ev: "update:modelValue", v: boolean): void;
 }>();
 
-const el = ref<HTMLElement>(); 
-
 const label = computed(() => {
 	return concat([
 		props.note.text
@@ -46,14 +43,6 @@ const label = computed(() => {
 const toggle = () => {
 	emit("update:modelValue", !props.modelValue);
 };
-
-function focus() {
-	el.value.focus();
-}
-
-defineExpose({
-	focus
-});
 </script>
 
 <style lang="scss" scoped>
@@ -73,7 +62,7 @@ defineExpose({
 			}
 		}
 	}
-	&:hover > span, &:focus > span {
+	&:hover > span {
 		background: var(--cwFg) !important;
 		color: var(--cwBg) !important;
 	}
@@ -84,7 +73,6 @@ defineExpose({
 		bottom: 0;
 		left: 0;
 		width: 100%;
-		z-index: 2;
 		> span {
 			display: inline-block;
 			background: var(--panel);
@@ -93,7 +81,7 @@ defineExpose({
 			border-radius: 999px;
 			box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
 		}
-		&:hover, &:focus {
+		&:hover {
 			> span {
 				background: var(--panelHighlight);
 			}
diff --git a/packages/client/src/components/MkDriveFileThumbnail.vue b/packages/client/src/components/MkDriveFileThumbnail.vue
index 48b542817..39150c10c 100644
--- a/packages/client/src/components/MkDriveFileThumbnail.vue
+++ b/packages/client/src/components/MkDriveFileThumbnail.vue
@@ -1,5 +1,5 @@
 <template>
-	<button ref="thumbnail" class="zdjebgpv">
+	<div ref="thumbnail" class="zdjebgpv">
 		<ImgWithBlurhash
 			v-if="isThumbnailAvailable"
 			:hash="file.blurhash"
@@ -36,7 +36,7 @@
 			v-if="isThumbnailAvailable && is === 'video'"
 			class="ph-file-video ph-bold ph-lg icon-sub"
 		></i>
-	</button>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -88,9 +88,6 @@ const isThumbnailAvailable = computed(() => {
 	background: var(--panel);
 	border-radius: 8px;
 	overflow: clip;
-	border: 0;
-	padding: 0;
-	cursor: pointer;
 
 	> .icon-sub {
 		position: absolute;
diff --git a/packages/client/src/components/MkEmojiPicker.vue b/packages/client/src/components/MkEmojiPicker.vue
index 88d207bab..a22006951 100644
--- a/packages/client/src/components/MkEmojiPicker.vue
+++ b/packages/client/src/components/MkEmojiPicker.vue
@@ -1,160 +1,157 @@
 <template>
-	<FocusTrap v-bind:active="isActive">
-		<div
-			class="omfetrab"
-			:class="['s' + size, 'w' + width, 'h' + height, { asDrawer }]"
-			:style="{ maxHeight: maxHeight ? maxHeight + 'px' : undefined }"
-			tabindex="-1"
-		>
-			<input
-				ref="search"
-				v-model.trim="q"
-				class="search"
-				data-prevent-emoji-insert
-				:class="{ filled: q != null && q != '' }"
-				:placeholder="i18n.ts.search"
-				type="search"
-				@paste.stop="paste"
-				@keyup.enter="done()"
-			/>
-			<div ref="emojis" class="emojis">
-				<section class="result">
-					<div v-if="searchResultCustom.length > 0" class="body">
+	<div
+		class="omfetrab"
+		:class="['s' + size, 'w' + width, 'h' + height, { asDrawer }]"
+		:style="{ maxHeight: maxHeight ? maxHeight + 'px' : undefined }"
+	>
+		<input
+			ref="search"
+			v-model.trim="q"
+			class="search"
+			data-prevent-emoji-insert
+			:class="{ filled: q != null && q != '' }"
+			:placeholder="i18n.ts.search"
+			type="search"
+			@paste.stop="paste"
+			@keyup.enter="done()"
+		/>
+		<div ref="emojis" class="emojis">
+			<section class="result">
+				<div v-if="searchResultCustom.length > 0" class="body">
+					<button
+						v-for="emoji in searchResultCustom"
+						:key="emoji.id"
+						class="_button item"
+						:title="emoji.name"
+						tabindex="0"
+						@click="chosen(emoji, $event)"
+					>
+						<!--<MkEmoji v-if="emoji.char != null" :emoji="emoji.char"/>-->
+						<img
+							class="emoji"
+							:src="
+								disableShowingAnimatedImages
+									? getStaticImageUrl(emoji.url)
+									: emoji.url
+							"
+						/>
+					</button>
+				</div>
+				<div v-if="searchResultUnicode.length > 0" class="body">
+					<button
+						v-for="emoji in searchResultUnicode"
+						:key="emoji.name"
+						class="_button item"
+						:title="emoji.name"
+						tabindex="0"
+						@click="chosen(emoji, $event)"
+					>
+						<MkEmoji class="emoji" :emoji="emoji.char" />
+					</button>
+				</div>
+			</section>
+
+			<div v-if="tab === 'index'" class="group index">
+				<section v-if="showPinned">
+					<div class="body">
 						<button
-							v-for="emoji in searchResultCustom"
-							:key="emoji.id"
+							v-for="emoji in pinned"
+							:key="emoji"
 							class="_button item"
-							:title="emoji.name"
 							tabindex="0"
 							@click="chosen(emoji, $event)"
 						>
-							<!--<MkEmoji v-if="emoji.char != null" :emoji="emoji.char"/>-->
-							<img
+							<MkEmoji
 								class="emoji"
-								:src="
-									disableShowingAnimatedImages
-										? getStaticImageUrl(emoji.url)
-										: emoji.url
-								"
+								:emoji="emoji"
+								:normal="true"
 							/>
 						</button>
 					</div>
-					<div v-if="searchResultUnicode.length > 0" class="body">
-						<button
-							v-for="emoji in searchResultUnicode"
-							:key="emoji.name"
-							class="_button item"
-							:title="emoji.name"
-							tabindex="0"
-							@click="chosen(emoji, $event)"
-						>
-							<MkEmoji class="emoji" :emoji="emoji.char" />
-						</button>
-					</div>
 				</section>
 
-				<div v-if="tab === 'index'" class="group index">
-					<section v-if="showPinned">
-						<div class="body">
-							<button
-								v-for="emoji in pinned"
-								:key="emoji"
-								class="_button item"
-								tabindex="0"
-								@click="chosen(emoji, $event)"
-							>
-								<MkEmoji
-									class="emoji"
-									:emoji="emoji"
-									:normal="true"
-								/>
-							</button>
-						</div>
-					</section>
-
-					<section>
-						<header class="_acrylic">
-							<i class="ph-alarm ph-bold ph-fw ph-lg"></i>
-							{{ i18n.ts.recentUsed }}
-						</header>
-						<div class="body">
-							<button
-								v-for="emoji in recentlyUsedEmojis"
-								:key="emoji"
-								class="_button item"
-								@click="chosen(emoji, $event)"
-							>
-								<MkEmoji
-									class="emoji"
-									:emoji="emoji"
-									:normal="true"
-								/>
-							</button>
-						</div>
-					</section>
-				</div>
-				<div v-once class="group">
-					<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>{{ 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>
+				<section>
+					<header class="_acrylic">
+						<i class="ph-alarm ph-bold ph-fw ph-lg"></i>
+						{{ i18n.ts.recentUsed }}
+					</header>
+					<div class="body">
+						<button
+							v-for="emoji in recentlyUsedEmojis"
+							:key="emoji"
+							class="_button item"
+							@click="chosen(emoji, $event)"
+						>
+							<MkEmoji
+								class="emoji"
+								:emoji="emoji"
+								:normal="true"
+							/>
+						</button>
+					</div>
+				</section>
 			</div>
-			<div class="tabs">
-				<button
-					class="_button tab"
-					:class="{ active: tab === 'index' }"
-					@click="tab = 'index'"
+			<div v-once class="group">
+				<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
 				>
-					<i class="ph-asterisk ph-bold ph-lg ph-fw ph-lg"></i>
-				</button>
-				<button
-					class="_button tab"
-					:class="{ active: tab === 'custom' }"
-					@click="tab = 'custom'"
+			</div>
+			<div v-once class="group">
+				<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
 				>
-					<i class="ph-smiley ph-bold ph-lg ph-fw ph-lg"></i>
-				</button>
-				<button
-					class="_button tab"
-					:class="{ active: tab === 'unicode' }"
-					@click="tab = 'unicode'"
-				>
-					<i class="ph-leaf ph-bold ph-lg ph-fw ph-lg"></i>
-				</button>
-				<button
-					class="_button tab"
-					:class="{ active: tab === 'tags' }"
-					@click="tab = 'tags'"
-				>
-					<i class="ph-hash ph-bold ph-lg ph-fw ph-lg"></i>
-				</button>
 			</div>
 		</div>
-	</FocusTrap>
+		<div class="tabs">
+			<button
+				class="_button tab"
+				:class="{ active: tab === 'index' }"
+				@click="tab = 'index'"
+			>
+				<i class="ph-asterisk ph-bold ph-lg ph-fw ph-lg"></i>
+			</button>
+			<button
+				class="_button tab"
+				:class="{ active: tab === 'custom' }"
+				@click="tab = 'custom'"
+			>
+				<i class="ph-smiley ph-bold ph-lg ph-fw ph-lg"></i>
+			</button>
+			<button
+				class="_button tab"
+				:class="{ active: tab === 'unicode' }"
+				@click="tab = 'unicode'"
+			>
+				<i class="ph-leaf ph-bold ph-lg ph-fw ph-lg"></i>
+			</button>
+			<button
+				class="_button tab"
+				:class="{ active: tab === 'tags' }"
+				@click="tab = 'tags'"
+			>
+				<i class="ph-hash ph-bold ph-lg ph-fw ph-lg"></i>
+			</button>
+		</div>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -174,7 +171,6 @@ import { deviceKind } from "@/scripts/device-kind";
 import { emojiCategories, instance } from "@/instance";
 import { i18n } from "@/i18n";
 import { defaultStore } from "@/store";
-import { FocusTrap } from 'focus-trap-vue';
 
 const props = withDefaults(
 	defineProps<{
diff --git a/packages/client/src/components/MkLaunchPad.vue b/packages/client/src/components/MkLaunchPad.vue
index 759c215f7..f713b4c41 100644
--- a/packages/client/src/components/MkLaunchPad.vue
+++ b/packages/client/src/components/MkLaunchPad.vue
@@ -139,7 +139,7 @@ function close() {
 			height: 100px;
 			border-radius: 10px;
 
-			&:hover, &:focus-visible {
+			&:hover {
 				color: var(--accent);
 				background: var(--accentedBg);
 				text-decoration: none;
diff --git a/packages/client/src/components/MkMediaImage.vue b/packages/client/src/components/MkMediaImage.vue
index 3cfb0f465..882908040 100644
--- a/packages/client/src/components/MkMediaImage.vue
+++ b/packages/client/src/components/MkMediaImage.vue
@@ -138,10 +138,6 @@ watch(
 		background-position: center;
 		background-size: contain;
 		background-repeat: no-repeat;
-		box-sizing: border-box;
-		&:focus-visible {
-			border: 2px solid var(--accent);
-		}
 
 		> .gif {
 			background-color: var(--fg);
diff --git a/packages/client/src/components/MkMenu.child.vue b/packages/client/src/components/MkMenu.child.vue
index e5ca9e4ee..6b05ab447 100644
--- a/packages/client/src/components/MkMenu.child.vue
+++ b/packages/client/src/components/MkMenu.child.vue
@@ -1,14 +1,14 @@
 <template>
-	<div ref="el" class="sfhdhdhr" tabindex="-1">
-			<MkMenu
-				ref="menu"
-				:items="items"
-				:align="align"
-				:width="width"
-				:as-drawer="false"
-				@close="onChildClosed"
-			/>
-		</div>
+	<div ref="el" class="sfhdhdhr">
+		<MkMenu
+			ref="menu"
+			:items="items"
+			:align="align"
+			:width="width"
+			:as-drawer="false"
+			@close="onChildClosed"
+		/>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -23,6 +23,7 @@ import {
 } from "vue";
 import MkMenu from "./MkMenu.vue";
 import { MenuItem } from "@/types/menu";
+import * as os from "@/os";
 
 const props = defineProps<{
 	items: MenuItem[];
diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index c71e3ac58..88c8af1c5 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -1,188 +1,191 @@
 <template>
-	<FocusTrap v-bind:active="isActive">
-		<div tabindex="-1" v-focus>
-			<div
-				ref="itemsEl"
-				class="rrevdjwt _popup _shadow"
-				:class="{ center: align === 'center', asDrawer }"
-				:style="{
-					width: width && !asDrawer ? width + 'px' : '',
-					maxHeight: maxHeight ? maxHeight + 'px' : '',
-				}"
-				@contextmenu.self="(e) => e.preventDefault()"
-			>
-				<template v-for="(item, i) in items2">
-					<div v-if="item === null" class="divider"></div>
-					<span v-else-if="item.type === 'label'" class="label item">
-						<span :style="item.textStyle || ''">{{ item.text }}</span>
-					</span>
-					<span
-						v-else-if="item.type === 'pending'"
-						class="pending item"
-					>
-						<span><MkEllipsis /></span>
-					</span>
-					<MkA
-						v-else-if="item.type === 'link'"
-						:to="item.to"
-						class="_button item"
-						@click.passive="close(true)"
-						@mouseenter.passive="onItemMouseEnter(item)"
-						@mouseleave.passive="onItemMouseLeave(item)"
-					>
-						<i
-							v-if="item.icon"
-							class="ph-fw ph-lg"
-							:class="item.icon"
-						></i>
-						<span v-else-if="item.icons">
-							<i
-								v-for="icon in item.icons"
-								class="ph-fw ph-lg"
-								:class="icon"
-							></i>
-						</span>
-						<MkAvatar
-							v-if="item.avatar"
-							:user="item.avatar"
-							class="avatar"
-							disableLink
-						/>
-						<span :style="item.textStyle || ''">{{ item.text }}</span>
-						<span v-if="item.indicate" class="indicator"
-							><i class="ph-circle ph-fill"></i
-						></span>
-					</MkA>
-					<a
-						v-else-if="item.type === 'a'"
-						:href="item.href"
-						:target="item.target"
-						:download="item.download"
-						class="_button item"
-						@click="close(true)"
-						@mouseenter.passive="onItemMouseEnter(item)"
-						@mouseleave.passive="onItemMouseLeave(item)"
-					>
-						<i
-							v-if="item.icon"
-							class="ph-fw ph-lg"
-							:class="item.icon"
-						></i>
-						<span v-else-if="item.icons">
-							<i
-								v-for="icon in item.icons"
-								class="ph-fw ph-lg"
-								:class="icon"
-							></i>
-						</span>
-						<span :style="item.textStyle || ''">{{ item.text }}</span>
-						<span v-if="item.indicate" class="indicator"
-							><i class="ph-circle ph-fill"></i
-						></span>
-					</a>
-					<button
-						v-else-if="item.type === 'user' && !items.hidden"
-						class="_button item"
-						:class="{ active: item.active }"
-						:disabled="item.active"
-						@click="clicked(item.action, $event)"
-						@mouseenter.passive="onItemMouseEnter(item)"
-						@mouseleave.passive="onItemMouseLeave(item)"
-					>
-						<MkAvatar :user="item.user" class="avatar" disableLink /><MkUserName
-							:user="item.user"
-						/>
-						<span v-if="item.indicate" class="indicator"
-							><i class="ph-circle ph-fill"></i
-						></span>
-					</button>
-					<span
-						v-else-if="item.type === 'switch'"
-						class="item"
-						@mouseenter.passive="onItemMouseEnter(item)"
-						@mouseleave.passive="onItemMouseLeave(item)"
-					>
-						<FormSwitch
-							v-model="item.ref"
-							:disabled="item.disabled"
-							class="form-switch"
-							:style="item.textStyle || ''"
-							>{{ item.text }}</FormSwitch
-						>
-					</span>
-					<button
-						v-else-if="item.type === 'parent'"
-						class="_button item parent"
-						:class="{ childShowing: childShowingItem === item }"
-						@mouseenter="showChildren(item, $event)"
-						@click="showChildren(item, $event)"
-					>
-						<i
-							v-if="item.icon"
-							class="ph-fw ph-lg"
-							:class="item.icon"
-						></i>
-						<span v-else-if="item.icons">
-							<i
-								v-for="icon in item.icons"
-								class="ph-fw ph-lg"
-								:class="icon"
-							></i>
-						</span>
-						<span :style="item.textStyle || ''">{{ item.text }}</span>
-						<span class="caret"
-							><i class="ph-caret-right ph-bold ph-lg ph-fw ph-lg"></i
-						></span>
-					</button>
-					<button
-						v-else-if="!item.hidden"
-						class="_button item"
-						:class="{ danger: item.danger, active: item.active }"
-						:disabled="item.active"
-						@click="clicked(item.action, $event)"
-						@mouseenter.passive="onItemMouseEnter(item)"
-						@mouseleave.passive="onItemMouseLeave(item)"
-					>
-						<i
-							v-if="item.icon"
-							class="ph-fw ph-lg"
-							:class="item.icon"
-						></i>
-						<span v-else-if="item.icons">
-							<i
-								v-for="icon in item.icons"
-								class="ph-fw ph-lg"
-								:class="icon"
-							></i>
-						</span>
-						<MkAvatar
-							v-if="item.avatar"
-							:user="item.avatar"
-							class="avatar"
-							disableLink
-						/>
-						<span :style="item.textStyle || ''">{{ item.text }}</span>
-						<span v-if="item.indicate" class="indicator"
-							><i class="ph-circle ph-fill"></i
-						></span>
-					</button>
-				</template>
-				<span v-if="items2.length === 0" class="none item">
-					<span>{{ i18n.ts.none }}</span>
+	<div>
+		<div
+			ref="itemsEl"
+			v-hotkey="keymap"
+			class="rrevdjwt _popup _shadow"
+			:class="{ center: align === 'center', asDrawer }"
+			:style="{
+				width: width && !asDrawer ? width + 'px' : '',
+				maxHeight: maxHeight ? maxHeight + 'px' : '',
+			}"
+			@contextmenu.self="(e) => e.preventDefault()"
+		>
+			<template v-for="(item, i) in items2">
+				<div v-if="item === null" class="divider"></div>
+				<span v-else-if="item.type === 'label'" class="label item">
+					<span :style="item.textStyle || ''">{{ item.text }}</span>
 				</span>
-			</div>
-			<div v-if="childMenu" class="child">
-				<XChild
-					ref="child"
-					:items="childMenu"
-					:target-element="childTarget"
-					:root-element="itemsEl"
-					showing
-					@actioned="childActioned"
-				/>
-			</div>
+				<span
+					v-else-if="item.type === 'pending'"
+					:tabindex="i"
+					class="pending item"
+				>
+					<span><MkEllipsis /></span>
+				</span>
+				<MkA
+					v-else-if="item.type === 'link'"
+					:to="item.to"
+					:tabindex="i"
+					class="_button item"
+					@click.passive="close(true)"
+					@mouseenter.passive="onItemMouseEnter(item)"
+					@mouseleave.passive="onItemMouseLeave(item)"
+				>
+					<i
+						v-if="item.icon"
+						class="ph-fw ph-lg"
+						:class="item.icon"
+					></i>
+					<span v-else-if="item.icons">
+						<i
+							v-for="icon in item.icons"
+							class="ph-fw ph-lg"
+							:class="icon"
+						></i>
+					</span>
+					<MkAvatar
+						v-if="item.avatar"
+						:user="item.avatar"
+						class="avatar"
+					/>
+					<span :style="item.textStyle || ''">{{ item.text }}</span>
+					<span v-if="item.indicate" class="indicator"
+						><i class="ph-circle ph-fill"></i
+					></span>
+				</MkA>
+				<a
+					v-else-if="item.type === 'a'"
+					:href="item.href"
+					:target="item.target"
+					:download="item.download"
+					:tabindex="i"
+					class="_button item"
+					@click="close(true)"
+					@mouseenter.passive="onItemMouseEnter(item)"
+					@mouseleave.passive="onItemMouseLeave(item)"
+				>
+					<i
+						v-if="item.icon"
+						class="ph-fw ph-lg"
+						:class="item.icon"
+					></i>
+					<span v-else-if="item.icons">
+						<i
+							v-for="icon in item.icons"
+							class="ph-fw ph-lg"
+							:class="icon"
+						></i>
+					</span>
+					<span :style="item.textStyle || ''">{{ item.text }}</span>
+					<span v-if="item.indicate" class="indicator"
+						><i class="ph-circle ph-fill"></i
+					></span>
+				</a>
+				<button
+					v-else-if="item.type === 'user' && !items.hidden"
+					:tabindex="i"
+					class="_button item"
+					:class="{ active: item.active }"
+					:disabled="item.active"
+					@click="clicked(item.action, $event)"
+					@mouseenter.passive="onItemMouseEnter(item)"
+					@mouseleave.passive="onItemMouseLeave(item)"
+				>
+					<MkAvatar :user="item.user" class="avatar" /><MkUserName
+						:user="item.user"
+					/>
+					<span v-if="item.indicate" class="indicator"
+						><i class="ph-circle ph-fill"></i
+					></span>
+				</button>
+				<span
+					v-else-if="item.type === 'switch'"
+					:tabindex="i"
+					class="item"
+					@mouseenter.passive="onItemMouseEnter(item)"
+					@mouseleave.passive="onItemMouseLeave(item)"
+				>
+					<FormSwitch
+						v-model="item.ref"
+						:disabled="item.disabled"
+						class="form-switch"
+						:style="item.textStyle || ''"
+						>{{ item.text }}</FormSwitch
+					>
+				</span>
+				<button
+					v-else-if="item.type === 'parent'"
+					:tabindex="i"
+					class="_button item parent"
+					:class="{ childShowing: childShowingItem === item }"
+					@mouseenter="showChildren(item, $event)"
+				>
+					<i
+						v-if="item.icon"
+						class="ph-fw ph-lg"
+						:class="item.icon"
+					></i>
+					<span v-else-if="item.icons">
+						<i
+							v-for="icon in item.icons"
+							class="ph-fw ph-lg"
+							:class="icon"
+						></i>
+					</span>
+					<span :style="item.textStyle || ''">{{ item.text }}</span>
+					<span class="caret"
+						><i class="ph-caret-right ph-bold ph-lg ph-fw ph-lg"></i
+					></span>
+				</button>
+				<button
+					v-else-if="!item.hidden"
+					:tabindex="i"
+					class="_button item"
+					:class="{ danger: item.danger, active: item.active }"
+					:disabled="item.active"
+					@click="clicked(item.action, $event)"
+					@mouseenter.passive="onItemMouseEnter(item)"
+					@mouseleave.passive="onItemMouseLeave(item)"
+				>
+					<i
+						v-if="item.icon"
+						class="ph-fw ph-lg"
+						:class="item.icon"
+					></i>
+					<span v-else-if="item.icons">
+						<i
+							v-for="icon in item.icons"
+							class="ph-fw ph-lg"
+							:class="icon"
+						></i>
+					</span>
+					<MkAvatar
+						v-if="item.avatar"
+						:user="item.avatar"
+						class="avatar"
+					/>
+					<span :style="item.textStyle || ''">{{ item.text }}</span>
+					<span v-if="item.indicate" class="indicator"
+						><i class="ph-circle ph-fill"></i
+					></span>
+				</button>
+			</template>
+			<span v-if="items2.length === 0" class="none item">
+				<span>{{ i18n.ts.none }}</span>
+			</span>
 		</div>
-	</FocusTrap>
+		<div v-if="childMenu" class="child">
+			<XChild
+				ref="child"
+				:items="childMenu"
+				:target-element="childTarget"
+				:root-element="itemsEl"
+				showing
+				@actioned="childActioned"
+			/>
+		</div>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -203,7 +206,6 @@ import FormSwitch from "@/components/form/switch.vue";
 import { MenuItem, InnerMenuItem, MenuPending, MenuAction } from "@/types/menu";
 import * as os from "@/os";
 import { i18n } from "@/i18n";
-import { FocusTrap } from 'focus-trap-vue';
 
 const XChild = defineAsyncComponent(() => import("./MkMenu.child.vue"));
 
@@ -226,6 +228,12 @@ let items2: InnerMenuItem[] = $ref([]);
 
 let child = $ref<InstanceType<typeof XChild>>();
 
+let keymap = computed(() => ({
+	"up|k|shift+tab": focusUp,
+	"down|j|tab": focusDown,
+	esc: close,
+}));
+
 let childShowingItem = $ref<MenuItem | null>();
 
 watch(
@@ -356,7 +364,8 @@ onBeforeUnmount(() => {
 		font-size: 0.9em;
 		line-height: 20px;
 		text-align: left;
-		outline: none;
+		overflow: hidden;
+		text-overflow: ellipsis;
 
 		&:before {
 			content: "";
@@ -380,7 +389,7 @@ onBeforeUnmount(() => {
 			transform: translateY(0em);
 		}
 
-		&:not(:disabled):hover, &:focus-visible {
+		&:not(:disabled):hover {
 			color: var(--accent);
 			text-decoration: none;
 
@@ -388,9 +397,6 @@ onBeforeUnmount(() => {
 				background: var(--accentedBg);
 			}
 		}
-		&:focus-visible:before {
-			outline: auto;
-		}
 
 		&.danger {
 			color: #eb6f92;
diff --git a/packages/client/src/components/MkModal.vue b/packages/client/src/components/MkModal.vue
index 12e79f428..d9cd56f95 100644
--- a/packages/client/src/components/MkModal.vue
+++ b/packages/client/src/components/MkModal.vue
@@ -14,59 +14,54 @@
 		:duration="transitionDuration"
 		appear
 		@after-leave="emit('closed')"
-		@keyup.esc="emit('click')"
 		@enter="emit('opening')"
 		@after-enter="onOpened"
 	>
-		<FocusTrap v-model:active="isActive">
+		<div
+			v-show="manualShowing != null ? manualShowing : showing"
+			v-hotkey.global="keymap"
+			:class="[
+				$style.root,
+				{
+					[$style.drawer]: type === 'drawer',
+					[$style.dialog]: type === 'dialog' || type === 'dialog:top',
+					[$style.popup]: type === 'popup',
+				},
+			]"
+			:style="{
+				zIndex,
+				pointerEvents: (manualShowing != null ? manualShowing : showing)
+					? 'auto'
+					: 'none',
+				'--transformOrigin': transformOrigin,
+			}"
+		>
 			<div
-				v-show="manualShowing != null ? manualShowing : showing"
-				v-hotkey.global="keymap"
+				class="_modalBg data-cy-bg"
 				:class="[
-					$style.root,
+					$style.bg,
 					{
-						[$style.drawer]: type === 'drawer',
-						[$style.dialog]: type === 'dialog' || type === 'dialog:top',
-						[$style.popup]: type === 'popup',
+						[$style.bgTransparent]: isEnableBgTransparent,
+						'data-cy-transparent': isEnableBgTransparent,
 					},
 				]"
-				:style="{
-					zIndex,
-					pointerEvents: (manualShowing != null ? manualShowing : showing)
-						? 'auto'
-						: 'none',
-					'--transformOrigin': transformOrigin,
-				}"
-				tabindex="-1"
-				v-focus
+				:style="{ zIndex }"
+				@click="onBgClick"
+				@mousedown="onBgClick"
+				@contextmenu.prevent.stop="() => {}"
+			></div>
+			<div
+				ref="content"
+				:class="[
+					$style.content,
+					{ [$style.fixed]: fixed, top: type === 'dialog:top' },
+				]"
+				:style="{ zIndex }"
+				@click.self="onBgClick"
 			>
-				<div
-					class="_modalBg data-cy-bg"
-					:class="[
-						$style.bg,
-						{
-							[$style.bgTransparent]: isEnableBgTransparent,
-							'data-cy-transparent': isEnableBgTransparent,
-						},
-					]"
-					:style="{ zIndex }"
-					@click="onBgClick"
-					@mousedown="onBgClick"
-					@contextmenu.prevent.stop="() => {}"
-				></div>
-				<div
-					ref="content"
-					:class="[
-						$style.content,
-						{ [$style.fixed]: fixed, top: type === 'dialog:top' },
-					]"
-					:style="{ zIndex }"
-					@click.self="onBgClick"
-				>
-					<slot :max-height="maxHeight" :type="type"></slot>
-				</div>
+				<slot :max-height="maxHeight" :type="type"></slot>
 			</div>
-		</FocusTrap>
+		</div>
 	</Transition>
 </template>
 
@@ -76,7 +71,6 @@ import * as os from "@/os";
 import { isTouchUsing } from "@/scripts/touch";
 import { defaultStore } from "@/store";
 import { deviceKind } from "@/scripts/device-kind";
-import { FocusTrap } from 'focus-trap-vue';
 
 function getFixedContainer(el: Element | null): Element | null {
 	if (el == null || el.tagName === "BODY") return null;
@@ -172,7 +166,6 @@ let transitionDuration = $computed(() =>
 
 let contentClicking = false;
 
-const focusedElement = document.activeElement;
 function close(opts: { useSendAnimation?: boolean } = {}) {
 	if (opts.useSendAnimation) {
 		useSendAnime = true;
@@ -182,12 +175,10 @@ function close(opts: { useSendAnimation?: boolean } = {}) {
 	if (props.src) props.src.style.pointerEvents = "auto";
 	showing = false;
 	emit("close");
-	focusedElement.focus();
 }
 
 function onBgClick() {
 	if (contentClicking) return;
-	focusedElement.focus();
 	emit("click");
 }
 
@@ -490,7 +481,6 @@ defineExpose({
 }
 
 .root {
-	outline: none;
 	&.dialog {
 		> .content {
 			position: fixed;
diff --git a/packages/client/src/components/MkModalPageWindow.vue b/packages/client/src/components/MkModalPageWindow.vue
index bf4d8d0bc..361128464 100644
--- a/packages/client/src/components/MkModalPageWindow.vue
+++ b/packages/client/src/components/MkModalPageWindow.vue
@@ -158,7 +158,6 @@ function onContextmenu(ev: MouseEvent) {
 	flex-direction: column;
 	contain: content;
 	border-radius: var(--radius);
-	margin: auto;
 
 	--root-margin: 24px;
 
diff --git a/packages/client/src/components/MkModalWindow.vue b/packages/client/src/components/MkModalWindow.vue
index 017bfae8c..3afcff6cb 100644
--- a/packages/client/src/components/MkModalWindow.vue
+++ b/packages/client/src/components/MkModalWindow.vue
@@ -3,64 +3,59 @@
 		ref="modal"
 		:prefer-type="'dialog'"
 		@click="onBgClick"
-		@keyup.esc="$emit('close')"
 		@closed="$emit('closed')"
 	>
-		<FocusTrap v-model:active="isActive">
-			<div
-				ref="rootEl"
-				class="ebkgoccj"
-				:style="{
-					width: `${width}px`,
-					height: scroll
-						? height
-							? `${height}px`
-							: null
-						: height
-						? `min(${height}px, 100%)`
-						: '100%',
-				}"
-				@keydown="onKeydown"
-				tabindex="-1"
-			>
-				<div ref="headerEl" class="header">
-					<button
-						v-if="withOkButton"
-						class="_button"
-						@click="$emit('close')"
-					>
-						<i class="ph-x ph-bold ph-lg"></i>
-					</button>
-					<span class="title">
-						<slot name="header"></slot>
-					</span>
-					<button
-						v-if="!withOkButton"
-						class="_button"
-						@click="$emit('close')"
-					>
-						<i class="ph-x ph-bold ph-lg"></i>
-					</button>
-					<button
-						v-if="withOkButton"
-						class="_button"
-						:disabled="okButtonDisabled"
-						@click="$emit('ok')"
-					>
-						<i class="ph-check ph-bold ph-lg"></i>
-					</button>
-				</div>
-				<div class="body">
-					<slot :width="bodyWidth" :height="bodyHeight"></slot>
-				</div>
+		<div
+			ref="rootEl"
+			class="ebkgoccj"
+			:style="{
+				width: `${width}px`,
+				height: scroll
+					? height
+						? `${height}px`
+						: null
+					: height
+					? `min(${height}px, 100%)`
+					: '100%',
+			}"
+			@keydown="onKeydown"
+		>
+			<div ref="headerEl" class="header">
+				<button
+					v-if="withOkButton"
+					class="_button"
+					@click="$emit('close')"
+				>
+					<i class="ph-x ph-bold ph-lg"></i>
+				</button>
+				<span class="title">
+					<slot name="header"></slot>
+				</span>
+				<button
+					v-if="!withOkButton"
+					class="_button"
+					@click="$emit('close')"
+				>
+					<i class="ph-x ph-bold ph-lg"></i>
+				</button>
+				<button
+					v-if="withOkButton"
+					class="_button"
+					:disabled="okButtonDisabled"
+					@click="$emit('ok')"
+				>
+					<i class="ph-check ph-bold ph-lg"></i>
+				</button>
 			</div>
-		</FocusTrap>
+			<div class="body">
+				<slot :width="bodyWidth" :height="bodyHeight"></slot>
+			</div>
+		</div>
 	</MkModal>
 </template>
 
 <script lang="ts" setup>
 import { onMounted, onUnmounted } from "vue";
-import { FocusTrap } from 'focus-trap-vue';
 import MkModal from "./MkModal.vue";
 
 const props = withDefaults(
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 5d9c40d38..22a7ef93f 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -84,7 +84,6 @@
 						:detailedView="detailedView"
 						:parentId="appearNote.parentId"
 						@push="(e) => router.push(notePage(e))"
-						@focusfooter="footerEl.focus()"
 					></MkSubNoteContent>
 					<div v-if="translating || translation" class="translation">
 						<MkLoading v-if="translating" mini />
@@ -118,7 +117,7 @@
 						<MkTime :time="appearNote.createdAt" mode="absolute" />
 					</MkA>
 				</div>
-				<footer ref="footerEl" class="footer" @click.stop tabindex="-1">
+				<footer ref="el" class="footer" @click.stop>
 					<XReactionsViewer
 						v-if="enableEmojiReactions"
 						ref="reactionsViewer"
@@ -279,7 +278,6 @@ const isRenote =
 	note.poll == null;
 
 const el = ref<HTMLElement>();
-const footerEl = ref<HTMLElement>(); 
 const menuButton = ref<HTMLElement>();
 const starButton = ref<InstanceType<typeof XStarButton>>();
 const renoteButton = ref<InstanceType<typeof XRenoteButton>>();
@@ -300,8 +298,8 @@ const keymap = {
 	r: () => reply(true),
 	"e|a|plus": () => react(true),
 	q: () => renoteButton.value.renote(true),
-	"up|k": focusBefore,
-	"down|j": focusAfter,
+	"up|k|shift+tab": focusBefore,
+	"down|j|tab": focusAfter,
 	esc: blur,
 	"m|o": () => menu(true),
 	s: () => showContent.value !== showContent.value,
diff --git a/packages/client/src/components/MkNotePreview.vue b/packages/client/src/components/MkNotePreview.vue
index 6fdd79dc6..9d388e71b 100644
--- a/packages/client/src/components/MkNotePreview.vue
+++ b/packages/client/src/components/MkNotePreview.vue
@@ -1,6 +1,6 @@
 <template>
 	<div v-size="{ min: [350, 500] }" class="fefdfafb">
-		<MkAvatar class="avatar" :user="$i" disableLink />
+		<MkAvatar class="avatar" :user="$i" />
 		<div class="main">
 			<div class="header">
 				<MkUserName :user="$i" />
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index a0b70ff1f..f5e70891f 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -26,7 +26,6 @@
 						:note="note"
 						:parentId="appearNote.parentId"
 						:conversation="conversation"
-						@focusfooter="footerEl.focus()"
 					/>
 					<div v-if="translating || translation" class="translation">
 						<MkLoading v-if="translating" mini />
@@ -47,7 +46,7 @@
 						</div>
 					</div>
 				</div>
-				<footer ref="footerEl" class="footer" @click.stop tabindex="-1">
+				<footer class="footer" @click.stop>
 					<XReactionsViewer
 						v-if="enableEmojiReactions"
 						ref="reactionsViewer"
@@ -213,7 +212,6 @@ const isRenote =
 	note.poll == null;
 
 const el = ref<HTMLElement>();
-const footerEl = ref<HTMLElement>();
 const menuButton = ref<HTMLElement>();
 const starButton = ref<InstanceType<typeof XStarButton>>();
 const renoteButton = ref<InstanceType<typeof XRenoteButton>>();
diff --git a/packages/client/src/components/MkPopupMenu.vue b/packages/client/src/components/MkPopupMenu.vue
index 5f1ed037b..4d52616e1 100644
--- a/packages/client/src/components/MkPopupMenu.vue
+++ b/packages/client/src/components/MkPopupMenu.vue
@@ -7,8 +7,6 @@
 		:transparent-bg="true"
 		@click="modal.close()"
 		@closed="emit('closed')"
-		tabindex="-1"
-		v-focus
 	>
 		<MkMenu
 			:items="items"
diff --git a/packages/client/src/components/MkPostFormAttaches.vue b/packages/client/src/components/MkPostFormAttaches.vue
index 7cf397e55..7c7f240e8 100644
--- a/packages/client/src/components/MkPostFormAttaches.vue
+++ b/packages/client/src/components/MkPostFormAttaches.vue
@@ -198,6 +198,7 @@ export default defineComponent({
 			height: 64px;
 			margin-right: 4px;
 			border-radius: 4px;
+			overflow: hidden;
 			cursor: move;
 
 			&:hover > .remove {
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 68439527a..a1f7cc1b9 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -35,11 +35,7 @@
 			class="content"
 			:class="{ collapsed, isLong, showContent: note.cw && !showContent }"
 		>
-			<XCwButton ref="cwButton" v-if="note.cw && !showContent" v-model="showContent" :note="note" v-on:keydown="focusFooter" />
-			<div 
-				class="body"
-				v-bind="{ 'aria-label': !showContent ? '' : null, 'tabindex': !showContent ? '-1' : null }"
-			>
+			<div class="body">
 				<span v-if="note.deletedAt" style="opacity: 0.5"
 					>({{ i18n.ts.deleted }})</span
 				>
@@ -100,20 +96,15 @@
 						<XNoteSimple :note="note.renote" />
 					</div>
 				</template>
-				<div
-					v-if="note.cw && !showContent"
-					tabindex="0"
-					v-on:focus="cwButton?.focus()"
-				></div>
 			</div>
 			<XShowMoreButton v-if="isLong" v-model="collapsed"></XShowMoreButton>
-			<XCwButton v-if="note.cw && showContent" v-model="showContent" :note="note" />
+			<XCwButton v-if="note.cw" v-model="showContent" :note="note" />
 		</div>
 	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref } from "vue"; 
+import {} from "vue";
 import * as misskey from "calckey-js";
 import * as mfm from "mfm-js";
 import XNoteSimple from "@/components/MkNoteSimple.vue";
@@ -135,10 +126,8 @@ const props = defineProps<{
 
 const emit = defineEmits<{
 	(ev: "push", v): void;
-	(ev: "focusfooter"): void;
 }>();
 
-const cwButton = ref<HTMLElement>(); 
 const isLong =
 	!props.detailedView &&
 	props.note.cw == null &&
@@ -151,13 +140,6 @@ const urls = props.note.text
 	: null;
 
 let showContent = $ref(false);
-
-
-function focusFooter(ev) {
-	if (ev.key == "Tab" && !ev.getModifierState("Shift")) {
-		emit("focusfooter");
-	}
-}
 </script>
 
 <style lang="scss" scoped>
@@ -249,9 +231,6 @@ function focusFooter(ev) {
 				margin-top: -50px;
 				padding-top: 50px;
 				overflow: hidden;
-				user-select: none;
-				-webkit-user-select: none;
-				-moz-user-select: none;
 			}
 			&.collapsed > .body {
 				box-sizing: border-box;
diff --git a/packages/client/src/components/MkSuperMenu.vue b/packages/client/src/components/MkSuperMenu.vue
index 83c667070..55d6fba50 100644
--- a/packages/client/src/components/MkSuperMenu.vue
+++ b/packages/client/src/components/MkSuperMenu.vue
@@ -9,6 +9,7 @@
 						v-if="item.type === 'a'"
 						:href="item.href"
 						:target="item.target"
+						:tabindex="i"
 						class="_button item"
 						:class="{ danger: item.danger, active: item.active }"
 					>
@@ -21,6 +22,7 @@
 					</a>
 					<button
 						v-else-if="item.type === 'button'"
+						:tabindex="i"
 						class="_button item"
 						:class="{ danger: item.danger, active: item.active }"
 						:disabled="item.active"
@@ -36,6 +38,7 @@
 					<MkA
 						v-else
 						:to="item.to"
+						:tabindex="i"
 						class="_button item"
 						:class="{ danger: item.danger, active: item.active }"
 					>
@@ -96,7 +99,7 @@ export default defineComponent({
 				font-size: 0.9em;
 				margin-bottom: 0.3rem;
 
-				&:hover, &:focus-visible {
+				&:hover {
 					text-decoration: none;
 					background: var(--panelHighlight);
 				}
diff --git a/packages/client/src/components/MkUserSelectDialog.vue b/packages/client/src/components/MkUserSelectDialog.vue
index 14553ca46..506f48bd4 100644
--- a/packages/client/src/components/MkUserSelectDialog.vue
+++ b/packages/client/src/components/MkUserSelectDialog.vue
@@ -46,7 +46,6 @@
 							:user="user"
 							class="avatar"
 							:show-indicator="true"
-							disableLink
 						/>
 						<div class="body">
 							<MkUserName :user="user" class="name" />
@@ -74,7 +73,6 @@
 							:user="user"
 							class="avatar"
 							:show-indicator="true"
-							disableLink
 						/>
 						<div class="body">
 							<MkUserName :user="user" class="name" />
diff --git a/packages/client/src/components/MkUsersTooltip.vue b/packages/client/src/components/MkUsersTooltip.vue
index 78a4f90f2..972864d1f 100644
--- a/packages/client/src/components/MkUsersTooltip.vue
+++ b/packages/client/src/components/MkUsersTooltip.vue
@@ -7,7 +7,7 @@
 	>
 		<div class="beaffaef">
 			<div v-for="u in users" :key="u.id" class="user">
-				<MkAvatar class="avatar" :user="u" disableLink />
+				<MkAvatar class="avatar" :user="u" />
 				<MkUserName class="name" :user="u" :nowrap="true" />
 			</div>
 			<div v-if="users.length < count" class="omitted">
diff --git a/packages/client/src/components/MkWidgets.vue b/packages/client/src/components/MkWidgets.vue
index d48fc5383..07e845032 100644
--- a/packages/client/src/components/MkWidgets.vue
+++ b/packages/client/src/components/MkWidgets.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="vjoppmmu">
 		<template v-if="edit">
-			<header tabindex="-1" v-focus>
+			<header>
 				<MkSelect
 					v-model="widgetAdderSelected"
 					style="margin-bottom: var(--margin)"
diff --git a/packages/client/src/components/form/folder.vue b/packages/client/src/components/form/folder.vue
index a2fde5341..8868f5784 100644
--- a/packages/client/src/components/form/folder.vue
+++ b/packages/client/src/components/form/folder.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="dwzlatin" :class="{ opened }">
-		<button class="header _button" @click="toggle">
+		<div class="header _button" @click="toggle">
 			<span class="icon"><slot name="icon"></slot></span>
 			<span class="text"><slot name="label"></slot></span>
 			<span class="right">
@@ -8,7 +8,7 @@
 				<i v-if="opened" class="ph-caret-up ph-bold ph-lg icon"></i>
 				<i v-else class="ph-caret-down ph-bold ph-lg icon"></i>
 			</span>
-		</button>
+		</div>
 		<KeepAlive>
 			<div v-if="openedAtLeastOnce" v-show="opened" class="body">
 				<MkSpacer :margin-min="14" :margin-max="22">
diff --git a/packages/client/src/components/form/radio.vue b/packages/client/src/components/form/radio.vue
index ef644b327..493b2d010 100644
--- a/packages/client/src/components/form/radio.vue
+++ b/packages/client/src/components/form/radio.vue
@@ -66,9 +66,6 @@ function toggle(): void {
 	&:hover {
 		border-color: var(--inputBorderHover) !important;
 	}
-	&:focus-within {
-		outline: auto;
-	}
 
 	&.checked {
 		background-color: var(--accentedBg) !important;
diff --git a/packages/client/src/components/form/switch.vue b/packages/client/src/components/form/switch.vue
index b1c6df4e9..efaf488a9 100644
--- a/packages/client/src/components/form/switch.vue
+++ b/packages/client/src/components/form/switch.vue
@@ -99,9 +99,6 @@ const toggle = () => {
 			border-color: var(--inputBorderHover) !important;
 		}
 	}
-	&:focus-within > .button {
-		outline: auto;
-	}
 
 	> .label {
 		margin-left: 12px;
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index c78ef0c10..ad1d80ca6 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -19,7 +19,6 @@
 				class="avatar"
 				:user="$i"
 				:disable-preview="true"
-				disableLink
 			/>
 		</div>
 		<template v-if="metadata">
@@ -34,7 +33,6 @@
 					:user="metadata.avatar"
 					:disable-preview="true"
 					:show-indicator="true"
-					disableLink
 				/>
 				<i
 					v-else-if="metadata.icon && !narrow"
diff --git a/packages/client/src/components/global/RouterView.vue b/packages/client/src/components/global/RouterView.vue
index 437b7c53e..8423ce773 100644
--- a/packages/client/src/components/global/RouterView.vue
+++ b/packages/client/src/components/global/RouterView.vue
@@ -5,9 +5,6 @@
 				:is="currentPageComponent"
 				:key="key"
 				v-bind="Object.fromEntries(currentPageProps)"
-				tabindex="-1"
-				v-focus
-				style="outline: none;"
 			/>
 
 			<template #fallback>
diff --git a/packages/client/src/directives/focus.ts b/packages/client/src/directives/focus.ts
deleted file mode 100644
index 4d34fbf1f..000000000
--- a/packages/client/src/directives/focus.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export default {
-	mounted: (el) => el.focus()
-}
diff --git a/packages/client/src/directives/index.ts b/packages/client/src/directives/index.ts
index 77639e2f3..0a5c32326 100644
--- a/packages/client/src/directives/index.ts
+++ b/packages/client/src/directives/index.ts
@@ -11,7 +11,6 @@ import anim from "./anim";
 import clickAnime from "./click-anime";
 import panel from "./panel";
 import adaptiveBorder from "./adaptive-border";
-import focus from "./focus";
 
 export default function (app: App) {
 	app.directive("userPreview", userPreview);
@@ -26,5 +25,4 @@ export default function (app: App) {
 	app.directive("click-anime", clickAnime);
 	app.directive("panel", panel);
 	app.directive("adaptive-border", adaptiveBorder);
-	app.directive("focus", focus);
 }
diff --git a/packages/client/src/directives/tooltip.ts b/packages/client/src/directives/tooltip.ts
index 91024a6e3..7738d14e8 100644
--- a/packages/client/src/directives/tooltip.ts
+++ b/packages/client/src/directives/tooltip.ts
@@ -76,32 +76,23 @@ export default {
 			ev.preventDefault();
 		});
 
-		function showTooltip() {
-			window.clearTimeout(self.showTimer);
-			window.clearTimeout(self.hideTimer);
-			self.showTimer = window.setTimeout(self.show, delay);
-		}
-		function hideTooltip() {
-			window.clearTimeout(self.showTimer);
-			window.clearTimeout(self.hideTimer);
-			self.hideTimer = window.setTimeout(self.close, delay);
-		}
-
 		el.addEventListener(
-			start, showTooltip,
-			{ passive: true },
-		);
-		el.addEventListener(
-			"focusin", showTooltip,
+			start,
+			() => {
+				window.clearTimeout(self.showTimer);
+				window.clearTimeout(self.hideTimer);
+				self.showTimer = window.setTimeout(self.show, delay);
+			},
 			{ passive: true },
 		);
 
 		el.addEventListener(
-			end, hideTooltip,
-			{ passive: true },
-		);
-		el.addEventListener(
-			"focusout", hideTooltip,
+			end,
+			() => {
+				window.clearTimeout(self.showTimer);
+				window.clearTimeout(self.hideTimer);
+				self.hideTimer = window.setTimeout(self.close, delay);
+			},
 			{ passive: true },
 		);
 
diff --git a/packages/client/src/pages/admin/_header_.vue b/packages/client/src/pages/admin/_header_.vue
index bf070e269..69fd1bc58 100644
--- a/packages/client/src/pages/admin/_header_.vue
+++ b/packages/client/src/pages/admin/_header_.vue
@@ -313,7 +313,11 @@ onUnmounted(() => {
 			font-weight: normal;
 			opacity: 0.7;
 
-			&:hover, &:focus-visible, &.active {
+			&:hover {
+				opacity: 1;
+			}
+
+			&.active {
 				opacity: 1;
 			}
 
diff --git a/packages/client/src/pages/admin/overview.moderators.vue b/packages/client/src/pages/admin/overview.moderators.vue
index db953b890..6184cfb10 100644
--- a/packages/client/src/pages/admin/overview.moderators.vue
+++ b/packages/client/src/pages/admin/overview.moderators.vue
@@ -12,7 +12,7 @@
 					class="user"
 					:to="`/user-info/${user.id}`"
 				>
-					<MkAvatar :user="user" class="avatar" indicator disableLink />
+					<MkAvatar :user="user" class="avatar" indicator />
 				</MkA>
 			</div>
 		</Transition>
diff --git a/packages/client/src/pages/follow-requests.vue b/packages/client/src/pages/follow-requests.vue
index 35279495b..2aac52163 100644
--- a/packages/client/src/pages/follow-requests.vue
+++ b/packages/client/src/pages/follow-requests.vue
@@ -23,7 +23,6 @@
 								class="avatar"
 								:user="req.follower"
 								:show-indicator="true"
-								disableLink
 							/>
 							<div class="body">
 								<div class="name">
diff --git a/packages/client/src/pages/settings/accounts.vue b/packages/client/src/pages/settings/accounts.vue
index 3010354b6..ec2cd2477 100644
--- a/packages/client/src/pages/settings/accounts.vue
+++ b/packages/client/src/pages/settings/accounts.vue
@@ -6,14 +6,14 @@
 				{{ i18n.ts.addAccount }}</FormButton
 			>
 
-			<button
+			<div
 				v-for="account in accounts"
 				:key="account.id"
 				class="_panel _button lcjjdxlm"
 				@click="menu(account, $event)"
 			>
 				<div class="avatar">
-					<MkAvatar :user="account" class="avatar" disableLink />
+					<MkAvatar :user="account" class="avatar" />
 				</div>
 				<div class="body">
 					<div class="name">
@@ -23,7 +23,7 @@
 						<MkAcct :user="account" />
 					</div>
 				</div>
-			</button>
+			</div>
 		</FormSuspense>
 	</div>
 </template>
@@ -158,8 +158,6 @@ definePageMetadata({
 .lcjjdxlm {
 	display: flex;
 	padding: 16px;
-	width: 100%;
-	text-align: unset;
 
 	> .avatar {
 		display: block;
diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index 52c7b62f4..051edf6e0 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -204,6 +204,10 @@ hr {
 		pointer-events: none;
 	}
 
+	&:focus-visible {
+		outline: none;
+	}
+
 	&:disabled {
 		opacity: 0.5;
 		cursor: default;
diff --git a/packages/client/src/ui/_common_/navbar-for-mobile.vue b/packages/client/src/ui/_common_/navbar-for-mobile.vue
index 39abb7c26..43c91d147 100644
--- a/packages/client/src/ui/_common_/navbar-for-mobile.vue
+++ b/packages/client/src/ui/_common_/navbar-for-mobile.vue
@@ -18,7 +18,6 @@
 					<MkAvatar
 						:user="$i"
 						class="icon"
-						disableLink
 					/><!-- <MkAcct class="text" :user="$i"/> -->
 				</button>
 			</div>
diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index 20c177f37..380f77c3c 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -18,7 +18,6 @@
 					<MkAvatar
 						:user="$i"
 						class="icon"
-						disableLink
 					/><!-- <MkAcct class="text" :user="$i"/> -->
 				</button>
 			</div>
@@ -335,7 +334,6 @@ function more(ev: MouseEvent) {
 					}
 
 					&:hover,
-					&:focus-within,
 					&.active {
 						&:before {
 							background: var(--accentLighten);
@@ -400,6 +398,8 @@ function more(ev: MouseEvent) {
 					padding-left: 30px;
 					line-height: 2.85rem;
 					margin-bottom: 0.5rem;
+					text-overflow: ellipsis;
+					overflow: hidden;
 					white-space: nowrap;
 					width: 100%;
 					text-align: left;
@@ -425,12 +425,9 @@ function more(ev: MouseEvent) {
 					> .text {
 						position: relative;
 						font-size: 0.9em;
-						overflow: hidden;
-						text-overflow: ellipsis;
 					}
 
-					&:hover,
-					&:focus-within {
+					&:hover {
 						text-decoration: none;
 						color: var(--navHoverFg);
 						transition: all 0.4s ease;
@@ -440,8 +437,7 @@ function more(ev: MouseEvent) {
 						color: var(--navActive);
 					}
 
-					&:hover, 
-					&:focus-within,
+					&:hover,
 					&.active {
 						color: var(--accent);
 						transition: all 0.4s ease;
@@ -532,7 +528,6 @@ function more(ev: MouseEvent) {
 					}
 
 					&:hover,
-					&:focus-within,
 					&.active {
 						&:before {
 							background: var(--accentLighten);
@@ -618,7 +613,6 @@ function more(ev: MouseEvent) {
 					}
 
 					&:hover,
-					&:focus-within,
 					&.active {
 						text-decoration: none;
 						color: var(--accent);
@@ -648,12 +642,5 @@ function more(ev: MouseEvent) {
 			}
 		}
 	}
-
-	.item {
-		outline: none;
-		&:focus-visible:before {
-			outline: auto;
-		}
-	}
 }
 </style>
diff --git a/packages/client/src/ui/classic.header.vue b/packages/client/src/ui/classic.header.vue
index 99a0ab098..5c3e6b702 100644
--- a/packages/client/src/ui/classic.header.vue
+++ b/packages/client/src/ui/classic.header.vue
@@ -83,7 +83,6 @@
 					<MkAvatar :user="$i" class="avatar" /><MkAcct
 						class="acct"
 						:user="$i"
-						disableLink
 					/>
 				</button>
 				<div class="post" @click="post">
diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue
index fa72c5765..b70a3c984 100644
--- a/packages/client/src/ui/classic.sidebar.vue
+++ b/packages/client/src/ui/classic.sidebar.vue
@@ -5,7 +5,7 @@
 			class="item _button account"
 			@click="openAccountMenu"
 		>
-			<MkAvatar :user="$i" class="avatar" disableLink /><MkAcct
+			<MkAvatar :user="$i" class="avatar" /><MkAcct
 				class="text"
 				:user="$i"
 			/>
@@ -299,7 +299,6 @@ function openInstanceMenu(ev: MouseEvent) {
 				width: 46px;
 				height: 46px;
 				padding: 0;
-				margin-inline: 0 !important;
 			}
 		}
 
@@ -373,7 +372,6 @@ function openInstanceMenu(ev: MouseEvent) {
 
 		> i {
 			width: 32px;
-			justify-content: center;
 		}
 
 		> i,
diff --git a/packages/client/src/ui/classic.vue b/packages/client/src/ui/classic.vue
index 266effd9a..a721ffd0b 100644
--- a/packages/client/src/ui/classic.vue
+++ b/packages/client/src/ui/classic.vue
@@ -227,8 +227,6 @@ onMounted(() => {
 }
 
 .gbhvwtnk {
-	display: flex;
-	justify-content: center;
 	$ui-font-size: 1em;
 	$widgets-hide-threshold: 1200px;
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 60e42e11a..9f0b4195d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -19,12 +19,6 @@ importers:
       '@tensorflow/tfjs':
         specifier: ^3.21.0
         version: 3.21.0(seedrandom@3.0.5)
-      focus-trap:
-        specifier: ^7.2.0
-        version: 7.2.0
-      focus-trap-vue:
-        specifier: ^4.0.1
-        version: 4.0.1(focus-trap@7.2.0)(vue@3.2.45)
       js-yaml:
         specifier: 4.1.0
         version: 4.1.0
@@ -3809,12 +3803,14 @@ packages:
       '@vue/shared': 3.2.45
       estree-walker: 2.0.2
       source-map: 0.6.1
+    dev: true
 
   /@vue/compiler-dom@3.2.45:
     resolution: {integrity: sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==}
     dependencies:
       '@vue/compiler-core': 3.2.45
       '@vue/shared': 3.2.45
+    dev: true
 
   /@vue/compiler-sfc@2.7.14:
     resolution: {integrity: sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==}
@@ -3837,12 +3833,14 @@ packages:
       magic-string: 0.25.9
       postcss: 8.4.21
       source-map: 0.6.1
+    dev: true
 
   /@vue/compiler-ssr@3.2.45:
     resolution: {integrity: sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ==}
     dependencies:
       '@vue/compiler-dom': 3.2.45
       '@vue/shared': 3.2.45
+    dev: true
 
   /@vue/reactivity-transform@3.2.45:
     resolution: {integrity: sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==}
@@ -3852,17 +3850,20 @@ packages:
       '@vue/shared': 3.2.45
       estree-walker: 2.0.2
       magic-string: 0.25.9
+    dev: true
 
   /@vue/reactivity@3.2.45:
     resolution: {integrity: sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==}
     dependencies:
       '@vue/shared': 3.2.45
+    dev: true
 
   /@vue/runtime-core@3.2.45:
     resolution: {integrity: sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==}
     dependencies:
       '@vue/reactivity': 3.2.45
       '@vue/shared': 3.2.45
+    dev: true
 
   /@vue/runtime-dom@3.2.45:
     resolution: {integrity: sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==}
@@ -3870,6 +3871,7 @@ packages:
       '@vue/runtime-core': 3.2.45
       '@vue/shared': 3.2.45
       csstype: 2.6.21
+    dev: true
 
   /@vue/server-renderer@3.2.45(vue@3.2.45):
     resolution: {integrity: sha512-ebiMq7q24WBU1D6uhPK//2OTR1iRIyxjF5iVq/1a5I1SDMDyDu4Ts6fJaMnjrvD3MqnaiFkKQj+LKAgz5WIK3g==}
@@ -3879,9 +3881,11 @@ packages:
       '@vue/compiler-ssr': 3.2.45
       '@vue/shared': 3.2.45
       vue: 3.2.45
+    dev: true
 
   /@vue/shared@3.2.45:
     resolution: {integrity: sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==}
+    dev: true
 
   /@webassemblyjs/ast@1.11.1:
     resolution: {integrity: sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==}
@@ -6070,6 +6074,7 @@ packages:
 
   /csstype@2.6.21:
     resolution: {integrity: sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==}
+    dev: true
 
   /csstype@3.1.1:
     resolution: {integrity: sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==}
@@ -6974,6 +6979,7 @@ packages:
 
   /estree-walker@2.0.2:
     resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
+    dev: true
 
   /esutils@2.0.3:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
@@ -7439,22 +7445,6 @@ packages:
       readable-stream: 2.3.7
     dev: true
 
-  /focus-trap-vue@4.0.1(focus-trap@7.2.0)(vue@3.2.45):
-    resolution: {integrity: sha512-2iqOeoSvgq7Um6aL+255a/wXPskj6waLq2oKCa4gOnMORPo15JX7wN6J5bl1SMhMlTlkHXGSrQ9uJPJLPZDl5w==}
-    peerDependencies:
-      focus-trap: ^7.0.0
-      vue: ^3.0.0
-    dependencies:
-      focus-trap: 7.2.0
-      vue: 3.2.45
-    dev: false
-
-  /focus-trap@7.2.0:
-    resolution: {integrity: sha512-v4wY6HDDYvzkBy4735kW5BUEuw6Yz9ABqMYLuTNbzAFPcBOGiGHwwcNVMvUz4G0kgSYh13wa/7TG3XwTeT4O/A==}
-    dependencies:
-      tabbable: 6.1.1
-    dev: false
-
   /follow-redirects@1.15.2(debug@4.3.4):
     resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
     engines: {node: '>=4.0'}
@@ -10360,6 +10350,7 @@ packages:
     resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==}
     dependencies:
       sourcemap-codec: 1.4.8
+    dev: true
 
   /mailcheck@1.1.1:
     resolution: {integrity: sha512-3WjL8+ZDouZwKlyJBMp/4LeziLFXgleOdsYu87piGcMLqhBzCsy2QFdbtAwv757TFC/rtqd738fgJw1tFQCSgA==}
@@ -13276,6 +13267,7 @@ packages:
   /sourcemap-codec@1.4.8:
     resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
     deprecated: Please use @jridgewell/sourcemap-codec instead
+    dev: true
 
   /sparkles@1.0.1:
     resolution: {integrity: sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==}
@@ -13694,10 +13686,6 @@ packages:
     resolution: {integrity: sha512-g9rPT3V1Q4WjWFZ/t5BdGC1mT/FpYnsLdBl+M5e6MlRkuE1RSR+R43wcY/3mKI59B9KEr+vxdWCuWNMD3oNHKA==}
     dev: true
 
-  /tabbable@6.1.1:
-    resolution: {integrity: sha512-4kl5w+nCB44EVRdO0g/UGoOp3vlwgycUVtkk/7DPyeLZUCuNFFKCFG6/t/DgHLrUPHjrZg6s5tNm+56Q2B0xyg==}
-    dev: false
-
   /tapable@2.2.1:
     resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
     engines: {node: '>=6'}
@@ -14788,6 +14776,7 @@ packages:
       '@vue/runtime-dom': 3.2.45
       '@vue/server-renderer': 3.2.45(vue@3.2.45)
       '@vue/shared': 3.2.45
+    dev: true
 
   /vuedraggable@4.1.0(vue@3.2.45):
     resolution: {integrity: sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==}

From da6dd318122cf5db08d74a83393d2798b3a4ce30 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 29 Apr 2023 19:14:47 -0700
Subject: [PATCH 41/90] hotfix

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

diff --git a/package.json b/package.json
index 80942ff54..61c247ab2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev40",
+	"version": "13.2.0-dev41",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From f6c5a521067d0ced5cd5b7be4db671316dde11aa Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 29 Apr 2023 19:38:26 -0700
Subject: [PATCH 42/90] Revert "Merge pull request 'Add show more button to
 notifications' (#9942) from Freeplay/calckey:notifications into develop"

This reverts commit 8cb321b110dca7f8020f8a7a9af6a49308a0c036, reversing
changes made to 133391122b77c92bff6e0e94f40cfdea542c6f35.
---
 packages/client/src/components/MkCwButton.vue | 37 ----------
 .../client/src/components/MkNotification.vue  | 47 ++++---------
 .../src/components/MkShowMoreButton.vue       | 68 -------------------
 .../src/components/MkSubNoteContent.vue       | 56 +++++++++++++--
 .../client/src/components/MkUserPreview.vue   | 16 ++++-
 5 files changed, 79 insertions(+), 145 deletions(-)
 delete mode 100644 packages/client/src/components/MkShowMoreButton.vue

diff --git a/packages/client/src/components/MkCwButton.vue b/packages/client/src/components/MkCwButton.vue
index 1f6340510..01ab11351 100644
--- a/packages/client/src/components/MkCwButton.vue
+++ b/packages/client/src/components/MkCwButton.vue
@@ -77,42 +77,5 @@ defineExpose({
 		background: var(--cwFg) !important;
 		color: var(--cwBg) !important;
 	}
-
-	&.fade {
-		display: block;
-		position: absolute;
-		bottom: 0;
-		left: 0;
-		width: 100%;
-		z-index: 2;
-		> span {
-			display: inline-block;
-			background: var(--panel);
-			padding: 0.4em 1em;
-			font-size: 0.8em;
-			border-radius: 999px;
-			box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
-		}
-		&:hover, &:focus {
-			> span {
-				background: var(--panelHighlight);
-			}
-		}
-	}
-	&.showLess {
-		width: 100%;
-		margin-top: 1em;
-		position: sticky;
-		bottom: var(--stickyBottom);
-
-		> 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>
diff --git a/packages/client/src/components/MkNotification.vue b/packages/client/src/components/MkNotification.vue
index 2c7281dbe..c909873a5 100644
--- a/packages/client/src/components/MkNotification.vue
+++ b/packages/client/src/components/MkNotification.vue
@@ -89,7 +89,7 @@
 				/>
 			</div>
 		</div>
-		<div class="tail" :class="{ collapsed }">
+		<div class="tail">
 			<header>
 				<span v-if="notification.type === 'pollEnded'">{{
 					i18n.ts._notification.pollEnded
@@ -112,11 +112,11 @@
 				v-if="notification.type === 'reaction'"
 				class="text"
 				:to="notePage(notification.note)"
-				:title="summary"
+				:title="getNoteSummary(notification.note)"
 			>
 				<i class="ph-quotes ph-fill ph-lg"></i>
 				<Mfm
-					:text="summary"
+					:text="getNoteSummary(notification.note)"
 					:plain="true"
 					:nowrap="!full"
 					:custom-emojis="notification.note.emojis"
@@ -142,10 +142,10 @@
 				v-if="notification.type === 'reply'"
 				class="text"
 				:to="notePage(notification.note)"
-				:title="summary"
+				:title="getNoteSummary(notification.note)"
 			>
 				<Mfm
-					:text="summary"
+					:text="getNoteSummary(notification.note)"
 					:plain="true"
 					:nowrap="!full"
 					:custom-emojis="notification.note.emojis"
@@ -155,10 +155,10 @@
 				v-if="notification.type === 'mention'"
 				class="text"
 				:to="notePage(notification.note)"
-				:title="summary"
+				:title="getNoteSummary(notification.note)"
 			>
 				<Mfm
-					:text="summary"
+					:text="getNoteSummary(notification.note)"
 					:plain="true"
 					:nowrap="!full"
 					:custom-emojis="notification.note.emojis"
@@ -168,10 +168,10 @@
 				v-if="notification.type === 'quote'"
 				class="text"
 				:to="notePage(notification.note)"
-				:title="summary"
+				:title="getNoteSummary(notification.note)"
 			>
 				<Mfm
-					:text="summary"
+					:text="getNoteSummary(notification.note)"
 					:plain="true"
 					:nowrap="!full"
 					:custom-emojis="notification.note.emojis"
@@ -181,11 +181,11 @@
 				v-if="notification.type === 'pollVote'"
 				class="text"
 				:to="notePage(notification.note)"
-				:title="summary"
+				:title="getNoteSummary(notification.note)"
 			>
 				<i class="ph-quotes ph-fill ph-lg"></i>
 				<Mfm
-					:text="summary"
+					:text="getNoteSummary(notification.note)"
 					:plain="true"
 					:nowrap="!full"
 					:custom-emojis="notification.note.emojis"
@@ -196,11 +196,11 @@
 				v-if="notification.type === 'pollEnded'"
 				class="text"
 				:to="notePage(notification.note)"
-				:title="summary"
+				:title="getNoteSummary(notification.note)"
 			>
 				<i class="ph-quotes ph-fill ph-lg"></i>
 				<Mfm
-					:text="summary"
+					:text="getNoteSummary(notification.note)"
 					:plain="true"
 					:nowrap="!full"
 					:custom-emojis="notification.note.emojis"
@@ -264,7 +264,6 @@
 			<span v-if="notification.type === 'app'" class="text">
 				<Mfm :text="notification.body" :nowrap="!full" />
 			</span>
-			<xShowMoreButton v-if="isLong" v-model="collapsed"></xShowMoreButton>
 		</div>
 	</div>
 </template>
@@ -275,7 +274,6 @@ import * as misskey from "calckey-js";
 import XReactionIcon from "@/components/MkReactionIcon.vue";
 import MkFollowButton from "@/components/MkFollowButton.vue";
 import XReactionTooltip from "@/components/MkReactionTooltip.vue";
-import XShowMoreButton from "./MkShowMoreButton.vue";
 import { getNoteSummary } from "@/scripts/get-note-summary";
 import { notePage } from "@/filters/note";
 import { userPage } from "@/filters/user";
@@ -301,19 +299,12 @@ const props = withDefaults(
 const elRef = ref<HTMLElement>(null);
 const reactionRef = ref(null);
 
-const summary = getNoteSummary(props.notification.note);
-
 const showEmojiReactions =
 	defaultStore.state.enableEmojiReactions ||
 	defaultStore.state.showEmojisInReactionNotifications;
 const defaultReaction = ["⭐", "👍", "❤️"].includes(instance.defaultReaction)
 	? instance.defaultReaction
 	: "⭐";
-const isLong = (summary.split("\n").length > 3 || summary.length > 200);
-const collapsed = $ref(isLong);
-
-
-
 
 let readObserver: IntersectionObserver | undefined;
 let connection;
@@ -495,7 +486,6 @@ useTooltip(reactionRef, (showing) => {
 	}
 
 	> .tail {
-		position: relative;
 		flex: 1;
 		min-width: 0;
 
@@ -536,17 +526,6 @@ useTooltip(reactionRef, (showing) => {
 				margin-left: 4px;
 			}
 		}
-		&.collapsed > .text {
-			display: block;
-			position: relative;
-			max-height: calc(4em + 50px);
-			overflow: hidden;
-			mask: linear-gradient(black calc(100% - 64px), transparent);
-			-webkit-mask: linear-gradient(
-				black calc(100% - 64px),
-				transparent
-			);
-		}
 	}
 }
 </style>
diff --git a/packages/client/src/components/MkShowMoreButton.vue b/packages/client/src/components/MkShowMoreButton.vue
deleted file mode 100644
index 3516d6f43..000000000
--- a/packages/client/src/components/MkShowMoreButton.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-	<button
-		v-if="modelValue"
-		class="fade _button"
-		@click.stop="toggle"
-	>
-		<span>{{ i18n.ts.showMore }}</span>
-	</button>
-	<button
-		v-if="!modelValue"
-		class="showLess _button"
-		@click.stop="toggle"
-	>
-		<span>{{ i18n.ts.showLess }}</span>
-	</button>
-</template>
-<script lang="ts" setup>
-import { i18n } from "@/i18n";
-
-const props = defineProps<{
-	modelValue: boolean;
-}>();
-
-const emit = defineEmits<{
-	(ev: "update:modelValue", v: boolean): void;
-}>();
-
-const toggle = () => {
-	emit("update:modelValue", !props.modelValue);
-};
-</script>
-<style lang="scss" scoped>
-.fade {
-	display: block;
-	position: absolute;
-	bottom: 0;
-	left: 0;
-	width: 100%;
-	> span {
-		display: inline-block;
-		background: var(--panel);
-		padding: 0.4em 1em;
-		font-size: 0.8em;
-		border-radius: 999px;
-		box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
-	}
-	&:hover {
-		> span {
-			background: var(--panelHighlight);
-		}
-	}
-}
-.showLess {
-	width: 100%;
-	margin-top: 1em;
-	position: sticky;
-	bottom: var(--stickyBottom);
-
-	> 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>
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 68439527a..94869402f 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -106,8 +106,21 @@
 					v-on:focus="cwButton?.focus()"
 				></div>
 			</div>
-			<XShowMoreButton v-if="isLong" v-model="collapsed"></XShowMoreButton>
-			<XCwButton v-if="note.cw && showContent" v-model="showContent" :note="note" />
+			<button
+				v-if="isLong && collapsed"
+				class="fade _button"
+				@click.stop="collapsed = false"
+			>
+				<span>{{ i18n.ts.showMore }}</span>
+			</button>
+			<button
+				v-if="isLong && !collapsed"
+				class="showLess _button"
+				@click.stop="collapsed = true"
+			>
+				<span>{{ i18n.ts.showLess }}</span>
+			</button>
+			<XCwButton v-if="note.cw" v-model="showContent" :note="note" />
 		</div>
 	</div>
 </template>
@@ -120,7 +133,6 @@ import XNoteSimple from "@/components/MkNoteSimple.vue";
 import XMediaList from "@/components/MkMediaList.vue";
 import XPoll from "@/components/MkPoll.vue";
 import MkUrlPreview from "@/components/MkUrlPreview.vue";
-import XShowMoreButton from "./MkShowMoreButton.vue";
 import XCwButton from "@/components/MkCwButton.vue";
 import { extractUrlFromMfm } from "@/scripts/extract-url-from-mfm";
 import { i18n } from "@/i18n";
@@ -145,7 +157,6 @@ const isLong =
 	props.note.text != null &&
 	(props.note.text.split("\n").length > 9 || props.note.text.length > 500);
 const collapsed = $ref(props.note.cw == null && isLong);
-
 const urls = props.note.text
 	? extractUrlFromMfm(mfm.parse(props.note.text)).slice(0, 5)
 	: null;
@@ -274,6 +285,43 @@ function focusFooter(ev) {
 					top: 40px;
 				}
 			}
+
+			:deep(.fade) {
+				display: block;
+				position: absolute;
+				bottom: 0;
+				left: 0;
+				width: 100%;
+				> span {
+					display: inline-block;
+					background: var(--panel);
+					padding: 0.4em 1em;
+					font-size: 0.8em;
+					border-radius: 999px;
+					box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
+				}
+				&:hover {
+					> span {
+						background: var(--panelHighlight);
+					}
+				}
+			}
+		}
+
+		:deep(.showLess) {
+			width: 100%;
+			margin-top: 1em;
+			position: sticky;
+			bottom: var(--stickyBottom);
+
+			> 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);
+			}
 		}
 	}
 }
diff --git a/packages/client/src/components/MkUserPreview.vue b/packages/client/src/components/MkUserPreview.vue
index ddfd39f14..1e6db1442 100644
--- a/packages/client/src/components/MkUserPreview.vue
+++ b/packages/client/src/components/MkUserPreview.vue
@@ -55,7 +55,20 @@
 						:custom-emojis="user.emojis"
 					/>
 				</div>
-				<XShowMoreButton v-if="isLong" v-model="collapsed"></XShowMoreButton>
+				<button
+					v-if="isLong && collapsed"
+					class="fade _button"
+					@click.stop="collapsed = false"
+				>
+					<span>{{ i18n.ts.showMore }}</span>
+				</button>
+				<button
+					v-if="isLong && !collapsed"
+					class="showLess _button"
+					@click.stop="collapsed = true"
+				>
+					<span>{{ i18n.ts.showLess }}</span>
+				</button>
 				<div v-if="user.fields.length > 0" class="fields">
 					<dl
 						v-for="(field, i) in user.fields"
@@ -115,7 +128,6 @@ import * as Acct from "calckey-js/built/acct";
 import type * as misskey from "calckey-js";
 import MkFollowButton from "@/components/MkFollowButton.vue";
 import { userPage } from "@/filters/user";
-import XShowMoreButton from "./MkShowMoreButton.vue";
 import * as os from "@/os";
 import { $i } from "@/account";
 import { i18n } from "@/i18n";

From 4706bc8796ab04dc887a01079f72f7df9eda3da8 Mon Sep 17 00:00:00 2001
From: Laker Turner <la@laker.gay>
Date: Sat, 29 Apr 2023 10:28:49 +0000
Subject: [PATCH 43/90] chore: Translated using Weblate (English)

Currently translated at 100.0% (1735 of 1735 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/en/
---
 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 2feb2cd94..f9d4d23f0 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1042,7 +1042,7 @@ moveFromLabel: "Account you're moving from:"
 moveFromDescription: "This will set an alias of your old account so that you can move\
   \ from that account to this current one. Do this BEFORE moving from your older account.\
   \ Please enter the tag of the account formatted like @person@instance.com"
-migrationConfirm: "Are you absolutely sure you want to migrate your acccount to {account}?\
+migrationConfirm: "Are you absolutely sure you want to migrate your account to {account}?\
   \ Once you do this, you won't be able to reverse it, and you won't be able to use\
   \ your account normally again.\nAlso, please ensure that you've set this current\
   \ account as the account you're moving from."

From 3b9b6daba3d43ef3e80be5e3fd62ef69fad536b7 Mon Sep 17 00:00:00 2001
From: jolupa <jolupameister@gmail.com>
Date: Sat, 29 Apr 2023 11:53:12 +0000
Subject: [PATCH 44/90] chore: Translated using Weblate (Catalan)

Currently translated at 37.1% (644 of 1735 strings)

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

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index 24e4b6d7d..b226d641e 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -675,3 +675,48 @@ useGlobalSetting: Fes servir els ajustos globals
 useGlobalSettingDesc: Si s'activa, es faran servir els ajustos de notificacions del
   teu compte. Si es desactiva , es poden fer configuracions individuals.
 other: Altres
+menu: Menú
+addItem: Afegeix un element
+divider: Divisor
+relays: Relés
+addRelay: Afegeix un Relé
+inboxUrl: Adreça de la safata d'entrada
+addedRelays: Relés afegits
+serviceworkerInfo: Ha de estar activat per les notificacions push.
+poll: Enquesta
+deletedNote: Article eliminat
+disablePlayer: Tancar el reproductor de vídeo
+fileIdOrUrl: ID o adreça URL del fitxer
+behavior: Comportament
+regenerateLoginTokenDescription: Regenera el token que es fa servir de manera interna
+  durant l'inici de sessió. Normalment això no és necessari. Si es torna a genera
+  el token, es tancarà la sessió a tots els dispositius.
+setMultipleBySeparatingWithSpace: Separa diferents entrades amb espais.
+reportAbuseOf: Informa sobre {name}
+sample: Exemple
+abuseReports: Informes
+reportAbuse: Informe
+reporter: Informador
+reporterOrigin: Origen d'el informador
+forwardReport: Envia l'informe a una instancia remota
+abuseReported: El teu informe ha sigut enviat. Moltes gràcies.
+reporteeOrigin: Origen de l'informe
+send: Enviar
+abuseMarkAsResolved: Marcar l'informe com a resolt
+visibility: Visibilitat
+useCw: Amaga el contingut
+enablePlayer: Obre el reproductor de vídeo
+yourAccountSuspendedDescription: Aquest compte ha sigut suspesa per no seguir els
+  termes de servei del servidor o quelcom similar. Contacte amb l'administrador si
+  vols conèixer la raó amb més detall. Si us plau no facis un compte nou.
+invisibleNote: Article ocult
+enableInfiniteScroll: Carregar més de forma automàtica
+fillAbuseReportDescription: Si us plau omple els detalls sobre aquest informe. Si
+  es sobre un article en concret, si us plau inclou l'adreça URL.
+forwardReportIsAnonymous: Com a informador a l'instància remota no es mostrarà el
+  teu compte, si no un compte anònim.
+openInNewTab: Obrir en una pestanya nova
+openInSideView: Obrir a la vista lateral
+defaultNavigationBehaviour: Navegació per defecte
+editTheseSettingsMayBreakAccount: Si edites aquestes configuracions pots fer mal bé
+  el teu compte.

From 50d8301b2f01c611928f5a5e72448df61d2ed839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Lepist=C3=B6?= <ville.lepisto@protonmail.com>
Date: Sat, 29 Apr 2023 08:52:45 +0000
Subject: [PATCH 45/90] chore: Translated using Weblate (Finnish)

Currently translated at 11.7% (204 of 1735 strings)

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

diff --git a/locales/fi.yml b/locales/fi.yml
index c9e5e06e0..558d1afc2 100644
--- a/locales/fi.yml
+++ b/locales/fi.yml
@@ -41,3 +41,182 @@ favorite: Lisää kirjanmerkkeihin
 copyContent: Kopioi sisältö
 deleteAndEdit: Poista ja muokkaa
 copyLink: Kopioi linkki
+makeFollowManuallyApprove: Seuraajapyyntö vaatii hyväksymistä
+follow: Seuraa
+pinned: Kiinnitä profiiliin
+followRequestPending: Seuraajapyyntö odottaa
+you: Sinä
+unrenote: Peruuta buustaus
+reaction: Reaktiot
+reactionSettingDescription2: Vedä uudelleenjärjestelläksesi, napsauta poistaaksesi,
+  paina "+" lisätäksesi.
+attachCancel: Poista liite
+enterFileName: Anna tiedostonimi
+mute: Hiljennä
+unmute: Poista hiljennys
+headlineMisskey: Avoimen lähdekoodin, hajautettu sosiaalisen median alusta, joka on
+  ikuisesti ilmainen! 🚀
+monthAndDay: '{day}/{month}'
+deleteAndEditConfirm: Oletko varma, että haluat poistaa tämän lähetyksen ja muokata
+  sitä? Menetät kaikki reaktiot, buustaukset ja vastaukset lähetyksestäsi.
+addToList: Lisää listaan
+sendMessage: Lähetä viesti
+reply: Vastaa
+loadMore: Lataa enemmän
+showMore: Näytä enemmän
+receiveFollowRequest: Seuraajapyyntö vastaanotettu
+followRequestAccepted: Seuraajapyyntö hyväksytty
+mentions: Maininnat
+importAndExport: Tuo/Vie Tietosisältö
+import: Tuo
+export: Vie
+files: Tiedostot
+download: Lataa
+unfollowConfirm: Oletko varma, ettet halua seurata enää käyttäjää {name}?
+noLists: Sinulla ei ole listoja
+note: Lähetys
+notes: Lähetykset
+following: Seuraa
+createList: Luo lista
+manageLists: Hallitse listoja
+error: Virhe
+somethingHappened: On tapahtunut virhe
+retry: Yritä uudelleen
+pageLoadError: Virhe ladattaessa sivua.
+serverIsDead: Tämä palvelin ei vastaa. Yritä hetken kuluttua uudelleen.
+youShouldUpgradeClient: Nähdäksesi tämän sivun, virkistä päivittääksesi asiakasohjelmasi.
+privacy: Tietosuoja
+defaultNoteVisibility: Oletusnäkyvyys
+followRequest: Seuraajapyyntö
+followRequests: Seuraajapyynnöt
+unfollow: Poista seuraaminen
+enterEmoji: Syötä emoji
+renote: Buustaa
+renoted: Buustattu.
+cantRenote: Tätä lähetystä ei voi buustata.
+cantReRenote: Buustausta ei voi buustata.
+quote: Lainaus
+pinnedNote: Lukittu lähetys
+clickToShow: Napsauta nähdäksesi
+sensitive: Herkkää sisältöä (NSFW)
+add: Lisää
+enableEmojiReactions: Ota käyttöön emoji-reaktiot
+showEmojisInReactionNotifications: Näytä emojit reaktioilmoituksissa
+reactionSetting: Reaktiot näytettäväksi reaktiovalitsimessa
+rememberNoteVisibility: Muista lähetyksen näkyvyysasetukset
+markAsSensitive: Merkitse herkäksi sisällöksi (NSFW)
+unmarkAsSensitive: Poista merkintä herkkää sisältöä (NSFW)
+renoteMute: Hiljennä buustit
+renoteUnmute: Poista buustien hiljennys
+block: Estä
+unblock: Poista esto
+unsuspend: Poista keskeytys
+suspend: Keskeytys
+blockConfirm: Oletko varma, että haluat estää tämän tilin?
+unblockConfirm: Oletko varma, että haluat poistaa tämän tilin eston?
+selectAntenna: Valitse antenni
+selectWidget: Valitse vimpain
+editWidgets: Muokkaa vimpaimia
+editWidgetsExit: Valmis
+emoji: Emoji
+emojis: Emojit
+emojiName: Emojin nimi
+emojiUrl: Emojin URL-linkki
+cacheRemoteFiles: Taltioi etätiedostot välimuistiin
+flagAsBot: Merkitse tili botiksi
+flagAsBotDescription: Ota tämä vaihtoehto käyttöön, jos tätä tiliä ohjaa ohjelma.
+  Jos se on käytössä, se toimii lippuna muille kehittäjille, jotta estetään loputtomat
+  vuorovaikutusketjut muiden bottien kanssa ja säädetään Calckeyn sisäiset järjestelmät
+  käsittelemään tätä tiliä botina.
+flagAsCat: Oletko kissa? 🐱
+flagAsCatDescription: Saat kissan korvat ja puhut kuin kissa!
+flagSpeakAsCat: Puhu kuin kissa
+flagShowTimelineReplies: Näytä vastaukset aikajanalla
+addAccount: Lisää tili
+loginFailed: Kirjautuminen epäonnistui
+showOnRemote: Katsele etäinstanssilla
+general: Yleistä
+accountMoved: 'Käyttäjä on muuttanut uuteen tiliin:'
+wallpaper: Taustakuva
+setWallpaper: Aseta taustakuva
+searchWith: 'Etsi: {q}'
+youHaveNoLists: Sinulla ei ole listoja
+followConfirm: Oletko varma, että haluat seurata käyttäjää {name}?
+host: Isäntä
+selectUser: Valitse käyttäjä
+annotation: Kommentit
+registeredAt: Rekisteröity
+latestRequestReceivedAt: Viimeisin pyyntö vastaanotettu
+latestRequestSentAt: Viimeisin pyyntö lähetetty
+storageUsage: Tallennustilan käyttö
+charts: Kaaviot
+stopActivityDelivery: Lopeta toimintojen lähettäminen
+blockThisInstance: Estä tämä instanssi
+operations: Toiminnot
+metadata: Metatieto
+monitor: Seuranta
+jobQueue: Työjono
+cpuAndMemory: Prosessori ja muisti
+network: Verkko
+disk: Levy
+clearCachedFiles: Tyhjennä välimuisti
+clearCachedFilesConfirm: Oletko varma, että haluat tyhjentää kaikki välimuistiin tallennetut
+  etätiedostot?
+blockedInstances: Estetyt instanssit
+hiddenTags: Piilotetut asiatunnisteet
+mention: Maininta
+copyUsername: Kopioi käyttäjänimi
+searchUser: Etsi käyttäjää
+showLess: Sulje
+youGotNewFollower: seurasi sinua
+directNotes: Yksityisviestit
+driveFileDeleteConfirm: Oletko varma, että haluat poistaa tiedoston " {name}"? Lähetykset,
+  jotka sisältyvät tiedostoon, poistuvat myös.
+importRequested: Olet pyytänyt viemistä. Tämä voi viedä hetken.
+exportRequested: Olet pyytänyt tuomista. Tämä voi viedä hetken. Se lisätään asemaan
+  kun tuonti valmistuu.
+lists: Listat
+followers: Seuraajat
+followsYou: Seuraa sinua
+pageLoadErrorDescription: Tämä yleensä johtuu verkkovirheistä tai selaimen välimuistista.
+  Kokeile tyhjentämällä välimuisti ja yritä sitten hetken kuluttua uudelleen.
+enterListName: Anna listalle nimi
+withNFiles: '{n} tiedosto(t)'
+instanceInfo: Instanssin tiedot
+clearQueue: Tyhjennä jono
+suspendConfirm: Oletko varma, että haluat keskeyttää tämän tilin?
+unsuspendConfirm: Oletko varma, että haluat poistaa tämän tilin keskeytyksen?
+selectList: Valitse lista
+customEmojis: Kustomoitu Emoji
+addEmoji: Lisää
+settingGuide: Suositellut asetukset
+cacheRemoteFilesDescription: Kun tämä asetus ei ole käytössä, etätiedostot on ladattu
+  suoraan etäinstanssilta. Asetuksen poistaminen käytöstä vähentää tallennustilan
+  käyttöä, mutta lisää verkkoliikennettä kun pienoiskuvat eivät muodostu.
+flagSpeakAsCatDescription: Lähetyksesi nyanifioidaan, kun olet kissatilassa
+flagShowTimelineRepliesDescription: Näyttää käyttäjien vastaukset muiden käyttäjien
+  lähetyksiin aikajanalla, jos se on päällä.
+autoAcceptFollowed: Automaattisesti hyväksy seuraamispyynnöt käyttäjiltä, joita seuraat
+perHour: Tunnissa
+removeWallpaper: Poista taustakuva
+recipient: Vastaanottaja(t)
+federation: Federaatio
+software: Ohjelmisto
+proxyAccount: Proxy-tili
+proxyAccountDescription: Välitystili (Proxy-tili) on tili, joka toimii käyttäjien
+  etäseuraajana tietyin edellytyksin. Kun käyttäjä esimerkiksi lisää etäkäyttäjän
+  luetteloon, etäkäyttäjän toimintaa ei toimiteta instanssiin, jos yksikään paikallinen
+  käyttäjä ei seuraa kyseistä käyttäjää, joten välitystili seuraa sen sijaan.
+latestStatus: Viimeisin tila
+selectInstance: Valitse instanssi
+instances: Instanssit
+perDay: Päivässä
+version: Versio
+statistics: Tilastot
+clearQueueConfirmTitle: Oletko varma, että haluat tyhjentää jonon?
+introMisskey: Tervetuloa! Calckey on avoimen lähdekoodin, hajautettu sosiaalisen median
+  alusta, joka on ikuisesti ilmainen! 🚀
+clearQueueConfirmText: Mitkään välittämättömät lähetykset, jotka ovat jonossa, eivät
+  federoidu. Yleensä tätä toimintoa ei tarvita.
+blockedInstancesDescription: Lista instanssien isäntänimistä, jotka haluat estää.
+  Listatut instanssit eivät kykene kommunikoimaan enää tämän instanssin kanssa.

From 7d25b7adc6c93979f1b38f876ae31a9c93791b71 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Sat, 29 Apr 2023 08:11:18 +0000
Subject: [PATCH 46/90] chore: Translated using Weblate (Finnish)

Currently translated at 11.7% (204 of 1735 strings)

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

diff --git a/locales/fi.yml b/locales/fi.yml
index 558d1afc2..fd6c160e6 100644
--- a/locales/fi.yml
+++ b/locales/fi.yml
@@ -3,7 +3,7 @@ fetchingAsApObject: Hae Fedeversestä
 gotIt: Selvä!
 cancel: Peruuta
 enterUsername: Anna käyttäjänimi
-renotedBy: Buustannut {käyttäjä}
+renotedBy: Buustannut {user}
 noNotes: Ei lähetyksiä
 noNotifications: Ei ilmoituksia
 instance: Instanssi
@@ -220,3 +220,4 @@ clearQueueConfirmText: Mitkään välittämättömät lähetykset, jotka ovat jo
   federoidu. Yleensä tätä toimintoa ei tarvita.
 blockedInstancesDescription: Lista instanssien isäntänimistä, jotka haluat estää.
   Listatut instanssit eivät kykene kommunikoimaan enää tämän instanssin kanssa.
+_lang_: Suomi

From ba734a9f3c2070fbfbd35995e15b83d20a603d6c Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 07:27:55 -0400
Subject: [PATCH 47/90] instance silence

---
 .../1682844825247-InstanceSilence.js          | 63 +++++++++++++++++++
 .../backend/src/misc/should-block-instance.ts | 17 +++++
 packages/backend/src/models/entities/meta.ts  |  5 ++
 .../src/models/repositories/instance.ts       |  5 +-
 .../src/models/schema/federation-instance.ts  |  5 ++
 .../src/server/api/endpoints/admin/meta.ts    | 11 ++++
 .../server/api/endpoints/admin/update-meta.ts | 16 +++++
 .../api/endpoints/federation/instances.ts     | 17 +++++
 .../backend/src/services/following/create.ts  |  7 ++-
 packages/backend/src/services/note/create.ts  | 21 ++++++-
 packages/calckey-js/src/api.types.ts          |  1 +
 .../client/src/pages/admin/instance-block.vue | 30 ++++++++-
 12 files changed, 188 insertions(+), 10 deletions(-)
 create mode 100644 packages/backend/migration/1682844825247-InstanceSilence.js

diff --git a/packages/backend/migration/1682844825247-InstanceSilence.js b/packages/backend/migration/1682844825247-InstanceSilence.js
new file mode 100644
index 000000000..5689c4f16
--- /dev/null
+++ b/packages/backend/migration/1682844825247-InstanceSilence.js
@@ -0,0 +1,63 @@
+export class InstanceSilence1682844825247 {
+    name = 'InstanceSilence1682844825247'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "fk_7f4e851a35d81b64dda28eee0"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_renote_muting_createdAt"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_renote_muting_muteeId"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_renote_muting_muterId"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "useStarForReactionFallback"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableGuestTimeline"`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "silencedHosts" character varying(256) array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`COMMENT ON COLUMN "notification"."isRead" IS 'Whether the notification was read.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "meta"."defaultReaction" IS NULL`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "secureMode" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "privateMode" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "allowedHosts" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "pinnedPages" SET DEFAULT '{/featured,/channels,/explore,/pages,/about-calckey}'`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://codeberg.org/calckey/calckey'`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://codeberg.org/calckey/calckey/issues/new'`);
+        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."createdAt" IS 'The created date of the Muting.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."muteeId" IS 'The mutee user ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."muterId" IS 'The muter user ID.'`);
+        await queryRunner.query(`ALTER TABLE "page" ALTER COLUMN "isPublic" DROP DEFAULT`);
+        await queryRunner.query(`CREATE INDEX "IDX_d1259a2c2b7bb413ff449e8711" ON "renote_muting" ("createdAt") `);
+        await queryRunner.query(`CREATE INDEX "IDX_7eac97594bcac5ffcf2068089b" ON "renote_muting" ("muteeId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_7aa72a5fe76019bfe8e5e0e8b7" ON "renote_muting" ("muterId") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_0d801c609cec4e9eb4b6b4490c" ON "renote_muting" ("muterId", "muteeId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_a9021cc2e1feb5f72d3db6e9f5" ON "abuse_user_report" ("targetUserId") `);
+        await queryRunner.query(`ALTER TABLE "renote_muting" ADD CONSTRAINT "FK_7eac97594bcac5ffcf2068089b6" FOREIGN KEY ("muteeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "renote_muting" ADD CONSTRAINT "FK_7aa72a5fe76019bfe8e5e0e8b7d" FOREIGN KEY ("muterId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f"`);
+        await queryRunner.query(`ALTER TABLE "renote_muting" DROP CONSTRAINT "FK_7aa72a5fe76019bfe8e5e0e8b7d"`);
+        await queryRunner.query(`ALTER TABLE "renote_muting" DROP CONSTRAINT "FK_7eac97594bcac5ffcf2068089b6"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_a9021cc2e1feb5f72d3db6e9f5"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_0d801c609cec4e9eb4b6b4490c"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_7aa72a5fe76019bfe8e5e0e8b7"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_7eac97594bcac5ffcf2068089b"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_d1259a2c2b7bb413ff449e8711"`);
+        await queryRunner.query(`ALTER TABLE "page" ALTER COLUMN "isPublic" SET DEFAULT true`);
+        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."muterId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."muteeId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."createdAt" IS NULL`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://github.com/misskey-dev/misskey/issues/new'`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://github.com/misskey-dev/misskey'`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "pinnedPages" SET DEFAULT '{/featured,/channels,/explore,/pages,/about-misskey}'`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "allowedHosts" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "privateMode" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "secureMode" DROP NOT NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "meta"."defaultReaction" IS 'The fallback reaction for emoji reacts'`);
+        await queryRunner.query(`COMMENT ON COLUMN "notification"."isRead" IS 'Whether the Notification is read.'`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "silencedHosts"`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "enableGuestTimeline" boolean NOT NULL DEFAULT false`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "useStarForReactionFallback" boolean NOT NULL DEFAULT false`);
+        await queryRunner.query(`CREATE INDEX "IDX_renote_muting_muterId" ON "muting" ("muterId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_renote_muting_muteeId" ON "muting" ("muteeId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_renote_muting_createdAt" ON "muting" ("createdAt") `);
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "fk_7f4e851a35d81b64dda28eee0" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+}
diff --git a/packages/backend/src/misc/should-block-instance.ts b/packages/backend/src/misc/should-block-instance.ts
index 6e4623242..66b5832c7 100644
--- a/packages/backend/src/misc/should-block-instance.ts
+++ b/packages/backend/src/misc/should-block-instance.ts
@@ -18,3 +18,20 @@ export async function shouldBlockInstance(
 		(blockedHost) => host === blockedHost || host.endsWith(`.${blockedHost}`),
 	);
 }
+
+/**
+ * Returns whether a specific host (punycoded) should be limited.
+ *
+ * @param host punycoded instance host
+ * @param meta a resolved Meta table
+ * @returns whether the given host should be limited
+ */
+export async function shouldSilenceInstance(
+	host: Instance["host"],
+	meta?: Meta,
+): Promise<boolean> {
+	const { silencedHosts } = meta ?? (await fetchMeta());
+	return silencedHosts.some(
+		(limitedHost) => host === limitedHost || host.endsWith(`.${limitedHost}`),
+	);
+}
diff --git a/packages/backend/src/models/entities/meta.ts b/packages/backend/src/models/entities/meta.ts
index 2f77796c4..84f9af479 100644
--- a/packages/backend/src/models/entities/meta.ts
+++ b/packages/backend/src/models/entities/meta.ts
@@ -97,6 +97,11 @@ export class Meta {
 	})
 	public blockedHosts: string[];
 
+	@Column('varchar', {
+		length: 256, array: true, default: '{}',
+	})
+	public silencedHosts: string[];
+
 	@Column('boolean', {
 		default: false,
 	})
diff --git a/packages/backend/src/models/repositories/instance.ts b/packages/backend/src/models/repositories/instance.ts
index fb4498911..bae32b571 100644
--- a/packages/backend/src/models/repositories/instance.ts
+++ b/packages/backend/src/models/repositories/instance.ts
@@ -1,12 +1,10 @@
 import { db } from "@/db/postgre.js";
 import { Instance } from "@/models/entities/instance.js";
 import type { Packed } from "@/misc/schema.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
-import { shouldBlockInstance } from "@/misc/should-block-instance.js";
+import { shouldBlockInstance, shouldSilenceInstance } from "@/misc/should-block-instance.js";
 
 export const InstanceRepository = db.getRepository(Instance).extend({
 	async pack(instance: Instance): Promise<Packed<"FederationInstance">> {
-		const meta = await fetchMeta();
 		return {
 			id: instance.id,
 			caughtAt: instance.caughtAt.toISOString(),
@@ -22,6 +20,7 @@ export const InstanceRepository = db.getRepository(Instance).extend({
 			isNotResponding: instance.isNotResponding,
 			isSuspended: instance.isSuspended,
 			isBlocked: await shouldBlockInstance(instance.host),
+			isSilenced: await shouldSilenceInstance(instance.host),
 			softwareName: instance.softwareName,
 			softwareVersion: instance.softwareVersion,
 			openRegistrations: instance.openRegistrations,
diff --git a/packages/backend/src/models/schema/federation-instance.ts b/packages/backend/src/models/schema/federation-instance.ts
index ed3369bf1..f793d40f6 100644
--- a/packages/backend/src/models/schema/federation-instance.ts
+++ b/packages/backend/src/models/schema/federation-instance.ts
@@ -68,6 +68,11 @@ export const packedFederationInstanceSchema = {
 			optional: false,
 			nullable: false,
 		},
+		isSilenced: {
+			type: "boolean",
+			optional: false,
+			nullable: false,
+		},
 		softwareName: {
 			type: "string",
 			optional: false,
diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts
index f0ac57892..89928af11 100644
--- a/packages/backend/src/server/api/endpoints/admin/meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -259,6 +259,16 @@ export const meta = {
 					nullable: false,
 				},
 			},
+			silencedHosts: {
+				type: "array",
+				optional: true,
+				nullable: false,
+				items: {
+					type: "string",
+					optional: false,
+					nullable: false,
+				},
+			},
 			allowedHosts: {
 				type: "array",
 				optional: true,
@@ -524,6 +534,7 @@ export default define(meta, paramDef, async (ps, me) => {
 		customSplashIcons: instance.customSplashIcons,
 		hiddenTags: instance.hiddenTags,
 		blockedHosts: instance.blockedHosts,
+		silencedHosts: instance.silencedHosts,
 		allowedHosts: instance.allowedHosts,
 		privateMode: instance.privateMode,
 		secureMode: instance.secureMode,
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 a23000732..7f92e5e29 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -61,6 +61,13 @@ export const paramDef = {
 				type: "string",
 			},
 		},
+		silencedHosts: {
+			type: "array",
+			nullable: true,
+			items: {
+				type: "string",
+			},
+		},
 		allowedHosts: {
 			type: "array",
 			nullable: true,
@@ -219,6 +226,15 @@ export default define(meta, paramDef, async (ps, me) => {
 		});
 	}
 
+	if (Array.isArray(ps.silencedHosts)) {
+		let lastValue = "";
+		set.silencedHosts = ps.silencedHosts.sort().filter((h) => {
+			const lv = lastValue;
+			lastValue = h;
+			return h !== "" && h !== lv;
+		});
+	}
+
 	if (ps.themeColor !== undefined) {
 		set.themeColor = ps.themeColor;
 	}
diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts
index 8f6184b19..646f38282 100644
--- a/packages/backend/src/server/api/endpoints/federation/instances.ts
+++ b/packages/backend/src/server/api/endpoints/federation/instances.ts
@@ -34,6 +34,7 @@ export const paramDef = {
 		notResponding: { type: "boolean", nullable: true },
 		suspended: { type: "boolean", nullable: true },
 		federating: { type: "boolean", nullable: true },
+		silenced: { type: "boolean", nullable: true },
 		subscribing: { type: "boolean", nullable: true },
 		publishing: { type: "boolean", nullable: true },
 		limit: { type: "integer", minimum: 1, maximum: 100, default: 30 },
@@ -115,6 +116,22 @@ export default define(meta, paramDef, async (ps, me) => {
 		}
 	}
 
+	if (typeof ps.silenced === "boolean") {
+		const meta = await fetchMeta(true);
+		if (ps.silenced) {
+			if (meta.silencedHosts.length === 0) {
+				return [];
+			}
+			query.andWhere("instance.host IN (:...silences)", {
+				silences: meta.silencedHosts,
+			});
+		} else if (meta.silencedHosts.length > 0) {
+			query.andWhere("instance.host NOT IN (:...silences)", {
+				silences: meta.silencedHosts,
+			});
+		}
+	}
+
 	if (typeof ps.notResponding === "boolean") {
 		if (ps.notResponding) {
 			query.andWhere("instance.isNotResponding = TRUE");
diff --git a/packages/backend/src/services/following/create.ts b/packages/backend/src/services/following/create.ts
index 61a8c6b26..cb5a888be 100644
--- a/packages/backend/src/services/following/create.ts
+++ b/packages/backend/src/services/following/create.ts
@@ -27,6 +27,7 @@ import { isDuplicateKeyValueError } from "@/misc/is-duplicate-key-value-error.js
 import type { Packed } from "@/misc/schema.js";
 import { getActiveWebhooks } from "@/misc/webhook-cache.js";
 import { webhookDeliver } from "@/queue/index.js";
+import { shouldSilenceInstance } from "@/misc/should-block-instance.js";
 
 const logger = new Logger("following/create");
 
@@ -227,12 +228,14 @@ export default async function (
 
 	// フォロー対象が鍵アカウントである or
 	// フォロワーがBotであり、フォロー対象がBotからのフォローに慎重である or
-	// フォロワーがローカルユーザーであり、フォロー対象がリモートユーザーである
+	// フォロワーがローカルユーザーであり、フォロー対象がリモートユーザーである or
+	// The follower is remote, the followee is local, and the follower is in a silenced instance.
 	// 上記のいずれかに当てはまる場合はすぐフォローせずにフォローリクエストを発行しておく
 	if (
 		followee.isLocked ||
 		(followeeProfile.carefulBot && follower.isBot) ||
-		(Users.isLocalUser(follower) && Users.isRemoteUser(followee))
+		(Users.isLocalUser(follower) && Users.isRemoteUser(followee)) ||
+		(Users.isRemoteUser(follower) && Users.isLocalUser(followee) && await shouldSilenceInstance(follower.host))
 	) {
 		let autoAccept = false;
 
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 5dd324d89..3bccf33f7 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -39,7 +39,7 @@ import {
 } from "@/models/index.js";
 import type { DriveFile } from "@/models/entities/drive-file.js";
 import type { App } from "@/models/entities/app.js";
-import { Not, In } from "typeorm";
+import { Not, In, IsNull } from "typeorm";
 import type { User, ILocalUser, IRemoteUser } from "@/models/entities/user.js";
 import { genId } from "@/misc/gen-id.js";
 import {
@@ -66,6 +66,7 @@ import { Cache } from "@/misc/cache.js";
 import type { UserProfile } from "@/models/entities/user-profile.js";
 import { db } from "@/db/postgre.js";
 import { getActiveWebhooks } from "@/misc/webhook-cache.js";
+import { shouldSilenceInstance } from "@/misc/should-block-instance.js";
 
 const mutedWordsCache = new Cache<
 	{ userId: UserProfile["userId"]; mutedWords: UserProfile["mutedWords"] }[]
@@ -166,7 +167,8 @@ export default async (
 	data: Option,
 	silent = false,
 ) =>
-	new Promise<Note>(async (res, rej) => {
+// rome-ignore lint/suspicious/noAsyncPromiseExecutor: FIXME
+new  Promise<Note>(async (res, rej) => {
 		// If you reply outside the channel, match the scope of the target.
 		// TODO (I think it's a process that could be done on the client side, but it's server side for now.)
 		if (
@@ -203,6 +205,13 @@ export default async (
 			data.visibility = "home";
 		}
 
+		const inSilencedInstance = Users.isRemoteUser(user) && await shouldSilenceInstance(user.host);
+
+		// If the
+		if (data.visibility === "public" && inSilencedInstance) {
+			data.visibility = "home";
+		}
+
 		// Reject if the target of the renote is a public range other than "Home or Entire".
 		if (
 			data.renote &&
@@ -307,6 +316,14 @@ export default async (
 			}
 		}
 
+		// Remove from mention the local users who aren't following the remote user in the silenced instance.
+		if (inSilencedInstance) {
+			const relations = await Followings.findBy([
+				{ followeeId: user.id, followerHost: IsNull() }, // a local user following the silenced user
+			]).then(rels => rels.map(rel => rel.followerId));
+			mentionedUsers = mentionedUsers.filter(mentioned => relations.includes(mentioned.id));
+		}
+
 		const note = await insertNote(user, data, tags, emojis, mentionedUsers);
 
 		res(note);
diff --git a/packages/calckey-js/src/api.types.ts b/packages/calckey-js/src/api.types.ts
index bef00da4e..478b86721 100644
--- a/packages/calckey-js/src/api.types.ts
+++ b/packages/calckey-js/src/api.types.ts
@@ -55,6 +55,7 @@ export type Endpoints = {
 	"admin/get-table-stats": { req: TODO; res: TODO };
 	"admin/invite": { req: TODO; res: TODO };
 	"admin/logs": { req: TODO; res: TODO };
+	"admin/meta": { req: TODO; res: TODO };
 	"admin/reset-password": { req: TODO; res: TODO };
 	"admin/resolve-abuse-user-report": { req: TODO; res: TODO };
 	"admin/resync-chart": { req: TODO; res: TODO };
diff --git a/packages/client/src/pages/admin/instance-block.vue b/packages/client/src/pages/admin/instance-block.vue
index 80231b11e..688578ff4 100644
--- a/packages/client/src/pages/admin/instance-block.vue
+++ b/packages/client/src/pages/admin/instance-block.vue
@@ -2,18 +2,25 @@
 	<MkStickyContainer>
 		<template #header
 			><MkPageHeader
+				v-model:tab="tab"
 				:actions="headerActions"
 				:tabs="headerTabs"
 				:display-back-button="true"
 		/></template>
 		<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 			<FormSuspense :p="init">
-				<FormTextarea v-model="blockedHosts" class="_formBlock">
+				<FormTextarea v-if="tab === 'block'" v-model="blockedHosts" class="_formBlock">
 					<span>{{ i18n.ts.blockedInstances }}</span>
 					<template #caption>{{
 						i18n.ts.blockedInstancesDescription
 					}}</template>
 				</FormTextarea>
+				<FormTextarea v-else-if="tab === 'silence'" v-model="silencedHosts" class="_formBlock">
+					<span>{{ i18n.ts.silencedInstances }}</span>
+					<template #caption>{{
+						i18n.ts.silencedInstancesDescription
+					}}</template>
+				</FormTextarea>
 
 				<FormButton primary class="_formBlock" @click="save"
 					><i class="ph-floppy-disk-back ph-bold ph-lg"></i>
@@ -35,15 +42,21 @@ import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
 
 let blockedHosts: string = $ref("");
+let silencedHosts: string = $ref("");
+let tab = $ref("block");
 
 async function init() {
 	const meta = await os.api("admin/meta");
-	blockedHosts = meta.blockedHosts.join("\n");
+	if (meta) {
+		blockedHosts = meta.blockedHosts.join("\n");
+		silencedHosts = meta.silencedHosts.join("\n");
+	}
 }
 
 function save() {
 	os.apiWithDialog("admin/update-meta", {
 		blockedHosts: blockedHosts.split("\n").map((h) => h.trim()) || [],
+		silencedHosts: silencedHosts.split("\n").map((h) => h.trim()) || [],
 	}).then(() => {
 		fetchInstance();
 	});
@@ -51,7 +64,18 @@ function save() {
 
 const headerActions = $computed(() => []);
 
-const headerTabs = $computed(() => []);
+const headerTabs = $computed(() => [
+	{
+		key: "block",
+		title: i18n.ts.block,
+		icon: "ph-prohibit ph-bold ph-lg",
+	},
+	{
+		key: "silence",
+		title: i18n.ts.silence,
+		icon: "ph-eye-slash ph-bold ph-lg",
+	},
+]);
 
 definePageMetadata({
 	title: i18n.ts.instanceBlocking,

From 151b30c53d77d37db25d70eb025d3b7139be7d6d Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 07:58:03 -0400
Subject: [PATCH 48/90] rename and comment

---
 packages/backend/src/misc/should-block-instance.ts | 2 +-
 packages/backend/src/services/note/create.ts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/misc/should-block-instance.ts b/packages/backend/src/misc/should-block-instance.ts
index 66b5832c7..47f9200d4 100644
--- a/packages/backend/src/misc/should-block-instance.ts
+++ b/packages/backend/src/misc/should-block-instance.ts
@@ -32,6 +32,6 @@ export async function shouldSilenceInstance(
 ): Promise<boolean> {
 	const { silencedHosts } = meta ?? (await fetchMeta());
 	return silencedHosts.some(
-		(limitedHost) => host === limitedHost || host.endsWith(`.${limitedHost}`),
+		(silencedHost) => host === silencedHost || host.endsWith(`.${silencedHost}`),
 	);
 }
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 3bccf33f7..bd3a0224a 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -207,7 +207,7 @@ new  Promise<Note>(async (res, rej) => {
 
 		const inSilencedInstance = Users.isRemoteUser(user) && await shouldSilenceInstance(user.host);
 
-		// If the
+		// Enforce home visibility if the user is in a silenced instance.
 		if (data.visibility === "public" && inSilencedInstance) {
 			data.visibility = "home";
 		}

From 9bc872dc00fbd026f3e1c88e5bfc697ac9be7c76 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 08:08:45 -0400
Subject: [PATCH 49/90] format

---
 .../1682844825247-InstanceSilence.js          | 220 +++++++++++++-----
 .../backend/src/misc/should-block-instance.ts |   3 +-
 .../src/models/repositories/instance.ts       |   5 +-
 .../backend/src/services/following/create.ts  |   4 +-
 packages/backend/src/services/note/create.ts  |  13 +-
 .../client/src/pages/admin/instance-block.vue |  12 +-
 6 files changed, 188 insertions(+), 69 deletions(-)

diff --git a/packages/backend/migration/1682844825247-InstanceSilence.js b/packages/backend/migration/1682844825247-InstanceSilence.js
index 5689c4f16..4c05b349d 100644
--- a/packages/backend/migration/1682844825247-InstanceSilence.js
+++ b/packages/backend/migration/1682844825247-InstanceSilence.js
@@ -1,63 +1,165 @@
 export class InstanceSilence1682844825247 {
-    name = 'InstanceSilence1682844825247'
+	name = "InstanceSilence1682844825247";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "fk_7f4e851a35d81b64dda28eee0"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_renote_muting_createdAt"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_renote_muting_muteeId"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_renote_muting_muterId"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "useStarForReactionFallback"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableGuestTimeline"`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "silencedHosts" character varying(256) array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`COMMENT ON COLUMN "notification"."isRead" IS 'Whether the notification was read.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "meta"."defaultReaction" IS NULL`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "secureMode" SET NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "privateMode" SET NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "allowedHosts" SET NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "pinnedPages" SET DEFAULT '{/featured,/channels,/explore,/pages,/about-calckey}'`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://codeberg.org/calckey/calckey'`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://codeberg.org/calckey/calckey/issues/new'`);
-        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."createdAt" IS 'The created date of the Muting.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."muteeId" IS 'The mutee user ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."muterId" IS 'The muter user ID.'`);
-        await queryRunner.query(`ALTER TABLE "page" ALTER COLUMN "isPublic" DROP DEFAULT`);
-        await queryRunner.query(`CREATE INDEX "IDX_d1259a2c2b7bb413ff449e8711" ON "renote_muting" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7eac97594bcac5ffcf2068089b" ON "renote_muting" ("muteeId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7aa72a5fe76019bfe8e5e0e8b7" ON "renote_muting" ("muterId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_0d801c609cec4e9eb4b6b4490c" ON "renote_muting" ("muterId", "muteeId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a9021cc2e1feb5f72d3db6e9f5" ON "abuse_user_report" ("targetUserId") `);
-        await queryRunner.query(`ALTER TABLE "renote_muting" ADD CONSTRAINT "FK_7eac97594bcac5ffcf2068089b6" FOREIGN KEY ("muteeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "renote_muting" ADD CONSTRAINT "FK_7aa72a5fe76019bfe8e5e0e8b7d" FOREIGN KEY ("muterId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "fk_7f4e851a35d81b64dda28eee0"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_renote_muting_createdAt"`,
+		);
+		await queryRunner.query(`DROP INDEX "public"."IDX_renote_muting_muteeId"`);
+		await queryRunner.query(`DROP INDEX "public"."IDX_renote_muting_muterId"`);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "useStarForReactionFallback"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "enableGuestTimeline"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "silencedHosts" character varying(256) array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "notification"."isRead" IS 'Whether the notification was read.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "meta"."defaultReaction" IS NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "secureMode" SET NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "privateMode" SET NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "allowedHosts" SET NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "pinnedPages" SET DEFAULT '{/featured,/channels,/explore,/pages,/about-calckey}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://codeberg.org/calckey/calckey'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://codeberg.org/calckey/calckey/issues/new'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "renote_muting"."createdAt" IS 'The created date of the Muting.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "renote_muting"."muteeId" IS 'The mutee user ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "renote_muting"."muterId" IS 'The muter user ID.'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "page" ALTER COLUMN "isPublic" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_d1259a2c2b7bb413ff449e8711" ON "renote_muting" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_7eac97594bcac5ffcf2068089b" ON "renote_muting" ("muteeId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_7aa72a5fe76019bfe8e5e0e8b7" ON "renote_muting" ("muterId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_0d801c609cec4e9eb4b6b4490c" ON "renote_muting" ("muterId", "muteeId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_a9021cc2e1feb5f72d3db6e9f5" ON "abuse_user_report" ("targetUserId") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "renote_muting" ADD CONSTRAINT "FK_7eac97594bcac5ffcf2068089b6" FOREIGN KEY ("muteeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "renote_muting" ADD CONSTRAINT "FK_7aa72a5fe76019bfe8e5e0e8b7d" FOREIGN KEY ("muterId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f"`);
-        await queryRunner.query(`ALTER TABLE "renote_muting" DROP CONSTRAINT "FK_7aa72a5fe76019bfe8e5e0e8b7d"`);
-        await queryRunner.query(`ALTER TABLE "renote_muting" DROP CONSTRAINT "FK_7eac97594bcac5ffcf2068089b6"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_a9021cc2e1feb5f72d3db6e9f5"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_0d801c609cec4e9eb4b6b4490c"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_7aa72a5fe76019bfe8e5e0e8b7"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_7eac97594bcac5ffcf2068089b"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_d1259a2c2b7bb413ff449e8711"`);
-        await queryRunner.query(`ALTER TABLE "page" ALTER COLUMN "isPublic" SET DEFAULT true`);
-        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."muterId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."muteeId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."createdAt" IS NULL`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://github.com/misskey-dev/misskey/issues/new'`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://github.com/misskey-dev/misskey'`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "pinnedPages" SET DEFAULT '{/featured,/channels,/explore,/pages,/about-misskey}'`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "allowedHosts" DROP NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "privateMode" DROP NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "secureMode" DROP NOT NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "meta"."defaultReaction" IS 'The fallback reaction for emoji reacts'`);
-        await queryRunner.query(`COMMENT ON COLUMN "notification"."isRead" IS 'Whether the Notification is read.'`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "silencedHosts"`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "enableGuestTimeline" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "useStarForReactionFallback" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`CREATE INDEX "IDX_renote_muting_muterId" ON "muting" ("muterId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_renote_muting_muteeId" ON "muting" ("muteeId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_renote_muting_createdAt" ON "muting" ("createdAt") `);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "fk_7f4e851a35d81b64dda28eee0" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "renote_muting" DROP CONSTRAINT "FK_7aa72a5fe76019bfe8e5e0e8b7d"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "renote_muting" DROP CONSTRAINT "FK_7eac97594bcac5ffcf2068089b6"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_a9021cc2e1feb5f72d3db6e9f5"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_0d801c609cec4e9eb4b6b4490c"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_7aa72a5fe76019bfe8e5e0e8b7"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_7eac97594bcac5ffcf2068089b"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_d1259a2c2b7bb413ff449e8711"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "page" ALTER COLUMN "isPublic" SET DEFAULT true`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "renote_muting"."muterId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "renote_muting"."muteeId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "renote_muting"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://github.com/misskey-dev/misskey/issues/new'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://github.com/misskey-dev/misskey'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "pinnedPages" SET DEFAULT '{/featured,/channels,/explore,/pages,/about-misskey}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "allowedHosts" DROP NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "privateMode" DROP NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "secureMode" DROP NOT NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "meta"."defaultReaction" IS 'The fallback reaction for emoji reacts'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "notification"."isRead" IS 'Whether the Notification is read.'`,
+		);
+		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "silencedHosts"`);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "enableGuestTimeline" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "useStarForReactionFallback" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_renote_muting_muterId" ON "muting" ("muterId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_renote_muting_muteeId" ON "muting" ("muteeId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_renote_muting_createdAt" ON "muting" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "fk_7f4e851a35d81b64dda28eee0" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+	}
 }
diff --git a/packages/backend/src/misc/should-block-instance.ts b/packages/backend/src/misc/should-block-instance.ts
index 47f9200d4..35ed30793 100644
--- a/packages/backend/src/misc/should-block-instance.ts
+++ b/packages/backend/src/misc/should-block-instance.ts
@@ -32,6 +32,7 @@ export async function shouldSilenceInstance(
 ): Promise<boolean> {
 	const { silencedHosts } = meta ?? (await fetchMeta());
 	return silencedHosts.some(
-		(silencedHost) => host === silencedHost || host.endsWith(`.${silencedHost}`),
+		(silencedHost) =>
+			host === silencedHost || host.endsWith(`.${silencedHost}`),
 	);
 }
diff --git a/packages/backend/src/models/repositories/instance.ts b/packages/backend/src/models/repositories/instance.ts
index bae32b571..667ec948d 100644
--- a/packages/backend/src/models/repositories/instance.ts
+++ b/packages/backend/src/models/repositories/instance.ts
@@ -1,7 +1,10 @@
 import { db } from "@/db/postgre.js";
 import { Instance } from "@/models/entities/instance.js";
 import type { Packed } from "@/misc/schema.js";
-import { shouldBlockInstance, shouldSilenceInstance } from "@/misc/should-block-instance.js";
+import {
+	shouldBlockInstance,
+	shouldSilenceInstance,
+} from "@/misc/should-block-instance.js";
 
 export const InstanceRepository = db.getRepository(Instance).extend({
 	async pack(instance: Instance): Promise<Packed<"FederationInstance">> {
diff --git a/packages/backend/src/services/following/create.ts b/packages/backend/src/services/following/create.ts
index cb5a888be..c987a01e5 100644
--- a/packages/backend/src/services/following/create.ts
+++ b/packages/backend/src/services/following/create.ts
@@ -235,7 +235,9 @@ export default async function (
 		followee.isLocked ||
 		(followeeProfile.carefulBot && follower.isBot) ||
 		(Users.isLocalUser(follower) && Users.isRemoteUser(followee)) ||
-		(Users.isRemoteUser(follower) && Users.isLocalUser(followee) && await shouldSilenceInstance(follower.host))
+		(Users.isRemoteUser(follower) &&
+			Users.isLocalUser(followee) &&
+			(await shouldSilenceInstance(follower.host)))
 	) {
 		let autoAccept = false;
 
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index bd3a0224a..ad50bd97a 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -167,8 +167,8 @@ export default async (
 	data: Option,
 	silent = false,
 ) =>
-// rome-ignore lint/suspicious/noAsyncPromiseExecutor: FIXME
-new  Promise<Note>(async (res, rej) => {
+	// rome-ignore lint/suspicious/noAsyncPromiseExecutor: FIXME
+	new Promise<Note>(async (res, rej) => {
 		// If you reply outside the channel, match the scope of the target.
 		// TODO (I think it's a process that could be done on the client side, but it's server side for now.)
 		if (
@@ -205,7 +205,8 @@ new  Promise<Note>(async (res, rej) => {
 			data.visibility = "home";
 		}
 
-		const inSilencedInstance = Users.isRemoteUser(user) && await shouldSilenceInstance(user.host);
+		const inSilencedInstance =
+			Users.isRemoteUser(user) && (await shouldSilenceInstance(user.host));
 
 		// Enforce home visibility if the user is in a silenced instance.
 		if (data.visibility === "public" && inSilencedInstance) {
@@ -320,8 +321,10 @@ new  Promise<Note>(async (res, rej) => {
 		if (inSilencedInstance) {
 			const relations = await Followings.findBy([
 				{ followeeId: user.id, followerHost: IsNull() }, // a local user following the silenced user
-			]).then(rels => rels.map(rel => rel.followerId));
-			mentionedUsers = mentionedUsers.filter(mentioned => relations.includes(mentioned.id));
+			]).then((rels) => rels.map((rel) => rel.followerId));
+			mentionedUsers = mentionedUsers.filter((mentioned) =>
+				relations.includes(mentioned.id),
+			);
 		}
 
 		const note = await insertNote(user, data, tags, emojis, mentionedUsers);
diff --git a/packages/client/src/pages/admin/instance-block.vue b/packages/client/src/pages/admin/instance-block.vue
index 688578ff4..3a9a17fa0 100644
--- a/packages/client/src/pages/admin/instance-block.vue
+++ b/packages/client/src/pages/admin/instance-block.vue
@@ -9,13 +9,21 @@
 		/></template>
 		<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 			<FormSuspense :p="init">
-				<FormTextarea v-if="tab === 'block'" v-model="blockedHosts" class="_formBlock">
+				<FormTextarea
+					v-if="tab === 'block'"
+					v-model="blockedHosts"
+					class="_formBlock"
+				>
 					<span>{{ i18n.ts.blockedInstances }}</span>
 					<template #caption>{{
 						i18n.ts.blockedInstancesDescription
 					}}</template>
 				</FormTextarea>
-				<FormTextarea v-else-if="tab === 'silence'" v-model="silencedHosts" class="_formBlock">
+				<FormTextarea
+					v-else-if="tab === 'silence'"
+					v-model="silencedHosts"
+					class="_formBlock"
+				>
 					<span>{{ i18n.ts.silencedInstances }}</span>
 					<template #caption>{{
 						i18n.ts.silencedInstancesDescription

From 51858ae4739e3779aeb9b3998bf96d046b88e435 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 09:01:42 -0400
Subject: [PATCH 50/90] add toggler

---
 locales/en-US.yml                             |  8 +++--
 locales/ja-JP.yml                             |  5 +++-
 .../server/api/endpoints/admin/update-meta.ts |  2 +-
 packages/client/src/pages/instance-info.vue   | 30 ++++++++++++++++++-
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index f9d4d23f0..6c22e0066 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -197,6 +197,7 @@ perHour: "Per Hour"
 perDay: "Per Day"
 stopActivityDelivery: "Stop sending activities"
 blockThisInstance: "Block this instance"
+silenceThisInstance: "Silence this instance"
 operations: "Operations"
 software: "Software"
 version: "Version"
@@ -218,10 +219,13 @@ clearCachedFilesConfirm: "Are you sure that you want to delete all cached remote
 blockedInstances: "Blocked Instances"
 blockedInstancesDescription: "List the hostnames of the instances that you want to\
   \ block. Listed instances will no longer be able to communicate with this instance."
+silencedInstances: "Silenced Instances"
+silencedInstancesDescription: "List the hostnames of the instances that you want to\
+  \ silence. Accounts in the listed instances are treated as \"Silenced\", can only make follow requests, and cannot mention local accounts if not followed. This will not affect the blocked instances."
 hiddenTags: "Hidden Hashtags"
 hiddenTagsDescription: "List the hashtags (without the #) of the hashtags you wish\
   \ to hide from trending and explore. Hidden hashtags are still discoverable via\
-  \ other means."
+  \ other means. Blocked instances are not affected even if listed here."
 muteAndBlock: "Mutes and Blocks"
 mutedUsers: "Muted users"
 blockedUsers: "Blocked users"
@@ -829,7 +833,7 @@ active: "Active"
 offline: "Offline"
 notRecommended: "Not recommended"
 botProtection: "Bot Protection"
-instanceBlocking: "Blocked Instances"
+instanceBlocking: "Blocked/Silenced Instances"
 selectAccount: "Select account"
 switchAccount: "Switch account"
 enabled: "Enabled"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 466212ba2..7db2a7c82 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -183,6 +183,7 @@ perHour: "1時間ごと"
 perDay: "1日ごと"
 stopActivityDelivery: "アクティビティの配送を停止"
 blockThisInstance: "このインスタンスをブロック"
+silenceThisInstance: "このインスタンスをサイレンス"
 operations: "操作"
 software: "ソフトウェア"
 version: "バージョン"
@@ -202,6 +203,8 @@ clearCachedFiles: "キャッシュをクリア"
 clearCachedFilesConfirm: "キャッシュされたリモートファイルをすべて削除しますか？"
 blockedInstances: "ブロックしたインスタンス"
 blockedInstancesDescription: "ブロックしたいインスタンスのホストを改行で区切って設定します。ブロックされたインスタンスは、このインスタンスとやり取りできなくなります。"
+silencedInstances: "サイレンスしたインスタンス"
+silencedInstancesDescription: "サイレンスしたいインスタンスのホストを改行で区切って設定します。サイレンスされたインスタンスに所属するアカウントはすべて「サイレンス」として扱われ、フォローがすべてリクエストになり、フォロワーでないローカルアカウントにはメンションできなくなります。ブロックしたインスタンスには影響しません。"
 muteAndBlock: "ミュートとブロック"
 mutedUsers: "ミュートしたユーザー"
 blockedUsers: "ブロックしたユーザー"
@@ -768,7 +771,7 @@ active: "アクティブ"
 offline: "オフライン"
 notRecommended: "非推奨"
 botProtection: "Botプロテクション"
-instanceBlocking: "インスタンスブロック"
+instanceBlocking: "インスタンスブロック・サイレンス"
 selectAccount: "アカウントを選択"
 switchAccount: "アカウントを切り替え"
 enabled: "有効"
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 7f92e5e29..60a9e85a3 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -231,7 +231,7 @@ export default define(meta, paramDef, async (ps, me) => {
 		set.silencedHosts = ps.silencedHosts.sort().filter((h) => {
 			const lv = lastValue;
 			lastValue = h;
-			return h !== "" && h !== lv;
+			return h !== "" && h !== lv && !set.blockedHosts?.includes(h);
 		});
 	}
 
diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue
index 5c8147351..7aeb2cd1c 100644
--- a/packages/client/src/pages/instance-info.vue
+++ b/packages/client/src/pages/instance-info.vue
@@ -98,6 +98,14 @@
 									@update:modelValue="toggleBlock"
 									>{{ i18n.ts.blockThisInstance }}</FormSwitch
 								>
+								<FormSwitch
+									v-model="isSilenced"
+									class="_formBlock"
+									@update:modelValue="toggleSilence"
+									>{{
+										i18n.ts.silenceThisInstance
+									}}</FormSwitch
+								>
 							</FormSuspense>
 							<MkButton @click="refreshMetadata"
 								><i
@@ -354,9 +362,11 @@ import { getProxiedImageUrlNullable } from "@/scripts/media-proxy";
 
 type AugmentedInstanceMetadata = misskey.entities.DetailedInstanceMetadata & {
 	blockedHosts: string[];
+	silencedHosts: string[];
 };
 type AugmentedInstance = misskey.entities.Instance & {
 	isBlocked: boolean;
+	isSilenced: boolean;
 };
 
 const props = defineProps<{
@@ -373,6 +383,7 @@ let meta = $ref<AugmentedInstanceMetadata | null>(null);
 let instance = $ref<AugmentedInstance | null>(null);
 let suspended = $ref(false);
 let isBlocked = $ref(false);
+let isSilenced = $ref(false);
 let faviconUrl = $ref(null);
 
 const usersPagination = {
@@ -387,7 +398,7 @@ const usersPagination = {
 };
 
 async function init() {
-	meta = await os.api("admin/meta");
+	meta = (await os.api("admin/meta")) as AugmentedInstanceMetadata;
 }
 
 async function fetch() {
@@ -396,6 +407,7 @@ async function fetch() {
 	})) as AugmentedInstance;
 	suspended = instance.isSuspended;
 	isBlocked = instance.isBlocked;
+	isSilenced = instance.isSilenced;
 	faviconUrl =
 		getProxiedImageUrlNullable(instance.faviconUrl, "preview") ??
 		getProxiedImageUrlNullable(instance.iconUrl, "preview");
@@ -417,6 +429,22 @@ async function toggleBlock() {
 	});
 }
 
+async function toggleSilence() {
+	if (meta == null) return;
+	if (!instance) {
+		throw new Error(`Instance info not loaded`);
+	}
+	let silencedHosts: string[];
+	if (isSilenced) {
+		silencedHosts = meta.silencedHosts.concat([instance.host]);
+	} else {
+		silencedHosts = meta.silencedHosts.filter((x) => x !== instance!.host);
+	}
+	await os.api("admin/update-meta", {
+		silencedHosts,
+	});
+}
+
 async function toggleSuspend(v) {
 	await os.api("admin/federation/update-instance", {
 		host: instance.host,

From a1645ddc5bb39393384a90c74c088439ed5f5fab Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 09:04:07 -0400
Subject: [PATCH 51/90] can overlap with blocked hosts

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

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 60a9e85a3..7f92e5e29 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -231,7 +231,7 @@ export default define(meta, paramDef, async (ps, me) => {
 		set.silencedHosts = ps.silencedHosts.sort().filter((h) => {
 			const lv = lastValue;
 			lastValue = h;
-			return h !== "" && h !== lv && !set.blockedHosts?.includes(h);
+			return h !== "" && h !== lv;
 		});
 	}
 

From 518ae2f089865697932b2f6dbd1134af5c76517c Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 30 Apr 2023 23:18:39 +0900
Subject: [PATCH 52/90] add blockMath

---
 packages/client/src/pages/mfm-cheat-sheet.vue | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index 1946d17ce..a52cacdd4 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -137,6 +137,18 @@
 						</div>
 					</div>
 				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.blockMath }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.blockMathDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_blockMath" />
+							<MkTextarea v-model="preview_blockMath"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
 				<!-- deprecated
 		<div class="section _block">
 			<div class="title">{{ i18n.ts._mfm.search }}</div>
@@ -427,6 +439,7 @@ let preview_blockCode = $ref(
 	'```\n~ (#i, 100) {\n\t<: ? ((i % 15) = 0) "FizzBuzz"\n\t\t.? ((i % 3) = 0) "Fizz"\n\t\t.? ((i % 5) = 0) "Buzz"\n\t\t. i\n}\n```'
 );
 let preview_inlineMath = $ref("\\(x= \\frac{-b' \\pm \\sqrt{(b')^2-ac}}{a}\\)");
+let preview_blockMath = $ref("\\[x= \\frac{-b' \\pm \\sqrt{(b')^2-ac}}{a}\\]");
 let preview_quote = $ref(`> ${i18n.ts._mfm.dummy}`);
 let preview_search = $ref(`${i18n.ts._mfm.dummy} 検索`);
 let preview_jelly = $ref("$[jelly 🍮] $[jelly.speed=5s 🍮]");

From be58c08337eae2c05b1d211fb17fc4af90126f14 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 30 Apr 2023 23:24:19 +0900
Subject: [PATCH 53/90] more search syntax (although it doesn't appear since
 the description of the search syntax is commented out)

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

diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index a52cacdd4..f531a1911 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -441,7 +441,7 @@ let preview_blockCode = $ref(
 let preview_inlineMath = $ref("\\(x= \\frac{-b' \\pm \\sqrt{(b')^2-ac}}{a}\\)");
 let preview_blockMath = $ref("\\[x= \\frac{-b' \\pm \\sqrt{(b')^2-ac}}{a}\\]");
 let preview_quote = $ref(`> ${i18n.ts._mfm.dummy}`);
-let preview_search = $ref(`${i18n.ts._mfm.dummy} 検索`);
+let preview_search = $ref(`${i18n.ts._mfm.dummy} [search]\n${i18n.ts._mfm.dummy} [検索]\n${i18n.ts._mfm.dummy} 検索`);
 let preview_jelly = $ref("$[jelly 🍮] $[jelly.speed=5s 🍮]");
 let preview_tada = $ref("$[tada 🍮] $[tada.speed=5s 🍮]");
 let preview_jump = $ref("$[jump 🍮] $[jump.speed=5s 🍮]");

From fb3a43aebab172768df3fe5e8066a12952dc3d4d Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 30 Apr 2023 23:28:17 +0900
Subject: [PATCH 54/90] use new styling method

---
 packages/client/src/pages/mfm-cheat-sheet.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index f531a1911..71eba67c5 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -2,7 +2,7 @@
 	<MkStickyContainer>
 		<template #header><MkPageHeader /></template>
 		<MkSpacer :content-max="800">
-			<div class="mwysmxbg">
+			<div :class="$style.root">
 				<div>{{ i18n.ts._mfm.intro }}</div>
 				<br />
 				<div class="section _block">
@@ -478,8 +478,8 @@ definePageMetadata({
 });
 </script>
 
-<style lang="scss" scoped>
-.mwysmxbg {
+<style lang="scss" module>
+.root {
 	background: var(--bg);
 
 	> .section {

From e116dabdf4690a3f30217ca3b6897b950d85ff67 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 30 Apr 2023 23:49:08 +0900
Subject: [PATCH 55/90] blockMath is not necessarily multi-line (is this
 copy-pasted from blockCode?)

---
 locales/en-US.yml | 2 +-
 locales/ja-JP.yml | 2 +-
 locales/zh-CN.yml | 2 +-
 locales/zh-TW.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index f9d4d23f0..e5377dc54 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1197,7 +1197,7 @@ _mfm:
   inlineMath: "Math (Inline)"
   inlineMathDescription: "Display math formulas (KaTeX) in-line"
   blockMath: "Math (Block)"
-  blockMathDescription: "Display multi-line math formulas (KaTeX) in a block"
+  blockMathDescription: "Display math formulas (KaTeX) in a block"
   quote: "Quote"
   quoteDescription: "Displays content as a quote."
   emoji: "Custom Emoji"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 466212ba2..90a775714 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1079,7 +1079,7 @@ _mfm:
   inlineMath: "数式(インライン)"
   inlineMathDescription: "数式(KaTeX)をインラインで表示します。"
   blockMath: "数式(ブロック)"
-  blockMathDescription: "複数行の数式(KaTeX)をブロックで表示します。"
+  blockMathDescription: "数式(KaTeX)をブロックで表示します。"
   quote: "引用"
   quoteDescription: "内容が引用であることを示せます。"
   emoji: "カスタム絵文字"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index c652b52b7..3e90e4fb7 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1011,7 +1011,7 @@ _mfm:
   inlineMath: "数学公式(内嵌)"
   inlineMathDescription: "显示内嵌的KaTex公式。"
   blockMath: "数学公式(块)"
-  blockMathDescription: "显示整块的多行KaTex数学公式。"
+  blockMathDescription: "显示整块的KaTex数学公式。"
   quote: "引用"
   quoteDescription: "可以用来表示引用的内容。"
   emoji: "自定义表情符号"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index eb640b7dd..d1826f772 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1014,7 +1014,7 @@ _mfm:
   inlineMath: "數學公式(內嵌)"
   inlineMathDescription: "顯示內嵌的KaTex數學公式。"
   blockMath: "數學公式(方塊)"
-  blockMathDescription: "以區塊顯示複數行的KaTex數學式。"
+  blockMathDescription: "以區塊顯示KaTex數學式。"
   quote: "引用"
   quoteDescription: "可以用來表示引用的内容。"
   emoji: "自訂表情符號"

From b8598fcaceff048838fba97799c221b1a79bed86 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 1 May 2023 00:02:16 +0900
Subject: [PATCH 56/90] KaTex -> KaTeX

---
 locales/zh-CN.yml | 4 ++--
 locales/zh-TW.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 3e90e4fb7..645f11f56 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1009,9 +1009,9 @@ _mfm:
   blockCode: "代码(块)"
   blockCodeDescription: "语法高亮显示整块程序代码。"
   inlineMath: "数学公式(内嵌)"
-  inlineMathDescription: "显示内嵌的KaTex公式。"
+  inlineMathDescription: "显示内嵌的KaTeX公式。"
   blockMath: "数学公式(块)"
-  blockMathDescription: "显示整块的KaTex数学公式。"
+  blockMathDescription: "显示整块的KaTeX数学公式。"
   quote: "引用"
   quoteDescription: "可以用来表示引用的内容。"
   emoji: "自定义表情符号"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index d1826f772..c2dfd1ce0 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1012,9 +1012,9 @@ _mfm:
   blockCode: "程式碼(區塊)"
   blockCodeDescription: "在區塊中用高亮度顯示，例如複數行的程式碼語法。"
   inlineMath: "數學公式(內嵌)"
-  inlineMathDescription: "顯示內嵌的KaTex數學公式。"
+  inlineMathDescription: "顯示內嵌的KaTeX數學公式。"
   blockMath: "數學公式(方塊)"
-  blockMathDescription: "以區塊顯示KaTex數學式。"
+  blockMathDescription: "以區塊顯示KaTeX數學式。"
   quote: "引用"
   quoteDescription: "可以用來表示引用的内容。"
   emoji: "自訂表情符號"

From c89bed41b0889256f85e3952e32e207ef9ae1ba3 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 11:39:01 -0400
Subject: [PATCH 57/90] use tab instead of page header

---
 locales/en-US.yml                             |  3 ++-
 locales/ja-JP.yml                             |  3 ++-
 .../client/src/pages/about.federation.vue     |  6 ++++--
 .../client/src/pages/admin/federation.vue     |  1 -
 .../client/src/pages/admin/instance-block.vue | 19 ++++++-------------
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 6c22e0066..ec1bae34c 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -244,6 +244,7 @@ noCustomEmojis: "There are no emoji"
 noJobs: "There are no jobs"
 federating: "Federating"
 blocked: "Blocked"
+silenced: "Silenced"
 suspended: "Suspended"
 all: "All"
 subscribing: "Subscribing"
@@ -833,7 +834,7 @@ active: "Active"
 offline: "Offline"
 notRecommended: "Not recommended"
 botProtection: "Bot Protection"
-instanceBlocking: "Blocked/Silenced Instances"
+instanceBlocking: "Federation Block/Silence"
 selectAccount: "Select account"
 switchAccount: "Switch account"
 enabled: "Enabled"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 7db2a7c82..641aca938 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -223,6 +223,7 @@ noCustomEmojis: "絵文字はありません"
 noJobs: "ジョブはありません"
 federating: "連合中"
 blocked: "ブロック中"
+silenced: "サイレンス中"
 suspended: "配信停止"
 all: "全て"
 subscribing: "購読中"
@@ -771,7 +772,7 @@ active: "アクティブ"
 offline: "オフライン"
 notRecommended: "非推奨"
 botProtection: "Botプロテクション"
-instanceBlocking: "インスタンスブロック・サイレンス"
+instanceBlocking: "連合ブロック・サイレンス"
 selectAccount: "アカウントを選択"
 switchAccount: "アカウントを切り替え"
 enabled: "有効"
diff --git a/packages/client/src/pages/about.federation.vue b/packages/client/src/pages/about.federation.vue
index ac4d4c876..390f7b433 100644
--- a/packages/client/src/pages/about.federation.vue
+++ b/packages/client/src/pages/about.federation.vue
@@ -18,6 +18,7 @@
 					<option value="publishing">{{ i18n.ts.publishing }}</option>
 					<option value="suspended">{{ i18n.ts.suspended }}</option>
 					<option value="blocked">{{ i18n.ts.blocked }}</option>
+					<option value="silenced">{{ i18n.ts.silenced }}</option>
 					<option value="notResponding">
 						{{ i18n.ts.notResponding }}
 					</option>
@@ -105,13 +106,11 @@
 
 <script lang="ts" setup>
 import { computed } from "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/MkPagination.vue";
 import MkInstanceCardMini from "@/components/MkInstanceCardMini.vue";
 import FormSplit from "@/components/form/split.vue";
-import * as os from "@/os";
 import { i18n } from "@/i18n";
 
 let host = $ref("");
@@ -133,6 +132,8 @@ const pagination = {
 			: state === "suspended"
 			? { suspended: true }
 			: state === "blocked"
+			? { silenced: true }
+			: state === "silenced"
 			? { blocked: true }
 			: state === "notResponding"
 			? { notResponding: true }
@@ -143,6 +144,7 @@ const pagination = {
 function getStatus(instance) {
 	if (instance.isSuspended) return "Suspended";
 	if (instance.isBlocked) return "Blocked";
+	if (instance.isSilenced) return "Silenced";
 	if (instance.isNotResponding) return "Error";
 	return "Alive";
 }
diff --git a/packages/client/src/pages/admin/federation.vue b/packages/client/src/pages/admin/federation.vue
index 325ba32be..d288a56bc 100644
--- a/packages/client/src/pages/admin/federation.vue
+++ b/packages/client/src/pages/admin/federation.vue
@@ -3,7 +3,6 @@
 		<MkStickyContainer>
 			<template #header
 				><MkPageHeader
-					v-model:tab="tab"
 					:actions="headerActions"
 					:tabs="headerTabs"
 					:display-back-button="true"
diff --git a/packages/client/src/pages/admin/instance-block.vue b/packages/client/src/pages/admin/instance-block.vue
index 3a9a17fa0..f3c4f542c 100644
--- a/packages/client/src/pages/admin/instance-block.vue
+++ b/packages/client/src/pages/admin/instance-block.vue
@@ -2,12 +2,15 @@
 	<MkStickyContainer>
 		<template #header
 			><MkPageHeader
-				v-model:tab="tab"
 				:actions="headerActions"
 				:tabs="headerTabs"
 				:display-back-button="true"
 		/></template>
 		<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
+			<MkTab v-model="tab" class="_formBlock">
+				<option value="block">{{ i18n.ts.blockedInstances }}</option>
+				<option value="silence">{{ i18n.ts.silencedInstances }}</option>
+			</MkTab>
 			<FormSuspense :p="init">
 				<FormTextarea
 					v-if="tab === 'block'"
@@ -44,6 +47,7 @@ import {} from "vue";
 import FormButton from "@/components/MkButton.vue";
 import FormTextarea from "@/components/form/textarea.vue";
 import FormSuspense from "@/components/form/suspense.vue";
+import MkTab from "@/components/MkTab.vue";
 import * as os from "@/os";
 import { fetchInstance } from "@/instance";
 import { i18n } from "@/i18n";
@@ -72,18 +76,7 @@ function save() {
 
 const headerActions = $computed(() => []);
 
-const headerTabs = $computed(() => [
-	{
-		key: "block",
-		title: i18n.ts.block,
-		icon: "ph-prohibit ph-bold ph-lg",
-	},
-	{
-		key: "silence",
-		title: i18n.ts.silence,
-		icon: "ph-eye-slash ph-bold ph-lg",
-	},
-]);
+const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.instanceBlocking,

From fcd9fa4adc66c512599e33d0a30a7bdcbbd10beb Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 30 Apr 2023 11:58:36 -0400
Subject: [PATCH 58/90] Fix jumping to top of page when opening menu

I also thought this would maybe fix one of the focustrap errors in the console, but no.
---
 packages/client/src/components/MkMenu.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index c71e3ac58..41611bf0b 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -1,6 +1,6 @@
 <template>
-	<FocusTrap v-bind:active="isActive">
-		<div tabindex="-1" v-focus>
+	<FocusTrap :active="false" ref="focusTrap">
+		<div tabindex="-1">
 			<div
 				ref="itemsEl"
 				class="rrevdjwt _popup _shadow"
@@ -206,6 +206,7 @@ import { i18n } from "@/i18n";
 import { FocusTrap } from 'focus-trap-vue';
 
 const XChild = defineAsyncComponent(() => import("./MkMenu.child.vue"));
+const focusTrap = ref();
 
 const props = defineProps<{
 	items: MenuItem[];
@@ -316,6 +317,8 @@ function focusDown() {
 }
 
 onMounted(() => {
+	focusTrap.value.activate();
+
 	if (props.viaKeyboard) {
 		nextTick(() => {
 			focusNext(itemsEl.children[0], true, false);

From c3d747e42da2a04ba68ec5c270c9140675516dfb Mon Sep 17 00:00:00 2001
From: fruye <fruye@unix.dog>
Date: Sun, 30 Apr 2023 19:34:52 +0000
Subject: [PATCH 59/90] Use numeric ids everywhere in mastodon API (#9970)

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9970
Co-authored-by: fruye <fruye@unix.dog>
Co-committed-by: fruye <fruye@unix.dog>
---
 packages/backend/src/server/api/index.ts      |   5 +-
 .../mastodon/ApiMastodonCompatibleService.ts  |  10 +-
 .../src/server/api/mastodon/converters.ts     |  44 +++++
 .../server/api/mastodon/endpoints/account.ts  | 163 ++++--------------
 .../server/api/mastodon/endpoints/filter.ts   |  20 ++-
 .../api/mastodon/endpoints/notifications.ts   |  17 +-
 .../server/api/mastodon/endpoints/search.ts   |  21 ++-
 .../server/api/mastodon/endpoints/status.ts   |  97 +++++++----
 .../server/api/mastodon/endpoints/timeline.ts |  73 +++++---
 9 files changed, 238 insertions(+), 212 deletions(-)
 create mode 100644 packages/backend/src/server/api/mastodon/converters.ts

diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts
index 06b3ea4ef..3568a27b2 100644
--- a/packages/backend/src/server/api/index.ts
+++ b/packages/backend/src/server/api/index.ts
@@ -29,6 +29,7 @@ import {
 	convertId,
 	IdConvertType as IdType,
 } from "../../../native-utils/built/index.js";
+import { convertAttachment } from "./mastodon/converters.js";
 
 // re-export native rust id conversion (function and enum)
 export { IdType, convertId };
@@ -93,7 +94,7 @@ mastoFileRouter.post("/v1/media", upload.single("file"), async (ctx) => {
 			return;
 		}
 		const data = await client.uploadMedia(multipartData);
-		ctx.body = data.data;
+		ctx.body = convertAttachment(data.data as Entity.Attachment);
 	} catch (e: any) {
 		console.error(e);
 		ctx.status = 401;
@@ -112,7 +113,7 @@ mastoFileRouter.post("/v2/media", upload.single("file"), async (ctx) => {
 			return;
 		}
 		const data = await client.uploadMedia(multipartData);
-		ctx.body = data.data;
+		ctx.body = convertAttachment(data.data as Entity.Attachment);
 	} catch (e: any) {
 		console.error(e);
 		ctx.status = 401;
diff --git a/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts b/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
index e8dfe5281..0c59b38f4 100644
--- a/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
+++ b/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
@@ -8,6 +8,8 @@ import { apiTimelineMastodon } from "./endpoints/timeline.js";
 import { apiNotificationsMastodon } from "./endpoints/notifications.js";
 import { apiSearchMastodon } from "./endpoints/search.js";
 import { getInstance } from "./endpoints/meta.js";
+import { convertAnnouncement, convertFilter } from "./converters.js";
+import { convertId, IdType } from "../index.js";
 
 export function getClient(
 	BASE_URL: string,
@@ -68,7 +70,7 @@ export function apiMastodonCompatible(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		try {
 			const data = await client.getInstanceAnnouncements();
-			ctx.body = data.data;
+			ctx.body = data.data.map(announcement => convertAnnouncement(announcement));
 		} catch (e: any) {
 			console.error(e);
 			ctx.status = 401;
@@ -83,7 +85,9 @@ export function apiMastodonCompatible(router: Router): void {
 			const accessTokens = ctx.request.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.dismissInstanceAnnouncement(ctx.params.id);
+				const data = await client.dismissInstanceAnnouncement(
+					convertId(ctx.params.id, IdType.CalckeyId),
+				);
 				ctx.body = data.data;
 			} catch (e: any) {
 				console.error(e);
@@ -100,7 +104,7 @@ export function apiMastodonCompatible(router: Router): void {
 		// displayed without being logged in
 		try {
 			const data = await client.getFilters();
-			ctx.body = data.data;
+			ctx.body = data.data.map(filter => convertFilter(filter));
 		} catch (e: any) {
 			console.error(e);
 			ctx.status = 401;
diff --git a/packages/backend/src/server/api/mastodon/converters.ts b/packages/backend/src/server/api/mastodon/converters.ts
new file mode 100644
index 000000000..d9a4f90ef
--- /dev/null
+++ b/packages/backend/src/server/api/mastodon/converters.ts
@@ -0,0 +1,44 @@
+import { Entity } from "@calckey/megalodon";
+import { convertId, IdType } from "../index.js";
+
+function simpleConvert(data: any) {
+	data.id = convertId(data.id, IdType.MastodonId);
+	return data;
+}
+
+export function convertAccount(account: Entity.Account) { return simpleConvert(account); }
+export function convertAnnouncement(announcement: Entity.Announcement) { return simpleConvert(announcement); }
+export function convertAttachment(attachment: Entity.Attachment) { return simpleConvert(attachment); }
+export function convertFilter(filter: Entity.Filter) { return simpleConvert(filter); }
+export function convertList(list: Entity.List) { return simpleConvert(list); }
+
+export function convertNotification(notification: Entity.Notification) {
+	notification.account = convertAccount(notification.account);
+	notification.id = convertId(notification.id, IdType.MastodonId);
+	if (notification.status)
+		notification.status = convertStatus(notification.status);
+	return notification;
+}
+
+export function convertPoll(poll: Entity.Poll) { return simpleConvert(poll); }
+export function convertRelationship(relationship: Entity.Relationship) { return simpleConvert(relationship); }
+
+export function convertStatus(status: Entity.Status) {
+	status.account = convertAccount(status.account);
+	status.id = convertId(status.id, IdType.MastodonId);
+	if (status.in_reply_to_account_id)
+		status.in_reply_to_account_id = convertId(status.in_reply_to_account_id, IdType.MastodonId);
+	if (status.in_reply_to_id)
+		status.in_reply_to_id = convertId(status.in_reply_to_id, IdType.MastodonId);
+	status.media_attachments = status.media_attachments.map(attachment => convertAttachment(attachment));
+	status.mentions = status.mentions.map(mention => ({
+		...mention,
+		id: convertId(mention.id, IdType.MastodonId),
+	}));
+	if (status.poll)
+		status.poll = convertPoll(status.poll);
+	if (status.reblog)
+		status.reblog = convertStatus(status.reblog);
+
+	return status;
+}
diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 749058193..2984c20e3 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -3,8 +3,9 @@ import { resolveUser } from "@/remote/resolve-user.js";
 import Router from "@koa/router";
 import { FindOptionsWhere, IsNull } from "typeorm";
 import { getClient } from "../ApiMastodonCompatibleService.js";
-import { argsToBools, limitToInt } from "./timeline.js";
+import { argsToBools, convertTimelinesArgsId, limitToInt } from "./timeline.js";
 import { convertId, IdType } from "../../index.js";
+import { convertAccount, convertList, convertRelationship, convertStatus } from "../converters.js";
 
 const relationshipModel = {
 	id: "",
@@ -62,9 +63,7 @@ export function apiAccountMastodon(router: Router): void {
 			const data = await client.updateCredentials(
 				(ctx.request as any).body as any,
 			);
-			let resp = data.data;
-			resp.id = convertId(resp.id, IdType.MastodonId);
-			ctx.body = resp;
+			ctx.body = convertAccount(data.data);
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -81,9 +80,7 @@ export function apiAccountMastodon(router: Router): void {
 				(ctx.request.query as any).acct,
 				"accounts",
 			);
-			let resp = data.data.accounts[0];
-			resp.id = convertId(resp.id, IdType.MastodonId);
-			ctx.body = resp;
+			ctx.body = convertAccount(data.data.accounts[0]);
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -115,11 +112,7 @@ export function apiAccountMastodon(router: Router): void {
 			}
 
 			const data = await client.getRelationships(reqIds);
-			let resp = data.data;
-			for (let acctIdx = 0; acctIdx < resp.length; acctIdx++) {
-				resp[acctIdx].id = convertId(resp[acctIdx].id, IdType.MastodonId);
-			}
-			ctx.body = resp;
+			ctx.body = data.data.map(relationship => convertRelationship(relationship));
 		} catch (e: any) {
 			console.error(e);
 			let data = e.response.data;
@@ -136,9 +129,7 @@ export function apiAccountMastodon(router: Router): void {
 		try {
 			const calcId = convertId(ctx.params.id, IdType.CalckeyId);
 			const data = await client.getAccount(calcId);
-			let resp = data.data;
-			resp.id = convertId(resp.id, IdType.MastodonId);
-			ctx.body = resp;
+			ctx.body = convertAccount(data.data);
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -155,27 +146,9 @@ export function apiAccountMastodon(router: Router): void {
 			try {
 				const data = await client.getAccountStatuses(
 					convertId(ctx.params.id, IdType.CalckeyId),
-					argsToBools(limitToInt(ctx.query as any)),
+					convertTimelinesArgsId(argsToBools(limitToInt(ctx.query as any))),
 				);
-				let resp = data.data;
-				for (let statIdx = 0; statIdx < resp.length; statIdx++) {
-					resp[statIdx].id = convertId(resp[statIdx].id, IdType.MastodonId);
-					resp[statIdx].in_reply_to_account_id = resp[statIdx]
-						.in_reply_to_account_id
-						? convertId(resp[statIdx].in_reply_to_account_id, IdType.MastodonId)
-						: null;
-					resp[statIdx].in_reply_to_id = resp[statIdx].in_reply_to_id
-						? convertId(resp[statIdx].in_reply_to_id, IdType.MastodonId)
-						: null;
-					let mentions = resp[statIdx].mentions;
-					for (let mtnIdx = 0; mtnIdx < mentions.length; mtnIdx++) {
-						resp[statIdx].mentions[mtnIdx].id = convertId(
-							mentions[mtnIdx].id,
-							IdType.MastodonId,
-						);
-					}
-				}
-				ctx.body = resp;
+				ctx.body = data.data.map(status => convertStatus(status));
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -193,13 +166,9 @@ export function apiAccountMastodon(router: Router): void {
 			try {
 				const data = await client.getAccountFollowers(
 					convertId(ctx.params.id, IdType.CalckeyId),
-					limitToInt(ctx.query as any),
+					convertTimelinesArgsId(limitToInt(ctx.query as any)),
 				);
-				let resp = data.data;
-				for (let acctIdx = 0; acctIdx < resp.length; acctIdx++) {
-					resp[acctIdx].id = convertId(resp[acctIdx].id, IdType.MastodonId);
-				}
-				ctx.body = resp;
+				ctx.body = data.data.map(account => convertAccount(account));
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -217,13 +186,9 @@ export function apiAccountMastodon(router: Router): void {
 			try {
 				const data = await client.getAccountFollowing(
 					convertId(ctx.params.id, IdType.CalckeyId),
-					limitToInt(ctx.query as any),
+					convertTimelinesArgsId(limitToInt(ctx.query as any)),
 				);
-				let resp = data.data;
-				for (let acctIdx = 0; acctIdx < resp.length; acctIdx++) {
-					resp[acctIdx].id = convertId(resp[acctIdx].id, IdType.MastodonId);
-				}
-				ctx.body = resp;
+				ctx.body = data.data.map(account => convertAccount(account));
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -239,8 +204,10 @@ export function apiAccountMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.getAccountLists(ctx.params.id);
-				ctx.body = data.data;
+				const data = await client.getAccountLists(
+					convertId(ctx.params.id, IdType.CalckeyId)
+				);
+				ctx.body = data.data.map(list => convertList(list));
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -259,9 +226,8 @@ export function apiAccountMastodon(router: Router): void {
 				const data = await client.followAccount(
 					convertId(ctx.params.id, IdType.CalckeyId),
 				);
-				let acct = data.data;
+				let acct = convertRelationship(data.data);
 				acct.following = true;
-				acct.id = convertId(acct.id, IdType.MastodonId);
 				ctx.body = acct;
 			} catch (e: any) {
 				console.error(e);
@@ -281,8 +247,7 @@ export function apiAccountMastodon(router: Router): void {
 				const data = await client.unfollowAccount(
 					convertId(ctx.params.id, IdType.CalckeyId),
 				);
-				let acct = data.data;
-				acct.id = convertId(acct.id, IdType.MastodonId);
+				let acct = convertRelationship(data.data);
 				acct.following = false;
 				ctx.body = acct;
 			} catch (e: any) {
@@ -303,9 +268,7 @@ export function apiAccountMastodon(router: Router): void {
 				const data = await client.blockAccount(
 					convertId(ctx.params.id, IdType.CalckeyId),
 				);
-				let resp = data.data;
-				resp.id = convertId(resp.id, IdType.MastodonId);
-				ctx.body = resp;
+				ctx.body = convertRelationship(data.data);
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -324,9 +287,7 @@ export function apiAccountMastodon(router: Router): void {
 				const data = await client.unblockAccount(
 					convertId(ctx.params.id, IdType.MastodonId),
 				);
-				let resp = data.data;
-				resp.id = convertId(resp.id, IdType.MastodonId);
-				ctx.body = resp;
+				ctx.body = convertRelationship(data.data);
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -346,9 +307,7 @@ export function apiAccountMastodon(router: Router): void {
 					convertId(ctx.params.id, IdType.CalckeyId),
 					(ctx.request as any).body as any,
 				);
-				let resp = data.data;
-				resp.id = convertId(resp.id, IdType.MastodonId);
-				ctx.body = resp;
+				ctx.body = convertRelationship(data.data);
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -367,9 +326,7 @@ export function apiAccountMastodon(router: Router): void {
 				const data = await client.unmuteAccount(
 					convertId(ctx.params.id, IdType.CalckeyId),
 				);
-				let resp = data.data;
-				resp.id = convertId(resp.id, IdType.MastodonId);
-				ctx.body = resp;
+				ctx.body = convertRelationship(data.data);
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -384,27 +341,9 @@ export function apiAccountMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		try {
 			const data = (await client.getBookmarks(
-				limitToInt(ctx.query as any),
-			)) as any;
-			let resp = data.data;
-			for (let statIdx = 0; statIdx < resp.length; statIdx++) {
-				resp[statIdx].id = convertId(resp[statIdx].id, IdType.MastodonId);
-				resp[statIdx].in_reply_to_account_id = resp[statIdx]
-					.in_reply_to_account_id
-					? convertId(resp[statIdx].in_reply_to_account_id, IdType.MastodonId)
-					: null;
-				resp[statIdx].in_reply_to_id = resp[statIdx].in_reply_to_id
-					? convertId(resp[statIdx].in_reply_to_id, IdType.MastodonId)
-					: null;
-				let mentions = resp[statIdx].mentions;
-				for (let mtnIdx = 0; mtnIdx < mentions.length; mtnIdx++) {
-					resp[statIdx].mentions[mtnIdx].id = convertId(
-						mentions[mtnIdx].id,
-						IdType.MastodonId,
-					);
-				}
-			}
-			ctx.body = resp;
+				convertTimelinesArgsId(limitToInt(ctx.query as any)),
+			));
+			ctx.body = data.data.map(status => convertStatus(status));
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -417,26 +356,8 @@ export function apiAccountMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.getFavourites(limitToInt(ctx.query as any));
-			let resp = data.data;
-			for (let statIdx = 0; statIdx < resp.length; statIdx++) {
-				resp[statIdx].id = convertId(resp[statIdx].id, IdType.MastodonId);
-				resp[statIdx].in_reply_to_account_id = resp[statIdx]
-					.in_reply_to_account_id
-					? convertId(resp[statIdx].in_reply_to_account_id, IdType.MastodonId)
-					: null;
-				resp[statIdx].in_reply_to_id = resp[statIdx].in_reply_to_id
-					? convertId(resp[statIdx].in_reply_to_id, IdType.MastodonId)
-					: null;
-				let mentions = resp[statIdx].mentions;
-				for (let mtnIdx = 0; mtnIdx < mentions.length; mtnIdx++) {
-					resp[statIdx].mentions[mtnIdx].id = convertId(
-						mentions[mtnIdx].id,
-						IdType.MastodonId,
-					);
-				}
-			}
-			ctx.body = resp;
+			const data = await client.getFavourites(convertTimelinesArgsId(limitToInt(ctx.query as any)));
+			ctx.body = data.data.map(status => convertStatus(status));
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -449,12 +370,8 @@ export function apiAccountMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.getMutes(limitToInt(ctx.query as any));
-			let resp = data.data;
-			for (let acctIdx = 0; acctIdx < resp.length; acctIdx++) {
-				resp[acctIdx].id = convertId(resp[acctIdx].id, IdType.MastodonId);
-			}
-			ctx.body = resp;
+			const data = await client.getMutes(convertTimelinesArgsId(limitToInt(ctx.query as any)));
+			ctx.body = data.data.map(account => convertAccount(account));
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -467,12 +384,8 @@ export function apiAccountMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.getBlocks(limitToInt(ctx.query as any));
-			let resp = data.data;
-			for (let acctIdx = 0; acctIdx < resp.length; acctIdx++) {
-				resp[acctIdx].id = convertId(resp[acctIdx].id, IdType.MastodonId);
-			}
-			ctx.body = resp;
+			const data = await client.getBlocks(convertTimelinesArgsId(limitToInt(ctx.query as any)));
+			ctx.body = data.data.map(account => convertAccount(account));
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -488,11 +401,7 @@ export function apiAccountMastodon(router: Router): void {
 			const data = await client.getFollowRequests(
 				((ctx.query as any) || { limit: 20 }).limit,
 			);
-			let resp = data.data;
-			for (let acctIdx = 0; acctIdx < resp.length; acctIdx++) {
-				resp[acctIdx].id = convertId(resp[acctIdx].id, IdType.MastodonId);
-			}
-			ctx.body = resp;
+			ctx.body = data.data.map(account => convertAccount(account));
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -510,9 +419,7 @@ export function apiAccountMastodon(router: Router): void {
 				const data = await client.acceptFollowRequest(
 					convertId(ctx.params.id, IdType.CalckeyId),
 				);
-				let resp = data.data;
-				resp.id = convertId(resp.id, IdType.MastodonId);
-				ctx.body = resp;
+				ctx.body = convertRelationship(data.data);
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -531,9 +438,7 @@ export function apiAccountMastodon(router: Router): void {
 				const data = await client.rejectFollowRequest(
 					convertId(ctx.params.id, IdType.CalckeyId),
 				);
-				let resp = data.data;
-				resp.id = convertId(resp.id, IdType.MastodonId);
-				ctx.body = resp;
+				ctx.body = convertRelationship(data.data);
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
diff --git a/packages/backend/src/server/api/mastodon/endpoints/filter.ts b/packages/backend/src/server/api/mastodon/endpoints/filter.ts
index d21bc1d33..7343fc337 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/filter.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/filter.ts
@@ -1,6 +1,8 @@
 import megalodon, { MegalodonInterface } from "@calckey/megalodon";
 import Router from "@koa/router";
 import { getClient } from "../ApiMastodonCompatibleService.js";
+import { IdType, convertId } from "../../index.js";
+import { convertFilter } from "../converters.js";
 
 export function apiFilterMastodon(router: Router): void {
 	router.get("/v1/filters", async (ctx) => {
@@ -10,7 +12,7 @@ export function apiFilterMastodon(router: Router): void {
 		const body: any = ctx.request.body;
 		try {
 			const data = await client.getFilters();
-			ctx.body = data.data;
+			ctx.body = data.data.map(filter => convertFilter(filter));
 		} catch (e: any) {
 			console.error(e);
 			ctx.status = 401;
@@ -24,8 +26,10 @@ export function apiFilterMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		const body: any = ctx.request.body;
 		try {
-			const data = await client.getFilter(ctx.params.id);
-			ctx.body = data.data;
+			const data = await client.getFilter(
+				convertId(ctx.params.id, IdType.CalckeyId)
+			);
+			ctx.body = convertFilter(data.data);
 		} catch (e: any) {
 			console.error(e);
 			ctx.status = 401;
@@ -40,7 +44,7 @@ export function apiFilterMastodon(router: Router): void {
 		const body: any = ctx.request.body;
 		try {
 			const data = await client.createFilter(body.phrase, body.context, body);
-			ctx.body = data.data;
+			ctx.body = convertFilter(data.data);
 		} catch (e: any) {
 			console.error(e);
 			ctx.status = 401;
@@ -55,11 +59,11 @@ export function apiFilterMastodon(router: Router): void {
 		const body: any = ctx.request.body;
 		try {
 			const data = await client.updateFilter(
-				ctx.params.id,
+				convertId(ctx.params.id, IdType.CalckeyId),
 				body.phrase,
 				body.context,
 			);
-			ctx.body = data.data;
+			ctx.body = convertFilter(data.data);
 		} catch (e: any) {
 			console.error(e);
 			ctx.status = 401;
@@ -73,7 +77,9 @@ export function apiFilterMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		const body: any = ctx.request.body;
 		try {
-			const data = await client.deleteFilter(ctx.params.id);
+			const data = await client.deleteFilter(
+				convertId(ctx.params.id, IdType.CalckeyId)
+			);
 			ctx.body = data.data;
 		} catch (e: any) {
 			console.error(e);
diff --git a/packages/backend/src/server/api/mastodon/endpoints/notifications.ts b/packages/backend/src/server/api/mastodon/endpoints/notifications.ts
index 8508f1d48..868377b78 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/notifications.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/notifications.ts
@@ -1,8 +1,10 @@
 import megalodon, { MegalodonInterface } from "@calckey/megalodon";
 import Router from "@koa/router";
 import { koaBody } from "koa-body";
+import { convertId, IdType } from "../../index.js";
 import { getClient } from "../ApiMastodonCompatibleService.js";
-import { toTextWithReaction } from "./timeline.js";
+import { convertTimelinesArgsId, toTextWithReaction } from "./timeline.js";
+import { convertNotification } from "../converters.js";
 function toLimitToInt(q: any) {
 	if (q.limit) if (typeof q.limit === "string") q.limit = parseInt(q.limit, 10);
 	return q;
@@ -15,9 +17,10 @@ export function apiNotificationsMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		const body: any = ctx.request.body;
 		try {
-			const data = await client.getNotifications(toLimitToInt(ctx.query));
+			const data = await client.getNotifications(convertTimelinesArgsId(toLimitToInt(ctx.query)));
 			const notfs = data.data;
 			const ret = notfs.map((n) => {
+				n = convertNotification(n);
 				if (n.type !== "follow" && n.type !== "follow_request") {
 					if (n.type === "reaction") n.type = "favourite";
 					n.status = toTextWithReaction(
@@ -43,8 +46,10 @@ export function apiNotificationsMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		const body: any = ctx.request.body;
 		try {
-			const dataRaw = await client.getNotification(ctx.params.id);
-			const data = dataRaw.data;
+			const dataRaw = await client.getNotification(
+				convertId(ctx.params.id, IdType.CalckeyId)
+			);
+			const data = convertNotification(dataRaw.data);
 			if (data.type !== "follow" && data.type !== "follow_request") {
 				if (data.type === "reaction") data.type = "favourite";
 				ctx.body = toTextWithReaction([data as any], ctx.request.hostname)[0];
@@ -79,7 +84,9 @@ export function apiNotificationsMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		const body: any = ctx.request.body;
 		try {
-			const data = await client.dismissNotification(ctx.params.id);
+			const data = await client.dismissNotification(
+				convertId(ctx.params.id, IdType.CalckeyId)
+			);
 			ctx.body = data.data;
 		} catch (e: any) {
 			console.error(e);
diff --git a/packages/backend/src/server/api/mastodon/endpoints/search.ts b/packages/backend/src/server/api/mastodon/endpoints/search.ts
index e4990811a..98349cfd2 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/search.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/search.ts
@@ -3,7 +3,8 @@ import Router from "@koa/router";
 import { getClient } from "../ApiMastodonCompatibleService.js";
 import axios from "axios";
 import { Converter } from "@calckey/megalodon";
-import { limitToInt } from "./timeline.js";
+import { convertTimelinesArgsId, limitToInt } from "./timeline.js";
+import { convertAccount, convertStatus } from "../converters.js";
 
 export function apiSearchMastodon(router: Router): void {
 	router.get("/v1/search", async (ctx) => {
@@ -12,7 +13,7 @@ export function apiSearchMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		const body: any = ctx.request.body;
 		try {
-			const query: any = limitToInt(ctx.query);
+			const query: any = convertTimelinesArgsId(limitToInt(ctx.query));
 			const type = query.type || "";
 			const data = await client.search(query.q, type, query);
 			ctx.body = data.data;
@@ -27,18 +28,18 @@ export function apiSearchMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const query: any = limitToInt(ctx.query);
+			const query: any = convertTimelinesArgsId(limitToInt(ctx.query));
 			const type = query.type;
 			if (type) {
 				const data = await client.search(query.q, type, query);
-				ctx.body = data.data;
+				ctx.body = data.data.accounts.map(account => convertAccount(account));
 			} else {
 				const acct = await client.search(query.q, "accounts", query);
 				const stat = await client.search(query.q, "statuses", query);
 				const tags = await client.search(query.q, "hashtags", query);
 				ctx.body = {
-					accounts: acct.data.accounts,
-					statuses: stat.data.statuses,
+					accounts: acct.data.accounts.map(account => convertAccount(account)),
+					statuses: stat.data.statuses.map(status => convertStatus(status)),
 					hashtags: tags.data.hashtags,
 				};
 			}
@@ -57,7 +58,7 @@ export function apiSearchMastodon(router: Router): void {
 				ctx.request.hostname,
 				accessTokens,
 			);
-			ctx.body = data;
+			ctx.body = data.map(status => convertStatus(status));
 		} catch (e: any) {
 			console.error(e);
 			ctx.status = 401;
@@ -69,12 +70,16 @@ export function apiSearchMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		try {
 			const query: any = ctx.query;
-			const data = await getFeaturedUser(
+			let data = await getFeaturedUser(
 				BASE_URL,
 				ctx.request.hostname,
 				accessTokens,
 				query.limit || 20,
 			);
+			data = data.map(suggestion => {
+				suggestion.account = convertAccount(suggestion.account);
+				return suggestion;
+			});
 			console.log(data);
 			ctx.body = data;
 		} catch (e: any) {
diff --git a/packages/backend/src/server/api/mastodon/endpoints/status.ts b/packages/backend/src/server/api/mastodon/endpoints/status.ts
index f7589569c..27b30d113 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/status.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/status.ts
@@ -4,7 +4,9 @@ import { emojiRegexAtStartToEnd } from "@/misc/emoji-regex.js";
 import axios from "axios";
 import querystring from "node:querystring";
 import qs from "qs";
-import { limitToInt } from "./timeline.js";
+import { convertTimelinesArgsId, limitToInt } from "./timeline.js";
+import { convertId, IdType } from "../../index.js";
+import { convertAccount, convertAttachment, convertPoll, convertStatus } from "../converters.js";
 
 function normalizeQuery(data: any) {
 	const str = querystring.stringify(data);
@@ -18,6 +20,8 @@ export function apiStatusMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		try {
 			let body: any = ctx.request.body;
+			if (body.in_reply_to_id)
+				body.in_reply_to_id = convertId(body.in_reply_to_id, IdType.CalckeyId);
 			if (
 				(!body.poll && body["poll[options][]"]) ||
 				(!body.media_ids && body["media_ids[]"])
@@ -54,7 +58,7 @@ export function apiStatusMastodon(router: Router): void {
 			body.sensitive =
 				typeof sensitive === "string" ? sensitive === "true" : sensitive;
 			const data = await client.postStatus(text, body);
-			ctx.body = data.data;
+			ctx.body = convertStatus(data.data);
 		} catch (e: any) {
 			console.error(e);
 			ctx.status = 401;
@@ -66,8 +70,10 @@ export function apiStatusMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.getStatus(ctx.params.id);
-			ctx.body = data.data;
+			const data = await client.getStatus(
+				convertId(ctx.params.id, IdType.CalckeyId),
+			);
+			ctx.body = convertStatus(data.data);
 		} catch (e: any) {
 			console.error(e);
 			ctx.status = 401;
@@ -79,7 +85,9 @@ export function apiStatusMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.deleteStatus(ctx.params.id);
+			const data = await client.deleteStatus(
+				convertId(ctx.params.id, IdType.CalckeyId)
+			);
 			ctx.body = data.data;
 		} catch (e: any) {
 			console.error(e.response.data, request.params.id);
@@ -100,10 +108,10 @@ export function apiStatusMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const id = ctx.params.id;
+				const id = convertId(ctx.params.id, IdType.CalckeyId);
 				const data = await client.getStatusContext(
 					id,
-					limitToInt(ctx.query as any),
+					convertTimelinesArgsId(limitToInt(ctx.query as any)),
 				);
 				const status = await client.getStatus(id);
 				let reqInstance = axios.create({
@@ -126,6 +134,8 @@ export function apiStatusMastodon(router: Router): void {
 						text,
 					),
 				);
+				data.data.ancestors = data.data.ancestors.map(status => convertStatus(status));
+				data.data.descendants = data.data.descendants.map(status => convertStatus(status));
 				ctx.body = data.data;
 			} catch (e: any) {
 				console.error(e);
@@ -141,8 +151,10 @@ export function apiStatusMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.getStatusRebloggedBy(ctx.params.id);
-				ctx.body = data.data;
+				const data = await client.getStatusRebloggedBy(
+					convertId(ctx.params.id, IdType.CalckeyId)
+				);
+				ctx.body = data.data.map(account => convertAccount(account));
 			} catch (e: any) {
 				console.error(e);
 				ctx.status = 401;
@@ -165,11 +177,11 @@ export function apiStatusMastodon(router: Router): void {
 			const react = await getFirstReaction(BASE_URL, accessTokens);
 			try {
 				const a = (await client.createEmojiReaction(
-					ctx.params.id,
+					convertId(ctx.params.id, IdType.CalckeyId),
 					react,
 				)) as any;
 				//const data = await client.favouriteStatus(ctx.params.id) as any;
-				ctx.body = a.data;
+				ctx.body = convertStatus(a.data);
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -186,8 +198,11 @@ export function apiStatusMastodon(router: Router): void {
 			const client = getClient(BASE_URL, accessTokens);
 			const react = await getFirstReaction(BASE_URL, accessTokens);
 			try {
-				const data = await client.deleteEmojiReaction(ctx.params.id, react);
-				ctx.body = data.data;
+				const data = await client.deleteEmojiReaction(
+					convertId(ctx.params.id, IdType.CalckeyId),
+					react
+				);
+				ctx.body = convertStatus(data.data);
 			} catch (e: any) {
 				console.error(e);
 				ctx.status = 401;
@@ -203,8 +218,10 @@ export function apiStatusMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.reblogStatus(ctx.params.id);
-				ctx.body = data.data;
+				const data = await client.reblogStatus(
+					convertId(ctx.params.id, IdType.CalckeyId)
+				);
+				ctx.body = convertStatus(data.data);
 			} catch (e: any) {
 				console.error(e);
 				ctx.status = 401;
@@ -220,8 +237,10 @@ export function apiStatusMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.unreblogStatus(ctx.params.id);
-				ctx.body = data.data;
+				const data = await client.unreblogStatus(
+					convertId(ctx.params.id, IdType.CalckeyId)
+				);
+				ctx.body = convertStatus(data.data);
 			} catch (e: any) {
 				console.error(e);
 				ctx.status = 401;
@@ -237,8 +256,10 @@ export function apiStatusMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.bookmarkStatus(ctx.params.id);
-				ctx.body = data.data;
+				const data = await client.bookmarkStatus(
+					convertId(ctx.params.id, IdType.CalckeyId)
+				);
+				ctx.body = convertStatus(data.data);
 			} catch (e: any) {
 				console.error(e);
 				ctx.status = 401;
@@ -254,8 +275,10 @@ export function apiStatusMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = (await client.unbookmarkStatus(ctx.params.id)) as any;
-				ctx.body = data.data;
+				const data = await client.unbookmarkStatus(
+					convertId(ctx.params.id, IdType.CalckeyId)
+				);
+				ctx.body = convertStatus(data.data);
 			} catch (e: any) {
 				console.error(e);
 				ctx.status = 401;
@@ -271,8 +294,10 @@ export function apiStatusMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.pinStatus(ctx.params.id);
-				ctx.body = data.data;
+				const data = await client.pinStatus(
+					convertId(ctx.params.id, IdType.CalckeyId)
+				);
+				ctx.body = convertStatus(data.data);
 			} catch (e: any) {
 				console.error(e);
 				ctx.status = 401;
@@ -288,8 +313,10 @@ export function apiStatusMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.unpinStatus(ctx.params.id);
-				ctx.body = data.data;
+				const data = await client.unpinStatus(
+					convertId(ctx.params.id, IdType.CalckeyId)
+				);
+				ctx.body = convertStatus(data.data);
 			} catch (e: any) {
 				console.error(e);
 				ctx.status = 401;
@@ -302,8 +329,10 @@ export function apiStatusMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.getMedia(ctx.params.id);
-			ctx.body = data.data;
+			const data = await client.getMedia(
+				convertId(ctx.params.id, IdType.CalckeyId)
+			);
+			ctx.body = convertAttachment(data.data);
 		} catch (e: any) {
 			console.error(e);
 			ctx.status = 401;
@@ -316,10 +345,10 @@ export function apiStatusMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		try {
 			const data = await client.updateMedia(
-				ctx.params.id,
+				convertId(ctx.params.id, IdType.CalckeyId),
 				ctx.request.body as any,
 			);
-			ctx.body = data.data;
+			ctx.body = convertAttachment(data.data);
 		} catch (e: any) {
 			console.error(e);
 			ctx.status = 401;
@@ -331,8 +360,10 @@ export function apiStatusMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.getPoll(ctx.params.id);
-			ctx.body = data.data;
+			const data = await client.getPoll(
+				convertId(ctx.params.id, IdType.CalckeyId)
+			);
+			ctx.body = convertPoll(data.data);
 		} catch (e: any) {
 			console.error(e);
 			ctx.status = 401;
@@ -347,10 +378,10 @@ export function apiStatusMastodon(router: Router): void {
 			const client = getClient(BASE_URL, accessTokens);
 			try {
 				const data = await client.votePoll(
-					ctx.params.id,
+					convertId(ctx.params.id, IdType.CalckeyId),
 					(ctx.request.body as any).choices,
 				);
-				ctx.body = data.data;
+				ctx.body = convertPoll(data.data);
 			} catch (e: any) {
 				console.error(e);
 				ctx.status = 401;
diff --git a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
index 57e5d9bb0..268c6a161 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
@@ -4,6 +4,8 @@ import { getClient } from "../ApiMastodonCompatibleService.js";
 import { statusModel } from "./status.js";
 import Autolinker from "autolinker";
 import { ParsedUrlQuery } from "querystring";
+import { convertAccount, convertList, convertStatus } from "../converters.js";
+import { convertId, IdType } from "../../index.js";
 
 export function limitToInt(q: ParsedUrlQuery) {
 	let object: any = q;
@@ -29,6 +31,16 @@ export function argsToBools(q: ParsedUrlQuery) {
 	return q;
 }
 
+export function convertTimelinesArgsId(q: ParsedUrlQuery) {
+	if (typeof q.min_id === "string")
+		q.min_id = convertId(q.min_id, IdType.CalckeyId);
+	if (typeof q.max_id === "string")
+		q.max_id = convertId(q.max_id, IdType.CalckeyId);
+	if (typeof q.since_id === "string")
+		q.since_id = convertId(q.since_id, IdType.CalckeyId);
+	return q;
+}
+
 export function toTextWithReaction(status: Entity.Status[], host: string) {
 	return status.map((t) => {
 		if (!t) return statusModel(null, null, [], "no content");
@@ -97,9 +109,10 @@ export function apiTimelineMastodon(router: Router): void {
 		try {
 			const query: any = ctx.query;
 			const data = query.local
-				? await client.getLocalTimeline(argsToBools(limitToInt(query)))
-				: await client.getPublicTimeline(argsToBools(limitToInt(query)));
-			ctx.body = toTextWithReaction(data.data, ctx.hostname);
+				? await client.getLocalTimeline(convertTimelinesArgsId(argsToBools(limitToInt(query))))
+				: await client.getPublicTimeline(convertTimelinesArgsId(argsToBools(limitToInt(query))));
+			let resp = data.data.map(status => convertStatus(status));
+			ctx.body = toTextWithReaction(resp, ctx.hostname);
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -116,9 +129,10 @@ export function apiTimelineMastodon(router: Router): void {
 			try {
 				const data = await client.getTagTimeline(
 					ctx.params.hashtag,
-					argsToBools(limitToInt(ctx.query)),
+					convertTimelinesArgsId(argsToBools(limitToInt(ctx.query))),
 				);
-				ctx.body = toTextWithReaction(data.data, ctx.hostname);
+				let resp = data.data.map(status => convertStatus(status));
+				ctx.body = toTextWithReaction(resp, ctx.hostname);
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -132,8 +146,9 @@ export function apiTimelineMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.getHomeTimeline(limitToInt(ctx.query));
-			ctx.body = toTextWithReaction(data.data, ctx.hostname);
+			const data = await client.getHomeTimeline(convertTimelinesArgsId(limitToInt(ctx.query)));
+			let resp = data.data.map(status => convertStatus(status));
+			ctx.body = toTextWithReaction(resp, ctx.hostname);
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -149,10 +164,11 @@ export function apiTimelineMastodon(router: Router): void {
 			const client = getClient(BASE_URL, accessTokens);
 			try {
 				const data = await client.getListTimeline(
-					ctx.params.listId,
-					limitToInt(ctx.query),
+					convertId(ctx.params.listId, IdType.CalckeyId),
+					convertTimelinesArgsId(limitToInt(ctx.query)),
 				);
-				ctx.body = toTextWithReaction(data.data, ctx.hostname);
+				let resp = data.data.map(status => convertStatus(status));
+				ctx.body = toTextWithReaction(resp, ctx.hostname);
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -166,7 +182,7 @@ export function apiTimelineMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.getConversationTimeline(limitToInt(ctx.query));
+			const data = await client.getConversationTimeline(convertTimelinesArgsId(limitToInt(ctx.query)));
 			ctx.body = data.data;
 		} catch (e: any) {
 			console.error(e);
@@ -181,7 +197,7 @@ export function apiTimelineMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		try {
 			const data = await client.getLists();
-			ctx.body = data.data;
+			ctx.body = data.data.map(list => convertList(list));
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -196,8 +212,10 @@ export function apiTimelineMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.getList(ctx.params.id);
-				ctx.body = data.data;
+				const data = await client.getList(
+					convertId(ctx.params.id, IdType.CalckeyId),
+				);
+				ctx.body = convertList(data.data);
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -212,7 +230,7 @@ export function apiTimelineMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		try {
 			const data = await client.createList((ctx.request.body as any).title);
-			ctx.body = data.data;
+			ctx.body = convertList(data.data);
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -227,8 +245,11 @@ export function apiTimelineMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.updateList(ctx.params.id, (ctx.request.body as any).title);
-				ctx.body = data.data;
+				const data = await client.updateList(
+					convertId(ctx.params.id, IdType.CalckeyId),
+					(ctx.request.body as any).title
+				);
+				ctx.body = convertList(data.data);
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -244,7 +265,9 @@ export function apiTimelineMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.deleteList(ctx.params.id);
+				const data = await client.deleteList(
+					convertId(ctx.params.id, IdType.CalckeyId),
+				);
 				ctx.body = data.data;
 			} catch (e: any) {
 				console.error(e);
@@ -262,10 +285,10 @@ export function apiTimelineMastodon(router: Router): void {
 			const client = getClient(BASE_URL, accessTokens);
 			try {
 				const data = await client.getAccountsInList(
-					ctx.params.id,
-					ctx.query as any,
+					convertId(ctx.params.id, IdType.CalckeyId),
+					convertTimelinesArgsId(ctx.query as any),
 				);
-				ctx.body = data.data;
+				ctx.body = data.data.map(account => convertAccount(account));
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -282,8 +305,8 @@ export function apiTimelineMastodon(router: Router): void {
 			const client = getClient(BASE_URL, accessTokens);
 			try {
 				const data = await client.addAccountsToList(
-					ctx.params.id,
-					(ctx.query as any).account_ids,
+					convertId(ctx.params.id, IdType.CalckeyId),
+					(ctx.query.account_ids as string[]).map(id => convertId(id, IdType.CalckeyId)),
 				);
 				ctx.body = data.data;
 			} catch (e: any) {
@@ -302,8 +325,8 @@ export function apiTimelineMastodon(router: Router): void {
 			const client = getClient(BASE_URL, accessTokens);
 			try {
 				const data = await client.deleteAccountsFromList(
-					ctx.params.id,
-					(ctx.query as any).account_ids,
+					convertId(ctx.params.id, IdType.CalckeyId),
+					(ctx.query.account_ids as string[]).map(id => convertId(id, IdType.CalckeyId)),
 				);
 				ctx.body = data.data;
 			} catch (e: any) {

From 4cc9673873c4222842209403129067ecd0ac68cc Mon Sep 17 00:00:00 2001
From: waon <waonme@gmail.com>
Date: Sun, 30 Apr 2023 07:55:50 +0000
Subject: [PATCH 60/90] chore: Translated using Weblate (Japanese)

Currently translated at 99.3% (1724 of 1735 strings)

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

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 466212ba2..c0bb851a8 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1120,6 +1120,7 @@ _mfm:
   rotateDescription: "指定した角度で回転させます。"
   plain: "プレーン"
   plainDescription: "内側の構文を全て無効にします。"
+  position: 位置
 _instanceTicker:
   none: "表示しない"
   remote: "リモートユーザーに表示"
@@ -1128,7 +1129,7 @@ _serverDisconnectedBehavior:
   reload: "自動でリロード"
   dialog: "ダイアログで警告"
   quiet: "控えめに警告"
-  nothing: "何も起こらない"
+  nothing: "何もしない"
 _channel:
   create: "チャンネルを作成"
   edit: "チャンネルを編集"

From 3533f6b481c61d5ad6cab95ca2b5a0a918acd4eb Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 30 Apr 2023 13:13:43 -0700
Subject: [PATCH 61/90] chore: up browser-image-resizer

---
 packages/client/package.json |   2 +-
 pnpm-lock.yaml               | 165 ++++++++++++++++++++++++++++++++---
 2 files changed, 154 insertions(+), 13 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 49c175b15..173585503 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -32,7 +32,7 @@
 		"autosize": "5.0.2",
 		"blurhash": "1.1.5",
 		"broadcast-channel": "4.19.1",
-		"browser-image-resizer": "https://github.com/misskey-dev/browser-image-resizer.git",
+		"browser-image-resizer": "github:misskey-dev/browser-image-resizer",
 		"calckey-js": "workspace:*",
 		"chart.js": "4.1.1",
 		"chartjs-adapter-date-fns": "2.0.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 60e42e11a..77b0e0d4c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -24,7 +24,7 @@ importers:
         version: 7.2.0
       focus-trap-vue:
         specifier: ^4.0.1
-        version: 4.0.1(focus-trap@7.2.0)(vue@3.2.45)
+        version: 4.0.1(focus-trap@7.2.0)(vue@3.2.47)
       js-yaml:
         specifier: 4.1.0
         version: 4.1.0
@@ -726,8 +726,8 @@ importers:
         specifier: 4.19.1
         version: 4.19.1
       browser-image-resizer:
-        specifier: https://github.com/misskey-dev/browser-image-resizer.git
-        version: github.com/misskey-dev/browser-image-resizer/0380d12c8e736788ea7f4e6e985175521ea7b23c
+        specifier: github:misskey-dev/browser-image-resizer
+        version: github.com/misskey-dev/browser-image-resizer/56f504427ad7f6500e141a6d9f3aee42023d7f3e
       calckey-js:
         specifier: workspace:*
         version: link:../calckey-js
@@ -1071,6 +1071,11 @@ packages:
     resolution: {integrity: sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==}
     engines: {node: '>=6.9.0'}
 
+  /@babel/helper-string-parser@7.21.5:
+    resolution: {integrity: sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==}
+    engines: {node: '>=6.9.0'}
+    dev: false
+
   /@babel/helper-validator-identifier@7.19.1:
     resolution: {integrity: sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==}
     engines: {node: '>=6.9.0'}
@@ -1114,6 +1119,14 @@ packages:
       '@babel/types': 7.21.4
     dev: true
 
+  /@babel/parser@7.21.5:
+    resolution: {integrity: sha512-J+IxH2IsxV4HbnTrSWgMAQj0UEo61hDA4Ny8h8PCX0MLXiibqHbqIOVneqdocemSBc22VpBKxt4J6FQzy9HarQ==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+    dependencies:
+      '@babel/types': 7.21.5
+    dev: false
+
   /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.21.4):
     resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
     peerDependencies:
@@ -1300,6 +1313,15 @@ packages:
       to-fast-properties: 2.0.0
     dev: true
 
+  /@babel/types@7.21.5:
+    resolution: {integrity: sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-string-parser': 7.21.5
+      '@babel/helper-validator-identifier': 7.19.1
+      to-fast-properties: 2.0.0
+    dev: false
+
   /@bcoe/v8-coverage@0.2.3:
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
     dev: true
@@ -3809,12 +3831,30 @@ packages:
       '@vue/shared': 3.2.45
       estree-walker: 2.0.2
       source-map: 0.6.1
+    dev: true
+
+  /@vue/compiler-core@3.2.47:
+    resolution: {integrity: sha512-p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig==}
+    dependencies:
+      '@babel/parser': 7.21.5
+      '@vue/shared': 3.2.47
+      estree-walker: 2.0.2
+      source-map: 0.6.1
+    dev: false
 
   /@vue/compiler-dom@3.2.45:
     resolution: {integrity: sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==}
     dependencies:
       '@vue/compiler-core': 3.2.45
       '@vue/shared': 3.2.45
+    dev: true
+
+  /@vue/compiler-dom@3.2.47:
+    resolution: {integrity: sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ==}
+    dependencies:
+      '@vue/compiler-core': 3.2.47
+      '@vue/shared': 3.2.47
+    dev: false
 
   /@vue/compiler-sfc@2.7.14:
     resolution: {integrity: sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==}
@@ -3837,12 +3877,36 @@ packages:
       magic-string: 0.25.9
       postcss: 8.4.21
       source-map: 0.6.1
+    dev: true
+
+  /@vue/compiler-sfc@3.2.47:
+    resolution: {integrity: sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ==}
+    dependencies:
+      '@babel/parser': 7.21.5
+      '@vue/compiler-core': 3.2.47
+      '@vue/compiler-dom': 3.2.47
+      '@vue/compiler-ssr': 3.2.47
+      '@vue/reactivity-transform': 3.2.47
+      '@vue/shared': 3.2.47
+      estree-walker: 2.0.2
+      magic-string: 0.25.9
+      postcss: 8.4.23
+      source-map: 0.6.1
+    dev: false
 
   /@vue/compiler-ssr@3.2.45:
     resolution: {integrity: sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ==}
     dependencies:
       '@vue/compiler-dom': 3.2.45
       '@vue/shared': 3.2.45
+    dev: true
+
+  /@vue/compiler-ssr@3.2.47:
+    resolution: {integrity: sha512-wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw==}
+    dependencies:
+      '@vue/compiler-dom': 3.2.47
+      '@vue/shared': 3.2.47
+    dev: false
 
   /@vue/reactivity-transform@3.2.45:
     resolution: {integrity: sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==}
@@ -3852,17 +3916,43 @@ packages:
       '@vue/shared': 3.2.45
       estree-walker: 2.0.2
       magic-string: 0.25.9
+    dev: true
+
+  /@vue/reactivity-transform@3.2.47:
+    resolution: {integrity: sha512-m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA==}
+    dependencies:
+      '@babel/parser': 7.21.5
+      '@vue/compiler-core': 3.2.47
+      '@vue/shared': 3.2.47
+      estree-walker: 2.0.2
+      magic-string: 0.25.9
+    dev: false
 
   /@vue/reactivity@3.2.45:
     resolution: {integrity: sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==}
     dependencies:
       '@vue/shared': 3.2.45
+    dev: true
+
+  /@vue/reactivity@3.2.47:
+    resolution: {integrity: sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ==}
+    dependencies:
+      '@vue/shared': 3.2.47
+    dev: false
 
   /@vue/runtime-core@3.2.45:
     resolution: {integrity: sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==}
     dependencies:
       '@vue/reactivity': 3.2.45
       '@vue/shared': 3.2.45
+    dev: true
+
+  /@vue/runtime-core@3.2.47:
+    resolution: {integrity: sha512-RZxbLQIRB/K0ev0K9FXhNbBzT32H9iRtYbaXb0ZIz2usLms/D55dJR2t6cIEUn6vyhS3ALNvNthI+Q95C+NOpA==}
+    dependencies:
+      '@vue/reactivity': 3.2.47
+      '@vue/shared': 3.2.47
+    dev: false
 
   /@vue/runtime-dom@3.2.45:
     resolution: {integrity: sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==}
@@ -3870,6 +3960,15 @@ packages:
       '@vue/runtime-core': 3.2.45
       '@vue/shared': 3.2.45
       csstype: 2.6.21
+    dev: true
+
+  /@vue/runtime-dom@3.2.47:
+    resolution: {integrity: sha512-ArXrFTjS6TsDei4qwNvgrdmHtD930KgSKGhS5M+j8QxXrDJYLqYw4RRcDy1bz1m1wMmb6j+zGLifdVHtkXA7gA==}
+    dependencies:
+      '@vue/runtime-core': 3.2.47
+      '@vue/shared': 3.2.47
+      csstype: 2.6.21
+    dev: false
 
   /@vue/server-renderer@3.2.45(vue@3.2.45):
     resolution: {integrity: sha512-ebiMq7q24WBU1D6uhPK//2OTR1iRIyxjF5iVq/1a5I1SDMDyDu4Ts6fJaMnjrvD3MqnaiFkKQj+LKAgz5WIK3g==}
@@ -3879,9 +3978,25 @@ packages:
       '@vue/compiler-ssr': 3.2.45
       '@vue/shared': 3.2.45
       vue: 3.2.45
+    dev: true
+
+  /@vue/server-renderer@3.2.47(vue@3.2.47):
+    resolution: {integrity: sha512-dN9gc1i8EvmP9RCzvneONXsKfBRgqFeFZLurmHOveL7oH6HiFXJw5OGu294n1nHc/HMgTy6LulU/tv5/A7f/LA==}
+    peerDependencies:
+      vue: 3.2.47
+    dependencies:
+      '@vue/compiler-ssr': 3.2.47
+      '@vue/shared': 3.2.47
+      vue: 3.2.47
+    dev: false
 
   /@vue/shared@3.2.45:
     resolution: {integrity: sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==}
+    dev: true
+
+  /@vue/shared@3.2.47:
+    resolution: {integrity: sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ==}
+    dev: false
 
   /@webassemblyjs/ast@1.11.1:
     resolution: {integrity: sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==}
@@ -7439,14 +7554,14 @@ packages:
       readable-stream: 2.3.7
     dev: true
 
-  /focus-trap-vue@4.0.1(focus-trap@7.2.0)(vue@3.2.45):
+  /focus-trap-vue@4.0.1(focus-trap@7.2.0)(vue@3.2.47):
     resolution: {integrity: sha512-2iqOeoSvgq7Um6aL+255a/wXPskj6waLq2oKCa4gOnMORPo15JX7wN6J5bl1SMhMlTlkHXGSrQ9uJPJLPZDl5w==}
     peerDependencies:
       focus-trap: ^7.0.0
       vue: ^3.0.0
     dependencies:
       focus-trap: 7.2.0
-      vue: 3.2.45
+      vue: 3.2.47
     dev: false
 
   /focus-trap@7.2.0:
@@ -7606,7 +7721,7 @@ packages:
     resolution: {integrity: sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ==}
     engines: {node: '>= 0.10'}
     dependencies:
-      graceful-fs: 4.2.11
+      graceful-fs: 4.2.10
       through2: 2.0.5
     dev: true
 
@@ -9695,7 +9810,7 @@ packages:
   /jsonfile@4.0.0:
     resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
     optionalDependencies:
-      graceful-fs: 4.2.11
+      graceful-fs: 4.2.10
 
   /jsonfile@5.0.0:
     resolution: {integrity: sha512-NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w==}
@@ -9709,7 +9824,7 @@ packages:
     dependencies:
       universalify: 2.0.0
     optionalDependencies:
-      graceful-fs: 4.2.11
+      graceful-fs: 4.2.10
     dev: true
 
   /jsonld@6.0.0:
@@ -10832,6 +10947,12 @@ packages:
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
+  /nanoid@3.3.6:
+    resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+    dev: false
+
   /nanomatch@1.2.13:
     resolution: {integrity: sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==}
     engines: {node: '>=0.10.0'}
@@ -11953,6 +12074,15 @@ packages:
       picocolors: 1.0.0
       source-map-js: 1.0.2
 
+  /postcss@8.4.23:
+    resolution: {integrity: sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==}
+    engines: {node: ^10 || ^12 || >=14}
+    dependencies:
+      nanoid: 3.3.6
+      picocolors: 1.0.0
+      source-map-js: 1.0.2
+    dev: false
+
   /postgres-array@2.0.0:
     resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
     engines: {node: '>=4'}
@@ -14675,7 +14805,7 @@ packages:
     dependencies:
       append-buffer: 1.0.2
       convert-source-map: 1.9.0
-      graceful-fs: 4.2.11
+      graceful-fs: 4.2.10
       normalize-path: 2.1.1
       now-and-later: 2.0.1
       remove-bom-buffer: 3.0.0
@@ -14788,6 +14918,17 @@ packages:
       '@vue/runtime-dom': 3.2.45
       '@vue/server-renderer': 3.2.45(vue@3.2.45)
       '@vue/shared': 3.2.45
+    dev: true
+
+  /vue@3.2.47:
+    resolution: {integrity: sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==}
+    dependencies:
+      '@vue/compiler-dom': 3.2.47
+      '@vue/compiler-sfc': 3.2.47
+      '@vue/runtime-dom': 3.2.47
+      '@vue/server-renderer': 3.2.47(vue@3.2.47)
+      '@vue/shared': 3.2.47
+    dev: false
 
   /vuedraggable@4.1.0(vue@3.2.45):
     resolution: {integrity: sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==}
@@ -15402,10 +15543,10 @@ packages:
     resolution: {integrity: sha512-+MLeeUcLTlnzVo5xDn9+LVN9oX4esvgZ7qfZczBN+YVUvZBafIrPPVyG2WdjMWU2Qkb2ZAh2M8lpqf1wIoGqJQ==}
     dev: false
 
-  github.com/misskey-dev/browser-image-resizer/0380d12c8e736788ea7f4e6e985175521ea7b23c:
-    resolution: {tarball: https://codeload.github.com/misskey-dev/browser-image-resizer/tar.gz/0380d12c8e736788ea7f4e6e985175521ea7b23c}
+  github.com/misskey-dev/browser-image-resizer/56f504427ad7f6500e141a6d9f3aee42023d7f3e:
+    resolution: {tarball: https://codeload.github.com/misskey-dev/browser-image-resizer/tar.gz/56f504427ad7f6500e141a6d9f3aee42023d7f3e}
     name: browser-image-resizer
-    version: 2.2.1-misskey.3
+    version: 2.2.1-misskey.4
     dev: true
 
   github.com/sampotts/plyr/d434c9af16e641400aaee93188594208d88f2658:

From 4b1fa90c8fb06a2b30cdad0c25d74c8e5209e196 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 30 Apr 2023 13:26:51 -0700
Subject: [PATCH 62/90] fix(ap): Use unique identifier for each follow request

Closes #9677

Co-authored-by: GitHub <hutchisr>
---
 packages/backend/src/server/activitypub.ts    | 47 ++++++++++++++++++-
 .../src/services/following/requests/create.ts |  3 +-
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/server/activitypub.ts b/packages/backend/src/server/activitypub.ts
index 29ac726ef..d47e6f300 100644
--- a/packages/backend/src/server/activitypub.ts
+++ b/packages/backend/src/server/activitypub.ts
@@ -10,7 +10,7 @@ import { renderPerson } from "@/remote/activitypub/renderer/person.js";
 import renderEmoji from "@/remote/activitypub/renderer/emoji.js";
 import { inbox as processInbox } from "@/queue/index.js";
 import { isSelfHost, toPuny } from "@/misc/convert-host.js";
-import { Notes, Users, Emojis, NoteReactions } from "@/models/index.js";
+import { Notes, Users, Emojis, NoteReactions, FollowRequests } from "@/models/index.js";
 import type { ILocalUser, User } from "@/models/entities/user.js";
 import { renderLike } from "@/remote/activitypub/renderer/like.js";
 import { getUserKeypair } from "@/misc/keypair-store.js";
@@ -330,7 +330,7 @@ router.get("/likes/:like", async (ctx) => {
 });
 
 // follow
-router.get("/follows/:follower/:followee", async (ctx) => {
+router.get("/follows/:follower/:followee", async (ctx: Router.RouterContext) => {
 	const verify = await checkFetch(ctx.req);
 	if (verify !== 200) {
 		ctx.status = verify;
@@ -365,4 +365,47 @@ router.get("/follows/:follower/:followee", async (ctx) => {
 	setResponseType(ctx);
 });
 
+// follow request
+router.get("/follows/:followRequestId", async (ctx: Router.RouterContext) => {
+	const verify = await checkFetch(ctx.req);
+	if (verify !== 200) {
+		ctx.status = verify;
+		return;
+	}
+
+	const followRequest = await FollowRequests.findOneBy({
+		id: ctx.params.followRequestId,
+	});
+
+	if (followRequest == null) {
+		ctx.status = 404;
+		return;
+	}
+
+	const [follower, followee] = await Promise.all([
+		Users.findOneBy({
+			id: followRequest.followerId,
+			host: IsNull(),
+		}),
+		Users.findOneBy({
+			id: followRequest.followeeId,
+			host: Not(IsNull()),
+		}),
+	]);
+
+	if (follower == null || followee == null) {
+		ctx.status = 404;
+		return;
+	}
+
+	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");
+	}
+	ctx.body = renderActivity(renderFollow(follower, followee));
+	setResponseType(ctx);
+});
+
 export default router;
diff --git a/packages/backend/src/services/following/requests/create.ts b/packages/backend/src/services/following/requests/create.ts
index 8b2e86ab5..27f9144d0 100644
--- a/packages/backend/src/services/following/requests/create.ts
+++ b/packages/backend/src/services/following/requests/create.ts
@@ -6,6 +6,7 @@ import type { User } from "@/models/entities/user.js";
 import { Blockings, FollowRequests, Users } from "@/models/index.js";
 import { genId } from "@/misc/gen-id.js";
 import { createNotification } from "../../create-notification.js";
+import config from "@/config/index.js";
 
 export default async function (
 	follower: {
@@ -79,7 +80,7 @@ export default async function (
 	}
 
 	if (Users.isLocalUser(follower) && Users.isRemoteUser(followee)) {
-		const content = renderActivity(renderFollow(follower, followee));
+		const content = renderActivity(renderFollow(follower, followee, requestId ?? `${config.url}/follows/${followRequest.id}`));
 		deliver(follower, content, followee.inbox);
 	}
 }

From 121ddedce86ac31a303c6a9b31ac8df2ee85f1cc Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 30 Apr 2023 13:27:27 -0700
Subject: [PATCH 63/90] chore: format

---
 packages/client/src/components/MkCwButton.vue | 10 +++---
 .../client/src/components/MkEmojiPicker.vue   |  2 +-
 .../client/src/components/MkLaunchPad.vue     |  3 +-
 .../client/src/components/MkMenu.child.vue    | 18 +++++-----
 packages/client/src/components/MkMenu.vue     | 35 +++++++++++++------
 packages/client/src/components/MkModal.vue    |  9 +++--
 .../client/src/components/MkModalWindow.vue   |  2 +-
 packages/client/src/components/MkNote.vue     |  2 +-
 .../src/components/MkSubNoteContent.vue       | 31 +++++++++++-----
 .../client/src/components/MkSuperMenu.vue     |  3 +-
 .../client/src/components/MkUserPreview.vue   | 17 +++++----
 .../src/components/global/RouterView.vue      |  2 +-
 packages/client/src/pages/admin/_header_.vue  |  4 ++-
 .../src/pages/admin/overview.moderators.vue   |  7 +++-
 packages/client/src/pages/mfm-cheat-sheet.vue | 16 ++++++---
 packages/client/src/ui/_common_/navbar.vue    |  2 +-
 16 files changed, 110 insertions(+), 53 deletions(-)

diff --git a/packages/client/src/components/MkCwButton.vue b/packages/client/src/components/MkCwButton.vue
index 1f6340510..5e59853b6 100644
--- a/packages/client/src/components/MkCwButton.vue
+++ b/packages/client/src/components/MkCwButton.vue
@@ -28,7 +28,7 @@ const emit = defineEmits<{
 	(ev: "update:modelValue", v: boolean): void;
 }>();
 
-const el = ref<HTMLElement>(); 
+const el = ref<HTMLElement>();
 
 const label = computed(() => {
 	return concat([
@@ -52,7 +52,7 @@ function focus() {
 }
 
 defineExpose({
-	focus
+	focus,
 });
 </script>
 
@@ -73,7 +73,8 @@ defineExpose({
 			}
 		}
 	}
-	&:hover > span, &:focus > span {
+	&:hover > span,
+	&:focus > span {
 		background: var(--cwFg) !important;
 		color: var(--cwBg) !important;
 	}
@@ -93,7 +94,8 @@ defineExpose({
 			border-radius: 999px;
 			box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
 		}
-		&:hover, &:focus {
+		&:hover,
+		&:focus {
 			> span {
 				background: var(--panelHighlight);
 			}
diff --git a/packages/client/src/components/MkEmojiPicker.vue b/packages/client/src/components/MkEmojiPicker.vue
index 88d207bab..3dd54ed84 100644
--- a/packages/client/src/components/MkEmojiPicker.vue
+++ b/packages/client/src/components/MkEmojiPicker.vue
@@ -174,7 +174,7 @@ import { deviceKind } from "@/scripts/device-kind";
 import { emojiCategories, instance } from "@/instance";
 import { i18n } from "@/i18n";
 import { defaultStore } from "@/store";
-import { FocusTrap } from 'focus-trap-vue';
+import { FocusTrap } from "focus-trap-vue";
 
 const props = withDefaults(
 	defineProps<{
diff --git a/packages/client/src/components/MkLaunchPad.vue b/packages/client/src/components/MkLaunchPad.vue
index 759c215f7..b1f42ec76 100644
--- a/packages/client/src/components/MkLaunchPad.vue
+++ b/packages/client/src/components/MkLaunchPad.vue
@@ -139,7 +139,8 @@ function close() {
 			height: 100px;
 			border-radius: 10px;
 
-			&:hover, &:focus-visible {
+			&:hover,
+			&:focus-visible {
 				color: var(--accent);
 				background: var(--accentedBg);
 				text-decoration: none;
diff --git a/packages/client/src/components/MkMenu.child.vue b/packages/client/src/components/MkMenu.child.vue
index e5ca9e4ee..83ae6b5a1 100644
--- a/packages/client/src/components/MkMenu.child.vue
+++ b/packages/client/src/components/MkMenu.child.vue
@@ -1,14 +1,14 @@
 <template>
 	<div ref="el" class="sfhdhdhr" tabindex="-1">
-			<MkMenu
-				ref="menu"
-				:items="items"
-				:align="align"
-				:width="width"
-				:as-drawer="false"
-				@close="onChildClosed"
-			/>
-		</div>
+		<MkMenu
+			ref="menu"
+			:items="items"
+			:align="align"
+			:width="width"
+			:as-drawer="false"
+			@close="onChildClosed"
+		/>
+	</div>
 </template>
 
 <script lang="ts" setup>
diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index 41611bf0b..e976eee4d 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -14,7 +14,9 @@
 				<template v-for="(item, i) in items2">
 					<div v-if="item === null" class="divider"></div>
 					<span v-else-if="item.type === 'label'" class="label item">
-						<span :style="item.textStyle || ''">{{ item.text }}</span>
+						<span :style="item.textStyle || ''">{{
+							item.text
+						}}</span>
 					</span>
 					<span
 						v-else-if="item.type === 'pending'"
@@ -48,7 +50,9 @@
 							class="avatar"
 							disableLink
 						/>
-						<span :style="item.textStyle || ''">{{ item.text }}</span>
+						<span :style="item.textStyle || ''">{{
+							item.text
+						}}</span>
 						<span v-if="item.indicate" class="indicator"
 							><i class="ph-circle ph-fill"></i
 						></span>
@@ -75,7 +79,9 @@
 								:class="icon"
 							></i>
 						</span>
-						<span :style="item.textStyle || ''">{{ item.text }}</span>
+						<span :style="item.textStyle || ''">{{
+							item.text
+						}}</span>
 						<span v-if="item.indicate" class="indicator"
 							><i class="ph-circle ph-fill"></i
 						></span>
@@ -89,9 +95,11 @@
 						@mouseenter.passive="onItemMouseEnter(item)"
 						@mouseleave.passive="onItemMouseLeave(item)"
 					>
-						<MkAvatar :user="item.user" class="avatar" disableLink /><MkUserName
+						<MkAvatar
 							:user="item.user"
-						/>
+							class="avatar"
+							disableLink
+						/><MkUserName :user="item.user" />
 						<span v-if="item.indicate" class="indicator"
 							><i class="ph-circle ph-fill"></i
 						></span>
@@ -129,9 +137,13 @@
 								:class="icon"
 							></i>
 						</span>
-						<span :style="item.textStyle || ''">{{ item.text }}</span>
+						<span :style="item.textStyle || ''">{{
+							item.text
+						}}</span>
 						<span class="caret"
-							><i class="ph-caret-right ph-bold ph-lg ph-fw ph-lg"></i
+							><i
+								class="ph-caret-right ph-bold ph-lg ph-fw ph-lg"
+							></i
 						></span>
 					</button>
 					<button
@@ -161,7 +173,9 @@
 							class="avatar"
 							disableLink
 						/>
-						<span :style="item.textStyle || ''">{{ item.text }}</span>
+						<span :style="item.textStyle || ''">{{
+							item.text
+						}}</span>
 						<span v-if="item.indicate" class="indicator"
 							><i class="ph-circle ph-fill"></i
 						></span>
@@ -203,7 +217,7 @@ import FormSwitch from "@/components/form/switch.vue";
 import { MenuItem, InnerMenuItem, MenuPending, MenuAction } from "@/types/menu";
 import * as os from "@/os";
 import { i18n } from "@/i18n";
-import { FocusTrap } from 'focus-trap-vue';
+import { FocusTrap } from "focus-trap-vue";
 
 const XChild = defineAsyncComponent(() => import("./MkMenu.child.vue"));
 const focusTrap = ref();
@@ -383,7 +397,8 @@ onBeforeUnmount(() => {
 			transform: translateY(0em);
 		}
 
-		&:not(:disabled):hover, &:focus-visible {
+		&:not(:disabled):hover,
+		&:focus-visible {
 			color: var(--accent);
 			text-decoration: none;
 
diff --git a/packages/client/src/components/MkModal.vue b/packages/client/src/components/MkModal.vue
index 12e79f428..0a07f57e0 100644
--- a/packages/client/src/components/MkModal.vue
+++ b/packages/client/src/components/MkModal.vue
@@ -26,13 +26,16 @@
 					$style.root,
 					{
 						[$style.drawer]: type === 'drawer',
-						[$style.dialog]: type === 'dialog' || type === 'dialog:top',
+						[$style.dialog]:
+							type === 'dialog' || type === 'dialog:top',
 						[$style.popup]: type === 'popup',
 					},
 				]"
 				:style="{
 					zIndex,
-					pointerEvents: (manualShowing != null ? manualShowing : showing)
+					pointerEvents: (
+						manualShowing != null ? manualShowing : showing
+					)
 						? 'auto'
 						: 'none',
 					'--transformOrigin': transformOrigin,
@@ -76,7 +79,7 @@ import * as os from "@/os";
 import { isTouchUsing } from "@/scripts/touch";
 import { defaultStore } from "@/store";
 import { deviceKind } from "@/scripts/device-kind";
-import { FocusTrap } from 'focus-trap-vue';
+import { FocusTrap } from "focus-trap-vue";
 
 function getFixedContainer(el: Element | null): Element | null {
 	if (el == null || el.tagName === "BODY") return null;
diff --git a/packages/client/src/components/MkModalWindow.vue b/packages/client/src/components/MkModalWindow.vue
index 017bfae8c..ea5a9aca0 100644
--- a/packages/client/src/components/MkModalWindow.vue
+++ b/packages/client/src/components/MkModalWindow.vue
@@ -60,7 +60,7 @@
 
 <script lang="ts" setup>
 import { onMounted, onUnmounted } from "vue";
-import { FocusTrap } from 'focus-trap-vue';
+import { FocusTrap } from "focus-trap-vue";
 import MkModal from "./MkModal.vue";
 
 const props = withDefaults(
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 5d9c40d38..7e3fd6be5 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -279,7 +279,7 @@ const isRenote =
 	note.poll == null;
 
 const el = ref<HTMLElement>();
-const footerEl = ref<HTMLElement>(); 
+const footerEl = ref<HTMLElement>();
 const menuButton = ref<HTMLElement>();
 const starButton = ref<InstanceType<typeof XStarButton>>();
 const renoteButton = ref<InstanceType<typeof XRenoteButton>>();
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 3d6f97e8b..fc587379c 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -35,10 +35,19 @@
 			class="content"
 			:class="{ collapsed, isLong, showContent: note.cw && !showContent }"
 		>
-			<XCwButton ref="cwButton" v-if="note.cw && !showContent" v-model="showContent" :note="note" v-on:keydown="focusFooter" />
-			<div 
+			<XCwButton
+				ref="cwButton"
+				v-if="note.cw && !showContent"
+				v-model="showContent"
+				:note="note"
+				v-on:keydown="focusFooter"
+			/>
+			<div
 				class="body"
-				v-bind="{ 'aria-label': !showContent ? '' : null, 'tabindex': !showContent ? '-1' : null }"
+				v-bind="{
+					'aria-label': !showContent ? '' : null,
+					tabindex: !showContent ? '-1' : null,
+				}"
 			>
 				<span v-if="note.deletedAt" style="opacity: 0.5"
 					>({{ i18n.ts.deleted }})</span
@@ -106,14 +115,21 @@
 					v-on:focus="cwButton?.focus()"
 				></div>
 			</div>
-			<XShowMoreButton v-if="isLong" v-model="collapsed"></XShowMoreButton>
-			<XCwButton v-if="note.cw && showContent" v-model="showContent" :note="note" />
+			<XShowMoreButton
+				v-if="isLong"
+				v-model="collapsed"
+			></XShowMoreButton>
+			<XCwButton
+				v-if="note.cw && showContent"
+				v-model="showContent"
+				:note="note"
+			/>
 		</div>
 	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref } from "vue"; 
+import { ref } from "vue";
 import * as misskey from "calckey-js";
 import * as mfm from "mfm-js";
 import XNoteSimple from "@/components/MkNoteSimple.vue";
@@ -137,7 +153,7 @@ const emit = defineEmits<{
 	(ev: "focusfooter"): void;
 }>();
 
-const cwButton = ref<HTMLElement>(); 
+const cwButton = ref<HTMLElement>();
 const isLong =
 	!props.detailedView &&
 	props.note.cw == null &&
@@ -150,7 +166,6 @@ const urls = props.note.text
 
 let showContent = $ref(false);
 
-
 function focusFooter(ev) {
 	if (ev.key == "Tab" && !ev.getModifierState("Shift")) {
 		emit("focusfooter");
diff --git a/packages/client/src/components/MkSuperMenu.vue b/packages/client/src/components/MkSuperMenu.vue
index 83c667070..d66f838d1 100644
--- a/packages/client/src/components/MkSuperMenu.vue
+++ b/packages/client/src/components/MkSuperMenu.vue
@@ -96,7 +96,8 @@ export default defineComponent({
 				font-size: 0.9em;
 				margin-bottom: 0.3rem;
 
-				&:hover, &:focus-visible {
+				&:hover,
+				&:focus-visible {
 					text-decoration: none;
 					background: var(--panelHighlight);
 				}
diff --git a/packages/client/src/components/MkUserPreview.vue b/packages/client/src/components/MkUserPreview.vue
index 1e6db1442..a8a6bb90a 100644
--- a/packages/client/src/components/MkUserPreview.vue
+++ b/packages/client/src/components/MkUserPreview.vue
@@ -46,7 +46,10 @@
 					/></MkA>
 					<p class="username"><MkAcct :user="user" /></p>
 				</div>
-				<div class="description" :class="{ collapsed: isLong && collapsed }">
+				<div
+					class="description"
+					:class="{ collapsed: isLong && collapsed }"
+				>
 					<Mfm
 						v-if="user.description"
 						:text="user.description"
@@ -149,14 +152,15 @@ let user = $ref<misskey.entities.UserDetailed | null>(null);
 let top = $ref(0);
 let left = $ref(0);
 
-
 let isLong = $ref(false);
 let collapsed = $ref(!isLong);
 
 onMounted(() => {
 	if (typeof props.q === "object") {
 		user = props.q;
-		isLong = (user.description.split("\n").length > 9 || user.description.length > 400);
+		isLong =
+			user.description.split("\n").length > 9 ||
+			user.description.length > 400;
 	} else {
 		const query = props.q.startsWith("@")
 			? Acct.parse(props.q.substr(1))
@@ -165,10 +169,11 @@ onMounted(() => {
 		os.api("users/show", query).then((res) => {
 			if (!props.showing) return;
 			user = res;
-			isLong = (user.description.split("\n").length > 9 || user.description.length > 400);
+			isLong =
+				user.description.split("\n").length > 9 ||
+				user.description.length > 400;
 		});
 	}
-	
 
 	const rect = props.source.getBoundingClientRect();
 	const x =
@@ -313,7 +318,7 @@ onMounted(() => {
 
 		> .fields {
 			padding: 0 16px;
-			font-size: .8em;
+			font-size: 0.8em;
 			margin-top: 1em;
 
 			> .field {
diff --git a/packages/client/src/components/global/RouterView.vue b/packages/client/src/components/global/RouterView.vue
index 437b7c53e..0fa244f8f 100644
--- a/packages/client/src/components/global/RouterView.vue
+++ b/packages/client/src/components/global/RouterView.vue
@@ -7,7 +7,7 @@
 				v-bind="Object.fromEntries(currentPageProps)"
 				tabindex="-1"
 				v-focus
-				style="outline: none;"
+				style="outline: none"
 			/>
 
 			<template #fallback>
diff --git a/packages/client/src/pages/admin/_header_.vue b/packages/client/src/pages/admin/_header_.vue
index bf070e269..a1a8c979b 100644
--- a/packages/client/src/pages/admin/_header_.vue
+++ b/packages/client/src/pages/admin/_header_.vue
@@ -313,7 +313,9 @@ onUnmounted(() => {
 			font-weight: normal;
 			opacity: 0.7;
 
-			&:hover, &:focus-visible, &.active {
+			&:hover,
+			&:focus-visible,
+			&.active {
 				opacity: 1;
 			}
 
diff --git a/packages/client/src/pages/admin/overview.moderators.vue b/packages/client/src/pages/admin/overview.moderators.vue
index db953b890..a29cc20b9 100644
--- a/packages/client/src/pages/admin/overview.moderators.vue
+++ b/packages/client/src/pages/admin/overview.moderators.vue
@@ -12,7 +12,12 @@
 					class="user"
 					:to="`/user-info/${user.id}`"
 				>
-					<MkAvatar :user="user" class="avatar" indicator disableLink />
+					<MkAvatar
+						:user="user"
+						class="avatar"
+						indicator
+						disableLink
+					/>
 				</MkA>
 			</div>
 		</Transition>
diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index 71eba67c5..754f19e93 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -441,7 +441,9 @@ let preview_blockCode = $ref(
 let preview_inlineMath = $ref("\\(x= \\frac{-b' \\pm \\sqrt{(b')^2-ac}}{a}\\)");
 let preview_blockMath = $ref("\\[x= \\frac{-b' \\pm \\sqrt{(b')^2-ac}}{a}\\]");
 let preview_quote = $ref(`> ${i18n.ts._mfm.dummy}`);
-let preview_search = $ref(`${i18n.ts._mfm.dummy} [search]\n${i18n.ts._mfm.dummy} [検索]\n${i18n.ts._mfm.dummy} 検索`);
+let preview_search = $ref(
+	`${i18n.ts._mfm.dummy} [search]\n${i18n.ts._mfm.dummy} [検索]\n${i18n.ts._mfm.dummy} 検索`
+);
 let preview_jelly = $ref("$[jelly 🍮] $[jelly.speed=5s 🍮]");
 let preview_tada = $ref("$[tada 🍮] $[tada.speed=5s 🍮]");
 let preview_jump = $ref("$[jump 🍮] $[jump.speed=5s 🍮]");
@@ -463,9 +465,15 @@ let preview_x4 = $ref("$[x4 🍮]");
 let preview_blur = $ref(`$[blur ${i18n.ts._mfm.dummy}]`);
 let preview_rainbow = $ref("$[rainbow 🍮] $[rainbow.speed=5s 🍮]");
 let preview_sparkle = $ref("$[sparkle 🍮]");
-let preview_rotate = $ref("$[rotate 🍮]\n$[rotate.deg=45 🍮]\n$[rotate.x,deg=45 Hello, world!]");
-let preview_position = $ref("$[position.y=-1 Positioning]\n$[position.x=-1 Positioning]");
-let preview_scale = $ref("$[scale.x=1.3 Scaling]\n$[scale.x=1.3,y=2 Scaling]\n$[scale.y=0.3 Tiny scaling]");
+let preview_rotate = $ref(
+	"$[rotate 🍮]\n$[rotate.deg=45 🍮]\n$[rotate.x,deg=45 Hello, world!]"
+);
+let preview_position = $ref(
+	"$[position.y=-1 Positioning]\n$[position.x=-1 Positioning]"
+);
+let preview_scale = $ref(
+	"$[scale.x=1.3 Scaling]\n$[scale.x=1.3,y=2 Scaling]\n$[scale.y=0.3 Tiny scaling]"
+);
 let preview_fg = $ref("$[fg.color=ff0000 Text color]");
 let preview_bg = $ref("$[bg.color=ff0000 Background color]");
 let preview_plain = $ref(
diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index 20c177f37..14e1f1cd1 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -440,7 +440,7 @@ function more(ev: MouseEvent) {
 						color: var(--navActive);
 					}
 
-					&:hover, 
+					&:hover,
 					&:focus-within,
 					&.active {
 						color: var(--accent);

From d8e139a21ff2e4200c61754572eb42d2562896da Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 17:06:43 -0400
Subject: [PATCH 64/90] fix meta fetch

---
 packages/client/src/pages/instance-info.vue | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue
index 7aeb2cd1c..15c853078 100644
--- a/packages/client/src/pages/instance-info.vue
+++ b/packages/client/src/pages/instance-info.vue
@@ -337,7 +337,7 @@
 import { watch } from "vue";
 import { Virtual } from "swiper";
 import { Swiper, SwiperSlide } from "swiper/vue";
-import type * as misskey from "calckey-js";
+import type * as calckey from "calckey-js";
 import MkChart from "@/components/MkChart.vue";
 import MkObjectView from "@/components/MkObjectView.vue";
 import FormLink from "@/components/form/link.vue";
@@ -360,11 +360,11 @@ import "swiper/scss";
 import "swiper/scss/virtual";
 import { getProxiedImageUrlNullable } from "@/scripts/media-proxy";
 
-type AugmentedInstanceMetadata = misskey.entities.DetailedInstanceMetadata & {
+type AugmentedInstanceMetadata = calckey.entities.DetailedInstanceMetadata & {
 	blockedHosts: string[];
 	silencedHosts: string[];
 };
-type AugmentedInstance = misskey.entities.Instance & {
+type AugmentedInstance = calckey.entities.Instance & {
 	isBlocked: boolean;
 	isSilenced: boolean;
 };
@@ -397,11 +397,8 @@ const usersPagination = {
 	offsetMode: true,
 };
 
-async function init() {
-	meta = (await os.api("admin/meta")) as AugmentedInstanceMetadata;
-}
-
 async function fetch() {
+	meta = (await os.api("admin/meta")) as AugmentedInstanceMetadata;
 	instance = (await os.api("federation/show-instance", {
 		host: props.host,
 	})) as AugmentedInstance;

From 631aa3de41fd6d8b143de7f0dbfa9ee8b7cf9d9a Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 17:32:14 -0400
Subject: [PATCH 65/90] fix params

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

diff --git a/packages/client/src/pages/about.federation.vue b/packages/client/src/pages/about.federation.vue
index 390f7b433..ca9a6d75c 100644
--- a/packages/client/src/pages/about.federation.vue
+++ b/packages/client/src/pages/about.federation.vue
@@ -132,9 +132,9 @@ const pagination = {
 			: state === "suspended"
 			? { suspended: true }
 			: state === "blocked"
-			? { silenced: true }
-			: state === "silenced"
 			? { blocked: true }
+			: state === "silenced"
+			? { silenced: true }
 			: state === "notResponding"
 			? { notResponding: true }
 			: {}),

From 441bf2842f18d270576ba9ac09e634901bb4d38c Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 17:42:01 -0400
Subject: [PATCH 66/90] add silenced colour

---
 .../src/components/MkInstanceCardMini.vue     | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkInstanceCardMini.vue b/packages/client/src/components/MkInstanceCardMini.vue
index 0a3fbbea2..6bc46c0e4 100644
--- a/packages/client/src/components/MkInstanceCardMini.vue
+++ b/packages/client/src/components/MkInstanceCardMini.vue
@@ -5,6 +5,7 @@
 			{
 				yellow: instance.isNotResponding,
 				red: instance.isBlocked,
+				purple: instance.isSilenced,
 				gray: instance.isSuspended,
 			},
 		]"
@@ -23,13 +24,13 @@
 </template>
 
 <script lang="ts" setup>
-import * as misskey from "calckey-js";
+import * as calckey from "calckey-js";
 import MkMiniChart from "@/components/MkMiniChart.vue";
 import * as os from "@/os";
 import { getProxiedImageUrlNullable } from "@/scripts/media-proxy";
 
 const props = defineProps<{
-	instance: misskey.entities.Instance;
+	instance: calckey.entities.Instance;
 }>();
 
 let chartValues = $ref<number[] | null>(null);
@@ -135,6 +136,21 @@ function getInstanceIcon(instance): string {
 		background-size: 16px 16px;
 	}
 
+	&:global(.purple) {
+		--c: rgba(196, 0, 255, 0.15);
+		background-image: linear-gradient(
+			45deg,
+			var(--c) 16.67%,
+			transparent 16.67%,
+			transparent 50%,
+			var(--c) 50%,
+			var(--c) 66.67%,
+			transparent 66.67%,
+			transparent 100%
+		);
+		background-size: 16px 16px;
+	}
+
 	&:global(.gray) {
 		--c: var(--bg);
 		background-image: linear-gradient(

From 5b62f110d16d348dc62f8e715db4c05ac4348438 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 18:00:19 -0400
Subject: [PATCH 67/90] add db migration

---
 .../1682844825247-InstanceSilence.js          | 165 ------------------
 .../1682891890317-InstanceSilence.js          |  63 +++++++
 2 files changed, 63 insertions(+), 165 deletions(-)
 delete mode 100644 packages/backend/migration/1682844825247-InstanceSilence.js
 create mode 100644 packages/backend/migration/1682891890317-InstanceSilence.js

diff --git a/packages/backend/migration/1682844825247-InstanceSilence.js b/packages/backend/migration/1682844825247-InstanceSilence.js
deleted file mode 100644
index 4c05b349d..000000000
--- a/packages/backend/migration/1682844825247-InstanceSilence.js
+++ /dev/null
@@ -1,165 +0,0 @@
-export class InstanceSilence1682844825247 {
-	name = "InstanceSilence1682844825247";
-
-	async up(queryRunner) {
-		await queryRunner.query(
-			`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "fk_7f4e851a35d81b64dda28eee0"`,
-		);
-		await queryRunner.query(
-			`DROP INDEX "public"."IDX_renote_muting_createdAt"`,
-		);
-		await queryRunner.query(`DROP INDEX "public"."IDX_renote_muting_muteeId"`);
-		await queryRunner.query(`DROP INDEX "public"."IDX_renote_muting_muterId"`);
-		await queryRunner.query(
-			`ALTER TABLE "meta" DROP COLUMN "useStarForReactionFallback"`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" DROP COLUMN "enableGuestTimeline"`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ADD "silencedHosts" character varying(256) array NOT NULL DEFAULT '{}'`,
-		);
-		await queryRunner.query(
-			`COMMENT ON COLUMN "notification"."isRead" IS 'Whether the notification was read.'`,
-		);
-		await queryRunner.query(
-			`COMMENT ON COLUMN "meta"."defaultReaction" IS NULL`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "secureMode" SET NOT NULL`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "privateMode" SET NOT NULL`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "allowedHosts" SET NOT NULL`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "pinnedPages" SET DEFAULT '{/featured,/channels,/explore,/pages,/about-calckey}'`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://codeberg.org/calckey/calckey'`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://codeberg.org/calckey/calckey/issues/new'`,
-		);
-		await queryRunner.query(
-			`COMMENT ON COLUMN "renote_muting"."createdAt" IS 'The created date of the Muting.'`,
-		);
-		await queryRunner.query(
-			`COMMENT ON COLUMN "renote_muting"."muteeId" IS 'The mutee user ID.'`,
-		);
-		await queryRunner.query(
-			`COMMENT ON COLUMN "renote_muting"."muterId" IS 'The muter user ID.'`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "page" ALTER COLUMN "isPublic" DROP DEFAULT`,
-		);
-		await queryRunner.query(
-			`CREATE INDEX "IDX_d1259a2c2b7bb413ff449e8711" ON "renote_muting" ("createdAt") `,
-		);
-		await queryRunner.query(
-			`CREATE INDEX "IDX_7eac97594bcac5ffcf2068089b" ON "renote_muting" ("muteeId") `,
-		);
-		await queryRunner.query(
-			`CREATE INDEX "IDX_7aa72a5fe76019bfe8e5e0e8b7" ON "renote_muting" ("muterId") `,
-		);
-		await queryRunner.query(
-			`CREATE UNIQUE INDEX "IDX_0d801c609cec4e9eb4b6b4490c" ON "renote_muting" ("muterId", "muteeId") `,
-		);
-		await queryRunner.query(
-			`CREATE INDEX "IDX_a9021cc2e1feb5f72d3db6e9f5" ON "abuse_user_report" ("targetUserId") `,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "renote_muting" ADD CONSTRAINT "FK_7eac97594bcac5ffcf2068089b6" FOREIGN KEY ("muteeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "renote_muting" ADD CONSTRAINT "FK_7aa72a5fe76019bfe8e5e0e8b7d" FOREIGN KEY ("muterId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
-		);
-	}
-
-	async down(queryRunner) {
-		await queryRunner.query(
-			`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f"`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "renote_muting" DROP CONSTRAINT "FK_7aa72a5fe76019bfe8e5e0e8b7d"`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "renote_muting" DROP CONSTRAINT "FK_7eac97594bcac5ffcf2068089b6"`,
-		);
-		await queryRunner.query(
-			`DROP INDEX "public"."IDX_a9021cc2e1feb5f72d3db6e9f5"`,
-		);
-		await queryRunner.query(
-			`DROP INDEX "public"."IDX_0d801c609cec4e9eb4b6b4490c"`,
-		);
-		await queryRunner.query(
-			`DROP INDEX "public"."IDX_7aa72a5fe76019bfe8e5e0e8b7"`,
-		);
-		await queryRunner.query(
-			`DROP INDEX "public"."IDX_7eac97594bcac5ffcf2068089b"`,
-		);
-		await queryRunner.query(
-			`DROP INDEX "public"."IDX_d1259a2c2b7bb413ff449e8711"`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "page" ALTER COLUMN "isPublic" SET DEFAULT true`,
-		);
-		await queryRunner.query(
-			`COMMENT ON COLUMN "renote_muting"."muterId" IS NULL`,
-		);
-		await queryRunner.query(
-			`COMMENT ON COLUMN "renote_muting"."muteeId" IS NULL`,
-		);
-		await queryRunner.query(
-			`COMMENT ON COLUMN "renote_muting"."createdAt" IS NULL`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://github.com/misskey-dev/misskey/issues/new'`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://github.com/misskey-dev/misskey'`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "pinnedPages" SET DEFAULT '{/featured,/channels,/explore,/pages,/about-misskey}'`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "allowedHosts" DROP NOT NULL`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "privateMode" DROP NOT NULL`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "secureMode" DROP NOT NULL`,
-		);
-		await queryRunner.query(
-			`COMMENT ON COLUMN "meta"."defaultReaction" IS 'The fallback reaction for emoji reacts'`,
-		);
-		await queryRunner.query(
-			`COMMENT ON COLUMN "notification"."isRead" IS 'Whether the Notification is read.'`,
-		);
-		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "silencedHosts"`);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ADD "enableGuestTimeline" boolean NOT NULL DEFAULT false`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ADD "useStarForReactionFallback" boolean NOT NULL DEFAULT false`,
-		);
-		await queryRunner.query(
-			`CREATE INDEX "IDX_renote_muting_muterId" ON "muting" ("muterId") `,
-		);
-		await queryRunner.query(
-			`CREATE INDEX "IDX_renote_muting_muteeId" ON "muting" ("muteeId") `,
-		);
-		await queryRunner.query(
-			`CREATE INDEX "IDX_renote_muting_createdAt" ON "muting" ("createdAt") `,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "fk_7f4e851a35d81b64dda28eee0" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
-		);
-	}
-}
diff --git a/packages/backend/migration/1682891890317-InstanceSilence.js b/packages/backend/migration/1682891890317-InstanceSilence.js
new file mode 100644
index 000000000..b5c9539bc
--- /dev/null
+++ b/packages/backend/migration/1682891890317-InstanceSilence.js
@@ -0,0 +1,63 @@
+export class InstanceSilence1682891890317 {
+    name = 'InstanceSilence1682891890317'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "fk_7f4e851a35d81b64dda28eee0"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_renote_muting_createdAt"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_renote_muting_muteeId"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_renote_muting_muterId"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "useStarForReactionFallback"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableGuestTimeline"`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "silencedHosts" character varying(256) array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`COMMENT ON COLUMN "notification"."isRead" IS 'Whether the notification was read.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "meta"."defaultReaction" IS NULL`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "secureMode" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "privateMode" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "allowedHosts" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "pinnedPages" SET DEFAULT '{/featured,/channels,/explore,/pages,/about-calckey}'`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://codeberg.org/calckey/calckey'`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://codeberg.org/calckey/calckey/issues/new'`);
+        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."createdAt" IS 'The created date of the Muting.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."muteeId" IS 'The mutee user ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."muterId" IS 'The muter user ID.'`);
+        await queryRunner.query(`ALTER TABLE "page" ALTER COLUMN "isPublic" DROP DEFAULT`);
+        await queryRunner.query(`CREATE INDEX "IDX_d1259a2c2b7bb413ff449e8711" ON "renote_muting" ("createdAt") `);
+        await queryRunner.query(`CREATE INDEX "IDX_7eac97594bcac5ffcf2068089b" ON "renote_muting" ("muteeId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_7aa72a5fe76019bfe8e5e0e8b7" ON "renote_muting" ("muterId") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_0d801c609cec4e9eb4b6b4490c" ON "renote_muting" ("muterId", "muteeId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_a9021cc2e1feb5f72d3db6e9f5" ON "abuse_user_report" ("targetUserId") `);
+        await queryRunner.query(`ALTER TABLE "renote_muting" ADD CONSTRAINT "FK_7eac97594bcac5ffcf2068089b6" FOREIGN KEY ("muteeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "renote_muting" ADD CONSTRAINT "FK_7aa72a5fe76019bfe8e5e0e8b7d" FOREIGN KEY ("muterId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f"`);
+        await queryRunner.query(`ALTER TABLE "renote_muting" DROP CONSTRAINT "FK_7aa72a5fe76019bfe8e5e0e8b7d"`);
+        await queryRunner.query(`ALTER TABLE "renote_muting" DROP CONSTRAINT "FK_7eac97594bcac5ffcf2068089b6"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_a9021cc2e1feb5f72d3db6e9f5"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_0d801c609cec4e9eb4b6b4490c"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_7aa72a5fe76019bfe8e5e0e8b7"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_7eac97594bcac5ffcf2068089b"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_d1259a2c2b7bb413ff449e8711"`);
+        await queryRunner.query(`ALTER TABLE "page" ALTER COLUMN "isPublic" SET DEFAULT true`);
+        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."muterId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."muteeId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."createdAt" IS NULL`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://github.com/misskey-dev/misskey/issues/new'`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://github.com/misskey-dev/misskey'`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "pinnedPages" SET DEFAULT '{/featured,/channels,/explore,/pages,/about-misskey}'`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "allowedHosts" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "privateMode" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "secureMode" DROP NOT NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "meta"."defaultReaction" IS 'The fallback reaction for emoji reacts'`);
+        await queryRunner.query(`COMMENT ON COLUMN "notification"."isRead" IS 'Whether the Notification is read.'`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "silencedHosts"`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "enableGuestTimeline" boolean NOT NULL DEFAULT false`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "useStarForReactionFallback" boolean NOT NULL DEFAULT false`);
+        await queryRunner.query(`CREATE INDEX "IDX_renote_muting_muterId" ON "muting" ("muterId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_renote_muting_muteeId" ON "muting" ("muteeId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_renote_muting_createdAt" ON "muting" ("createdAt") `);
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "fk_7f4e851a35d81b64dda28eee0" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+}

From 5338185605a19831cfcb5e967c7386c616c29025 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 18:01:06 -0400
Subject: [PATCH 68/90] format

---
 .../1682891890317-InstanceSilence.js          | 220 +++++++++++++-----
 1 file changed, 161 insertions(+), 59 deletions(-)

diff --git a/packages/backend/migration/1682891890317-InstanceSilence.js b/packages/backend/migration/1682891890317-InstanceSilence.js
index b5c9539bc..f487111f7 100644
--- a/packages/backend/migration/1682891890317-InstanceSilence.js
+++ b/packages/backend/migration/1682891890317-InstanceSilence.js
@@ -1,63 +1,165 @@
 export class InstanceSilence1682891890317 {
-    name = 'InstanceSilence1682891890317'
+	name = "InstanceSilence1682891890317";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "fk_7f4e851a35d81b64dda28eee0"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_renote_muting_createdAt"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_renote_muting_muteeId"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_renote_muting_muterId"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "useStarForReactionFallback"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableGuestTimeline"`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "silencedHosts" character varying(256) array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`COMMENT ON COLUMN "notification"."isRead" IS 'Whether the notification was read.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "meta"."defaultReaction" IS NULL`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "secureMode" SET NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "privateMode" SET NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "allowedHosts" SET NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "pinnedPages" SET DEFAULT '{/featured,/channels,/explore,/pages,/about-calckey}'`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://codeberg.org/calckey/calckey'`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://codeberg.org/calckey/calckey/issues/new'`);
-        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."createdAt" IS 'The created date of the Muting.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."muteeId" IS 'The mutee user ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."muterId" IS 'The muter user ID.'`);
-        await queryRunner.query(`ALTER TABLE "page" ALTER COLUMN "isPublic" DROP DEFAULT`);
-        await queryRunner.query(`CREATE INDEX "IDX_d1259a2c2b7bb413ff449e8711" ON "renote_muting" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7eac97594bcac5ffcf2068089b" ON "renote_muting" ("muteeId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7aa72a5fe76019bfe8e5e0e8b7" ON "renote_muting" ("muterId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_0d801c609cec4e9eb4b6b4490c" ON "renote_muting" ("muterId", "muteeId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a9021cc2e1feb5f72d3db6e9f5" ON "abuse_user_report" ("targetUserId") `);
-        await queryRunner.query(`ALTER TABLE "renote_muting" ADD CONSTRAINT "FK_7eac97594bcac5ffcf2068089b6" FOREIGN KEY ("muteeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "renote_muting" ADD CONSTRAINT "FK_7aa72a5fe76019bfe8e5e0e8b7d" FOREIGN KEY ("muterId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "fk_7f4e851a35d81b64dda28eee0"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_renote_muting_createdAt"`,
+		);
+		await queryRunner.query(`DROP INDEX "public"."IDX_renote_muting_muteeId"`);
+		await queryRunner.query(`DROP INDEX "public"."IDX_renote_muting_muterId"`);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "useStarForReactionFallback"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "enableGuestTimeline"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "silencedHosts" character varying(256) array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "notification"."isRead" IS 'Whether the notification was read.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "meta"."defaultReaction" IS NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "secureMode" SET NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "privateMode" SET NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "allowedHosts" SET NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "pinnedPages" SET DEFAULT '{/featured,/channels,/explore,/pages,/about-calckey}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://codeberg.org/calckey/calckey'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://codeberg.org/calckey/calckey/issues/new'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "renote_muting"."createdAt" IS 'The created date of the Muting.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "renote_muting"."muteeId" IS 'The mutee user ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "renote_muting"."muterId" IS 'The muter user ID.'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "page" ALTER COLUMN "isPublic" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_d1259a2c2b7bb413ff449e8711" ON "renote_muting" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_7eac97594bcac5ffcf2068089b" ON "renote_muting" ("muteeId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_7aa72a5fe76019bfe8e5e0e8b7" ON "renote_muting" ("muterId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_0d801c609cec4e9eb4b6b4490c" ON "renote_muting" ("muterId", "muteeId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_a9021cc2e1feb5f72d3db6e9f5" ON "abuse_user_report" ("targetUserId") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "renote_muting" ADD CONSTRAINT "FK_7eac97594bcac5ffcf2068089b6" FOREIGN KEY ("muteeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "renote_muting" ADD CONSTRAINT "FK_7aa72a5fe76019bfe8e5e0e8b7d" FOREIGN KEY ("muterId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f"`);
-        await queryRunner.query(`ALTER TABLE "renote_muting" DROP CONSTRAINT "FK_7aa72a5fe76019bfe8e5e0e8b7d"`);
-        await queryRunner.query(`ALTER TABLE "renote_muting" DROP CONSTRAINT "FK_7eac97594bcac5ffcf2068089b6"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_a9021cc2e1feb5f72d3db6e9f5"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_0d801c609cec4e9eb4b6b4490c"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_7aa72a5fe76019bfe8e5e0e8b7"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_7eac97594bcac5ffcf2068089b"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_d1259a2c2b7bb413ff449e8711"`);
-        await queryRunner.query(`ALTER TABLE "page" ALTER COLUMN "isPublic" SET DEFAULT true`);
-        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."muterId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."muteeId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."createdAt" IS NULL`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://github.com/misskey-dev/misskey/issues/new'`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://github.com/misskey-dev/misskey'`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "pinnedPages" SET DEFAULT '{/featured,/channels,/explore,/pages,/about-misskey}'`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "allowedHosts" DROP NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "privateMode" DROP NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "secureMode" DROP NOT NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "meta"."defaultReaction" IS 'The fallback reaction for emoji reacts'`);
-        await queryRunner.query(`COMMENT ON COLUMN "notification"."isRead" IS 'Whether the Notification is read.'`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "silencedHosts"`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "enableGuestTimeline" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "useStarForReactionFallback" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`CREATE INDEX "IDX_renote_muting_muterId" ON "muting" ("muterId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_renote_muting_muteeId" ON "muting" ("muteeId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_renote_muting_createdAt" ON "muting" ("createdAt") `);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "fk_7f4e851a35d81b64dda28eee0" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "renote_muting" DROP CONSTRAINT "FK_7aa72a5fe76019bfe8e5e0e8b7d"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "renote_muting" DROP CONSTRAINT "FK_7eac97594bcac5ffcf2068089b6"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_a9021cc2e1feb5f72d3db6e9f5"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_0d801c609cec4e9eb4b6b4490c"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_7aa72a5fe76019bfe8e5e0e8b7"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_7eac97594bcac5ffcf2068089b"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_d1259a2c2b7bb413ff449e8711"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "page" ALTER COLUMN "isPublic" SET DEFAULT true`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "renote_muting"."muterId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "renote_muting"."muteeId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "renote_muting"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://github.com/misskey-dev/misskey/issues/new'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://github.com/misskey-dev/misskey'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "pinnedPages" SET DEFAULT '{/featured,/channels,/explore,/pages,/about-misskey}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "allowedHosts" DROP NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "privateMode" DROP NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "secureMode" DROP NOT NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "meta"."defaultReaction" IS 'The fallback reaction for emoji reacts'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "notification"."isRead" IS 'Whether the Notification is read.'`,
+		);
+		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "silencedHosts"`);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "enableGuestTimeline" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "useStarForReactionFallback" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_renote_muting_muterId" ON "muting" ("muterId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_renote_muting_muteeId" ON "muting" ("muteeId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_renote_muting_createdAt" ON "muting" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "fk_7f4e851a35d81b64dda28eee0" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+	}
 }

From 9535bbcf8915e8ee9808a426441865e972e4a92d Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 19:45:53 -0400
Subject: [PATCH 69/90] do not notify if the target is not following

---
 .../src/services/note/reaction/create.ts      | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/services/note/reaction/create.ts b/packages/backend/src/services/note/reaction/create.ts
index 1a3c52eb5..20a724f3d 100644
--- a/packages/backend/src/services/note/reaction/create.ts
+++ b/packages/backend/src/services/note/reaction/create.ts
@@ -12,6 +12,7 @@ import {
 	Notes,
 	Emojis,
 	Blockings,
+	Followings,
 } from "@/models/index.js";
 import { IsNull, Not } from "typeorm";
 import { perUserReactionsChart } from "@/services/chart/index.js";
@@ -21,6 +22,7 @@ import deleteReaction from "./delete.js";
 import { isDuplicateKeyValueError } from "@/misc/is-duplicate-key-value-error.js";
 import type { NoteReaction } from "@/models/entities/note-reaction.js";
 import { IdentifiableError } from "@/misc/identifiable-error.js";
+import { shouldSilenceInstance } from "@/misc/should-block-instance.js";
 
 export default async (
 	user: { id: User["id"]; host: User["host"] },
@@ -118,8 +120,25 @@ export default async (
 		userId: user.id,
 	});
 
-	// リアクションされたユーザーがローカルユーザーなら通知を作成
-	if (note.userHost === null) {
+	// Create notification if the reaction target is a local user.
+	if (
+		note.userHost === null &&
+		// if a local user reacted, or
+		(Users.isLocalUser(user) ||
+			// if a remote user not in a silenced instance reacted
+			(Users.isRemoteUser(user) &&
+			// if a remote user is in a silenced instance and the target is a local follower.
+				!(
+					(await shouldSilenceInstance(user.host)) &&
+					!(await Followings.exist({
+						where: {
+							followerId: note.userId,
+							followerHost: IsNull(),
+							followeeId: user.id,
+						},
+					}))
+				)))
+	) {
 		createNotification(note.userId, "reaction", {
 			notifierId: user.id,
 			note: note,
@@ -143,7 +162,7 @@ export default async (
 		}
 	});
 
-	//#region 配信
+	//#region deliver
 	if (Users.isLocalUser(user) && !note.localOnly) {
 		const content = renderActivity(await renderLike(record, note));
 		const dm = new DeliverManager(user, content);

From 69b62fa2c005f985dbcea9306c379c1c8d6a546f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 30 Apr 2023 17:14:04 -0700
Subject: [PATCH 70/90] favicon

---
 packages/backend/assets/favicon.ico | Bin 4286 -> 483961 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/packages/backend/assets/favicon.ico b/packages/backend/assets/favicon.ico
index 96effef17de4fa1817ae1a9a99e8506fc57c985c..11a614ae72336dbdb0e9ef88d7e5a26457669b9d 100644
GIT binary patch
literal 483961
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

literal 4286
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
Kcs*_-=KlcGB2p3n


From e18f3eb2125c8057e5551cd09a3f6eef8c90804e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 30 Apr 2023 17:14:31 -0700
Subject: [PATCH 71/90] patrons

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

diff --git a/patrons.json b/patrons.json
index 979fa3d8d..54dd6498e 100644
--- a/patrons.json
+++ b/patrons.json
@@ -26,6 +26,7 @@
 		"@jovikowi@calckey.social",
 		"@padraig@calckey.social",
 		"@pancakes@cats.city",
+		"@theresmiling@calckey.social",
 		"Interkosmos Link"
 	]
 }

From 16d8682721bc4093d9b6b160ae4d20f130bd251a Mon Sep 17 00:00:00 2001
From: s1idewhist1e <s1idewhist1e@noreply.codeberg.org>
Date: Mon, 1 May 2023 00:15:26 +0000
Subject: [PATCH 72/90] FIx: incorrect/poorly worded warning when deleting
 drive files (#9982)

Closes #9047

Co-authored-by: s1idewhist1e <trombonedude05@gmail.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9982
Co-authored-by: s1idewhist1e <s1idewhist1e@noreply.codeberg.org>
Co-committed-by: s1idewhist1e <s1idewhist1e@noreply.codeberg.org>
---
 locales/en-US.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index e5377dc54..662ae24e4 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -68,8 +68,8 @@ import: "Import"
 export: "Export"
 files: "Files"
 download: "Download"
-driveFileDeleteConfirm: "Are you sure you want to delete the file \"{name}\"? Posts\
-  \ with this file attached will also be deleted."
+driveFileDeleteConfirm: "Are you sure you want to delete the file \"{name}\"? It\
+  \ will be removed from all posts that contain it as an attachment."
 unfollowConfirm: "Are you sure that you want to unfollow {name}?"
 exportRequested: "You've requested an export. This may take a while. It will be added\
   \ to your Drive once completed."

From 6953fceade5fe8a6e0cb83a10f977c0643663b91 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 30 Apr 2023 17:57:04 -0700
Subject: [PATCH 73/90] chore: theme refactor

---
 packages/client/src/themes/d-astro.json5      |  2 +-
 packages/client/src/themes/d-botanical.json5  |  2 +-
 .../src/themes/d-catppuccin-frappe.json5      |  2 +-
 .../src/themes/d-catppuccin-mocha.json5       |  2 +-
 packages/client/src/themes/d-cherry.json5     |  2 +-
 packages/client/src/themes/d-future.json5     |  2 +-
 packages/client/src/themes/d-green-lime.json5 |  2 +-
 .../client/src/themes/d-green-orange.json5    | 24 -----
 packages/client/src/themes/d-ice.json5        |  2 +-
 packages/client/src/themes/d-persimmon.json5  |  2 +-
 packages/client/src/themes/d-u0.json5         |  2 +-
 packages/client/src/themes/l-apricot.json5    |  2 +-
 .../src/themes/l-catppuccin-latte.json5       | 94 +++++++++++++++++++
 packages/client/src/themes/l-cherry.json5     |  2 +-
 packages/client/src/themes/l-coffee.json5     |  2 +-
 packages/client/src/themes/l-rainy.json5      |  2 +-
 packages/client/src/themes/l-sushi.json5      |  2 +-
 packages/client/src/themes/l-u0.json5         |  2 +-
 packages/client/src/themes/l-vivid.json5      |  2 +-
 19 files changed, 111 insertions(+), 41 deletions(-)
 delete mode 100644 packages/client/src/themes/d-green-orange.json5
 create mode 100644 packages/client/src/themes/l-catppuccin-latte.json5

diff --git a/packages/client/src/themes/d-astro.json5 b/packages/client/src/themes/d-astro.json5
index c6a927ec3..a51ee94ae 100644
--- a/packages/client/src/themes/d-astro.json5
+++ b/packages/client/src/themes/d-astro.json5
@@ -1,7 +1,7 @@
 {
 	id: '080a01c5-377d-4fbb-88cc-6bb5d04977ea',
 	base: 'dark',
-	name: 'Mi Astro Dark',
+	name: 'Astro Dark',
 	author: 'syuilo',
 	props: {
 		bg: '#232125',
diff --git a/packages/client/src/themes/d-botanical.json5 b/packages/client/src/themes/d-botanical.json5
index c03b95e2d..08fabf86a 100644
--- a/packages/client/src/themes/d-botanical.json5
+++ b/packages/client/src/themes/d-botanical.json5
@@ -1,7 +1,7 @@
 {
 	id: '504debaf-4912-6a4c-5059-1db08a76b737',
 
-	name: 'Mi Botanical Dark',
+	name: 'Botanical Dark',
 	author: 'syuilo',
 
 	base: 'dark',
diff --git a/packages/client/src/themes/d-catppuccin-frappe.json5 b/packages/client/src/themes/d-catppuccin-frappe.json5
index 891fe1805..ed3aac3c5 100644
--- a/packages/client/src/themes/d-catppuccin-frappe.json5
+++ b/packages/client/src/themes/d-catppuccin-frappe.json5
@@ -1,7 +1,7 @@
 {
 	id: 'ffcd3328-5c57-4ca3-9dac-4580cbf7742f',
 	base: 'dark',
-	name: 'Catppuccin frappe',
+	name: 'Catppuccin Frappe',
 	props: {
 		X2: ':darken<2<@panel',
 		X3: 'rgba(255, 255, 255, 0.05)',
diff --git a/packages/client/src/themes/d-catppuccin-mocha.json5 b/packages/client/src/themes/d-catppuccin-mocha.json5
index 94e1381c7..83d464f88 100644
--- a/packages/client/src/themes/d-catppuccin-mocha.json5
+++ b/packages/client/src/themes/d-catppuccin-mocha.json5
@@ -1,7 +1,7 @@
 {
 	id: 'd413f41f-a489-48be-9e20-3532ffbb4363',
 	base: 'dark',
-	name: 'Catppuccin mocha',
+	name: 'Catppuccin Mocha',
 	props: {
 		X2: ':darken<2<@panel',
 		X3: 'rgba(255, 255, 255, 0.05)',
diff --git a/packages/client/src/themes/d-cherry.json5 b/packages/client/src/themes/d-cherry.json5
index a7e1ad1c8..e39e9ce66 100644
--- a/packages/client/src/themes/d-cherry.json5
+++ b/packages/client/src/themes/d-cherry.json5
@@ -1,7 +1,7 @@
 {
 	id: '679b3b87-a4e9-4789-8696-b56c15cc33b0',
 
-	name: 'Mi Cherry Dark',
+	name: 'Cherry Dark',
 	author: 'syuilo',
 
 	base: 'dark',
diff --git a/packages/client/src/themes/d-future.json5 b/packages/client/src/themes/d-future.json5
index b6fa1ab0c..8b6345708 100644
--- a/packages/client/src/themes/d-future.json5
+++ b/packages/client/src/themes/d-future.json5
@@ -1,7 +1,7 @@
 {
 	id: '32a637ef-b47a-4775-bb7b-bacbb823f865',
 
-	name: 'Mi Future Dark',
+	name: 'Future Dark',
 	author: 'syuilo',
 
 	base: 'dark',
diff --git a/packages/client/src/themes/d-green-lime.json5 b/packages/client/src/themes/d-green-lime.json5
index a6983b9ac..c06e9af71 100644
--- a/packages/client/src/themes/d-green-lime.json5
+++ b/packages/client/src/themes/d-green-lime.json5
@@ -1,7 +1,7 @@
 {
 	id: '02816013-8107-440f-877e-865083ffe194',
 
-	name: 'Mi Green+Lime Dark',
+	name: 'Mi Dark',
 	author: 'syuilo',
 
 	base: 'dark',
diff --git a/packages/client/src/themes/d-green-orange.json5 b/packages/client/src/themes/d-green-orange.json5
deleted file mode 100644
index 62adc39e2..000000000
--- a/packages/client/src/themes/d-green-orange.json5
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	id: 'dc489603-27b5-424a-9b25-1ff6aec9824a',
-
-	name: 'Mi Green+Orange Dark',
-	author: 'syuilo',
-
-	base: 'dark',
-
-	props: {
-		accent: '#e97f00',
-		bg: '#0C1210',
-		fg: '#dee7e4',
-		fgHighlighted: '#fff',
-		fgOnAccent: '#192320',
-		divider: '#e7fffb24',
-		panel: '#192320',
-		panelHeaderBg: '@panel',
-		panelHeaderDivider: '@divider',
-		popup: '#293330',
-		renote: '@accent',
-		mentionMe: '#b4e900',
-		link: '#24d7ce',
-	},
-}
diff --git a/packages/client/src/themes/d-ice.json5 b/packages/client/src/themes/d-ice.json5
index 179b060dc..c095bf287 100644
--- a/packages/client/src/themes/d-ice.json5
+++ b/packages/client/src/themes/d-ice.json5
@@ -1,7 +1,7 @@
 {
 	id: '66e7e5a9-cd43-42cd-837d-12f47841fa34',
 
-	name: 'Mi Ice Dark',
+	name: 'Ice Dark',
 	author: 'syuilo',
 
 	base: 'dark',
diff --git a/packages/client/src/themes/d-persimmon.json5 b/packages/client/src/themes/d-persimmon.json5
index e36265ff1..ec1728d07 100644
--- a/packages/client/src/themes/d-persimmon.json5
+++ b/packages/client/src/themes/d-persimmon.json5
@@ -1,7 +1,7 @@
 {
 	id: 'c503d768-7c70-4db2-a4e6-08264304bc8d',
 
-	name: 'Mi Persimmon Dark',
+	name: 'Persimmon Dark',
 	author: 'syuilo',
 
 	base: 'dark',
diff --git a/packages/client/src/themes/d-u0.json5 b/packages/client/src/themes/d-u0.json5
index 67c9235df..b5fe92cbc 100644
--- a/packages/client/src/themes/d-u0.json5
+++ b/packages/client/src/themes/d-u0.json5
@@ -1,7 +1,7 @@
 {
 	id: '7a5bc13b-df8f-4d44-8e94-4452f0c634bb',
 	base: 'dark',
-	name: 'Mi U0 Dark',
+	name: 'U0 Dark',
 	props: {
 		X2: ':darken<2<@panel',
 		X3: 'rgba(255, 255, 255, 0.05)',
diff --git a/packages/client/src/themes/l-apricot.json5 b/packages/client/src/themes/l-apricot.json5
index 1ed552557..c1a8b29c0 100644
--- a/packages/client/src/themes/l-apricot.json5
+++ b/packages/client/src/themes/l-apricot.json5
@@ -1,7 +1,7 @@
 {
 	id: '0ff48d43-aab3-46e7-ab12-8492110d2e2b',
 
-	name: 'Mi Apricot Light',
+	name: 'Apricot Light',
 	author: 'syuilo',
 
 	base: 'light',
diff --git a/packages/client/src/themes/l-catppuccin-latte.json5 b/packages/client/src/themes/l-catppuccin-latte.json5
new file mode 100644
index 000000000..085e66df6
--- /dev/null
+++ b/packages/client/src/themes/l-catppuccin-latte.json5
@@ -0,0 +1,94 @@
+{
+	id: "169661d2-5a17-4dfc-b71b-9938cbbbed3e",
+	base: "light",
+	name: "Catppuccin Latte",
+	props: {
+		X2: ":darken<2<@panel",
+		X3: "rgba(255, 255, 255, 0.05)",
+		X4: "rgba(255, 255, 255, 0.1)",
+		X5: "rgba(255, 255, 255, 0.05)",
+		X6: "rgba(255, 255, 255, 0.15)",
+		X7: "rgba(255, 255, 255, 0.05)",
+		X8: ":lighten<5<@accent",
+		X9: ":darken<5<@accent",
+		bg: "#dce0e8",
+		fg: "#4c4f69",
+		X10: ":alpha<0.4<@accent",
+		X11: "rgba(0, 0, 0, 0.3)",
+		X12: "rgba(255, 255, 255, 0.1)",
+		X13: "rgba(255, 255, 255, 0.15)",
+		X14: ":alpha<0.5<@navBg",
+		X15: ":alpha<0<@panel",
+		X16: ":alpha<0.7<@panel",
+		X17: ":alpha<0.8<@bg",
+		cwBg: "#bcc0cc",
+		cwFg: "#5c5f77",
+		link: "#1e66f5",
+		warn: "#fe640b",
+		badge: "#1e66f5",
+		error: "#d20f39",
+		focus: ":alpha<0.3<@accent",
+		navBg: "@panel",
+		navFg: "@fg",
+		panel: ":lighten<3<@bg",
+		popup: ":lighten<3<@panel",
+		accent: "#8839ef",
+		header: ":alpha<0.7<@panel",
+		infoBg: "#ccd0da",
+		infoFg: "#6c6f85",
+		renote: "#1e66f5",
+		shadow: "rgba(0, 0, 0, 0.3)",
+		divider: "rgba(255, 255, 255, 0.1)",
+		hashtag: "#209fb5",
+		mention: "@accent",
+		modalBg: "rgba(0, 0, 0, 0.5)",
+		success: "#40a02b",
+		buttonBg: "rgba(255, 255, 255, 0.05)",
+		switchBg: "rgba(255, 255, 255, 0.15)",
+		acrylicBg: ":alpha<0.5<@bg",
+		cwHoverBg: "#acb0be",
+		indicator: "@accent",
+		mentionMe: "@mention",
+		messageBg: "@bg",
+		navActive: "@accent",
+		accentedBg: ":alpha<0.15<@accent",
+		codeNumber: "#40a02b",
+		codeString: "#fe640b",
+		fgOnAccent: "#eff1f5",
+		infoWarnBg: "#ccd0da",
+		infoWarnFg: "#5c5f77",
+		navHoverFg: ":lighten<17<@fg",
+		swutchOnBg: "@accentedBg",
+		swutchOnFg: "@accent",
+		codeBoolean: "@accent",
+		dateLabelFg: "@fg",
+		deckDivider: "#9ca0b0",
+		inputBorder: "rgba(255, 255, 255, 0.1)",
+		panelBorder: "solid 1px var(--divider)",
+		swutchOffBg: "rgba(255, 255, 255, 0.1)",
+		swutchOffFg: "@fg",
+		accentDarken: ":darken<10<@accent",
+		acrylicPanel: ":alpha<0.5<@panel",
+		navIndicator: "@indicator",
+		windowHeader: ":alpha<0.85<@panel",
+		accentLighten: ":lighten<10<@accent",
+		buttonHoverBg: "rgba(255, 255, 255, 0.1)",
+		driveFolderBg: ":alpha<0.3<@accent",
+		fgHighlighted: ":lighten<3<@fg",
+		fgTransparent: ":alpha<0.5<@fg",
+		panelHeaderBg: ":lighten<3<@panel",
+		panelHeaderFg: "@fg",
+		buttonGradateA: "@accent",
+		buttonGradateB: ":hue<20<@accent",
+		htmlThemeColor: "@bg",
+		panelHighlight: ":lighten<3<@panel",
+		listItemHoverBg: "rgba(255, 255, 255, 0.03)",
+		scrollbarHandle: "rgba(255, 255, 255, 0.2)",
+		inputBorderHover: "rgba(255, 255, 255, 0.2)",
+		wallpaperOverlay: "rgba(0, 0, 0, 0.5)",
+		fgTransparentWeak: ":alpha<0.75<@fg",
+		panelHeaderDivider: "rgba(0, 0, 0, 0)",
+		scrollbarHandleHover: "rgba(255, 255, 255, 0.4)",
+	},
+	author: "somebody ¯_(ツ)_/¯",
+}
diff --git a/packages/client/src/themes/l-cherry.json5 b/packages/client/src/themes/l-cherry.json5
index 5ad240241..9aab308fc 100644
--- a/packages/client/src/themes/l-cherry.json5
+++ b/packages/client/src/themes/l-cherry.json5
@@ -1,7 +1,7 @@
 {
 	id: 'ac168876-f737-4074-a3fc-a370c732ef48',
 
-	name: 'Mi Cherry Light',
+	name: 'Cherry Light',
 	author: 'syuilo',
 
 	base: 'light',
diff --git a/packages/client/src/themes/l-coffee.json5 b/packages/client/src/themes/l-coffee.json5
index fbcd4fa9e..252b5989c 100644
--- a/packages/client/src/themes/l-coffee.json5
+++ b/packages/client/src/themes/l-coffee.json5
@@ -1,7 +1,7 @@
 {
 	id: '6ed80faa-74f0-42c2-98e4-a64d9e138eab',
 
-	name: 'Mi Coffee Light',
+	name: 'Coffee Light',
 	author: 'syuilo',
 
 	base: 'light',
diff --git a/packages/client/src/themes/l-rainy.json5 b/packages/client/src/themes/l-rainy.json5
index 283dd74c6..a7b871806 100644
--- a/packages/client/src/themes/l-rainy.json5
+++ b/packages/client/src/themes/l-rainy.json5
@@ -1,7 +1,7 @@
 {
 	id: 'a58a0abb-ff8c-476a-8dec-0ad7837e7e96',
 
-	name: 'Mi Rainy Light',
+	name: 'Rainy Light',
 	author: 'syuilo',
 
 	base: 'light',
diff --git a/packages/client/src/themes/l-sushi.json5 b/packages/client/src/themes/l-sushi.json5
index 5846927d6..d14f32293 100644
--- a/packages/client/src/themes/l-sushi.json5
+++ b/packages/client/src/themes/l-sushi.json5
@@ -1,7 +1,7 @@
 {
 	id: '213273e5-7d20-d5f0-6e36-1b6a4f67115c',
 
-	name: 'Mi Sushi Light',
+	name: 'Sushi Light',
 	author: 'syuilo',
 
 	base: 'light',
diff --git a/packages/client/src/themes/l-u0.json5 b/packages/client/src/themes/l-u0.json5
index 03b114ba3..1d89e0543 100644
--- a/packages/client/src/themes/l-u0.json5
+++ b/packages/client/src/themes/l-u0.json5
@@ -1,7 +1,7 @@
 {
 	id: 'e2c940b5-6e9a-4c03-b738-261c720c426d',
 	base: 'light',
-	name: 'Mi U0 Light',
+	name: 'U0 Light',
 	props: {
 		X2: ':darken<2<@panel',
 		X3: 'rgba(255, 255, 255, 0.05)',
diff --git a/packages/client/src/themes/l-vivid.json5 b/packages/client/src/themes/l-vivid.json5
index b3c08f38a..cd35626a1 100644
--- a/packages/client/src/themes/l-vivid.json5
+++ b/packages/client/src/themes/l-vivid.json5
@@ -1,7 +1,7 @@
 {
 	id: '6128c2a9-5c54-43fe-a47d-17942356470b',
 
-	name: 'Mi Vivid Light',
+	name: 'Vivid Light',
 	author: 'syuilo',
 
 	base: 'light',

From 784f632b993c2f2fefaba46cb4d138df8b5ba7a8 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 20:22:50 -0400
Subject: [PATCH 74/90] suppress notification from silenced users and instances

---
 .../src/services/create-notification.ts       | 22 +++++++++++++++++++
 .../src/services/following/requests/create.ts |  8 ++++++-
 packages/backend/src/services/note/create.ts  | 19 +++++-----------
 .../src/services/note/reaction/create.ts      | 21 +-----------------
 4 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/packages/backend/src/services/create-notification.ts b/packages/backend/src/services/create-notification.ts
index f6545b131..e2dd3fc33 100644
--- a/packages/backend/src/services/create-notification.ts
+++ b/packages/backend/src/services/create-notification.ts
@@ -6,11 +6,13 @@ import {
 	NoteThreadMutings,
 	UserProfiles,
 	Users,
+	Followings,
 } from "@/models/index.js";
 import { genId } from "@/misc/gen-id.js";
 import type { User } from "@/models/entities/user.js";
 import type { Notification } from "@/models/entities/notification.js";
 import { sendEmailNotification } from "./send-email-notification.js";
+import { shouldSilenceInstance } from "@/misc/should-block-instance.js";
 
 export async function createNotification(
 	notifieeId: User["id"],
@@ -21,6 +23,26 @@ export async function createNotification(
 		return null;
 	}
 
+	if (
+		data.notifierId &&
+		["mention", "reply", "renote", "quote", "reaction"].includes(type)
+	) {
+		const notifier = await Users.findOneBy({ id: data.notifierId });
+		// suppress if the notifier does not exist or is silenced.
+		if (!notifier) return null;
+
+		// suppress if the notifier is silenced or in a silenced instance, and not followed by the notifiee.
+		if (
+			(notifier.isSilenced ||
+				(Users.isRemoteUser(notifier) &&
+					(await shouldSilenceInstance(notifier.host)))) &&
+			!(await Followings.exist({
+				where: { followerId: notifieeId, followeeId: data.notifierId },
+			}))
+		)
+			return null;
+	}
+
 	const profile = await UserProfiles.findOneBy({ userId: notifieeId });
 
 	const isMuted = profile?.mutingNotificationTypes.includes(type);
diff --git a/packages/backend/src/services/following/requests/create.ts b/packages/backend/src/services/following/requests/create.ts
index 27f9144d0..50dbd9b3b 100644
--- a/packages/backend/src/services/following/requests/create.ts
+++ b/packages/backend/src/services/following/requests/create.ts
@@ -80,7 +80,13 @@ export default async function (
 	}
 
 	if (Users.isLocalUser(follower) && Users.isRemoteUser(followee)) {
-		const content = renderActivity(renderFollow(follower, followee, requestId ?? `${config.url}/follows/${followRequest.id}`));
+		const content = renderActivity(
+			renderFollow(
+				follower,
+				followee,
+				requestId ?? `${config.url}/follows/${followRequest.id}`,
+			),
+		);
 		deliver(follower, content, followee.inbox);
 	}
 }
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index ad50bd97a..f1164c9c6 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -205,11 +205,12 @@ export default async (
 			data.visibility = "home";
 		}
 
-		const inSilencedInstance =
-			Users.isRemoteUser(user) && (await shouldSilenceInstance(user.host));
-
 		// Enforce home visibility if the user is in a silenced instance.
-		if (data.visibility === "public" && inSilencedInstance) {
+		if (
+			data.visibility === "public" &&
+			Users.isRemoteUser(user) &&
+			(await shouldSilenceInstance(user.host))
+		) {
 			data.visibility = "home";
 		}
 
@@ -317,16 +318,6 @@ export default async (
 			}
 		}
 
-		// Remove from mention the local users who aren't following the remote user in the silenced instance.
-		if (inSilencedInstance) {
-			const relations = await Followings.findBy([
-				{ followeeId: user.id, followerHost: IsNull() }, // a local user following the silenced user
-			]).then((rels) => rels.map((rel) => rel.followerId));
-			mentionedUsers = mentionedUsers.filter((mentioned) =>
-				relations.includes(mentioned.id),
-			);
-		}
-
 		const note = await insertNote(user, data, tags, emojis, mentionedUsers);
 
 		res(note);
diff --git a/packages/backend/src/services/note/reaction/create.ts b/packages/backend/src/services/note/reaction/create.ts
index 20a724f3d..277393eb4 100644
--- a/packages/backend/src/services/note/reaction/create.ts
+++ b/packages/backend/src/services/note/reaction/create.ts
@@ -12,7 +12,6 @@ import {
 	Notes,
 	Emojis,
 	Blockings,
-	Followings,
 } from "@/models/index.js";
 import { IsNull, Not } from "typeorm";
 import { perUserReactionsChart } from "@/services/chart/index.js";
@@ -22,7 +21,6 @@ import deleteReaction from "./delete.js";
 import { isDuplicateKeyValueError } from "@/misc/is-duplicate-key-value-error.js";
 import type { NoteReaction } from "@/models/entities/note-reaction.js";
 import { IdentifiableError } from "@/misc/identifiable-error.js";
-import { shouldSilenceInstance } from "@/misc/should-block-instance.js";
 
 export default async (
 	user: { id: User["id"]; host: User["host"] },
@@ -121,24 +119,7 @@ export default async (
 	});
 
 	// Create notification if the reaction target is a local user.
-	if (
-		note.userHost === null &&
-		// if a local user reacted, or
-		(Users.isLocalUser(user) ||
-			// if a remote user not in a silenced instance reacted
-			(Users.isRemoteUser(user) &&
-			// if a remote user is in a silenced instance and the target is a local follower.
-				!(
-					(await shouldSilenceInstance(user.host)) &&
-					!(await Followings.exist({
-						where: {
-							followerId: note.userId,
-							followerHost: IsNull(),
-							followeeId: user.id,
-						},
-					}))
-				)))
-	) {
+	if (note.userHost === null) {
 		createNotification(note.userId, "reaction", {
 			notifierId: user.id,
 			note: note,

From fe96578b14322bd74da719d934ea955a3307a23c Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 21:43:56 -0400
Subject: [PATCH 75/90] enforce follow-request from silenced users

---
 packages/backend/src/services/following/create.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/backend/src/services/following/create.ts b/packages/backend/src/services/following/create.ts
index c987a01e5..3a77676b3 100644
--- a/packages/backend/src/services/following/create.ts
+++ b/packages/backend/src/services/following/create.ts
@@ -227,12 +227,14 @@ export default async function (
 	});
 
 	// フォロー対象が鍵アカウントである or
+	// The follower is silenced, or
 	// フォロワーがBotであり、フォロー対象がBotからのフォローに慎重である or
 	// フォロワーがローカルユーザーであり、フォロー対象がリモートユーザーである or
 	// The follower is remote, the followee is local, and the follower is in a silenced instance.
 	// 上記のいずれかに当てはまる場合はすぐフォローせずにフォローリクエストを発行しておく
 	if (
 		followee.isLocked ||
+		follower.isSilenced ||
 		(followeeProfile.carefulBot && follower.isBot) ||
 		(Users.isLocalUser(follower) && Users.isRemoteUser(followee)) ||
 		(Users.isRemoteUser(follower) &&

From 6f32efd8985be64e50b7fdcbbab38bb23061989a Mon Sep 17 00:00:00 2001
From: s1idewhist1e <trombonedude05@gmail.com>
Date: Sun, 30 Apr 2023 22:03:17 -0700
Subject: [PATCH 76/90] Wrap note fetching in a try/catch

---
 packages/backend/src/server/web/index.ts | 43 +++++++++++++-----------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts
index 642a17d57..270026dcc 100644
--- a/packages/backend/src/server/web/index.ts
+++ b/packages/backend/src/server/web/index.ts
@@ -399,28 +399,31 @@ router.get("/notes/:note", async (ctx, next) => {
 		visibility: In(["public", "home"]),
 	});
 
-	if (note) {
-		const _note = await Notes.pack(note);
-		const profile = await UserProfiles.findOneByOrFail({ userId: note.userId });
-		const meta = await fetchMeta();
-		await ctx.render("note", {
-			note: _note,
-			profile,
-			avatarUrl: await Users.getAvatarUrl(
-				await Users.findOneByOrFail({ id: note.userId }),
-			),
-			// TODO: Let locale changeable by instance setting
-			summary: getNoteSummary(_note),
-			instanceName: meta.name || "Calckey",
-			icon: meta.iconUrl,
-			privateMode: meta.privateMode,
-			themeColor: meta.themeColor,
-		});
+	try {
+		if (note) {
+			const _note = await Notes.pack(note);
+			
+			const profile = await UserProfiles.findOneByOrFail({ userId: note.userId });
+			const meta = await fetchMeta();
+			await ctx.render("note", {
+				note: _note,
+				profile,
+				avatarUrl: await Users.getAvatarUrl(
+					await Users.findOneByOrFail({ id: note.userId }),
+				),
+				// TODO: Let locale changeable by instance setting
+				summary: getNoteSummary(_note),
+				instanceName: meta.name || "Calckey",
+				icon: meta.iconUrl,
+				privateMode: meta.privateMode,
+				themeColor: meta.themeColor,
+			});
 
-		ctx.set("Cache-Control", "public, max-age=15");
+			ctx.set("Cache-Control", "public, max-age=15");
 
-		return;
-	}
+			return;
+		}
+	} catch {}
 
 	await next();
 });

From 8d1251b977019c2f250f00adf8cf7d604c409e53 Mon Sep 17 00:00:00 2001
From: s1idewhist1e <trombonedude05@gmail.com>
Date: Sun, 30 Apr 2023 22:50:43 -0700
Subject: [PATCH 77/90] fix email validation

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

diff --git a/packages/backend/src/server/api/private/signup.ts b/packages/backend/src/server/api/private/signup.ts
index d24a74c12..440d0e368 100644
--- a/packages/backend/src/server/api/private/signup.ts
+++ b/packages/backend/src/server/api/private/signup.ts
@@ -55,7 +55,7 @@ export default async (ctx: Koa.Context) => {
 			return;
 		}
 
-		const available = await validateEmailForAccount(emailAddress);
+		const { available } = await validateEmailForAccount(emailAddress);
 		if (!available) {
 			ctx.status = 400;
 			return;

From 455c7273eed2c7e4a2d46bd174805b4a0b50ca15 Mon Sep 17 00:00:00 2001
From: Cleo <cutestnekoaqua@noreply.codeberg.org>
Date: Mon, 1 May 2023 15:42:27 +0000
Subject: [PATCH 78/90] Fixing post visibility patch

Co-authored-by: Laura Hausmann <laura@hausmann.dev>
---
 packages/client/src/components/MkPostForm.vue | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index f16d1775a..1e8d363d8 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -462,15 +462,21 @@ if (
 	props.reply &&
 	["home", "followers", "specified"].includes(props.reply.visibility)
 ) {
-	visibility = props.reply.visibility;
-	if (props.reply.visibility === "specified") {
-		os.api("users/show", {
-			userIds: props.reply.visibleUserIds.filter(
-				(uid) => uid !== $i.id && uid !== props.reply.userId
-			),
-		}).then((users) => {
-			users.forEach(pushVisibleUser);
-		});
+        if (props.reply.visibility === 'home' && visibility === 'followers') {
+		visibility = 'followers';
+	} else if (['home', 'followers'].includes(props.reply.visibility) && visibility === 'specified') {
+		visibility = 'specified';
+	} else {
+		visibility = props.reply.visibility;
+	}
+	if (visibility === 'specified') {
+		if (props.reply.visibleUserIds) {
+			os.api('users/show', {
+				userIds: props.reply.visibleUserIds.filter(uid => uid !== $i.id && uid !== props.reply.userId),
+			}).then(users => {
+				users.forEach(pushVisibleUser);
+			});
+		}
 
 		if (props.reply.userId !== $i.id) {
 			os.api("users/show", { userId: props.reply.userId }).then(

From ee5f067069c5a151a70b657ede7e6f833e626e01 Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Mon, 1 May 2023 14:52:38 -0400
Subject: [PATCH 79/90] fix: Commit CI not running because cargo is not
 installed

---
 .woodpecker/commit.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.woodpecker/commit.yml b/.woodpecker/commit.yml
index 6bb1b2d81..827ebc81d 100644
--- a/.woodpecker/commit.yml
+++ b/.woodpecker/commit.yml
@@ -2,6 +2,9 @@ pipeline:
   testCommit:
     image: node:latest
     commands:
+      - apt-get update
+      - apt-get install -y cargo
+      - rm -rf /var/lib/apt/lists/*
       - cp .config/ci.yml .config/default.yml
       - corepack enable
       - corepack prepare pnpm@latest --activate

From 1be1b2db7611ec46c196e98f0ad935d551fe17db Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Mon, 1 May 2023 15:09:21 -0400
Subject: [PATCH 80/90] fix: Switch to node alpine image

---
 .woodpecker/commit.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.woodpecker/commit.yml b/.woodpecker/commit.yml
index 827ebc81d..f57fd9d1e 100644
--- a/.woodpecker/commit.yml
+++ b/.woodpecker/commit.yml
@@ -1,10 +1,8 @@
 pipeline:
   testCommit:
-    image: node:latest
+    image: node:alpine
     commands:
-      - apt-get update
-      - apt-get install -y cargo
-      - rm -rf /var/lib/apt/lists/*
+      - apk add --no-cache cargo python3 make g++
       - cp .config/ci.yml .config/default.yml
       - corepack enable
       - corepack prepare pnpm@latest --activate

From 53669aa2938502bdbad1d0ded41bdf2fe15a4c31 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 1 May 2023 12:57:24 -0700
Subject: [PATCH 81/90] update patrons

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

diff --git a/patrons.json b/patrons.json
index 54dd6498e..f27fd534a 100644
--- a/patrons.json
+++ b/patrons.json
@@ -27,6 +27,7 @@
 		"@padraig@calckey.social",
 		"@pancakes@cats.city",
 		"@theresmiling@calckey.social",
+		"@AlderForrest@calckey.social",
 		"Interkosmos Link"
 	]
 }

From 659fd9a16d68f92727b03fd48cd0997b350d5fd5 Mon Sep 17 00:00:00 2001
From: jolupa <jolupameister@gmail.com>
Date: Mon, 1 May 2023 15:44:14 +0000
Subject: [PATCH 82/90] chore: Translated using Weblate (Catalan)

Currently translated at 69.2% (1204 of 1739 strings)

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

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index b226d641e..2a72376de 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -140,10 +140,80 @@ file: "Fitxers"
 _email:
   _follow:
     title: "t'ha seguit"
+  _receiveFollowRequest:
+    title: Heu rebut una sol·licitud de seguiment
 _mfm:
   mention: "Menció"
   quote: "Citar"
   search: "Cercar"
+  dummy: Calckey amplia el món del Fediverse
+  hashtag: Etiqueta
+  intro: MFM és un llenguatge de marques utilitzat a Misskey, Calckey, Akkoma i més
+    que es pot utilitzar en molts llocs. Aquí podeu veure una llista de tota la sintaxi
+    MFM disponible.
+  hashtagDescription: Podeu especificar un hashtag mitjançant un signe de coixinet
+    i un text.
+  url: URL
+  urlDescription: Es poden mostrar URL.
+  link: Enllaç
+  linkDescription: Parts específiques del text es poden mostrar com a URL.
+  bold: Negreta
+  boldDescription: Ressalta les lletres fent-les més gruixudes.
+  smallDescription: Mostra contingut petit i prim.
+  small: Petit
+  centerDescription: Mostra el contingut centrat.
+  inlineCode: Codi (en línia)
+  inlineMathDescription: Mostra fórmules matemàtiques (KaTeX) en línia
+  blockCode: Codi (Bloc)
+  blockCodeDescription: Mostra el ressaltat de sintaxi per al codi de diverses línies
+    (programa) en un bloc.
+  inlineMath: Matemàtiques (en línia)
+  jellyDescription: Dóna al contingut una animació semblant a una gelatina.
+  bounceDescription: Ofereix al contingut una animació de rebot.
+  jumpDescription: Dóna al contingut una animació de salt.
+  shake: Animació (Shake)
+  shakeDescription: Dóna al contingut una animació tremolosa.
+  bounce: Animació (Bounce)
+  x3Description: Mostra contingut encara més gran.
+  x2Description: Mostra contingut més gran.
+  twitchDescription: Ofereix al contingut una animació fortament convulsa.
+  spin: Animació (Spin)
+  spinDescription: Dóna al contingut una animació giratòria.
+  x2: Gran
+  x3: Molt gran
+  x4: Increïblement gran
+  blur: Desenfocament
+  x4Description: Mostra contingut fins i tot més gran que gran que gran.
+  rainbowDescription: Fa que el contingut aparegui en colors de l'arc de Sant Martí.
+  sparkle: Brillantor
+  sparkleDescription: Dóna al contingut un efecte de partícula brillant.
+  rotate: Girar
+  rotateDescription: Gira el contingut en un angle especificat.
+  positionDescription: Mou el contingut en una quantitat especificada.
+  fontDescription: Estableix el tipus de lletra en què voleu mostrar el contingut.
+  position: Posició
+  rainbow: Arc de Sant Martí
+  jelly: Animació (Jelly)
+  tada: Animació (Tada)
+  tadaDescription: Dóna al contingut una animació tipus "Tada!".
+  jump: Animació (Jump)
+  twitch: Animació (Twitch)
+  blurDescription: Desenfoca el contingut. Es mostrarà clarament quan passeu el cursor
+    per sobre.
+  font: Tipus de lletra
+  cheatSheet: Full de trucs de MFM
+  mentionDescription: Podeu especificar un usuari mitjançant un arrova i un nom d'usuari.
+  center: Centre
+  inlineCodeDescription: Mostra el ressaltat de sintaxi en línia per al codi (de programa).
+  blockMath: Matemàtiques (Bloc)
+  blockMathDescription: Mostra fórmules matemàtiques (KaTeX) en un bloc
+  quoteDescription: Mostra el contingut com una cita.
+  emoji: Emoji personalitzat
+  emojiDescription: Un emoji personalitzat és pot mostrar envoltant el nom amb dos
+    punts.
+  searchDescription: Mostra un quadre de cerca amb el text introduït prèviament.
+  flip: Capgirar
+  flipDescription: Capgira el contingut horitzontalment o verticalment.
 _theme:
   keys:
     mention: "Menció"
@@ -180,10 +250,101 @@ _pages:
         arg1: "Llistes"
       _seedRandomPick:
         arg2: "Llistes"
+        arg1: Llavor
       _pick:
         arg1: "Llistes"
       _listLen:
         arg1: "Llistes"
+      add: Afegir
+      _subtract:
+        arg1: A
+        arg2: B
+      subtract: Restar
+      _round:
+        arg1: Número
+      eq: A i B són iguals
+      _mod:
+        arg2: B
+        arg1: A
+      round: Arrodoniment decimal
+      _and:
+        arg1: A
+        arg2: B
+      or: A O B
+      _or:
+        arg1: A
+        arg2: B
+      lt: < A és menor que B
+      _lt:
+        arg1: A
+        arg2: B
+      gt: '> A és més gran que B'
+      _gt:
+        arg1: A
+        arg2: B
+      seedRannum: Nombre aleatori (amb llavor)
+      _seedRannum:
+        arg1: Llavor
+        arg2: Valor mínim
+        arg3: Valor màxim
+      _eq:
+        arg1: A
+        arg2: B
+      ltEq: <= A és menor o igual que B
+      _multiply:
+        arg2: B
+        arg1: A
+      divide: Dividir
+      notEq: A i B són diferents
+      _notEq:
+        arg1: A
+        arg2: B
+      and: A I B
+      _ltEq:
+        arg2: B
+        arg1: A
+      gtEq: '>= A és més gran o igual que B'
+      _gtEq:
+        arg1: A
+        arg2: B
+      if: Branca
+      _if:
+        arg1: Si
+        arg2: Aleshores
+        arg3: Altrament
+      not: NO
+      random: Aleatori
+      _dailyRandom:
+        arg1: Probabilitat
+      dailyRannum: Nombre aleatori (canvia un cop al dia per a cada usuari)
+      _add:
+        arg1: A
+        arg2: B
+      _divide:
+        arg1: A
+        arg2: B
+      mod: Resta
+      _not:
+        arg1: NO
+      _random:
+        arg1: Probabilitat
+      rannum: Nombre aleatori
+      _rannum:
+        arg1: Valor mínim
+        arg2: Valor màxim
+      randomPick: Tria aleatòriament de la llista
+      dailyRandom: Aleatori (canvia un cop al dia per a cada usuari)
+      _dailyRannum:
+        arg2: Valor màxim
+        arg1: Valor mínim
+      dailyRandomPick: Tria aleatòriament d'una llista (Canvis un cop al dia per a
+        cada usuari)
+      seedRandom: Aleatori (amb llavor)
+      _seedRandom:
+        arg1: Llavor
+        arg2: Probabilitat
+      seedRandomPick: Tria aleatòriament de la llista (amb llavor)
+      multiply: Multiplicar
     types:
       array: "Llistes"
 _notification:
@@ -580,7 +741,7 @@ preferencesBackups: Preferències de còpies de seguretat
 undeck: Treure el Deck
 useBlurEffectForModal: Fes servir efectes de difuminació en les finestres modals
 useFullReactionPicker: Fes servir el selector de reaccions a tamany complert
-deck: Deck
+deck: Taulell
 width: Amplada
 generateAccessToken: Genera un token d'accés
 medium: Mitja
@@ -720,3 +881,544 @@ openInSideView: Obrir a la vista lateral
 defaultNavigationBehaviour: Navegació per defecte
 editTheseSettingsMayBreakAccount: Si edites aquestes configuracions pots fer mal bé
   el teu compte.
+userSilenced: Aquest usuari ha sigut silenciat.
+instanceTicker: Informació de notes de l'instància
+waitingFor: Esperant a {x}
+random: Aleatori
+system: Sistema
+switchUi: Interfície d'usuari
+createNewClip: Crear un clip nou
+unclip: Treure clip
+public: Públic
+renotesCount: Nombre de re-notes fetes
+sentReactionsCount: Nombre de reaccions fetes
+receivedReactionsCount: Nombre de reaccions rebudes
+pollVotesCount: Nombre de vots fets en enquestes
+pollVotedCount: Nombre de vots rebuts en enquestes
+yes: Sí
+no: No
+noCrawle: Rebutjar la indexació dels restrejadors
+driveUsage: Espai fet servir al Disk
+noCrawleDescription: No permetre que els buscadors guardin la informació de les pàgines
+  de perfil, notes, Pàgines, etc.
+alwaysMarkSensitive: Marcar per defecte com a NSFW
+lockedAccountInfo: Només si has configurat la visibilitat del compte per "Només seguidors"
+  les teves notes no serem visibles per a ningú, inclús si has d'aprovar els teus
+  seguiments manualment.
+disableShowingAnimatedImages: No reproduir les imatges animades
+verificationEmailSent: S'ha enviat correu electrònic de verificació. Si us plau segueix
+  les instruccions per completar la verificació.
+notSet: Sense especificar
+emailVerified: Correu electrònic enviat
+loadRawImages: Carregar les imatges originals en comptes de mostrar les miniatures
+noteFavoritesCount: Nombre de notes afegides a favorits
+useSystemFont: Fes servir la font per defecte del sistema
+contact: Contacte
+clips: Clips
+experimentalFeatures: Característiques experimentals
+developer: Desenvolupador
+makeExplorableDescription: Si desactives aquesta funció el teu compte no sortirà a
+  la secció "Explora".
+showGapBetweenNotesInTimeline: Mostra un espai entre notes a la línea de temps
+makeExplorable: Fes el compte visible a "Explora"
+duplicate: Duplicar
+left: Esquerra
+wide: Ample
+narrow: Estret
+reloadToApplySetting: Aquesta configuració només sortirà efecte després de recarregar
+  la pàgina. Vols fer-ho ara?
+needReloadToApply: Es requereix recarregar la pàgina perquè això surti efecte.
+showTitlebar: Mostrar la barra de títol
+onlineUsersCount: Hi han {n} usuaris connectats
+nUsers: '{n} Usuaris'
+nNotes: '{n} Notes'
+sendErrorReports: Enviar informe d'error
+clearCache: Netejar memòria cau
+switchAccount: Canvia de compte
+enabled: Activat
+configure: Configurar
+noBotProtectionWarning: La protecció contra bots no està configurada.
+ads: Anuncis
+ratio: Ratio
+global: Global
+sent: Enviat
+received: Rebut
+whatIsNew: Mostra els canvis
+usernameInfo: Un nom que identifica el vostre compte d'altres en aquest servidor.
+  Podeu utilitzar l'alfabet (a~z, A~Z), els dígits (0~9) o el guió baix (_). Els noms
+  d'usuari no es poden canviar més tard.
+breakFollow: Suprimeix el seguidor
+makeReactionsPublicDescription: Això farà que la llista de totes les vostres reaccions
+  passades sigui visible públicament.
+hide: Amagar
+leaveGroupConfirm: Estàs segur que vols deixar "{nom}"?
+voteConfirm: Vols confirmar el teu vot per a "{choice}"?
+leaveGroup: Sortir del grup
+rateLimitExceeded: S'ha excedit el límit proporcionat
+cropImage: Retalla la imatge
+cropImageAsk: Vols retallar aquesta imatge?
+failedToFetchAccountInformation: No s'ha pogut obtenir la informació del compte
+driveCapOverrideCaption: Restableix la capacitat per defecte introduint un valor de
+  0 o inferior.
+type: Tipus
+label: Etiqueta
+beta: Beta
+navbar: Barra de navegació
+adminCustomCssWarn: Aquesta configuració només s'ha d'utilitzar si sabeu què fa. La
+  introducció de valors inadequats pot fer que els clients de TOTS deixin de funcionar
+  amb normalitat. Assegureu-vos que el vostre CSS funcioni correctament provant-lo
+  a la configuració de l'usuari.
+showUpdates: Mostra una finestra emergent quan Calckey s'actualitzi
+recommendedInstances: Instàncies recomanades
+recommendedInstancesDescription: Instàncies recomanades separades per salts de línia
+  per aparèixer a la línia de temps recomanada. NO afegiu `https://`, NOMÉS el domini.
+caption: Descripció Automàtica
+splash: Pantalla de Benvinguda
+swipeOnDesktop: Permet lliscar a l'estil del mòbil a l'escriptori
+updateAvailable: Pot ser que hi hagi una actualització disponible!
+logoImageUrl: URL de la imatge del logotip
+showAdminUpdates: Indica que hi ha disponible una versió nova de Calckey (només per
+  a administradors)
+replayTutorial: Repetició del tutorial
+migration: Migració
+moveAccountDescription: Aquest procés és irreversible. Assegureu-vos que hàgiu configurat
+  un àlies per a aquest compte al vostre compte nou abans de moure's. Introduïu l'etiqueta
+  del compte amb el format @person@instance.com
+moveToLabel: 'Compte al qual us moveu:'
+moveAccount: Mou el compte!
+moveFromDescription: Això establirà un àlies del vostre compte antic perquè pugueu
+  passar d'aquest compte a aquest actual. Feu això ABANS de moure's del vostre compte
+  anterior. Introduïu l'etiqueta del compte amb el format @person@instance.com
+_sensitiveMediaDetection:
+  description: Redueix l'esforç de moderació del servidor mitjançant el reconeixement
+    automàtic dels mitjans NSFW mitjançant l'aprenentatge automàtic. Això augmentarà
+    lleugerament la càrrega al servidor.
+  setSensitiveFlagAutomaticallyDescription: Els resultats de la detecció interna es
+    conservaran encara que aquesta opció estigui desactivada.
+  analyzeVideos: Activa l'anàlisi de vídeos
+  analyzeVideosDescription: Analitza vídeos a més d'imatges. Això augmentarà lleugerament
+    la càrrega al servidor.
+  setSensitiveFlagAutomatically: Marca com a NSFW
+  sensitivity: Sensibilitat de detecció
+  sensitivityDescription: La reducció de la sensibilitat comportarà menys deteccions
+    errònies (falsos positius), mentre que augmentar-la comportarà menys deteccions
+    falses (falsos negatius).
+_emailUnavailable:
+  used: Aquesta adreça de correu electrònic ja s'està utilitzant
+  format: El format d'aquesta adreça de correu electrònic no és vàlid
+  disposable: Les adreces de correu electrònic d'un sol ús no es poden utilitzar
+  mx: Aquest servidor de correu electrònic no és vàlid
+  smtp: Aquest servidor de correu electrònic no respon
+_ffVisibility:
+  public: Públic
+  followers: Visible només per als seguidors
+  private: Privat
+_signup:
+  emailAddressInfo: Introduïu la vostra adreça de correu electrònic. No es farà públic.
+  almostThere: Gairebé està
+  emailSent: S'ha enviat un correu electrònic de confirmació a la vostra adreça electrònica
+    ({email}). Feu clic a l'enllaç inclòs per completar la creació del compte.
+_accountDelete:
+  started: S'ha iniciat la supressió.
+  accountDelete: Suprimeix el compte
+  mayTakeTime: Com que la supressió del compte és un procés que requereix molts recursos,
+    pot ser que trigui algun temps a completar-se en funció de la quantitat de contingut
+    que hàgiu creat i de quants fitxers hàgiu penjat.
+  sendEmail: Un cop s'hagi completat la supressió del compte, s'enviarà un correu
+    electrònic a l'adreça de correu electrònic registrada en aquest compte.
+  inProgress: La supressió del compte està en curs
+  requestAccountDelete: Sol·licitar la supressió del compte
+_ad:
+  back: Enrera
+  reduceFrequencyOfThisAd: Mostrar aquest anunci menys
+_gallery:
+  my: La meva Galeria
+  liked: Notes que m'han agradat
+  unlike: Elimina m'agrada
+  like: M'agrada
+_forgotPassword:
+  contactAdmin: Aquesta instància no admet l'ús d'adreces de correu electrònic; poseu-vos
+    en contacte amb l'administrador de la instància per restablir la contrasenya.
+  ifNoEmail: Si no heu utilitzat cap correu electrònic durant el registre, poseu-vos
+    en contacte amb l'administrador de la instància.
+  enterEmail: Introduïu l'adreça de correu electrònic que heu utilitzat per registrar-vos.
+    A continuació, se li enviarà un enllaç amb el qual podeu restablir la vostra contrasenya.
+_plugin:
+  install: Instal·leu connectors
+  installWarn: Si us plau, no instal·leu connectors que no siguin fiables.
+  manage: Gestionar els connectors
+_preferencesBackups:
+  saveNew: Desa una còpia de seguretat nova
+  apply: Aplicar a aquest dispositiu
+  loadFile: Carrega des del fitxer
+  save: Desa els canvis
+  nameAlreadyExists: Ja existeix una còpia de seguretat anomenada "{name}". Introduïu
+    un nom diferent.
+  renameConfirm: Canviar el nom d'aquesta còpia de seguretat de "{old}" a "{new}"?
+  noBackups: No existeixen còpies de seguretat. Podeu fer una còpia de seguretat de
+    la configuració del vostre client en aquest servidor utilitzant "Crea una còpia
+    de seguretat nova".
+  deleteConfirm: Vols suprimir la còpia de seguretat anomanada {name}?
+  updatedAt: 'Actualitzat el: {time} {date}'
+  createdAt: 'Creat el: {time} {date}'
+  cannotLoad: No s'ha pogut carregar
+  inputName: Introduïu un nom per a aquesta còpia de seguretat
+  saveConfirm: Deseu la còpia de seguretat com a {name}?
+  invalidFile: Format de fitxer no vàlid
+  applyConfirm: Realment voleu aplicar la còpia de seguretat "{name}" a aquest dispositiu?
+    La configuració existent d'aquest dispositiu es sobreescriurà.
+  list: Còpies de seguretat creades
+  cannotSave: S'ha produït un error en desar
+_registry:
+  domain: Domini
+  createKey: Crea la clau
+  scope: Àmbit
+  key: Clau
+  keys: Claus
+silenced: Silenciat
+objectStorageUseSSL: Fes servir SSL
+yourAccountSuspendedTitle: Aquest compte està suspès
+i18nInfo: Calckey està sent traduïts a diversos idiomes per voluntaris. Pots ajudar
+  {link}.
+manageAccessTokens: Administrar tokens d'accés
+accountInfo: Informació del compte
+pageLikedCount: Nombre de m'agrada rebuts a Pàgines
+center: Centre
+registry: Registre
+closeAccount: Tancar el compte
+currentVersion: Versió actual
+latestVersion: Versió més nova
+newVersionOfClientAvailable: Aquesta és la versió del client més nova disponible.
+usageAmount: Ús
+capacity: Capacitat
+editCode: Editar codi
+apply: Aplicar
+repliesCount: Nombre de contestacions fetes
+repliedCount: Nombre de respostes rebudes
+renotedCount: Nombre d'impulsos rebuts
+followingCount: Nombre de comptes seguits
+followersCount: Nombre de seguidors
+goBack: Enrera
+quitFullView: Sortí de la vista complerta
+addDescription: Afegeix una descripció
+notSpecifiedMentionWarning: Aquesta nota conté mencions a usuaris no inclosos com
+  a destinataris
+info: Sobre
+hideOnlineStatus: Amagar l'estat de conexió
+onlineStatus: Estat de conexió
+online: En línea
+offline: Desconectat
+notRecommended: No recomanat
+botProtection: Protecció contra Bots
+instanceBlocking: Bloquejar/Silenciar Federació
+selectAccount: Seleccionar un compte
+disabled: Desactivat
+quickAction: Accions ràpides
+administration: Administració
+switch: Canviar
+gallery: Galeria
+popularPosts: Pàgines populars
+shareWithNote: Comparteix amb una nota
+expiration: Data límit
+memo: Memo
+priority: Prioritat
+high: Alt
+middle: Mitjana
+low: Baixa
+emailNotConfiguredWarning: L'adreça de correu electrònic no està definida.
+instanceSecurity: Seguretat de la instància
+privateMode: Mode Privat
+allowedInstances: Instàncies a la llista blanca
+allowedInstancesDescription: Amfitrions d'instàncies a la llista blanca per a la federació,
+  cadascuna separat per una línia nova (només s'aplica en mode privat).
+previewNoteText: Mostra la vista prèvia
+customCss: CSS personalitzat
+recommended: Recomanat
+seperateRenoteQuote: Botons d'impuls i de citació separats
+searchResult: Resultats de la cerca
+hashtags: Etiquetes
+troubleshooting: Resolució de problemes
+learnMore: Aprèn més
+misskeyUpdated: Calckey s'ha actualitzat!
+translate: Tradueix
+translatedFrom: Traduït per {x}
+aiChanMode: Ai-chan a la interfície d'usuari clàssica
+keepCw: Mantenir els avisos de contingut
+pubSub: Comptes Pub/Sub
+lastCommunication: Última comunicació
+breakFollowConfirm: Confirmes que vols eliminar un seguidor?
+itsOn: Activat
+itsOff: Desactivat
+emailRequiredForSignup: Requereix una adreça de correu electrònic per registrar-te
+unread: Sense llegir
+controlPanel: Tauler de control
+manageAccounts: Gestionar comptes
+makeReactionsPublic: Estableix l'historial de reaccions com a públic
+classic: Clàssic
+muteThread: Silenciar el fil
+ffVisibility: Visibilitat dels Seguiments/Seguidors
+incorrectPassword: Contrasenya incorrecta.
+clickToFinishEmailVerification: Feu clic a [{ok}] per completar la verificació del
+  correu electrònic.
+overridedDeviceKind: Tipus de dispositiu
+smartphone: Smartphone
+tablet: Tauleta
+auto: Automàtic
+recentNHours: Últimes {n} hores
+recentNDays: Últims {n} dies
+noEmailServerWarning: El servidor de correu electrònic no està configurat.
+check: Comprovar
+fast: Ràpida
+sensitiveMediaDetection: Detecció de mitjans NSFW
+remoteOnly: Només remotes
+failedToUpload: S'ha produït un error en la càrrega
+cannotUploadBecauseInappropriate: Aquest fitxer no s'ha pogut carregar perquè s'han
+  detectat parts d'aquest com a potencialment NSFW.
+cannotUploadBecauseNoFreeSpace: La pujada ha fallat a causa de la manca de capacitat
+  del Disc.
+enableAutoSensitive: Marcatge automàtic NSFW
+moveTo: Mou el compte actual al compte nou
+customKaTeXMacro: Macros KaTeX personalitzats
+_aboutMisskey:
+  contributors: Col·laboradors principals
+  allContributors: Tots els col·laboradors
+  donate: Fes una donació a Calckey
+  source: Codi font
+  translation: Tradueix Calckey
+  about: Calckey és una bifurcació de Misskey feta per ThatOneCalculator, que està
+    en desenvolupament des del 2022.
+  morePatrons: També agraïm el suport de molts altres ajudants que no figuren aquí.
+    Gràcies! 🥰
+  patrons: Mecenes de Calckey
+unknown: Desconegut
+pageLikesCount: Nombre de pàgines amb M'agrada
+youAreRunningUpToDateClient: Estás fent servir la versió del client més nova.
+unlikeConfirm: Vols treure el teu m'agrada?
+fullView: Vista complerta
+desktop: Escritori
+notesCount: Nombre de notes
+confirmToUnclipAlreadyClippedNote: Aquesta nota ja és al clip "{name}". Vols treure'l
+  d'aquest clip?
+driveFilesCount: Nombre de fitxers el Disk
+silencedInstances: Instàncies silenciades
+silenceThisInstance: Silencia la instància
+silencedInstancesDescription: Llista amb els noms de les instàncies que vols silenciar.
+  Les comptes en les instàncies silenciades seran tractades com "Silenciades", només
+  poden fer sol·licitud de seguiments, i no poden mencionar comptes locals si no les
+  segueixen. Això no afectarà les instàncies silenciades.
+objectStorageEndpointDesc: Deixa això buit si fas servir AWS, S3, d'una altre manera
+  específica un "endpoint" com a '<host>' o '<host>:<port>', depend del proveïdor
+  que facis servir.
+objectStorageRegionDesc: Especifica una regió com a 'xx-east-1'. Si el teu proveïdor
+  no distingeix entre regions, deixa això en buit o pots escriure 'us-east-1'.
+userPagePinTip: Pots mostrar notes aquí escollint "Pin al perfil" dintre del menú
+  de cada nota.
+userInfo: Informació d'usuari
+hideOnlineStatusDescription: Amagant el teu estat en línea redueix la comoditat d'ús
+  d'algunes característiques com ara la recerca.
+active: Actiu
+accounts: Comptes
+postToGallery: Crea una nova nota a la galeria
+secureMode: Mode segur (Recuperació Autoritzada)
+customCssWarn: Aquesta configuració només s'ha d'utilitzar si sabeu què fa. La introducció
+  de valors indeguts pot provocar que el client deixi de funcionar amb normalitat.
+squareAvatars: Mostra avatars quadrats
+secureModeInfo: Quan sol·liciteu des d'altres instàncies, no envieu de tornada sense
+  prova.
+privateModeInfo: Quan està activat, només les instàncies de la llista blanca es poden
+  federar amb les vostres instàncies. Totes les publicacions s'amagaran al públic.
+useBlurEffect: Utilitzeu efectes de desenfocament a la interfície d'usuari
+accountDeletionInProgress: La supressió del compte està en curs
+unmuteThread: Desfés el silenci al fil
+deleteAccountConfirm: Això suprimirà el vostre compte de manera irreversible. Procedir?
+requireAdminForView: Heu d'iniciar sessió amb un compte d'administrador per veure-ho.
+enableAutoSensitiveDescription: Permet la detecció i el marcatge automàtics dels mitjans
+  NSFW mitjançant Machine Learning sempre que sigui possible. Fins i tot si aquesta
+  opció està desactivada, és possible que estigui habilitada a tota la instància.
+localOnly: Només local
+customKaTeXMacroDescription: "Configura macros per escriure expressions matemàtiques\
+  \ fàcilment! La notació s'ajusta a les definicions de l'ordre LaTeX i s'escriu com\
+  \ a \\newcommand{\\name}{content} o \\newcommand{\\name}[nombre d'arguments]{contingut}.\
+  \ Per exemple, \\newcommand{\\add}[2]{#1 + #2} ampliarà \\add{3}{foo} a 3 + foo.\
+  \ Els claudàtors que envolten el nom de la macro es poden canviar per claudàtors\
+  \ rodons o quadrats. Això afecta els claudàtors utilitzats per als arguments. Es\
+  \ pot definir una (i només una) macro per línia, i no podeu trencar la línia al\
+  \ mig de la definició. Les línies no vàlides simplement s'ignoren. Només s'admeten\
+  \ funcions de substitució de cadenes senzilles; La sintaxi avançada, com ara la\
+  \ ramificació condicional, no es pot utilitzar aquí."
+objectStorageRegion: Regió
+objectStoragePrefix: Prefix
+objectStoragePrefixDesc: Els fitxers es guardaran dins de carpetes amb aquest prefix.
+objectStorageEndpoint: Endpoint
+newNoteRecived: Hi han notes noves
+sounds: Sons
+listen: Escoltar
+none: Res
+showInPage: Mostrar a la página
+popout: Apareixa
+volume: Volum
+objectStorageUseSSLDesc: Desactiva això si no fas servir HTTP per les connexions API
+objectStorageUseProxy: Conectarse mitjançant un Proxy
+objectStorageUseProxyDesc: Desactiva això si no faràs servir un servidor Proxy per
+  conexions API
+objectStorageSetPublicRead: Fixar com a "public-read" al pujar
+serverLogs: Registres del servidor
+deleteAll: Esborrar tot
+showFixedPostForm: Mostrar el formulari de publicació al principi de la línea de temps
+unableToProcess: Aquesta operació no es pot acabar
+recentUsed: Fet servir fa poc
+install: Instal·lar
+masterVolume: Volum principal
+uninstall: Desinstal·lar
+installedApps: Aplicacions autoritzades
+nothing: No hi a res per veure
+installedDate: Data d'autorització
+details: Detalls
+chooseEmoji: Selecciona un emoji
+removeAllFollowingDescription: Fent això deixes de seguir tots els comptes de {host}.
+  Si us plau fes servir això sí, per exemple, l'instància deixa d'existir.
+userSuspended: Aquest usuari ha sigut suspès.
+lastUsedDate: Data d'últim ús
+state: Estat
+sort: Ordenar
+ascendingOrder: Ascendent
+descendingOrder: Descendent
+scratchpad: Bloc de notes
+scratchpadDescription: El bloc de notes proporciona un entorn per experiments amb
+  AiScript. Pots escriure, executar i comprovar els resultats interactuant amb Calckey.
+output: Sortida
+script: Script
+disablePagesScript: Desactivar AiScript a les pàgines
+updateRemoteUser: Actualitzar la informació de l'usuari remot
+deleteAllFiles: Esborrar tots els fitxers
+deleteAllFilesConfirm: Segur que vols esborrar tots els fitxers?
+removeAllFollowing: Deixar de seguir a tots els usuaris
+accentColor: Color principal
+textColor: Color del text
+value: Valor
+sendErrorReportsDescription: "Quant està activat, es compartirà amb els desenvolupadors\
+  \ de Calckey quant aparegui un problema quan ajudarà a millorar la qualitat.\nAixò\
+  \ inclourà informació com la versió del teu sistema operatiu, el navegador que estiguis\
+  \ fent servir, la teva activitat a Calckey, etc."
+myTheme: El meu tema
+backgroundColor: Color de fons
+saveAs: Desa com...
+advanced: Avançat
+invalidValue: Valor invàlid.
+createdAt: Dada de creació
+updatedAt: Data d'actualització
+saveConfirm: Desa canvis?
+deleteConfirm: De veritat ho vols esborrar?
+receiveAnnouncementFromInstance: Rep notificacions d'aquesta instància
+emailNotification: Notificacions per correu electrònic
+publish: Publicar
+inChannelSearch: Buscar al canal
+useReactionPickerForContextMenu: Obrir el selector de reaccions al fer click esquerra
+typingUsers: L'{users} està escrivint
+oneDay: Un dia
+instanceDefaultLightTheme: Tema de llum predeterminat per a tota la instància
+instanceDefaultDarkTheme: Tema fosc predeterminat per a tota la instància
+instanceDefaultThemeDescription: Introduïu el codi del tema en format d'objecte.
+mutePeriod: Durada del silenci
+indefinitely: Permanentment
+tenMinutes: 10 minuts
+oneHour: Una hora
+oneWeek: Una setmana
+reflectMayTakeTime: Pot trigar una mica a reflectir-se.
+thereIsUnresolvedAbuseReportWarning: Hi ha informes sense resoldre.
+driveCapOverrideLabel: Canvieu la capacitat del disc per a aquest usuari
+isSystemAccount: Un compte creat i operat automàticament pel sistema.
+typeToConfirm: Introduïu {x} per confirmar
+deleteAccount: Suprimeix el compte
+document: Documentació
+sendPushNotificationReadMessage: Suprimeix les notificacions push un cop s'hagin llegit
+  les notificacions o missatges rellevants
+sendPushNotificationReadMessageCaption: Es mostrarà una notificació amb el text "{emptyPushNotificationMessage}"
+  durant un breu temps. Això pot augmentar l'ús de la bateria del vostre dispositiu,
+  si escau.
+showAds: Mostrar anuncis
+enterSendsMessage: Pren retorn al formulari del missatge per enviar (quant no s'activa
+  es Ctrl + Return)
+customMOTD: MOTD personalitzat (missatges de la pantalla d'inici)
+customMOTDDescription: Missatges personalitzats per al MOTD (pantalla de presentació)
+  separats per salts de línia es mostraran aleatòriament cada vegada que un usuari
+  carrega/recarrega la pàgina.
+customSplashIcons: Icones personalitzades de la pantalla d'inici (urls)
+customSplashIconsDescription: La URL de les icones de pantalla de presentació personalitzades
+  separades per salts de línia es mostraran aleatòriament cada vegada que un usuari
+  carrega/recarrega la pàgina. Si us plau, assegureu-vos que les imatges estiguin
+  en una URL estàtica, preferiblement totes a la mida de 192 x 192.
+moveFrom: Mou a aquest compte des d'un compte anterior
+moveFromLabel: 'Compte des del qual us moveu:'
+migrationConfirm: "Esteu absolutament segur que voleu migrar el vostre compte a {account}?\
+  \ Un cop ho feu, no podreu revertir-ho i no podreu tornar a utilitzar el vostre\
+  \ compte amb normalitat.\nA més, assegureu-vos d'haver configurat aquest compte\
+  \ actual com el compte del qual us moveu."
+defaultReaction: Reacció d'emoji predeterminada per a notes sortints i entrants
+enableCustomKaTeXMacro: Activa les macros KaTeX personalitzades
+noteId: ID de la nota
+_nsfw:
+  respect: Amaga els mitjans NSFW
+  ignore: No amagueu els mitjans NSFW
+  force: Amaga tots els mitjans
+inUse: Utilitzat
+ffVisibilityDescription: Et permet configurar qui pot veure a qui segueixes i qui
+  et segueix.
+continueThread: Continuar el fil
+reverse: Revés
+objectStorageBucket: Cubell
+objectStorageBucketDesc: Si us plau específica el nom del cubell que faràs servir
+  al teu proveïdor.
+clip: Clip
+createNew: Crear una nova
+optional: Opcional
+jumpToSpecifiedDate: Vés a una data concreta
+showingPastTimeline: Ara es mostra un línea de temps antiga
+clear: Tornar
+markAllAsRead: Marcar tot com a llegit
+recentPosts: Pàgines recents
+noMaintainerInformationWarning: La informació del responsable no està configurada.
+resolved: Resolt
+unresolved: Sense resoldre
+filter: Filtre
+slow: Lenta
+useDrawerReactionPickerForMobile: Mostra el selector de reaccions com a calaix al
+  mòbil
+welcomeBackWithName: Benvingut de nou, {name}
+showLocalPosts: 'Mostra les notes locals a:'
+homeTimeline: Línea de temps Local
+socialTimeline: Línea de temps Social
+themeColor: Color del Ticker de la instància
+size: Mida
+numberOfColumn: Nombre de columnes
+numberOfPageCache: Nombre de pàgines emmagatzemades a la memòria cau
+numberOfPageCacheDescription: L'augment d'aquest nombre millorarà la comoditat dels
+  usuaris, però provocarà més càrrega del servidor i més memòria per utilitzar-la.
+logoutConfirm: Vols tancar la sessió?
+lastActiveDate: Data d'últim ús
+statusbar: Barra d'estat
+pleaseSelect: Selecciona una opció
+colored: Color
+refreshInterval: "Interval d'actualització "
+speed: Velocitat
+cannotUploadBecauseExceedsFileSizeLimit: Aquest fitxer no s'ha pogut carregar perquè
+  supera la mida màxima permesa.
+activeEmailValidationDescription: Permet una validació més estricta de les adreces
+  de correu electrònic, que inclou la comprovació d'adreces d'un sol ús i si realment
+  es pot comunicar amb elles. Quan no està marcat, només es valida el format del correu
+  electrònic.
+shuffle: Barrejar
+account: Compte
+move: Moure
+pushNotification: Notificacions push
+subscribePushNotification: Activar les notificacions push
+unsubscribePushNotification: Desactivar les notificacions push
+pushNotificationAlreadySubscribed: Les notificacions push ja estan activades
+pushNotificationNotSupported: El vostre navegador o instància no admet notificacions
+  automàtiques
+license: Llicència
+indexPosts: Índex de notes
+indexFrom: Índex a partir de l'identificador de notes (deixeu en blanc per indexar
+  cada publicació)
+indexNotice: Ara indexant. Això probablement trigarà una estona, si us plau, no reinicieu
+  el servidor durant almenys una hora.

From 505a0dfd9cbc6d538de1eabebe11518d2c45a3e3 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 1 May 2023 16:50:08 -0400
Subject: [PATCH 83/90] revert show more notification component

---
 .../client/src/components/MkNotification.vue  | 47 +++++--------------
 1 file changed, 13 insertions(+), 34 deletions(-)

diff --git a/packages/client/src/components/MkNotification.vue b/packages/client/src/components/MkNotification.vue
index 2c7281dbe..c909873a5 100644
--- a/packages/client/src/components/MkNotification.vue
+++ b/packages/client/src/components/MkNotification.vue
@@ -89,7 +89,7 @@
 				/>
 			</div>
 		</div>
-		<div class="tail" :class="{ collapsed }">
+		<div class="tail">
 			<header>
 				<span v-if="notification.type === 'pollEnded'">{{
 					i18n.ts._notification.pollEnded
@@ -112,11 +112,11 @@
 				v-if="notification.type === 'reaction'"
 				class="text"
 				:to="notePage(notification.note)"
-				:title="summary"
+				:title="getNoteSummary(notification.note)"
 			>
 				<i class="ph-quotes ph-fill ph-lg"></i>
 				<Mfm
-					:text="summary"
+					:text="getNoteSummary(notification.note)"
 					:plain="true"
 					:nowrap="!full"
 					:custom-emojis="notification.note.emojis"
@@ -142,10 +142,10 @@
 				v-if="notification.type === 'reply'"
 				class="text"
 				:to="notePage(notification.note)"
-				:title="summary"
+				:title="getNoteSummary(notification.note)"
 			>
 				<Mfm
-					:text="summary"
+					:text="getNoteSummary(notification.note)"
 					:plain="true"
 					:nowrap="!full"
 					:custom-emojis="notification.note.emojis"
@@ -155,10 +155,10 @@
 				v-if="notification.type === 'mention'"
 				class="text"
 				:to="notePage(notification.note)"
-				:title="summary"
+				:title="getNoteSummary(notification.note)"
 			>
 				<Mfm
-					:text="summary"
+					:text="getNoteSummary(notification.note)"
 					:plain="true"
 					:nowrap="!full"
 					:custom-emojis="notification.note.emojis"
@@ -168,10 +168,10 @@
 				v-if="notification.type === 'quote'"
 				class="text"
 				:to="notePage(notification.note)"
-				:title="summary"
+				:title="getNoteSummary(notification.note)"
 			>
 				<Mfm
-					:text="summary"
+					:text="getNoteSummary(notification.note)"
 					:plain="true"
 					:nowrap="!full"
 					:custom-emojis="notification.note.emojis"
@@ -181,11 +181,11 @@
 				v-if="notification.type === 'pollVote'"
 				class="text"
 				:to="notePage(notification.note)"
-				:title="summary"
+				:title="getNoteSummary(notification.note)"
 			>
 				<i class="ph-quotes ph-fill ph-lg"></i>
 				<Mfm
-					:text="summary"
+					:text="getNoteSummary(notification.note)"
 					:plain="true"
 					:nowrap="!full"
 					:custom-emojis="notification.note.emojis"
@@ -196,11 +196,11 @@
 				v-if="notification.type === 'pollEnded'"
 				class="text"
 				:to="notePage(notification.note)"
-				:title="summary"
+				:title="getNoteSummary(notification.note)"
 			>
 				<i class="ph-quotes ph-fill ph-lg"></i>
 				<Mfm
-					:text="summary"
+					:text="getNoteSummary(notification.note)"
 					:plain="true"
 					:nowrap="!full"
 					:custom-emojis="notification.note.emojis"
@@ -264,7 +264,6 @@
 			<span v-if="notification.type === 'app'" class="text">
 				<Mfm :text="notification.body" :nowrap="!full" />
 			</span>
-			<xShowMoreButton v-if="isLong" v-model="collapsed"></xShowMoreButton>
 		</div>
 	</div>
 </template>
@@ -275,7 +274,6 @@ import * as misskey from "calckey-js";
 import XReactionIcon from "@/components/MkReactionIcon.vue";
 import MkFollowButton from "@/components/MkFollowButton.vue";
 import XReactionTooltip from "@/components/MkReactionTooltip.vue";
-import XShowMoreButton from "./MkShowMoreButton.vue";
 import { getNoteSummary } from "@/scripts/get-note-summary";
 import { notePage } from "@/filters/note";
 import { userPage } from "@/filters/user";
@@ -301,19 +299,12 @@ const props = withDefaults(
 const elRef = ref<HTMLElement>(null);
 const reactionRef = ref(null);
 
-const summary = getNoteSummary(props.notification.note);
-
 const showEmojiReactions =
 	defaultStore.state.enableEmojiReactions ||
 	defaultStore.state.showEmojisInReactionNotifications;
 const defaultReaction = ["⭐", "👍", "❤️"].includes(instance.defaultReaction)
 	? instance.defaultReaction
 	: "⭐";
-const isLong = (summary.split("\n").length > 3 || summary.length > 200);
-const collapsed = $ref(isLong);
-
-
-
 
 let readObserver: IntersectionObserver | undefined;
 let connection;
@@ -495,7 +486,6 @@ useTooltip(reactionRef, (showing) => {
 	}
 
 	> .tail {
-		position: relative;
 		flex: 1;
 		min-width: 0;
 
@@ -536,17 +526,6 @@ useTooltip(reactionRef, (showing) => {
 				margin-left: 4px;
 			}
 		}
-		&.collapsed > .text {
-			display: block;
-			position: relative;
-			max-height: calc(4em + 50px);
-			overflow: hidden;
-			mask: linear-gradient(black calc(100% - 64px), transparent);
-			-webkit-mask: linear-gradient(
-				black calc(100% - 64px),
-				transparent
-			);
-		}
 	}
 }
 </style>

From a17b5fc680aa2f2e6a3a005f95881f9151f45e8d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 1 May 2023 13:56:48 -0700
Subject: [PATCH 84/90] chore: patrons

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

diff --git a/patrons.json b/patrons.json
index f27fd534a..9b06dcbff 100644
--- a/patrons.json
+++ b/patrons.json
@@ -28,6 +28,7 @@
 		"@pancakes@cats.city",
 		"@theresmiling@calckey.social",
 		"@AlderForrest@calckey.social",
+		"@kristian@calckey.social",
 		"Interkosmos Link"
 	]
 }

From f34c224a108cc1455496a2b379003bf2dbbee53d Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 18:18:09 -0400
Subject: [PATCH 85/90] bring back Show More component

---
 packages/client/src/components/MkCwButton.vue |  4 +-
 .../src/components/MkShowMoreButton.vue       | 68 +++++++++++++++++++
 .../src/components/MkSubNoteContent.vue       | 50 ++------------
 .../client/src/components/MkUserPreview.vue   | 16 +----
 4 files changed, 75 insertions(+), 63 deletions(-)
 create mode 100644 packages/client/src/components/MkShowMoreButton.vue

diff --git a/packages/client/src/components/MkCwButton.vue b/packages/client/src/components/MkCwButton.vue
index 5e59853b6..107e140e7 100644
--- a/packages/client/src/components/MkCwButton.vue
+++ b/packages/client/src/components/MkCwButton.vue
@@ -85,7 +85,6 @@ defineExpose({
 		bottom: 0;
 		left: 0;
 		width: 100%;
-		z-index: 2;
 		> span {
 			display: inline-block;
 			background: var(--panel);
@@ -94,8 +93,7 @@ defineExpose({
 			border-radius: 999px;
 			box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
 		}
-		&:hover,
-		&:focus {
+		&:hover {
 			> span {
 				background: var(--panelHighlight);
 			}
diff --git a/packages/client/src/components/MkShowMoreButton.vue b/packages/client/src/components/MkShowMoreButton.vue
new file mode 100644
index 000000000..3516d6f43
--- /dev/null
+++ b/packages/client/src/components/MkShowMoreButton.vue
@@ -0,0 +1,68 @@
+<template>
+	<button
+		v-if="modelValue"
+		class="fade _button"
+		@click.stop="toggle"
+	>
+		<span>{{ i18n.ts.showMore }}</span>
+	</button>
+	<button
+		v-if="!modelValue"
+		class="showLess _button"
+		@click.stop="toggle"
+	>
+		<span>{{ i18n.ts.showLess }}</span>
+	</button>
+</template>
+<script lang="ts" setup>
+import { i18n } from "@/i18n";
+
+const props = defineProps<{
+	modelValue: boolean;
+}>();
+
+const emit = defineEmits<{
+	(ev: "update:modelValue", v: boolean): void;
+}>();
+
+const toggle = () => {
+	emit("update:modelValue", !props.modelValue);
+};
+</script>
+<style lang="scss" scoped>
+.fade {
+	display: block;
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	> span {
+		display: inline-block;
+		background: var(--panel);
+		padding: 0.4em 1em;
+		font-size: 0.8em;
+		border-radius: 999px;
+		box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
+	}
+	&:hover {
+		> span {
+			background: var(--panelHighlight);
+		}
+	}
+}
+.showLess {
+	width: 100%;
+	margin-top: 1em;
+	position: sticky;
+	bottom: var(--stickyBottom);
+
+	> 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>
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index fc587379c..1d505682b 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -115,15 +115,8 @@
 					v-on:focus="cwButton?.focus()"
 				></div>
 			</div>
-			<XShowMoreButton
-				v-if="isLong"
-				v-model="collapsed"
-			></XShowMoreButton>
-			<XCwButton
-				v-if="note.cw && showContent"
-				v-model="showContent"
-				:note="note"
-			/>
+			<XShowMoreButton v-if="isLong" v-model="collapsed"></XShowMoreButton>
+			<XCwButton v-if="note.cw" v-model="showContent" :note="note" />
 		</div>
 	</div>
 </template>
@@ -136,6 +129,7 @@ import XNoteSimple from "@/components/MkNoteSimple.vue";
 import XMediaList from "@/components/MkMediaList.vue";
 import XPoll from "@/components/MkPoll.vue";
 import MkUrlPreview from "@/components/MkUrlPreview.vue";
+import XShowMoreButton from "./MkShowMoreButton.vue";
 import XCwButton from "@/components/MkCwButton.vue";
 import { extractUrlFromMfm } from "@/scripts/extract-url-from-mfm";
 import { i18n } from "@/i18n";
@@ -160,6 +154,7 @@ const isLong =
 	props.note.text != null &&
 	(props.note.text.split("\n").length > 9 || props.note.text.length > 500);
 const collapsed = $ref(props.note.cw == null && isLong);
+
 const urls = props.note.text
 	? extractUrlFromMfm(mfm.parse(props.note.text)).slice(0, 5)
 	: null;
@@ -287,43 +282,6 @@ function focusFooter(ev) {
 					top: 40px;
 				}
 			}
-
-			:deep(.fade) {
-				display: block;
-				position: absolute;
-				bottom: 0;
-				left: 0;
-				width: 100%;
-				> span {
-					display: inline-block;
-					background: var(--panel);
-					padding: 0.4em 1em;
-					font-size: 0.8em;
-					border-radius: 999px;
-					box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
-				}
-				&:hover {
-					> span {
-						background: var(--panelHighlight);
-					}
-				}
-			}
-		}
-
-		:deep(.showLess) {
-			width: 100%;
-			margin-top: 1em;
-			position: sticky;
-			bottom: var(--stickyBottom);
-
-			> 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);
-			}
 		}
 	}
 }
diff --git a/packages/client/src/components/MkUserPreview.vue b/packages/client/src/components/MkUserPreview.vue
index a8a6bb90a..806ec8880 100644
--- a/packages/client/src/components/MkUserPreview.vue
+++ b/packages/client/src/components/MkUserPreview.vue
@@ -58,20 +58,7 @@
 						:custom-emojis="user.emojis"
 					/>
 				</div>
-				<button
-					v-if="isLong && collapsed"
-					class="fade _button"
-					@click.stop="collapsed = false"
-				>
-					<span>{{ i18n.ts.showMore }}</span>
-				</button>
-				<button
-					v-if="isLong && !collapsed"
-					class="showLess _button"
-					@click.stop="collapsed = true"
-				>
-					<span>{{ i18n.ts.showLess }}</span>
-				</button>
+				<XShowMoreButton v-if="isLong" v-model="collapsed"></XShowMoreButton>
 				<div v-if="user.fields.length > 0" class="fields">
 					<dl
 						v-for="(field, i) in user.fields"
@@ -131,6 +118,7 @@ import * as Acct from "calckey-js/built/acct";
 import type * as misskey from "calckey-js";
 import MkFollowButton from "@/components/MkFollowButton.vue";
 import { userPage } from "@/filters/user";
+import XShowMoreButton from "./MkShowMoreButton.vue";
 import * as os from "@/os";
 import { $i } from "@/account";
 import { i18n } from "@/i18n";

From aaa808374071331c0204dbea45597f3fc93a2909 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Mon, 1 May 2023 18:11:56 -0400
Subject: [PATCH 86/90] fix db migration

---
 .../1682891890317-InstanceSilence.js          | 152 ------------------
 1 file changed, 152 deletions(-)

diff --git a/packages/backend/migration/1682891890317-InstanceSilence.js b/packages/backend/migration/1682891890317-InstanceSilence.js
index f487111f7..babe64883 100644
--- a/packages/backend/migration/1682891890317-InstanceSilence.js
+++ b/packages/backend/migration/1682891890317-InstanceSilence.js
@@ -2,164 +2,12 @@ export class InstanceSilence1682891890317 {
 	name = "InstanceSilence1682891890317";
 
 	async up(queryRunner) {
-		await queryRunner.query(
-			`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "fk_7f4e851a35d81b64dda28eee0"`,
-		);
-		await queryRunner.query(
-			`DROP INDEX "public"."IDX_renote_muting_createdAt"`,
-		);
-		await queryRunner.query(`DROP INDEX "public"."IDX_renote_muting_muteeId"`);
-		await queryRunner.query(`DROP INDEX "public"."IDX_renote_muting_muterId"`);
-		await queryRunner.query(
-			`ALTER TABLE "meta" DROP COLUMN "useStarForReactionFallback"`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" DROP COLUMN "enableGuestTimeline"`,
-		);
 		await queryRunner.query(
 			`ALTER TABLE "meta" ADD "silencedHosts" character varying(256) array NOT NULL DEFAULT '{}'`,
 		);
-		await queryRunner.query(
-			`COMMENT ON COLUMN "notification"."isRead" IS 'Whether the notification was read.'`,
-		);
-		await queryRunner.query(
-			`COMMENT ON COLUMN "meta"."defaultReaction" IS NULL`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "secureMode" SET NOT NULL`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "privateMode" SET NOT NULL`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "allowedHosts" SET NOT NULL`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "pinnedPages" SET DEFAULT '{/featured,/channels,/explore,/pages,/about-calckey}'`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://codeberg.org/calckey/calckey'`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://codeberg.org/calckey/calckey/issues/new'`,
-		);
-		await queryRunner.query(
-			`COMMENT ON COLUMN "renote_muting"."createdAt" IS 'The created date of the Muting.'`,
-		);
-		await queryRunner.query(
-			`COMMENT ON COLUMN "renote_muting"."muteeId" IS 'The mutee user ID.'`,
-		);
-		await queryRunner.query(
-			`COMMENT ON COLUMN "renote_muting"."muterId" IS 'The muter user ID.'`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "page" ALTER COLUMN "isPublic" DROP DEFAULT`,
-		);
-		await queryRunner.query(
-			`CREATE INDEX "IDX_d1259a2c2b7bb413ff449e8711" ON "renote_muting" ("createdAt") `,
-		);
-		await queryRunner.query(
-			`CREATE INDEX "IDX_7eac97594bcac5ffcf2068089b" ON "renote_muting" ("muteeId") `,
-		);
-		await queryRunner.query(
-			`CREATE INDEX "IDX_7aa72a5fe76019bfe8e5e0e8b7" ON "renote_muting" ("muterId") `,
-		);
-		await queryRunner.query(
-			`CREATE UNIQUE INDEX "IDX_0d801c609cec4e9eb4b6b4490c" ON "renote_muting" ("muterId", "muteeId") `,
-		);
-		await queryRunner.query(
-			`CREATE INDEX "IDX_a9021cc2e1feb5f72d3db6e9f5" ON "abuse_user_report" ("targetUserId") `,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "renote_muting" ADD CONSTRAINT "FK_7eac97594bcac5ffcf2068089b6" FOREIGN KEY ("muteeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "renote_muting" ADD CONSTRAINT "FK_7aa72a5fe76019bfe8e5e0e8b7d" FOREIGN KEY ("muterId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
-		);
 	}
 
 	async down(queryRunner) {
-		await queryRunner.query(
-			`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f"`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "renote_muting" DROP CONSTRAINT "FK_7aa72a5fe76019bfe8e5e0e8b7d"`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "renote_muting" DROP CONSTRAINT "FK_7eac97594bcac5ffcf2068089b6"`,
-		);
-		await queryRunner.query(
-			`DROP INDEX "public"."IDX_a9021cc2e1feb5f72d3db6e9f5"`,
-		);
-		await queryRunner.query(
-			`DROP INDEX "public"."IDX_0d801c609cec4e9eb4b6b4490c"`,
-		);
-		await queryRunner.query(
-			`DROP INDEX "public"."IDX_7aa72a5fe76019bfe8e5e0e8b7"`,
-		);
-		await queryRunner.query(
-			`DROP INDEX "public"."IDX_7eac97594bcac5ffcf2068089b"`,
-		);
-		await queryRunner.query(
-			`DROP INDEX "public"."IDX_d1259a2c2b7bb413ff449e8711"`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "page" ALTER COLUMN "isPublic" SET DEFAULT true`,
-		);
-		await queryRunner.query(
-			`COMMENT ON COLUMN "renote_muting"."muterId" IS NULL`,
-		);
-		await queryRunner.query(
-			`COMMENT ON COLUMN "renote_muting"."muteeId" IS NULL`,
-		);
-		await queryRunner.query(
-			`COMMENT ON COLUMN "renote_muting"."createdAt" IS NULL`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://github.com/misskey-dev/misskey/issues/new'`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://github.com/misskey-dev/misskey'`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "pinnedPages" SET DEFAULT '{/featured,/channels,/explore,/pages,/about-misskey}'`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "allowedHosts" DROP NOT NULL`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "privateMode" DROP NOT NULL`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ALTER COLUMN "secureMode" DROP NOT NULL`,
-		);
-		await queryRunner.query(
-			`COMMENT ON COLUMN "meta"."defaultReaction" IS 'The fallback reaction for emoji reacts'`,
-		);
-		await queryRunner.query(
-			`COMMENT ON COLUMN "notification"."isRead" IS 'Whether the Notification is read.'`,
-		);
 		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "silencedHosts"`);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ADD "enableGuestTimeline" boolean NOT NULL DEFAULT false`,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "meta" ADD "useStarForReactionFallback" boolean NOT NULL DEFAULT false`,
-		);
-		await queryRunner.query(
-			`CREATE INDEX "IDX_renote_muting_muterId" ON "muting" ("muterId") `,
-		);
-		await queryRunner.query(
-			`CREATE INDEX "IDX_renote_muting_muteeId" ON "muting" ("muteeId") `,
-		);
-		await queryRunner.query(
-			`CREATE INDEX "IDX_renote_muting_createdAt" ON "muting" ("createdAt") `,
-		);
-		await queryRunner.query(
-			`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "fk_7f4e851a35d81b64dda28eee0" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
-		);
 	}
 }

From ad969a28ccac379b83f44846ec65e2cbe97aea1e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 1 May 2023 20:32:18 -0700
Subject: [PATCH 87/90] chore: formatting

---
 package.json                                  |  2 +-
 packages/backend/src/server/activitypub.ts    | 73 +++++++++++--------
 .../mastodon/ApiMastodonCompatibleService.ts  |  6 +-
 .../src/server/api/mastodon/converters.ts     | 45 ++++++++----
 .../server/api/mastodon/endpoints/account.ts  | 47 +++++++-----
 .../server/api/mastodon/endpoints/filter.ts   |  6 +-
 .../api/mastodon/endpoints/notifications.ts   |  8 +-
 .../server/api/mastodon/endpoints/search.ts   | 12 +--
 .../server/api/mastodon/endpoints/status.ts   | 39 ++++++----
 .../server/api/mastodon/endpoints/timeline.ts | 38 ++++++----
 packages/backend/src/server/web/index.ts      |  6 +-
 packages/client/src/components/MkPostForm.vue | 21 ++++--
 .../src/components/MkShowMoreButton.vue       | 12 +--
 .../src/components/MkSubNoteContent.vue       |  5 +-
 .../client/src/components/MkUserPreview.vue   |  5 +-
 packages/client/src/directives/focus.ts       |  4 +-
 packages/client/src/directives/tooltip.ts     | 20 +----
 17 files changed, 204 insertions(+), 145 deletions(-)

diff --git a/package.json b/package.json
index 78e39e69f..d31b74313 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev41",
+	"version": "13.2.0-dev42",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/backend/src/server/activitypub.ts b/packages/backend/src/server/activitypub.ts
index d47e6f300..042ab446c 100644
--- a/packages/backend/src/server/activitypub.ts
+++ b/packages/backend/src/server/activitypub.ts
@@ -10,7 +10,13 @@ import { renderPerson } from "@/remote/activitypub/renderer/person.js";
 import renderEmoji from "@/remote/activitypub/renderer/emoji.js";
 import { inbox as processInbox } from "@/queue/index.js";
 import { isSelfHost, toPuny } from "@/misc/convert-host.js";
-import { Notes, Users, Emojis, NoteReactions, FollowRequests } from "@/models/index.js";
+import {
+	Notes,
+	Users,
+	Emojis,
+	NoteReactions,
+	FollowRequests,
+} from "@/models/index.js";
 import type { ILocalUser, User } from "@/models/entities/user.js";
 import { renderLike } from "@/remote/activitypub/renderer/like.js";
 import { getUserKeypair } from "@/misc/keypair-store.js";
@@ -330,40 +336,43 @@ router.get("/likes/:like", async (ctx) => {
 });
 
 // follow
-router.get("/follows/:follower/:followee", async (ctx: Router.RouterContext) => {
-	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.
+router.get(
+	"/follows/:follower/:followee",
+	async (ctx: Router.RouterContext) => {
+		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.
 
-	const [follower, followee] = await Promise.all([
-		Users.findOneBy({
-			id: ctx.params.follower,
-			host: IsNull(),
-		}),
-		Users.findOneBy({
-			id: ctx.params.followee,
-			host: Not(IsNull()),
-		}),
-	]);
+		const [follower, followee] = await Promise.all([
+			Users.findOneBy({
+				id: ctx.params.follower,
+				host: IsNull(),
+			}),
+			Users.findOneBy({
+				id: ctx.params.followee,
+				host: Not(IsNull()),
+			}),
+		]);
 
-	if (follower == null || followee == null) {
-		ctx.status = 404;
-		return;
-	}
+		if (follower == null || followee == null) {
+			ctx.status = 404;
+			return;
+		}
 
-	ctx.body = renderActivity(renderFollow(follower, followee));
-	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);
-});
+		ctx.body = renderActivity(renderFollow(follower, followee));
+		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 request
 router.get("/follows/:followRequestId", async (ctx: Router.RouterContext) => {
diff --git a/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts b/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
index 0c59b38f4..df85f2162 100644
--- a/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
+++ b/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
@@ -70,7 +70,9 @@ export function apiMastodonCompatible(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		try {
 			const data = await client.getInstanceAnnouncements();
-			ctx.body = data.data.map(announcement => convertAnnouncement(announcement));
+			ctx.body = data.data.map((announcement) =>
+				convertAnnouncement(announcement),
+			);
 		} catch (e: any) {
 			console.error(e);
 			ctx.status = 401;
@@ -104,7 +106,7 @@ export function apiMastodonCompatible(router: Router): void {
 		// displayed without being logged in
 		try {
 			const data = await client.getFilters();
-			ctx.body = data.data.map(filter => convertFilter(filter));
+			ctx.body = data.data.map((filter) => convertFilter(filter));
 		} catch (e: any) {
 			console.error(e);
 			ctx.status = 401;
diff --git a/packages/backend/src/server/api/mastodon/converters.ts b/packages/backend/src/server/api/mastodon/converters.ts
index d9a4f90ef..825d0f518 100644
--- a/packages/backend/src/server/api/mastodon/converters.ts
+++ b/packages/backend/src/server/api/mastodon/converters.ts
@@ -6,11 +6,21 @@ function simpleConvert(data: any) {
 	return data;
 }
 
-export function convertAccount(account: Entity.Account) { return simpleConvert(account); }
-export function convertAnnouncement(announcement: Entity.Announcement) { return simpleConvert(announcement); }
-export function convertAttachment(attachment: Entity.Attachment) { return simpleConvert(attachment); }
-export function convertFilter(filter: Entity.Filter) { return simpleConvert(filter); }
-export function convertList(list: Entity.List) { return simpleConvert(list); }
+export function convertAccount(account: Entity.Account) {
+	return simpleConvert(account);
+}
+export function convertAnnouncement(announcement: Entity.Announcement) {
+	return simpleConvert(announcement);
+}
+export function convertAttachment(attachment: Entity.Attachment) {
+	return simpleConvert(attachment);
+}
+export function convertFilter(filter: Entity.Filter) {
+	return simpleConvert(filter);
+}
+export function convertList(list: Entity.List) {
+	return simpleConvert(list);
+}
 
 export function convertNotification(notification: Entity.Notification) {
 	notification.account = convertAccount(notification.account);
@@ -20,25 +30,32 @@ export function convertNotification(notification: Entity.Notification) {
 	return notification;
 }
 
-export function convertPoll(poll: Entity.Poll) { return simpleConvert(poll); }
-export function convertRelationship(relationship: Entity.Relationship) { return simpleConvert(relationship); }
+export function convertPoll(poll: Entity.Poll) {
+	return simpleConvert(poll);
+}
+export function convertRelationship(relationship: Entity.Relationship) {
+	return simpleConvert(relationship);
+}
 
 export function convertStatus(status: Entity.Status) {
 	status.account = convertAccount(status.account);
 	status.id = convertId(status.id, IdType.MastodonId);
 	if (status.in_reply_to_account_id)
-		status.in_reply_to_account_id = convertId(status.in_reply_to_account_id, IdType.MastodonId);
+		status.in_reply_to_account_id = convertId(
+			status.in_reply_to_account_id,
+			IdType.MastodonId,
+		);
 	if (status.in_reply_to_id)
 		status.in_reply_to_id = convertId(status.in_reply_to_id, IdType.MastodonId);
-	status.media_attachments = status.media_attachments.map(attachment => convertAttachment(attachment));
-	status.mentions = status.mentions.map(mention => ({
+	status.media_attachments = status.media_attachments.map((attachment) =>
+		convertAttachment(attachment),
+	);
+	status.mentions = status.mentions.map((mention) => ({
 		...mention,
 		id: convertId(mention.id, IdType.MastodonId),
 	}));
-	if (status.poll)
-		status.poll = convertPoll(status.poll);
-	if (status.reblog)
-		status.reblog = convertStatus(status.reblog);
+	if (status.poll) status.poll = convertPoll(status.poll);
+	if (status.reblog) status.reblog = convertStatus(status.reblog);
 
 	return status;
 }
diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 2984c20e3..deb5dac30 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -5,7 +5,12 @@ import { FindOptionsWhere, IsNull } from "typeorm";
 import { getClient } from "../ApiMastodonCompatibleService.js";
 import { argsToBools, convertTimelinesArgsId, limitToInt } from "./timeline.js";
 import { convertId, IdType } from "../../index.js";
-import { convertAccount, convertList, convertRelationship, convertStatus } from "../converters.js";
+import {
+	convertAccount,
+	convertList,
+	convertRelationship,
+	convertStatus,
+} from "../converters.js";
 
 const relationshipModel = {
 	id: "",
@@ -112,7 +117,9 @@ export function apiAccountMastodon(router: Router): void {
 			}
 
 			const data = await client.getRelationships(reqIds);
-			ctx.body = data.data.map(relationship => convertRelationship(relationship));
+			ctx.body = data.data.map((relationship) =>
+				convertRelationship(relationship),
+			);
 		} catch (e: any) {
 			console.error(e);
 			let data = e.response.data;
@@ -148,7 +155,7 @@ export function apiAccountMastodon(router: Router): void {
 					convertId(ctx.params.id, IdType.CalckeyId),
 					convertTimelinesArgsId(argsToBools(limitToInt(ctx.query as any))),
 				);
-				ctx.body = data.data.map(status => convertStatus(status));
+				ctx.body = data.data.map((status) => convertStatus(status));
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -168,7 +175,7 @@ export function apiAccountMastodon(router: Router): void {
 					convertId(ctx.params.id, IdType.CalckeyId),
 					convertTimelinesArgsId(limitToInt(ctx.query as any)),
 				);
-				ctx.body = data.data.map(account => convertAccount(account));
+				ctx.body = data.data.map((account) => convertAccount(account));
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -188,7 +195,7 @@ export function apiAccountMastodon(router: Router): void {
 					convertId(ctx.params.id, IdType.CalckeyId),
 					convertTimelinesArgsId(limitToInt(ctx.query as any)),
 				);
-				ctx.body = data.data.map(account => convertAccount(account));
+				ctx.body = data.data.map((account) => convertAccount(account));
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -205,9 +212,9 @@ export function apiAccountMastodon(router: Router): void {
 			const client = getClient(BASE_URL, accessTokens);
 			try {
 				const data = await client.getAccountLists(
-					convertId(ctx.params.id, IdType.CalckeyId)
+					convertId(ctx.params.id, IdType.CalckeyId),
 				);
-				ctx.body = data.data.map(list => convertList(list));
+				ctx.body = data.data.map((list) => convertList(list));
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -340,10 +347,10 @@ export function apiAccountMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = (await client.getBookmarks(
+			const data = await client.getBookmarks(
 				convertTimelinesArgsId(limitToInt(ctx.query as any)),
-			));
-			ctx.body = data.data.map(status => convertStatus(status));
+			);
+			ctx.body = data.data.map((status) => convertStatus(status));
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -356,8 +363,10 @@ export function apiAccountMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.getFavourites(convertTimelinesArgsId(limitToInt(ctx.query as any)));
-			ctx.body = data.data.map(status => convertStatus(status));
+			const data = await client.getFavourites(
+				convertTimelinesArgsId(limitToInt(ctx.query as any)),
+			);
+			ctx.body = data.data.map((status) => convertStatus(status));
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -370,8 +379,10 @@ export function apiAccountMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.getMutes(convertTimelinesArgsId(limitToInt(ctx.query as any)));
-			ctx.body = data.data.map(account => convertAccount(account));
+			const data = await client.getMutes(
+				convertTimelinesArgsId(limitToInt(ctx.query as any)),
+			);
+			ctx.body = data.data.map((account) => convertAccount(account));
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -384,8 +395,10 @@ export function apiAccountMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.getBlocks(convertTimelinesArgsId(limitToInt(ctx.query as any)));
-			ctx.body = data.data.map(account => convertAccount(account));
+			const data = await client.getBlocks(
+				convertTimelinesArgsId(limitToInt(ctx.query as any)),
+			);
+			ctx.body = data.data.map((account) => convertAccount(account));
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -401,7 +414,7 @@ export function apiAccountMastodon(router: Router): void {
 			const data = await client.getFollowRequests(
 				((ctx.query as any) || { limit: 20 }).limit,
 			);
-			ctx.body = data.data.map(account => convertAccount(account));
+			ctx.body = data.data.map((account) => convertAccount(account));
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
diff --git a/packages/backend/src/server/api/mastodon/endpoints/filter.ts b/packages/backend/src/server/api/mastodon/endpoints/filter.ts
index 7343fc337..c99031b0c 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/filter.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/filter.ts
@@ -12,7 +12,7 @@ export function apiFilterMastodon(router: Router): void {
 		const body: any = ctx.request.body;
 		try {
 			const data = await client.getFilters();
-			ctx.body = data.data.map(filter => convertFilter(filter));
+			ctx.body = data.data.map((filter) => convertFilter(filter));
 		} catch (e: any) {
 			console.error(e);
 			ctx.status = 401;
@@ -27,7 +27,7 @@ export function apiFilterMastodon(router: Router): void {
 		const body: any = ctx.request.body;
 		try {
 			const data = await client.getFilter(
-				convertId(ctx.params.id, IdType.CalckeyId)
+				convertId(ctx.params.id, IdType.CalckeyId),
 			);
 			ctx.body = convertFilter(data.data);
 		} catch (e: any) {
@@ -78,7 +78,7 @@ export function apiFilterMastodon(router: Router): void {
 		const body: any = ctx.request.body;
 		try {
 			const data = await client.deleteFilter(
-				convertId(ctx.params.id, IdType.CalckeyId)
+				convertId(ctx.params.id, IdType.CalckeyId),
 			);
 			ctx.body = data.data;
 		} catch (e: any) {
diff --git a/packages/backend/src/server/api/mastodon/endpoints/notifications.ts b/packages/backend/src/server/api/mastodon/endpoints/notifications.ts
index 868377b78..ac091855f 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/notifications.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/notifications.ts
@@ -17,7 +17,9 @@ export function apiNotificationsMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		const body: any = ctx.request.body;
 		try {
-			const data = await client.getNotifications(convertTimelinesArgsId(toLimitToInt(ctx.query)));
+			const data = await client.getNotifications(
+				convertTimelinesArgsId(toLimitToInt(ctx.query)),
+			);
 			const notfs = data.data;
 			const ret = notfs.map((n) => {
 				n = convertNotification(n);
@@ -47,7 +49,7 @@ export function apiNotificationsMastodon(router: Router): void {
 		const body: any = ctx.request.body;
 		try {
 			const dataRaw = await client.getNotification(
-				convertId(ctx.params.id, IdType.CalckeyId)
+				convertId(ctx.params.id, IdType.CalckeyId),
 			);
 			const data = convertNotification(dataRaw.data);
 			if (data.type !== "follow" && data.type !== "follow_request") {
@@ -85,7 +87,7 @@ export function apiNotificationsMastodon(router: Router): void {
 		const body: any = ctx.request.body;
 		try {
 			const data = await client.dismissNotification(
-				convertId(ctx.params.id, IdType.CalckeyId)
+				convertId(ctx.params.id, IdType.CalckeyId),
 			);
 			ctx.body = data.data;
 		} catch (e: any) {
diff --git a/packages/backend/src/server/api/mastodon/endpoints/search.ts b/packages/backend/src/server/api/mastodon/endpoints/search.ts
index 98349cfd2..e1aec3488 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/search.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/search.ts
@@ -32,14 +32,16 @@ export function apiSearchMastodon(router: Router): void {
 			const type = query.type;
 			if (type) {
 				const data = await client.search(query.q, type, query);
-				ctx.body = data.data.accounts.map(account => convertAccount(account));
+				ctx.body = data.data.accounts.map((account) => convertAccount(account));
 			} else {
 				const acct = await client.search(query.q, "accounts", query);
 				const stat = await client.search(query.q, "statuses", query);
 				const tags = await client.search(query.q, "hashtags", query);
 				ctx.body = {
-					accounts: acct.data.accounts.map(account => convertAccount(account)),
-					statuses: stat.data.statuses.map(status => convertStatus(status)),
+					accounts: acct.data.accounts.map((account) =>
+						convertAccount(account),
+					),
+					statuses: stat.data.statuses.map((status) => convertStatus(status)),
 					hashtags: tags.data.hashtags,
 				};
 			}
@@ -58,7 +60,7 @@ export function apiSearchMastodon(router: Router): void {
 				ctx.request.hostname,
 				accessTokens,
 			);
-			ctx.body = data.map(status => convertStatus(status));
+			ctx.body = data.map((status) => convertStatus(status));
 		} catch (e: any) {
 			console.error(e);
 			ctx.status = 401;
@@ -76,7 +78,7 @@ export function apiSearchMastodon(router: Router): void {
 				accessTokens,
 				query.limit || 20,
 			);
-			data = data.map(suggestion => {
+			data = data.map((suggestion) => {
 				suggestion.account = convertAccount(suggestion.account);
 				return suggestion;
 			});
diff --git a/packages/backend/src/server/api/mastodon/endpoints/status.ts b/packages/backend/src/server/api/mastodon/endpoints/status.ts
index 27b30d113..a479140e0 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/status.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/status.ts
@@ -6,7 +6,12 @@ import querystring from "node:querystring";
 import qs from "qs";
 import { convertTimelinesArgsId, limitToInt } from "./timeline.js";
 import { convertId, IdType } from "../../index.js";
-import { convertAccount, convertAttachment, convertPoll, convertStatus } from "../converters.js";
+import {
+	convertAccount,
+	convertAttachment,
+	convertPoll,
+	convertStatus,
+} from "../converters.js";
 
 function normalizeQuery(data: any) {
 	const str = querystring.stringify(data);
@@ -86,7 +91,7 @@ export function apiStatusMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		try {
 			const data = await client.deleteStatus(
-				convertId(ctx.params.id, IdType.CalckeyId)
+				convertId(ctx.params.id, IdType.CalckeyId),
 			);
 			ctx.body = data.data;
 		} catch (e: any) {
@@ -134,8 +139,12 @@ export function apiStatusMastodon(router: Router): void {
 						text,
 					),
 				);
-				data.data.ancestors = data.data.ancestors.map(status => convertStatus(status));
-				data.data.descendants = data.data.descendants.map(status => convertStatus(status));
+				data.data.ancestors = data.data.ancestors.map((status) =>
+					convertStatus(status),
+				);
+				data.data.descendants = data.data.descendants.map((status) =>
+					convertStatus(status),
+				);
 				ctx.body = data.data;
 			} catch (e: any) {
 				console.error(e);
@@ -152,9 +161,9 @@ export function apiStatusMastodon(router: Router): void {
 			const client = getClient(BASE_URL, accessTokens);
 			try {
 				const data = await client.getStatusRebloggedBy(
-					convertId(ctx.params.id, IdType.CalckeyId)
+					convertId(ctx.params.id, IdType.CalckeyId),
 				);
-				ctx.body = data.data.map(account => convertAccount(account));
+				ctx.body = data.data.map((account) => convertAccount(account));
 			} catch (e: any) {
 				console.error(e);
 				ctx.status = 401;
@@ -200,7 +209,7 @@ export function apiStatusMastodon(router: Router): void {
 			try {
 				const data = await client.deleteEmojiReaction(
 					convertId(ctx.params.id, IdType.CalckeyId),
-					react
+					react,
 				);
 				ctx.body = convertStatus(data.data);
 			} catch (e: any) {
@@ -219,7 +228,7 @@ export function apiStatusMastodon(router: Router): void {
 			const client = getClient(BASE_URL, accessTokens);
 			try {
 				const data = await client.reblogStatus(
-					convertId(ctx.params.id, IdType.CalckeyId)
+					convertId(ctx.params.id, IdType.CalckeyId),
 				);
 				ctx.body = convertStatus(data.data);
 			} catch (e: any) {
@@ -238,7 +247,7 @@ export function apiStatusMastodon(router: Router): void {
 			const client = getClient(BASE_URL, accessTokens);
 			try {
 				const data = await client.unreblogStatus(
-					convertId(ctx.params.id, IdType.CalckeyId)
+					convertId(ctx.params.id, IdType.CalckeyId),
 				);
 				ctx.body = convertStatus(data.data);
 			} catch (e: any) {
@@ -257,7 +266,7 @@ export function apiStatusMastodon(router: Router): void {
 			const client = getClient(BASE_URL, accessTokens);
 			try {
 				const data = await client.bookmarkStatus(
-					convertId(ctx.params.id, IdType.CalckeyId)
+					convertId(ctx.params.id, IdType.CalckeyId),
 				);
 				ctx.body = convertStatus(data.data);
 			} catch (e: any) {
@@ -276,7 +285,7 @@ export function apiStatusMastodon(router: Router): void {
 			const client = getClient(BASE_URL, accessTokens);
 			try {
 				const data = await client.unbookmarkStatus(
-					convertId(ctx.params.id, IdType.CalckeyId)
+					convertId(ctx.params.id, IdType.CalckeyId),
 				);
 				ctx.body = convertStatus(data.data);
 			} catch (e: any) {
@@ -295,7 +304,7 @@ export function apiStatusMastodon(router: Router): void {
 			const client = getClient(BASE_URL, accessTokens);
 			try {
 				const data = await client.pinStatus(
-					convertId(ctx.params.id, IdType.CalckeyId)
+					convertId(ctx.params.id, IdType.CalckeyId),
 				);
 				ctx.body = convertStatus(data.data);
 			} catch (e: any) {
@@ -314,7 +323,7 @@ export function apiStatusMastodon(router: Router): void {
 			const client = getClient(BASE_URL, accessTokens);
 			try {
 				const data = await client.unpinStatus(
-					convertId(ctx.params.id, IdType.CalckeyId)
+					convertId(ctx.params.id, IdType.CalckeyId),
 				);
 				ctx.body = convertStatus(data.data);
 			} catch (e: any) {
@@ -330,7 +339,7 @@ export function apiStatusMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		try {
 			const data = await client.getMedia(
-				convertId(ctx.params.id, IdType.CalckeyId)
+				convertId(ctx.params.id, IdType.CalckeyId),
 			);
 			ctx.body = convertAttachment(data.data);
 		} catch (e: any) {
@@ -361,7 +370,7 @@ export function apiStatusMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		try {
 			const data = await client.getPoll(
-				convertId(ctx.params.id, IdType.CalckeyId)
+				convertId(ctx.params.id, IdType.CalckeyId),
 			);
 			ctx.body = convertPoll(data.data);
 		} catch (e: any) {
diff --git a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
index 268c6a161..b8ef0929e 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
@@ -109,9 +109,13 @@ export function apiTimelineMastodon(router: Router): void {
 		try {
 			const query: any = ctx.query;
 			const data = query.local
-				? await client.getLocalTimeline(convertTimelinesArgsId(argsToBools(limitToInt(query))))
-				: await client.getPublicTimeline(convertTimelinesArgsId(argsToBools(limitToInt(query))));
-			let resp = data.data.map(status => convertStatus(status));
+				? await client.getLocalTimeline(
+						convertTimelinesArgsId(argsToBools(limitToInt(query))),
+				  )
+				: await client.getPublicTimeline(
+						convertTimelinesArgsId(argsToBools(limitToInt(query))),
+				  );
+			let resp = data.data.map((status) => convertStatus(status));
 			ctx.body = toTextWithReaction(resp, ctx.hostname);
 		} catch (e: any) {
 			console.error(e);
@@ -131,7 +135,7 @@ export function apiTimelineMastodon(router: Router): void {
 					ctx.params.hashtag,
 					convertTimelinesArgsId(argsToBools(limitToInt(ctx.query))),
 				);
-				let resp = data.data.map(status => convertStatus(status));
+				let resp = data.data.map((status) => convertStatus(status));
 				ctx.body = toTextWithReaction(resp, ctx.hostname);
 			} catch (e: any) {
 				console.error(e);
@@ -146,8 +150,10 @@ export function apiTimelineMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.getHomeTimeline(convertTimelinesArgsId(limitToInt(ctx.query)));
-			let resp = data.data.map(status => convertStatus(status));
+			const data = await client.getHomeTimeline(
+				convertTimelinesArgsId(limitToInt(ctx.query)),
+			);
+			let resp = data.data.map((status) => convertStatus(status));
 			ctx.body = toTextWithReaction(resp, ctx.hostname);
 		} catch (e: any) {
 			console.error(e);
@@ -167,7 +173,7 @@ export function apiTimelineMastodon(router: Router): void {
 					convertId(ctx.params.listId, IdType.CalckeyId),
 					convertTimelinesArgsId(limitToInt(ctx.query)),
 				);
-				let resp = data.data.map(status => convertStatus(status));
+				let resp = data.data.map((status) => convertStatus(status));
 				ctx.body = toTextWithReaction(resp, ctx.hostname);
 			} catch (e: any) {
 				console.error(e);
@@ -182,7 +188,9 @@ export function apiTimelineMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.getConversationTimeline(convertTimelinesArgsId(limitToInt(ctx.query)));
+			const data = await client.getConversationTimeline(
+				convertTimelinesArgsId(limitToInt(ctx.query)),
+			);
 			ctx.body = data.data;
 		} catch (e: any) {
 			console.error(e);
@@ -197,7 +205,7 @@ export function apiTimelineMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		try {
 			const data = await client.getLists();
-			ctx.body = data.data.map(list => convertList(list));
+			ctx.body = data.data.map((list) => convertList(list));
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -247,7 +255,7 @@ export function apiTimelineMastodon(router: Router): void {
 			try {
 				const data = await client.updateList(
 					convertId(ctx.params.id, IdType.CalckeyId),
-					(ctx.request.body as any).title
+					(ctx.request.body as any).title,
 				);
 				ctx.body = convertList(data.data);
 			} catch (e: any) {
@@ -288,7 +296,7 @@ export function apiTimelineMastodon(router: Router): void {
 					convertId(ctx.params.id, IdType.CalckeyId),
 					convertTimelinesArgsId(ctx.query as any),
 				);
-				ctx.body = data.data.map(account => convertAccount(account));
+				ctx.body = data.data.map((account) => convertAccount(account));
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -306,7 +314,9 @@ export function apiTimelineMastodon(router: Router): void {
 			try {
 				const data = await client.addAccountsToList(
 					convertId(ctx.params.id, IdType.CalckeyId),
-					(ctx.query.account_ids as string[]).map(id => convertId(id, IdType.CalckeyId)),
+					(ctx.query.account_ids as string[]).map((id) =>
+						convertId(id, IdType.CalckeyId),
+					),
 				);
 				ctx.body = data.data;
 			} catch (e: any) {
@@ -326,7 +336,9 @@ export function apiTimelineMastodon(router: Router): void {
 			try {
 				const data = await client.deleteAccountsFromList(
 					convertId(ctx.params.id, IdType.CalckeyId),
-					(ctx.query.account_ids as string[]).map(id => convertId(id, IdType.CalckeyId)),
+					(ctx.query.account_ids as string[]).map((id) =>
+						convertId(id, IdType.CalckeyId),
+					),
 				);
 				ctx.body = data.data;
 			} catch (e: any) {
diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts
index 270026dcc..f1e0ed692 100644
--- a/packages/backend/src/server/web/index.ts
+++ b/packages/backend/src/server/web/index.ts
@@ -402,8 +402,10 @@ router.get("/notes/:note", async (ctx, next) => {
 	try {
 		if (note) {
 			const _note = await Notes.pack(note);
-			
-			const profile = await UserProfiles.findOneByOrFail({ userId: note.userId });
+
+			const profile = await UserProfiles.findOneByOrFail({
+				userId: note.userId,
+			});
 			const meta = await fetchMeta();
 			await ctx.render("note", {
 				note: _note,
diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index 1e8d363d8..60d5dee2f 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -462,18 +462,23 @@ if (
 	props.reply &&
 	["home", "followers", "specified"].includes(props.reply.visibility)
 ) {
-        if (props.reply.visibility === 'home' && visibility === 'followers') {
-		visibility = 'followers';
-	} else if (['home', 'followers'].includes(props.reply.visibility) && visibility === 'specified') {
-		visibility = 'specified';
+	if (props.reply.visibility === "home" && visibility === "followers") {
+		visibility = "followers";
+	} else if (
+		["home", "followers"].includes(props.reply.visibility) &&
+		visibility === "specified"
+	) {
+		visibility = "specified";
 	} else {
 		visibility = props.reply.visibility;
 	}
-	if (visibility === 'specified') {
+	if (visibility === "specified") {
 		if (props.reply.visibleUserIds) {
-			os.api('users/show', {
-				userIds: props.reply.visibleUserIds.filter(uid => uid !== $i.id && uid !== props.reply.userId),
-			}).then(users => {
+			os.api("users/show", {
+				userIds: props.reply.visibleUserIds.filter(
+					(uid) => uid !== $i.id && uid !== props.reply.userId
+				),
+			}).then((users) => {
 				users.forEach(pushVisibleUser);
 			});
 		}
diff --git a/packages/client/src/components/MkShowMoreButton.vue b/packages/client/src/components/MkShowMoreButton.vue
index 3516d6f43..3e91d03fe 100644
--- a/packages/client/src/components/MkShowMoreButton.vue
+++ b/packages/client/src/components/MkShowMoreButton.vue
@@ -1,16 +1,8 @@
 <template>
-	<button
-		v-if="modelValue"
-		class="fade _button"
-		@click.stop="toggle"
-	>
+	<button v-if="modelValue" class="fade _button" @click.stop="toggle">
 		<span>{{ i18n.ts.showMore }}</span>
 	</button>
-	<button
-		v-if="!modelValue"
-		class="showLess _button"
-		@click.stop="toggle"
-	>
+	<button v-if="!modelValue" class="showLess _button" @click.stop="toggle">
 		<span>{{ i18n.ts.showLess }}</span>
 	</button>
 </template>
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 1d505682b..0f4422ee1 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -115,7 +115,10 @@
 					v-on:focus="cwButton?.focus()"
 				></div>
 			</div>
-			<XShowMoreButton v-if="isLong" v-model="collapsed"></XShowMoreButton>
+			<XShowMoreButton
+				v-if="isLong"
+				v-model="collapsed"
+			></XShowMoreButton>
 			<XCwButton v-if="note.cw" v-model="showContent" :note="note" />
 		</div>
 	</div>
diff --git a/packages/client/src/components/MkUserPreview.vue b/packages/client/src/components/MkUserPreview.vue
index 806ec8880..b154e529e 100644
--- a/packages/client/src/components/MkUserPreview.vue
+++ b/packages/client/src/components/MkUserPreview.vue
@@ -58,7 +58,10 @@
 						:custom-emojis="user.emojis"
 					/>
 				</div>
-				<XShowMoreButton v-if="isLong" v-model="collapsed"></XShowMoreButton>
+				<XShowMoreButton
+					v-if="isLong"
+					v-model="collapsed"
+				></XShowMoreButton>
 				<div v-if="user.fields.length > 0" class="fields">
 					<dl
 						v-for="(field, i) in user.fields"
diff --git a/packages/client/src/directives/focus.ts b/packages/client/src/directives/focus.ts
index 4d34fbf1f..36b2c2d71 100644
--- a/packages/client/src/directives/focus.ts
+++ b/packages/client/src/directives/focus.ts
@@ -1,3 +1,3 @@
 export default {
-	mounted: (el) => el.focus()
-}
+	mounted: (el) => el.focus(),
+};
diff --git a/packages/client/src/directives/tooltip.ts b/packages/client/src/directives/tooltip.ts
index 91024a6e3..4b495cf66 100644
--- a/packages/client/src/directives/tooltip.ts
+++ b/packages/client/src/directives/tooltip.ts
@@ -87,23 +87,11 @@ export default {
 			self.hideTimer = window.setTimeout(self.close, delay);
 		}
 
-		el.addEventListener(
-			start, showTooltip,
-			{ passive: true },
-		);
-		el.addEventListener(
-			"focusin", showTooltip,
-			{ passive: true },
-		);
+		el.addEventListener(start, showTooltip, { passive: true });
+		el.addEventListener("focusin", showTooltip, { passive: true });
 
-		el.addEventListener(
-			end, hideTooltip,
-			{ passive: true },
-		);
-		el.addEventListener(
-			"focusout", hideTooltip,
-			{ passive: true },
-		);
+		el.addEventListener(end, hideTooltip, { passive: true });
+		el.addEventListener("focusout", hideTooltip, { passive: true });
 
 		el.addEventListener("click", () => {
 			window.clearTimeout(self.showTimer);

From 30fd6c31389b8a108524a71d0e1095dd36258e6b Mon Sep 17 00:00:00 2001
From: jolupa <jolupameister@gmail.com>
Date: Mon, 1 May 2023 23:24:37 +0000
Subject: [PATCH 88/90] chore: Translated using Weblate (Catalan)

Currently translated at 100.0% (1739 of 1739 strings)

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

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index 2a72376de..49069a8f2 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -65,8 +65,8 @@ import: "Importar"
 export: "Exportar"
 files: "Fitxers"
 download: "Descarregar"
-driveFileDeleteConfirm: "Estàs segur que vols suprimir el fitxer \"{name}\"? Les publicacions\
-  \ associades a aquest fitxer adjunt també es suprimiran."
+driveFileDeleteConfirm: "Estàs segur que vols esborrar el fitxer \"{nom}\"? S'eliminarà\
+  \ de totes les notes que el continguin com a fitxer adjunt."
 unfollowConfirm: "Estàs segur que vols deixar de seguir {name}?"
 exportRequested: "Has sol·licitat una exportació. Això pot trigar una estona. S'afegirà\
   \ al teu Disc un cop completada."
@@ -214,36 +214,193 @@ _mfm:
   searchDescription: Mostra un quadre de cerca amb el text introduït prèviament.
   flip: Capgirar
   flipDescription: Capgira el contingut horitzontalment o verticalment.
+  plainDescription: Desactiva els efectes de tots els MFM continguts en aquest efecte
+    MFM.
+  scale: Escala
+  foreground: Color de primer pla
+  background: Color de fons
+  backgroundDescription: Canvia el color de fons del text.
+  scaleDescription: Escala el contingut en una quantitat especificada.
+  foregroundDescription: Canvia el color de primer pla del text.
+  plain: Pla
 _theme:
   keys:
     mention: "Menció"
     renote: "Impulsar"
+    fg: Text
+    navBg: Fons de la barra lateral
+    navFg: Text de la barra lateral
+    navHoverFg: Text de la barra lateral (Hover)
+    hashtag: Etiquetes
+    mentionMe: Mencions (Jo)
+    infoBg: Fons de l'informació
+    infoFg: Text informatiu
+    toastBg: Fons de notificació
+    listItemHoverBg: Fons de la llista d'elements (Hover)
+    driveFolderBg: Fons de la carpeta Disc
+    wallpaperOverlay: Superposició de fons de pantalla
+    badge: Distintiu
+    accentLighten: Accent (Lluminós)
+    accentDarken: Accent (enfosquit)
+    fgHighlighted: Text ressaltat
+    indicator: Indicador
+    focus: Centrar-se
+    panel: Panell
+    navIndicator: Indicador de la barra lateral
+    accent: Accent
+    header: Encapçalament
+    navActive: Text de la barra lateral (Active)
+    link: Enllaç
+    modalBg: Fons del modal
+    divider: Divisor
+    scrollbarHandle: Mànec de la barra de desplaçament
+    scrollbarHandleHover: Mànec de la barra de desplaçament (Hover)
+    dateLabelFg: Text de l'etiqueta de data
+    infoWarnBg: Fons d'advertència
+    cwBg: Fons del botó CW
+    cwFg: Text del botó CW
+    messageBg: Fons del xat
+    infoWarnFg: Text d'advertència
+    bg: Fons
+    shadow: Ombra
+    cwHoverBg: Fons del botó CW (Hover)
+    toastFg: Text de notificació
+    buttonHoverBg: Fons del botó (Hover)
+    inputBorder: Vora del camp d'entrada
+    buttonBg: Fons del botó
+  description: Descripció
+  installed: "{name} s'ha instal·lat"
+  installedThemes: Temes instal·lats
+  builtinThemes: Temes integrats
+  alreadyInstalled: Aquest tema ja està instal·lat
+  invalid: El format d'aquest tema no és vàlid
+  make: Fes un tema
+  defaultValue: 'Per defecte: {value}'
+  color: Color
+  refProp: Fes referència a una propietat
+  refConst: Fes referència a una constant
+  key: Clau
+  func: Funcions
+  funcKind: Tipus de funció
+  argument: Argument
+  basedProp: Propietat de referència
+  importInfo: Si introdueixes el codi de tema aquí, podeu importar-lo a l'editor de
+    temes
+  inputConstantName: Introdueix un nom per a aquesta constant
+  addConstant: Afegir una constant
+  code: Codi del tema
+  alpha: Opacitat
+  deleteConstantConfirm: De debò vols esborrar la constant {const}?
+  manage: Gestionar temes
+  explore: Explora Temes
+  darken: Enfosquir
+  base: Fundament
+  constant: Constant
+  lighten: Clar
+  install: Instal·lar un tema
 _sfx:
   note: "Posts"
   notification: "Notificacions"
+  antenna: Antenes
+  channel: Notificacions del canal
+  noteMy: Nota propia
+  chat: Xat
+  chatBg: Fons del xat
 _2fa:
   step2Url: "També pots inserir aquest enllaç i utilitzes una aplicació d'escriptori:"
+  alreadyRegistered: Ja heu registrat un dispositiu d'autenticació de dos factors.
+  registerDevice: Registrar un dispositiu nou
+  securityKeyInfo: A més de l'autenticació d'empremta digital o PIN, també podeu configurar
+    l'autenticació mitjançant claus de seguretat de maquinari compatibles amb FIDO2
+    per protegir encara més el vostre compte.
+  step4: A partir d'ara, qualsevol intent d'inici de sessió futur demanarà aquest
+    token d'inici de sessió.
+  registerKey: Registra una clau de seguretat
+  step1: En primer lloc, instal·la una aplicació d'autenticació (com ara {a} o {b})
+    al dispositiu.
+  step2: A continuació, escaneja el codi QR que es mostra en aquesta pantalla.
+  step3: Introdueix el token que t'ha proporcionat l'aplicació per finalitzar la configuració.
 _widgets:
   notifications: "Notificacions"
   timeline: "Línia de temps"
+  unixClock: Rellotge UNIX
+  federation: Federació
+  instanceCloud: Núvol d'instàncies
+  trends: Tendència
+  clock: Rellotge
+  calendar: Calendari
+  activity: Activitat
+  photos: Fotos
+  rssTicker: Ticker RSS
+  onlineUsers: Usuaris en línia
+  memo: Notes adhesives
+  digitalClock: Rellotge digital
+  postForm: Formulari de notes
+  slideshow: Presentació de diapositives
+  serverMetric: Mètriques del servidor
+  userList: Llista d'usuaris
+  rss: Lector d'RSS
+  jobQueue: Cua de treball
+  _userList:
+    chooseList: Selecciona una llista
+  aiscript: Consola AiScript
+  button: Botó
 _cw:
   show: "Carregar més"
+  files: '{count} fitxers'
+  hide: Amaga
+  chars: '{count} caràcters'
 _visibility:
   followers: "Seguidors"
+  publicDescription: La teva nota serà visible per a tots els usuaris
+  localOnly: Només Local
+  specified: Directe
+  home: Sense llistar
+  homeDescription: Publica només a la línea de temps local
+  followersDescription: Fes visible només per als teus seguidors
+  specifiedDescription: Fer visible només per a usuaris determinats
+  public: Públic
+  localOnlyDescription: No és visible per als usuaris remots
 _profile:
   username: "Nom d'usuari"
+  metadataEdit: Editar informació addicional
+  youCanIncludeHashtags: També pots incloure etiquetes al teu perfil.
+  metadata: Informació adicional
+  description: Perfil
+  metadataLabel: Etiqueta
+  metadataContent: Contingut
+  changeAvatar: Canvia l'avatar
+  changeBanner: Canvia el banner
+  locationDescription: Si primer introduïu la vostra ciutat, es mostrarà l'hora local
+    a altres usuaris.
+  name: Nom
+  metadataDescription: Fent servir això, podràs mostrar camps d'informació addicionals
+    al vostre perfil.
 _exportOrImport:
   followingList: "Seguint"
   muteList: "Silencia"
   blockingList: "Bloqueja"
   userLists: "Llistes"
+  excludeMutingUsers: Exclou els usuaris silenciats
+  allNotes: Totes les notes
+  excludeInactiveUsers: Exclou usuaris inactius
 _pages:
   script:
     categories:
       list: "Llistes"
+      flow: Control de flux
+      random: Aleatori
+      value: Valors
+      fn: Funcions
+      text: Operacions de text
+      convert: Transformacions
+      logical: Operació lògica
+      operation: Càlcul
+      comparison: Comparació
     blocks:
       _join:
         arg1: "Llistes"
+        arg2: Separador
       _randomPick:
         arg1: "Llistes"
       _dailyRandomPick:
@@ -253,6 +410,7 @@ _pages:
         arg1: Llavor
       _pick:
         arg1: "Llistes"
+        arg2: Posició
       _listLen:
         arg1: "Llistes"
       add: Afegir
@@ -345,8 +503,179 @@ _pages:
         arg2: Probabilitat
       seedRandomPick: Tria aleatòriament de la llista (amb llavor)
       multiply: Multiplicar
+      text: Text
+      _strPick:
+        arg1: Text
+        arg2: Ubicació de la cadena
+      strPick: Extreure cadena
+      strReplace: Cadena de substitució
+      _strReplace:
+        arg1: Text
+        arg3: Substitueix per
+        arg2: Text a substituir
+      strReverse: Voltejar text
+      _strReverse:
+        arg1: Text
+      join: Concatenació de textos
+      pick: Selecciona de la llista
+      listLen: Obtenir la longitud de la llista
+      stringToNumber: Text a número
+      number: Número
+      _stringToNumber:
+        arg1: Text
+      splitStrByLine: Dividir el text per salts de línia
+      _fn:
+        slots: Ranures
+        slots-info: Separa cada ranura amb un salt de línia
+        arg1: Sortida
+      aiScriptVar: Variable AiScript
+      fn: Funció
+      for: Repetir
+      _numberToString:
+        arg1: Número
+      _DRPWPM:
+        arg1: Llista de text
+      numberToString: Número a text
+      _splitStrByLine:
+        arg1: Text
+      ref: Variable
+      DRPWPM: Tria aleatòriament d'una llista ponderada (Canvis un cop al dia per
+        a cada usuari)
+      _for:
+        arg1: Nombre de vegades a repetir
+        arg2: Acció
+      strLen: Longitud del text
+      multiLineText: Text (multilínia)
+      _strLen:
+        arg1: Text
+      textList: Llista de text
+      _textList:
+        info: Separa cada ranura amb un salt de línia
     types:
       array: "Llistes"
+      stringArray: Llista de text
+      boolean: Bandera
+      string: Text
+      number: Número
+    emptySlot: Ranura buida
+    enviromentVariables: Variables d'entorn
+    pageVariables: Variables de pàgina
+    argVariables: Ranures d'entrada
+    thereIsEmptySlot: L'espai {slot} està buit!
+    typeError: L'espai {slot} accepta valors del tipus "{expect}", però el valor proporcionat
+      és del tipus "{actual}"!
+  newPage: Crea una pàgina nova
+  editPage: Edita aquesta pàgina
+  readPage: S'està veient la font d'aquesta pàgina
+  created: Pàgina creada correctament
+  updated: Pàgina editada correctament
+  invalidNameText: Assegurat que el títol de la pàgina no estigui buit
+  editThisPage: Edita aquesta pàgina
+  deleted: Pàgina suprimida correctament
+  pageSetting: Configuració de la pàgina
+  nameAlreadyExists: L'URL de la pàgina especificat ja existeix
+  invalidNameTitle: L'URL de la pàgina especificat no és vàlid
+  viewPage: Consulta la teva pàgina
+  like: M'agrada
+  viewSource: Veure la font
+  summary: Resum de la pàgina
+  alignCenter: Centrar elements
+  hideTitleWhenPinned: Amaga el títol de la pàgina quan estigui fixat al perfil
+  font: Tipus de lletra
+  fontSerif: Serif
+  fontSansSerif: Sans Serif
+  eyeCatchingImageSet: Estableix una miniatura
+  eyeCatchingImageRemove: Suprimeix la miniatura
+  chooseBlock: Afegeix un bloc
+  selectType: Selecciona un tipus
+  enterVariableName: Introduïu un nom de variable
+  blocks:
+    section: Secció
+    text: Text
+    textarea: Àrea de text
+    image: Imatges
+    if: Si
+    _if:
+      variable: Variable
+    post: Formulari de notes
+    _post:
+      text: Contingut
+      attachCanvasImage: Adjuntar imatge de llenç
+      canvasId: ID del llenç
+    _textInput:
+      name: Nom de la variable
+      text: Títol
+      default: Valor per defecte
+    textInput: Entrada de text
+    _textareaInput:
+      name: Nom de la variable
+      text: Títol
+      default: Valor per defecte
+    textareaInput: Entrada de text multilínia
+    numberInput: Entrada numèrica
+    _note:
+      id: ID de la nota
+      idDescription: També podeu enganxar l'URL de la nota aquí.
+      detailed: Vista detallada
+    switch: Canviar
+    canvas: Llenç
+    _canvas:
+      id: Identificador de llenç
+      width: Amplada
+      height: Alçada
+    note: Nota incrustada
+    _counter:
+      name: Nom de la variable
+      text: Títol
+      inc: Pas
+    _button:
+      text: Títol
+      colored: De colors
+      action: Comportament quan es prem el botó
+      _action:
+        _dialog:
+          content: Contingut
+        resetRandom: Restableix la llavor aleatòria
+        pushEvent: Envia un esdeveniment
+        _pushEvent:
+          event: Nom de l'esdeveniment
+          message: Missatge que s'ha de mostrar quan s'activa
+          variable: Variable per enviar
+          no-variable: Cap
+        dialog: Mostra un diàleg
+        callAiScript: Invoca AiScript
+        _callAiScript:
+          functionName: Nom de la funció
+    _switch:
+      default: Valor per defecte
+      name: Nom de la variable
+      text: Títol
+    counter: Comptador
+    _numberInput:
+      name: Nom de la variable
+      text: Títol
+      default: Valor per defecte
+    button: Botó
+    _radioButton:
+      name: Nom de la variable
+      title: Títol
+      values: Llista d'opcions separades per salts de línia
+      default: Valor per defecte
+    radioButton: Elecció
+  variableNameIsAlreadyUsed: Aquest nom de variable ja està en ús
+  contentBlocks: Contingut
+  inputBlocks: Entrada
+  specialBlocks: Especial
+  variables: Variables
+  title: Títol
+  url: URL de la pàgina
+  unlike: Elimina m'agrada
+  my: Les meves pàgines
+  liked: Pàgines que m'han agradat
+  content: Bloc de pàgines
+  featured: Popular
+  inspector: Inspector
+  contents: Contingut
 _notification:
   youWereFollowed: "t'ha seguit"
   _types:
@@ -355,15 +684,61 @@ _notification:
     renote: "Impulsos"
     quote: "Citar"
     reaction: "Reaccions"
+    all: Tots
+    reply: Respostes
+    pollEnded: S'acaben les enquestes
+    receiveFollowRequest: S'han rebut peticions de seguiment
+    followRequestAccepted: Sol·licituds de seguiment acceptades
+    groupInvited: Invitacions per a grups
+    app: Notificacions d'aplicacions enllaçades
+    pollVote: Votacions a les enquestes
   _actions:
     reply: "Respondre"
     renote: "Impulsos"
+    followBack: et va seguir de tornada
+  youGotQuote: "{name} t'ha citat"
+  fileUploaded: El fitxer s'ha penjat correctament
+  youGotMention: "{nom} t'ha esmentat"
+  youGotReply: "{name} t'ha respost"
+  youRenoted: Impuls de {name}
+  youGotPoll: '{name} ha votat a la teva enquesta'
+  youGotMessagingMessageFromUser: "{name} t'ha enviat un missatge de xat"
+  youGotMessagingMessageFromGroup: S'ha enviat un missatge de xat al grup {name}
+  youReceivedFollowRequest: Has rebut una sol·licitud de seguiment
+  yourFollowRequestAccepted: S'ha acceptat la vostra sol·licitud de seguiment
+  pollEnded: Es resultat de la enquesta ja està disponible
+  emptyPushNotificationMessage: Les notificacions push s'han actualitzat
+  youWereInvitedToGroup: "{userName} t'ha convidat a un grup"
 _deck:
   _columns:
     notifications: "Notificacions"
     tl: "Línia de temps"
     list: "Llistes"
     mentions: "Mencions"
+    widgets: Ginys
+    main: Principal
+    antenna: Antenes
+    direct: Missatges directes
+  alwaysShowMainColumn: Mostra sempre la columna principal
+  columnAlign: Alinear columnes
+  introduction: Crea la interfície perfecta per a tu organitzant columnes lliurement!
+  swapRight: Canvia amb la columna de la dreta
+  swapUp: Canvia amb la columna de d'alt
+  swapDown: Canvia amb la columna de sota
+  stackLeft: Apilar amb la columna de l'esquerra
+  popRight: Treu a la dreta
+  profile: Espai de treball
+  newProfile: Nou espai de treball
+  deleteProfile: Suprimir l'espai de treball
+  introduction2: Feu clic al + a la dreta de la pantalla per afegir noves columnes
+    sempre que vulgueu.
+  widgetsIntroduction: Selecciona "Editar ginys" al menú de columnes i afegeix un
+    giny.
+  addColumn: Afegeix una columna
+  configureColumn: Configuració de columnes
+  swapLeft: Canvia amb la columna de l'esquerra
+  renameProfile: Canvia el nom de l'espai de treball
+  nameAlreadyExists: Aquest nom d'espai de treball ja existeix.
 blockConfirm: Estás segur que vols bloquejar aquest compte?
 unsuspendConfirm: Estás segur que vols treure la suspensió d'aquesta compte?
 unblockConfirm: Estás segur que vols treure el bloqueig d'aquesta compte?
@@ -577,9 +952,10 @@ blockedInstances: Instàncies Bloquejades
 blockedInstancesDescription: Llista les adreces de les instàncies que vols bloquejar.
   Les instàncies de la llista no podrán comunicarse amb aquesta instància.
 hiddenTags: Etiquetes Ocultes
-hiddenTagsDescription: 'Llista de les etiquetes (sense el #) que vulguis amagar de
-  les tendències i el explorador. Les etiquetes amagades es poden descobrir per altres
-  mitjans.'
+hiddenTagsDescription: 'Enumereu els etiquetes (sense el #) de les etiquetes que voleu
+  ocultar de tendències i explorar. Les etiquetes ocultes encara es poden descobrir
+  per altres mitjans. Les instàncies bloquejades no es veuen afectades encara que
+  s''enumeren aquí.'
 noInstances: No hi han instàncies
 defaultValueIs: 'Per defecte: {value}'
 suspended: Suspès
@@ -632,7 +1008,7 @@ pinnedClipId: ID del clip que vols fixar
 hcaptcha: hCaptcha
 manageAntennas: Gestiona les Antenes
 name: Nom
-notesAndReplies: Articles i respostes
+notesAndReplies: Notes i respostes
 silence: Posa en silenci
 withFiles: Amb fitxers
 popularUsers: Usuaris populars
@@ -939,7 +1315,7 @@ enabled: Activat
 configure: Configurar
 noBotProtectionWarning: La protecció contra bots no està configurada.
 ads: Anuncis
-ratio: Ratio
+ratio: Ràtio
 global: Global
 sent: Enviat
 received: Rebut
@@ -1422,3 +1798,244 @@ indexFrom: Índex a partir de l'identificador de notes (deixeu en blanc per inde
   cada publicació)
 indexNotice: Ara indexant. Això probablement trigarà una estona, si us plau, no reinicieu
   el servidor durant almenys una hora.
+_instanceTicker:
+  none: No mostrar mai
+  remote: Mostra per a usuaris remots
+  always: Mostra sempre
+_serverDisconnectedBehavior:
+  nothing: No fer res
+  quiet: Mostra un avís discret
+  reload: Torna a carregar automàticament
+  dialog: Mostra el diàleg d'avís
+_channel:
+  create: Crea un canal
+  edit: Edita el canal
+  setBanner: Establir bàner
+  removeBanner: Suprimeix el bàner
+  featured: Tendència
+  owned: Propietari
+  usersCount: '{n} Participants'
+  following: Seguit
+  notesCount: '{n} Notes'
+_instanceMute:
+  instanceMuteDescription: Això silenciarà les notes o els impulsos de les instàncies
+    indicades, incloses les dels usuaris que responguin a un usuari des d'una instància
+    silenciada.
+  title: Amaga les notes de les instàncies de la llista.
+  instanceMuteDescription2: Separar amb noves línies
+  heading: Llista d'instàncies que cal silenciar
+_ago:
+  future: Futur
+  justNow: Ara mateix
+  minutesAgo: Fa {n}m
+  hoursAgo: Fa {n}h
+  daysAgo: Fa {n}d
+  secondsAgo: Fa {n}s
+  weeksAgo: Fa {n}s
+  monthsAgo: Fa {n}me
+  yearsAgo: Fa {n}a
+_time:
+  second: Segon(s)
+  minute: Minut(s)
+  hour: Hora(s)
+  day: Dia(s)
+_tutorial:
+  step5_4: La línea de temps Local de {icon} és on pots veure notes de tots els altres
+    usuaris en aquesta instància.
+  step5_2: La teva instància té activades {timelines} diferents.
+  step5_3: La línia de temps d'Inici {icon} és on pots veure notes dels comptes que
+    seguiu i de tots els altres en aquest cas. Si prefereixes que la teva línia de
+    temps d'inici només mostri notes dels comptes que seguiu, podeu canviar-ho fàcilment
+    a Configuració!
+  step5_6: La línia de temps de Recomanats {icon} és on pots veure les notes de les
+    instàncies que els administradors recomanen.
+  step5_7: La línia de temps Global {icon} és on pots veure les notes de totes les
+    altres instàncies connectades.
+  step6_1: Aleshores, què és aquest lloc?
+  step6_4: Ara ves, explora i diverteix-te!
+  step1_2: Anem a fer la configuració. Estaràs en funcionament en un tres i no res!
+  title: Com utilitzar Calckey
+  step1_1: Benvingut!
+  step2_1: En primer lloc, empleneu el vostre perfil.
+  step4_1: Anem a treure't allà fora.
+  step5_5: La línea de temps Social {icon} és on només pots veure notes dels comptes
+    que segueixes.
+  step6_3: Cada servidor funciona de diferents maneres, i no tots els servidors executen
+    Calckey. Aquest sí que sí! És una mica complicat, però ho aconseguiràs en poc
+    temps.
+  step2_2: Proporcionar informació sobre qui sou facilitarà que altres puguin saber
+    si volen veure les vostres notes o seguir-vos.
+  step3_1: Ara toca seguir a algunes persones!
+  step3_2: "Les teves líneas de temps domèstiques i socials es basen en qui seguiu,\
+    \ així que proveu de seguir un parell de comptes per començar.\nFeu clic al cercle\
+    \ més situat a la part superior dreta d'un perfil per seguir-los."
+  step4_2: Per a la vostra primera nota, a algunes persones els agrada fer una nota
+    de {introduction} o un senzill "Hola món!"
+  step5_1: Línies de temps, línies de temps a tot arreu!
+  step6_2: Bé, no només t'has unit a Calckey. T'has unit a un portal al Fediverse,
+    una xarxa interconnectada de milers de servidors, anomenats "instàncies".
+_permissions:
+  "read:account": Consulta la informació del teu compte
+  "read:blocks": Consulta la teva llista d'usuaris bloquejats
+  "write:account": Editar la informació del compte
+  "read:drive": Accedir als fitxers i carpetes del Disc
+  "read:messaging": Consulta els teus xats
+  "write:following": Segueix o deixa de seguir altres comptes
+  "write:mutes": Editar la teva llista d'usuaris silenciats
+  "read:notifications": Consulta les teves notificacions
+  "write:notifications": Gestiona les teves notificacions
+  "write:user-groups": Editar o suprimir grups d'usuaris
+  "write:blocks": Editar la llista d'usuaris bloquejats
+  "write:notes": Redactar o suprimir notes
+  "write:channels": Editar els teus canals
+  "read:gallery-likes": Consulta la llista de notes de la galeria que t'agraden
+  "write:drive": Editar o suprimir fitxers i carpetes del Disc
+  "read:favorites": Consulta la teva llista d'adreces d'interès
+  "write:favorites": Editeu la teva llista d'adreces d'interès
+  "write:messaging": Escriu o suprimeix missatges de xat
+  "read:mutes": Consulta la teva llista d'usuaris silenciats
+  "write:reactions": Edita les teves reaccions
+  "write:votes": Vota en una enquesta
+  "write:pages": Editeu o suprimeix la teva pàgina
+  "write:page-likes": Editar les pàgines que t'agraden
+  "read:user-groups": Consulta els teus grups d'usuaris
+  "read:channels": Consulta els teus canals
+  "read:gallery": Consulta la teva galeria
+  "write:gallery": Edita la teva galeria
+  "write:gallery-likes": Edita la llista de notes de la galeria que t'agraden
+  "read:following": Consulta la informació sobre a qui segueixes
+  "read:reactions": Consulta les teves reaccions
+  "read:pages": Consulta la teva pàgina
+  "read:page-likes": Veure les pàgines que t'agraden
+_poll:
+  noOnlyOneChoice: Calen almenys dues opcions
+  canMultipleVote: Permet seleccionar diverses opcions
+  expiration: Finalitzar l'enquesta
+  after: Acaba després...
+  duration: Durada
+  votesCount: '{n} vots'
+  totalVotes: '{n} vots en total'
+  showResult: Veure resultats
+  choiceN: Opció {n}
+  noMore: No es poden afegir més opcions
+  infinite: Mai
+  at: Acaba el...
+  deadlineDate: Data de finalització
+  deadlineTime: Temps
+  remainingHours: Queden {h} hora(s) {m} minut(s)
+  remainingDays: Queden {d} dia(s) {h} hores
+  remainingMinutes: Queden {m} minut(s) {s} segons
+  voted: Votat
+  closed: S'ha acabat
+  remainingSeconds: Queden {s} segons
+  vote: Vota
+_postForm:
+  _placeholders:
+    d: Què vols dir?
+    e: Comença a escriure...
+    f: Esperant que escriguis...
+    b: Què passa al teu voltant?
+    c: En què penses?
+    a: Què et portes entre mans?
+  quotePlaceholder: Cita aquesta nota...
+  replyPlaceholder: Respon a aquesta nota...
+  channelPlaceholder: Publica en un canal...
+_charts:
+  federation: Federació
+  usersIncDec: Diferència en el nombre d'usuaris
+  apRequest: Sol·licituds
+  usersTotal: Nombre total d'usuaris
+  activeUsers: Usuaris actius
+  notesIncDec: Diferència en el nombre de notes
+  localNotesIncDec: Diferència en el nombre de notes locals
+  remoteNotesIncDec: Diferència en el nombre de notes remotes
+  notesTotal: Nombre total de notes
+  filesIncDec: Diferència en el nombre de fitxers
+  filesTotal: Nombre total de fitxers
+  storageUsageTotal: Ús total d'emmagatzematge
+  storageUsageIncDec: Diferència en l'ús d'emmagatzematge
+_instanceCharts:
+  requests: Sol·licituds
+  users: Diferència en el nombre d'usuaris
+  usersTotal: Nombre acumulat d'usuaris
+  notes: Diferència en el nombre de notes
+  ffTotal: Nombre acumulat d'usuaris seguits/seguidors seguits
+  cacheSize: Diferència en la mida de la memòria cau
+  cacheSizeTotal: Mida total acumulada de la memòria cau
+  files: Diferència en el nombre de fitxers
+  filesTotal: Nombre acumulat de fitxers
+  notesTotal: Nombre acumulat de notes
+  ff: "Diferència en el nombre d'usuaris seguits/seguidors seguits "
+_timelines:
+  home: Inici
+  local: Local
+  recommended: Recomanat
+  social: Social
+  global: Global
+_menuDisplay:
+  hide: Amagar
+  top: Superior
+  sideFull: Costat
+  sideIcon: Costat (Icones)
+_wordMute:
+  muteWords: Paraules silenciades
+  muteWordsDescription: Separeu amb espais per a una condició AND o amb salts de línia
+    per a una condició OR.
+  soft: Suau
+  hard: Dur
+  muteWordsDescription2: Envolta les paraules clau amb barres inclinades per utilitzar
+    expressions regulars.
+  softDescription: Amaga les publicacions que compleixen les condicions establertes
+    de la línia de temps.
+  hardDescription: Evita que les publicacions que compleixin les condicions establertes
+    s'afegeixin a la línia de temps. A més, aquestes publicacions no s'afegiran a
+    la línia de temps encara que es modifiquin les condicions.
+  mutedNotes: Notes silenciades
+_auth:
+  shareAccessAsk: Estàs segur que vols autoritzar aquesta aplicació per accedir al
+    teu compte?
+  shareAccess: Vols autoritzar "{name}" per accedir a aquest compte?
+  permissionAsk: Aquesta aplicació sol·licita els següents permisos
+  callback: Tornant a l'aplicació
+  denied: Accés denegat
+  pleaseGoBack: Si us plau, torneu a l'aplicació
+  copyAsk: Enganxeu el següent codi d'autorització a l'aplicació
+_weekday:
+  wednesday: Dimecres
+  saturday: Dissabte
+  monday: Dilluns
+  tuesday: Dimarts
+  friday: Divendres
+  sunday: Diumenge
+  thursday: Dijous
+_messaging:
+  groups: Grups
+  dms: Privat
+_antennaSources:
+  all: Totes les notes
+  homeTimeline: Notes dels usuaris que segueixes
+  users: Notes d'usuaris concrets
+  userGroup: Notes d'usuaris d'un grup determinat
+  userList: Notes d'una llista determinada d'usuaris
+  instances: Notes de tots els usuaris d'una instància
+_relayStatus:
+  requesting: Pendent
+  accepted: Acceptat
+  rejected: Rebutjat
+_apps:
+  crossPlatform: Multiplataforma
+  mobile: Mòbil
+  firstParty: Primer partit
+  secondClass: Segona classe
+  thirdClass: Tercera classe
+  pwa: Instal·lar PWA
+  kaiteki: Kaiteki
+  milktea: Milktea
+  missLi: MissLi
+  mona: Mona
+  lesskey: Lesskey
+  firstClass: Primera classe
+  free: Gratuït
+  paid: Pagament
+  theDesk: TheDesk
+  apps: Aplicacions

From eac64dad5b09e1e2a61aed899eb3af7002671f92 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 1 May 2023 20:54:02 -0700
Subject: [PATCH 89/90] how in the world does this keep getting reversed

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

diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index fbdbd85fe..b7f6d3c71 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -22,10 +22,10 @@
 					@slide-change="onSlideChange"
 				>
 					<swiper-slide>
-						<XFeatured />
+						<XUsers />
 					</swiper-slide>
 					<swiper-slide>
-						<XUsers />
+						<XFeatured />
 					</swiper-slide>
 				</swiper>
 			</MkSpacer>
@@ -53,16 +53,16 @@ watch($$(tab), () => syncSlide(tabs.indexOf(tab)));
 const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => [
-	{
-		key: "featured",
-		icon: "ph-lightning ph-bold ph-lg",
-		title: i18n.ts.featured,
-	},
 	{
 		key: "users",
 		icon: "ph-users ph-bold ph-lg",
 		title: i18n.ts.users,
 	},
+	{
+		key: "featured",
+		icon: "ph-lightning ph-bold ph-lg",
+		title: i18n.ts.featured,
+	},
 ]);
 
 definePageMetadata(

From b02bfdd7de436bc82d0028bea04e23c2b157206c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 1 May 2023 21:00:27 -0700
Subject: [PATCH 90/90] fix lang

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

diff --git a/locales/fi.yml b/locales/fi.yml
index fd6c160e6..9b4102ddc 100644
--- a/locales/fi.yml
+++ b/locales/fi.yml
@@ -1,3 +1,4 @@
+_lang_: "Suomi"
 username: Käyttäjänimi
 fetchingAsApObject: Hae Fedeversestä
 gotIt: Selvä!
@@ -220,4 +221,3 @@ clearQueueConfirmText: Mitkään välittämättömät lähetykset, jotka ovat jo
   federoidu. Yleensä tätä toimintoa ei tarvita.
 blockedInstancesDescription: Lista instanssien isäntänimistä, jotka haluat estää.
   Listatut instanssit eivät kykene kommunikoimaan enää tämän instanssin kanssa.
-_lang_: Suomi