From 4b8b413c5170d7bcf9b37eb9bef2511f0ceb2b32 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 6 Feb 2023 15:52:00 -0500
Subject: [PATCH 01/85] =?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 2c4881dc94406b4696f8e5572cd15c3297bf112b Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 6 Feb 2023 23:23:56 -0500
Subject: [PATCH 02/85] 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 b8517719af16078bc5003718d3d2a832cdb2b935 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 8 Feb 2023 19:53:38 -0500
Subject: [PATCH 03/85] 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 1a7a0fdf31d87ad3af17abb9ced9f14a7287c3a0 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 8 Feb 2023 19:53:38 -0500
Subject: [PATCH 04/85] 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 e30c159226d0654cdecbef6d11fb500bdd2ce7b6 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 8 Feb 2023 19:56:35 -0500
Subject: [PATCH 05/85] 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 8b92fc8bb8834f30c6c3ffebb6ff86c66f7bed46 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 8 Feb 2023 20:25:22 -0500
Subject: [PATCH 06/85] 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 9cc5073dd7ab754b2141c008f7289de25729e977 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 8 Feb 2023 21:19:37 -0500
Subject: [PATCH 07/85] 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 841f8bee60e17dbe8ce398074a362ec6f8c01a04 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 8 Feb 2023 21:55:07 -0500
Subject: [PATCH 08/85] 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 6e8221a62a1c50641cd8f4bcd9ef121860de76be Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 10 Feb 2023 11:43:47 -0500
Subject: [PATCH 09/85] 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 14e3b3ac965a636ee8d9063f3d3dc3c0063782de Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 11 Feb 2023 14:11:25 -0500
Subject: [PATCH 10/85] 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 e266cc0b9928e368914b877834563bc0e253c8bb Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 12 Feb 2023 20:49:41 -0500
Subject: [PATCH 11/85] 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 ded8ab980a0de90d1d4d887b00970d4d2718cc32 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 12 Feb 2023 20:59:11 -0500
Subject: [PATCH 12/85] 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 5e07df2ed065c92eb1134c7e1b323f884dae391a Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 12 Feb 2023 21:56:01 -0500
Subject: [PATCH 13/85] 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 afbdd3bbcc5f614dc1e29a582316915ac2c95585 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 12 Feb 2023 22:16:15 -0500
Subject: [PATCH 14/85] 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 3d68efff4c6b3991a7cba1f139c315f38514490a Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 12 Feb 2023 22:19:40 -0500
Subject: [PATCH 15/85] 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 aab0377a1e350376e45c8738615db12043b565ef Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 12 Feb 2023 22:24:12 -0500
Subject: [PATCH 16/85] 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 a52281d4e018b33d53911b9376cf742556877157 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 12 Feb 2023 22:31:55 -0500
Subject: [PATCH 17/85] 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 d61a314f40d493201e6aebd8b4480acfce2c5bfe Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 19:06:29 -0400
Subject: [PATCH 18/85] 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 10b3079658c7a9fdb9ed45b9d9b46bc83a0b6a76 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 19:28:25 -0400
Subject: [PATCH 19/85] 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 14ec973c7088c5a7ff58fcb51270c00d4d4dbd84 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 19:57:19 -0400
Subject: [PATCH 20/85] 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 ec372782119f82f13785bcd53a8310a41c6b7199 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 20:26:10 -0400
Subject: [PATCH 21/85] 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 b8ca00c593ce2efdaf0d4b94407d93a1d5df7f15 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 20:47:57 -0400
Subject: [PATCH 22/85] 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 efcd0dd71bbddbf79943fedfd81b54d116336130 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 20:52:09 -0400
Subject: [PATCH 23/85] 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 7c698d1697c9edf542773af1b40076184c8c448b Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 21:18:00 -0400
Subject: [PATCH 24/85] 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 9e99df6e82bbd7ce5c9e22966d2b32eb245e04f1 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 21:22:29 -0400
Subject: [PATCH 25/85] 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 d8a6ce64a36426961481293a56cb2e1daf339478 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 21:39:48 -0400
Subject: [PATCH 26/85] 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 e52b3cef77fcbe21ed531b8aa343a5e150cd4894 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 21:49:41 -0400
Subject: [PATCH 27/85] 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 739e0331a84a2f14e881d3c881567e2c009144fd Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 22:04:35 -0400
Subject: [PATCH 28/85] 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 d096d7ea9a48d434e1ffc249d759d14db8a4b01c Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 22:17:39 -0400
Subject: [PATCH 29/85] 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 d21de526ed51347e86aa9e5cae967d0219c4c87a Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 22:19:02 -0400
Subject: [PATCH 30/85] 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 bd31d5d0af88a9d973e3edb103a4f3de51aca12a Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 22:24:40 -0400
Subject: [PATCH 31/85] 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 3647f78747c94fc56e9a8c81c5fe5449edcd6d82 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 22:40:23 -0400
Subject: [PATCH 32/85] 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 a66b334c3f055b64f5801f7ebdd5960c7444c6d6 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 22:50:32 -0400
Subject: [PATCH 33/85] 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 205c634d41f23deb2f57a18090d5f9ebe10706b9 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 23:18:01 -0400
Subject: [PATCH 34/85] 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 ba21f5446956279367aa22daabb37e5e5c2da00c Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 23:26:19 -0400
Subject: [PATCH 35/85] 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 cd4130e22b39cbdf927c27093166eba11d85fc7b Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 23:47:13 -0400
Subject: [PATCH 36/85] 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 d1cdd58bc1ee5e1a31103f73f8597a61e48828fa Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 29 Apr 2023 09:56:28 -0400
Subject: [PATCH 37/85] 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 ce606601282afb2381c4b634aa595a379a1cff15 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 07:27:55 -0400
Subject: [PATCH 38/85] 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 ada759a9e50756d7756c8ff364aaa25a2a412b84 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 07:58:03 -0400
Subject: [PATCH 39/85] 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 c35f03832d0c2ed6418f9a588cc120813784d192 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 08:08:45 -0400
Subject: [PATCH 40/85] 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 f2a8d1f680831db9d6ed23299c989b0bbbe2b356 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 09:01:42 -0400
Subject: [PATCH 41/85] 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 cec5813ab2d555f5172e01d5a369b2ecadb15e1f Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 09:04:07 -0400
Subject: [PATCH 42/85] 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 426f47fdad70b24b00c35eaeeb6b455ce0084283 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 30 Apr 2023 23:18:39 +0900
Subject: [PATCH 43/85] 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 0db337b977c234006ff6ed8e4919a70932baa8e0 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 30 Apr 2023 23:24:19 +0900
Subject: [PATCH 44/85] 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 1d37e78ca2b09e38a48de686a06101d1825aa4a9 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 30 Apr 2023 23:28:17 +0900
Subject: [PATCH 45/85] 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 9d193340350baf99ff9cf4507816699c045aa255 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 30 Apr 2023 23:49:08 +0900
Subject: [PATCH 46/85] 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 44f6c141242ef7ad1bf8f32bdfdc0d4382391adf Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 1 May 2023 00:02:16 +0900
Subject: [PATCH 47/85] 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 f0b4e10735424be72772f33744664eead6d1e5da Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 11:39:01 -0400
Subject: [PATCH 48/85] 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 affeb55c0116104b7b6b9b8a2c3827825ad6929f Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 30 Apr 2023 11:58:36 -0400
Subject: [PATCH 49/85] 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 0cf2e71b2e361b050b2d16224ce18a5db99abc64 Mon Sep 17 00:00:00 2001
From: fruye <fruye@unix.dog>
Date: Sun, 30 Apr 2023 19:34:52 +0000
Subject: [PATCH 50/85] 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 6f9a9dbfa13ca5aba0a2aacd6f8ef1b449919667 Mon Sep 17 00:00:00 2001
From: waon <waonme@gmail.com>
Date: Sun, 30 Apr 2023 07:55:50 +0000
Subject: [PATCH 51/85] 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 3191853c32af7fcb7e44ceda260caff65e45c398 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 30 Apr 2023 13:13:43 -0700
Subject: [PATCH 52/85] 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 1eb19b698847cf7e88fe15291bec982e997089d1 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 30 Apr 2023 13:26:51 -0700
Subject: [PATCH 53/85] 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 1fb5635a4d299da01d2b44df2f5193c637e26e99 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 30 Apr 2023 13:27:27 -0700
Subject: [PATCH 54/85] 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 7c08ea32324fe832ac333eee1641c599362a3fc8 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 17:06:43 -0400
Subject: [PATCH 55/85] 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 688d283986395498d35e5c72f01f82b59b4baaf5 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 17:32:14 -0400
Subject: [PATCH 56/85] 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 c8de7d818c50fb3a80af40d0362f874e43c557e2 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 17:42:01 -0400
Subject: [PATCH 57/85] 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 8128ef5f011a787a86e4fcbe4ab8a1be4a29c3d5 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 18:00:19 -0400
Subject: [PATCH 58/85] 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 5fc77586f27db52a5f72e0bba74e55a32204ff41 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 18:01:06 -0400
Subject: [PATCH 59/85] 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 ec97ccd4c3d5bb677fd09d7cd2cc96a6dfc87f31 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 19:45:53 -0400
Subject: [PATCH 60/85] 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 1faa47f558a593653b631cc8dc2311292a3a805f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 30 Apr 2023 17:14:04 -0700
Subject: [PATCH 61/85] favicon

---
 packages/backend/assets/favicon.ico | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/assets/favicon.ico b/packages/backend/assets/favicon.ico
index 8d46b0c1d..9fb005f7b 100644
--- a/packages/backend/assets/favicon.ico
+++ b/packages/backend/assets/favicon.ico
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c414a146ef32ee9017444a977d5b6bb40079be9cdfeaab9a8a58f836fb6eea62
-size 4286
+oid sha256:03a16bbee6313e52ca17a04db25c4a8b312a3208421a7e351e734f4ad0184900
+size 483961

From fbc8d5666e5ad0b99e9ef834e427a91563e67af2 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 30 Apr 2023 17:14:31 -0700
Subject: [PATCH 62/85] 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 e3e07590d74be1f88bcd360a2c47646ca05f5003 Mon Sep 17 00:00:00 2001
From: s1idewhist1e <s1idewhist1e@noreply.codeberg.org>
Date: Mon, 1 May 2023 00:15:26 +0000
Subject: [PATCH 63/85] 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 d3f7b4c18a00cd9753d0983ca9eafd317386a50d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 30 Apr 2023 17:57:04 -0700
Subject: [PATCH 64/85] 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 faa5fc5dd40e4abc3729f17d25eb58ad218a16a7 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 20:22:50 -0400
Subject: [PATCH 65/85] 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 5013111bee6908d7664e972a88c3191f672f2b75 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Sun, 30 Apr 2023 21:43:56 -0400
Subject: [PATCH 66/85] 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 45ef53994c027481a67ebfcc6159191fe72f3d36 Mon Sep 17 00:00:00 2001
From: s1idewhist1e <trombonedude05@gmail.com>
Date: Sun, 30 Apr 2023 22:03:17 -0700
Subject: [PATCH 67/85] 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 b1bbc3ac8eeb573f93c7471963ecc585c773937a Mon Sep 17 00:00:00 2001
From: s1idewhist1e <trombonedude05@gmail.com>
Date: Sun, 30 Apr 2023 22:50:43 -0700
Subject: [PATCH 68/85] 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 cb2fefef1972560f50936601801e40349700d857 Mon Sep 17 00:00:00 2001
From: Cleo <cutestnekoaqua@noreply.codeberg.org>
Date: Mon, 1 May 2023 15:42:27 +0000
Subject: [PATCH 69/85] 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 139a7f337495c2157934eec06d52361cd60f45cb Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Mon, 1 May 2023 14:52:38 -0400
Subject: [PATCH 70/85] 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 c5c1fb73cf75cfb3b706d15214863f04d663bd12 Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Mon, 1 May 2023 15:09:21 -0400
Subject: [PATCH 71/85] 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 b6a12db2979393f36cfb4870b76000aacee90d11 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 1 May 2023 12:57:24 -0700
Subject: [PATCH 72/85] 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 d9beed624e36ac54ddd7aea289ad047c5b4397cd Mon Sep 17 00:00:00 2001
From: jolupa <jolupameister@gmail.com>
Date: Mon, 1 May 2023 15:44:14 +0000
Subject: [PATCH 73/85] 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 1e884121c04f871bc1eddfe20337f92d8ea58e76 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 1 May 2023 16:50:08 -0400
Subject: [PATCH 74/85] 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 77e28574a80c7faf0185bbeccd09216a01ee91c5 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 1 May 2023 13:56:48 -0700
Subject: [PATCH 75/85] 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 b7b7d6cce431cdc4564fa9215348bf5ea4fb7faa Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 28 Apr 2023 18:18:09 -0400
Subject: [PATCH 76/85] 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 b067e8abfd84e3eefb5e04382dbdaa1c6c541d4d Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.kazuno.co>
Date: Mon, 1 May 2023 18:11:56 -0400
Subject: [PATCH 77/85] 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 2d0ace068559d685f86936119671ce1412fd0b8b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 1 May 2023 20:32:18 -0700
Subject: [PATCH 78/85] 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 6fcf20f45d06e48640f1ed6581218fa70cace216 Mon Sep 17 00:00:00 2001
From: jolupa <jolupameister@gmail.com>
Date: Mon, 1 May 2023 23:24:37 +0000
Subject: [PATCH 79/85] 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 04ce30ffb262fba73657bed9b821a7b1516953b8 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 1 May 2023 20:54:02 -0700
Subject: [PATCH 80/85] 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 16d43dee31302b40fb6bdc060dc118abddb9b9d1 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 1 May 2023 21:00:27 -0700
Subject: [PATCH 81/85] 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

From 59d9811e21aacead34e22e9cbcf2b4a09e5a7fa2 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 1 May 2023 21:09:48 -0700
Subject: [PATCH 82/85] import correctly

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

diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 0f4422ee1..3224f2da6 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -132,7 +132,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 XShowMoreButton from "@/components/MkShowMoreButton.vue";
 import XCwButton from "@/components/MkCwButton.vue";
 import { extractUrlFromMfm } from "@/scripts/extract-url-from-mfm";
 import { i18n } from "@/i18n";
diff --git a/packages/client/src/components/MkUserPreview.vue b/packages/client/src/components/MkUserPreview.vue
index b154e529e..58b29e01a 100644
--- a/packages/client/src/components/MkUserPreview.vue
+++ b/packages/client/src/components/MkUserPreview.vue
@@ -121,7 +121,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 XShowMoreButton from "@/components/MkShowMoreButton.vue";
 import * as os from "@/os";
 import { $i } from "@/account";
 import { i18n } from "@/i18n";

From 0aa6e47ccd64ff31695726d58de7b041eedef6e2 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 1 May 2023 21:10:08 -0700
Subject: [PATCH 83/85] 14 dev

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

diff --git a/package.json b/package.json
index d31b74313..4ec8e2d80 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev42",
+	"version": "14.0.0-dev",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From f6428ca16b9b5b324fa5a3a1edf764d1bc942d82 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 1 May 2023 21:50:14 -0700
Subject: [PATCH 84/85] max import posts twice a month

---
 packages/backend/src/server/api/endpoints/i/import-posts.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/i/import-posts.ts b/packages/backend/src/server/api/endpoints/i/import-posts.ts
index 6fdf562fd..5f4b99f02 100644
--- a/packages/backend/src/server/api/endpoints/i/import-posts.ts
+++ b/packages/backend/src/server/api/endpoints/i/import-posts.ts
@@ -8,8 +8,8 @@ export const meta = {
 	secure: true,
 	requireCredential: true,
 	limit: {
-		duration: DAY,
-		max: 1,
+		duration: DAY * 30,
+		max: 2,
 	},
 	errors: {
 		noSuchFile: {

From eec5c86cb30824bb7393304150a1d67a32a3e9fa Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 1 May 2023 23:08:35 -0700
Subject: [PATCH 85/85] disable post imports for now

---
 packages/backend/src/server/api/endpoints.ts         |  2 +-
 packages/client/src/pages/settings/import-export.vue | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index 3f82eb7a7..c17b6844d 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -533,7 +533,7 @@ const eps = [
 	["i/export-following", ep___i_exportFollowing],
 	["i/export-mute", ep___i_exportMute],
 	["i/export-notes", ep___i_exportNotes],
-	["i/import-posts", ep___i_importPosts],
+	// ["i/import-posts", ep___i_importPosts],
 	["i/export-user-lists", ep___i_exportUserLists],
 	["i/favorites", ep___i_favorites],
 	["i/gallery/likes", ep___i_gallery_likes],
diff --git a/packages/client/src/pages/settings/import-export.vue b/packages/client/src/pages/settings/import-export.vue
index fd0f79510..7186ec895 100644
--- a/packages/client/src/pages/settings/import-export.vue
+++ b/packages/client/src/pages/settings/import-export.vue
@@ -16,23 +16,20 @@
 					{{ i18n.ts.export }}</MkButton
 				>
 			</FormFolder>
-			<FormFolder class="_formBlock">
+			<!-- <FormFolder class="_formBlock">
 				<template #label>{{ i18n.ts.import }}</template>
 				<template #icon
 					><i class="ph-upload-simple ph-bold ph-lg"></i
 				></template>
-				<!-- <FormSwitch v-model="signatureCheck" class="_formBlock">
-					Mastodon import? (not Akkoma!)
-				</FormSwitch> -->
 				<FormRadios v-model="importType" class="_formBlock">
 					<option value="calckey">Calckey/Misskey</option>
 					<option value="mastodon">Mastodon</option>
-					<!-- <option :disabled="true" value="akkoma">
+					<option :disabled="true" value="akkoma">
 						Pleroma/Akkoma (soon)
 					</option>
 					<option :disabled="true" value="twitter">
 						Twitter (soon)
-					</option> -->
+					</option>
 				</FormRadios>
 				<MkButton
 					primary
@@ -42,7 +39,7 @@
 					><i class="ph-upload-simple ph-bold ph-lg"></i>
 					{{ i18n.ts.import }}</MkButton
 				>
-			</FormFolder>
+			</FormFolder> -->
 		</FormSection>
 		<FormSection>
 			<template #label>{{