From 015eed31f83330ec70f46c4b8863aa352a50dee1 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 4 May 2023 08:16:51 -0400
Subject: [PATCH 01/58] center header

---
 .../src/components/global/MkPageHeader.vue    | 154 ++++++++++--------
 1 file changed, 84 insertions(+), 70 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index c78ef0c10..e0664ce67 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -7,24 +7,24 @@
 		:style="{ background: bg }"
 		@click="onClick"
 	>
-		<i
-			@click="goBack()"
-			v-if="props.displayBackButton"
-			v-tooltip.noDelay="i18n.ts.goBack"
-			class="icon backButton ph-caret-left ph-bold ph-lg"
-		></i>
-		<div v-if="narrow" class="buttons left" @click="openAccountMenu">
-			<MkAvatar
-				v-if="props.displayMyAvatar && $i"
-				class="avatar"
-				:user="$i"
-				:disable-preview="true"
-				disableLink
-			/>
-		</div>
-		<template v-if="metadata">
+		<div class="left">
+			<i
+				@click="goBack()"
+				v-if="props.displayBackButton"
+				v-tooltip.noDelay="i18n.ts.goBack"
+				class="icon backButton ph-caret-left ph-bold ph-lg"
+			></i>
+			<div v-if="narrow" class="buttons left" @click="openAccountMenu">
+				<MkAvatar
+					v-if="props.displayMyAvatar && $i"
+					class="avatar"
+					:user="$i"
+					:disable-preview="true"
+					disableLink
+				/>
+			</div>
 			<div
-				v-if="!hideTitle"
+				v-if="!hideTitle && metadata"
 				class="titleContainer"
 				@click="showTabsPopup"
 			>
@@ -63,7 +63,9 @@
 					</div>
 				</div>
 			</div>
-			<div ref="tabsEl" v-if="hasTabs" class="tabs">
+		</div>
+		<template v-if="metadata">
+			<div ref="tabsEl" v-if="hasTabs" class="tabs" :class="{collapse: hasTabs && tabs.length > 3}">
 				<button
 					v-for="tab in tabs"
 					:ref="(el) => (tabRefs[tab.key] = el)"
@@ -215,25 +217,9 @@ function goBack(): void {
 	window.history.back();
 }
 
-const calcBg = () => {
-	const rawBg = metadata?.bg || "var(--bg)";
-	const tinyBg = tinycolor(
-		rawBg.startsWith("var(")
-			? getComputedStyle(document.documentElement).getPropertyValue(
-					rawBg.slice(4, -1)
-			  )
-			: rawBg
-	);
-	tinyBg.setAlpha(0.85);
-	bg.value = tinyBg.toRgbString();
-};
-
 let ro: ResizeObserver | null;
 
 onMounted(() => {
-	calcBg();
-	globalEvents.on("themeChanged", calcBg);
-
 	watch(
 		() => [props.tab, props.tabs],
 		() => {
@@ -243,7 +229,9 @@ onMounted(() => {
 					// offsetWidth や offsetLeft は少数を丸めてしまうため getBoundingClientRect を使う必要がある
 					// https://developer.mozilla.org/ja/docs/Web/API/HTMLElement/offsetWidth#%E5%80%A4
 					const tabSizeX = tabEl.scrollWidth + 20; // + the tab's padding
-					tabEl.style = `--width: ${tabSizeX}px`;
+					if (props.tabs.length > 3) {
+						tabEl.style = `--width: ${tabSizeX}px`;
+					}
 					setTimeout(() => {
 						const parentRect = tabsEl.getBoundingClientRect();
 						const rect = tabEl.getBoundingClientRect();
@@ -278,7 +266,6 @@ onMounted(() => {
 });
 
 onUnmounted(() => {
-	globalEvents.off("themeChanged", calcBg);
 	if (ro) ro.disconnect();
 });
 </script>
@@ -288,15 +275,32 @@ onUnmounted(() => {
 	--height: 55px;
 	display: flex;
 	width: 100%;
-	-webkit-backdrop-filter: var(--blur, blur(15px));
-	backdrop-filter: var(--blur, blur(15px));
-	border-bottom: solid 0.5px var(--divider);
 	height: var(--height);
+	max-width: 850px;
+	margin: auto;
+
+	&::before {
+		content: "";
+		position: absolute;
+		inset: 0;
+		border-bottom: solid 0.5px var(--divider);
+		-webkit-backdrop-filter: var(--blur, blur(15px));
+		backdrop-filter: var(--blur, blur(15px));
+		z-index: -1;
+	}
+	&::after {
+		content: "";
+		position: absolute;
+		inset: 0;
+		background: var(--bg);
+		opacity: .85;
+		z-index: -2;
+	}
 
 	&.thin {
 		--height: 45px;
 
-		> .buttons {
+		.buttons {
 			> .button {
 				font-size: 0.9em;
 			}
@@ -304,7 +308,7 @@ onUnmounted(() => {
 	}
 
 	&.slim {
-		> .titleContainer {
+		> .left > .titleContainer {
 			flex: 1;
 			margin: 0 auto;
 
@@ -348,14 +352,9 @@ onUnmounted(() => {
 		}
 	}
 
-	> .buttons {
-		--margin: 8px;
+	> .left {
 		display: flex;
-		align-items: center;
-		height: var(--height);
-		margin: 0 var(--margin);
-
-		&.left {
+		> .buttons {
 			margin-right: auto;
 
 			> .avatar {
@@ -368,13 +367,17 @@ onUnmounted(() => {
 				pointer-events: none;
 			}
 		}
+	}
+
+	> .buttons {
+		--margin: 8px;
+		display: flex;
+		align-items: center;
+		height: var(--height);
+		margin: 0 var(--margin);
 
 		&.right {
-			margin-left: auto;
-		}
-
-		&:empty {
-			display: none;
+			justify-content: flex-end;
 		}
 
 		> .button {
@@ -410,7 +413,7 @@ onUnmounted(() => {
 		margin-left: 1rem;
 	}
 
-	> .titleContainer {
+	> .left > .titleContainer {
 		display: flex;
 		align-items: center;
 		max-width: 400px;
@@ -466,34 +469,49 @@ onUnmounted(() => {
 		}
 	}
 
+	> .buttons, > .left {
+		width: 20%;
+	}
+
 	> .tabs {
 		position: relative;
-		width: 100%;
 		font-size: 1em;
 		overflow-x: auto;
 		white-space: nowrap;
 		contain: strict;
-
-		&::before {
-			content: "";
-			display: inline-block;
-			height: 40%;
-			border-left: 1px solid var(--divider);
-			margin-right: 1em;
-			margin-left: 10px;
-			vertical-align: -1px;
+		display: flex;
+		flex-grow: 1;
+		justify-content: center;
+		&.collapse {
+			--width: 38px;
+			> .tab {
+				width: 38px;
+				min-width: unset !important;
+				&:not(.active) > .title {
+					opacity: 0;
+				}
+			}
 		}
 
+		// &::before {
+		// 	content: "";
+		// 	display: inline-block;
+		// 	height: 40%;
+		// 	border-left: 1px solid var(--divider);
+		// 	margin-right: 1em;
+		// 	margin-left: 10px;
+		// 	vertical-align: -1px;
+		// }
+
 		> .tab {
 			display: inline-flex;
 			align-items: center;
 			position: relative;
 			border-inline: 10px solid transparent;
 			height: 100%;
+			min-width: max-content;
 			font-weight: normal;
 			opacity: 0.7;
-			width: 38px;
-			--width: 38px;
 			overflow: hidden;
 			transition: color 0.2s, opacity 0.2s, width 0.2s;
 
@@ -507,9 +525,6 @@ onUnmounted(() => {
 				font-weight: 600;
 				width: var(--width);
 			}
-			&:not(.active) > .title {
-				opacity: 0;
-			}
 
 			> .icon + .title {
 				margin-left: 8px;
@@ -518,7 +533,6 @@ onUnmounted(() => {
 				transition: opacity 0.2s;
 			}
 		}
-
 		> .highlight {
 			position: absolute;
 			bottom: 0;

From 506420130e2d5f38e7fef5b4a20baba549f6f6ee Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 20 May 2023 16:42:06 -0400
Subject: [PATCH 02/58] 'Jump to Reply' to 'Jump to previous'

---
 locales/en-US.yml                                   | 2 +-
 packages/client/src/components/MkSubNoteContent.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index b3944b1e5..9b2a9c010 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -57,7 +57,7 @@ sendMessage: "Send a message"
 copyUsername: "Copy username"
 searchUser: "Search for a user"
 reply: "Reply"
-jumpToReply: "Jump to Reply"
+jumpToPrevious: "Jump to previous"
 loadMore: "Load more"
 showMore: "Show more"
 newer: "newer"
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index e2672298c..5415ae984 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -17,7 +17,7 @@
 				!note.replyId
 			"
 			:to="`/notes/${note.renoteId}`"
-			v-tooltip="i18n.ts.jumpToReply"
+			v-tooltip="i18n.ts.jumpToPrevious"
 			class="reply-icon"
 			@click.stop
 		>
@@ -70,7 +70,7 @@
 						v-if="!detailed && note.replyId"
 						:to="`#${note.replyId}`"
 						behavior="browser"
-						v-tooltip="i18n.ts.jumpToReply"
+						v-tooltip="i18n.ts.jumpToPrevious"
 						class="reply-icon"
 						@click.stop
 					>

From b871746b93d61acc97408a944ae0a9b5e5353cdd Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 20 May 2023 21:20:17 -0400
Subject: [PATCH 03/58] hide empty tabs

---
 .../client/src/components/MkNoteDetailed.vue  | 40 ++++++++-----------
 packages/client/src/components/MkTab.vue      |  4 ++
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index cf072d4ac..a7d657e3f 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -34,39 +34,29 @@
 		></MkNote>
 
 		<MkTab v-model="tab" :style="'underline'" @update:modelValue="loadTab">
-			<option value="replies">
+			<option value="replies" v-if="appearNote.repliesCount > 0">
 				<i class="ph-arrow-u-up-left ph-bold ph-lg"></i>
-				<template v-if="appearNote.repliesCount > 0">
-					<span class="count">{{ appearNote.repliesCount }}</span>
-				</template>
+				<span class="count">{{ appearNote.repliesCount }}</span>
 				{{ i18n.ts._notification._types.reply }}
 			</option>
-			<option value="renotes">
+			<option value="renotes" v-if="appearNote.renoteCount > 0">
 				<i class="ph-repeat ph-bold ph-lg"></i>
-				<template v-if="appearNote.renoteCount > 0">
-					<span class="count">{{ appearNote.renoteCount }}</span>
-				</template>
+				<span class="count">{{ appearNote.renoteCount }}</span>
 				{{ i18n.ts._notification._types.renote }}
 			</option>
-			<option value="quotes">
-				<i class="ph-quotes ph-bold ph-lg"></i>
-				<template v-if="directQuotes?.length > 0">
-					<span class="count">{{ directQuotes.length }}</span>
-				</template>
-				{{ i18n.ts._notification._types.quote }}
-			</option>
-			<option value="reactions">
+			<option value="reactions" v-if="reactionsCount > 0">
 				<i class="ph-smiley ph-bold ph-lg"></i>
-				<template v-if="reactionsCount > 0">
-					<span class="count">{{ reactionsCount }}</span>
-				</template>
+				<span class="count">{{ reactionsCount }}</span>
 				{{ i18n.ts.reaction }}
 			</option>
-			<option value="clips">
+			<option value="quotes" v-if="directQuotes?.length > 0">
+				<i class="ph-quotes ph-bold ph-lg"></i>
+				<span class="count">{{ directQuotes.length }}</span>
+				{{ i18n.ts._notification._types.quote }}
+			</option>
+			<option value="clips" v-if="clips?.length > 0">
 				<i class="ph-paperclip ph-bold ph-lg"></i>
-				<template v-if="clips?.length > 0">
-					<span class="count">{{ clips.length }}</span>
-				</template>
+				<span class="count">{{ clips.length }}</span>
 				{{ i18n.ts.clips }}
 			</option>
 		</MkTab>
@@ -518,6 +508,10 @@ onUnmounted(() => {
 		overflow: clip;
 		outline: none;
 		scroll-margin-top: calc(var(--stickyTop) + 20vh);
+		&:not(:last-child) {
+			border-bottom: 1px solid var(--divider);
+			margin-bottom: 4px;
+		}
 		.article {
 			cursor: unset;
 			padding-bottom: 0;
diff --git a/packages/client/src/components/MkTab.vue b/packages/client/src/components/MkTab.vue
index 29c943547..76887a247 100644
--- a/packages/client/src/components/MkTab.vue
+++ b/packages/client/src/components/MkTab.vue
@@ -86,6 +86,10 @@ export default defineComponent({
 		> .icon {
 			margin-right: 6px;
 		}
+
+		&:empty {
+			display: none !important;
+		}
 	}
 
 	&.chips, &.underline {

From da0a0503baee8d8b1afa6b040a370f56b0978069 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 20 May 2023 21:46:33 -0400
Subject: [PATCH 04/58] tab fix

---
 packages/client/src/components/MkNoteDetailed.vue | 2 +-
 packages/client/src/components/MkTab.vue          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index a7d657e3f..80202f279 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -636,7 +636,7 @@ onUnmounted(() => {
 		> :deep(.reacted-users > *) {
 			padding-inline: 16px !important;
 		}
-		> .chips {
+		> :deep(.underline) {
 			padding-left: 16px !important;
 		}
 	}
diff --git a/packages/client/src/components/MkTab.vue b/packages/client/src/components/MkTab.vue
index 76887a247..5f7cd084f 100644
--- a/packages/client/src/components/MkTab.vue
+++ b/packages/client/src/components/MkTab.vue
@@ -128,6 +128,7 @@ export default defineComponent({
 	&.underline {
 		padding-block: 0 !important;
 		margin-bottom: -1px;
+		border-radius: 0;
 		button {
 			background: none !important;
 			border-radius: 0 !important;

From 84ea25771dc032bb117d3f39523d102b623abc3d Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Sun, 21 May 2023 16:10:48 +0200
Subject: [PATCH 05/58] Add aria-label to note container. This makes
 screen-readers read out the content while navigating with the keyboard.

---
 packages/client/src/components/MkNote.vue | 34 +++++++++++++----------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index c9c38a53e..d267f2d4d 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -1,19 +1,8 @@
 <template>
-	<div
-		v-if="!muted.muted"
-		v-show="!isDeleted"
-		ref="el"
-		v-hotkey="keymap"
-		v-size="{ max: [500, 450, 350, 300] }"
-		class="tkcbzcuz note-container"
-		:tabindex="!isDeleted ? '-1' : null"
-		:class="{ renote: isRenote }"
-	>
-		<MkNoteSub
-			v-if="appearNote.reply && !detailedView"
-			:note="appearNote.reply"
-			class="reply-to"
-		/>
+	<div :aria-label="accessibleLabel" v-if="!muted.muted" v-show="!isDeleted" ref="el" v-hotkey="keymap"
+		v-size="{ max: [500, 450, 350, 300] }" class="tkcbzcuz note-container" :tabindex="!isDeleted ? '-1' : null"
+		:class="{ renote: isRenote }">
+		<MkNoteSub v-if="appearNote.reply && !detailedView" :note="appearNote.reply" class="reply-to" />
 		<div v-if="!detailedView" class="note-context" @click="noteClick">
 			<div class="line"></div>
 			<div v-if="appearNote._prId_" class="info">
@@ -472,6 +461,21 @@ function readPromo() {
 	isDeleted.value = true;
 }
 
+let accessibleLabel: string = getAccessibleLabel();
+
+function getAccessibleLabel(): string {
+	let label = `${note.user.name ? note.user.name : note.user.username}: `;
+	if (note.cw && note.isHidden) {
+		label += `Content Warning: ${note.cw}`;
+
+	} else {
+		label += `${note.text}`;
+	}
+
+
+	label += `${note.createdAt.toLocaleUpperCase()}`;
+	return label;
+}
 defineExpose({
 	focus,
 	blur,

From 0b7e9068bc32c9ffdf0ec09343b6994225bda9a2 Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Sun, 21 May 2023 16:12:13 +0200
Subject: [PATCH 06/58] Properly set aria-hidden on note content only if CW is
 present and show content has not been clicked

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

diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index e2672298c..b162bca0b 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -58,7 +58,7 @@
 			<div
 				class="body"
 				v-bind="{
-					'aria-hidden': !showContent ? 'true' : null,
+					'aria-hidden': note.cw && !showContent ? 'true' : null,
 					tabindex: !showContent ? '-1' : null,
 				}"
 			>

From 55b6b6075dd8c7b6bd63cac9d60c6b9ef397637e Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 21 May 2023 13:10:27 -0400
Subject: [PATCH 07/58] Accessible follow button

---
 .../client/src/components/MkFollowButton.vue  | 33 +++++++++++--------
 packages/client/src/pages/user/home.vue       |  1 -
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/packages/client/src/components/MkFollowButton.vue b/packages/client/src/components/MkFollowButton.vue
index 12491f6ad..0ef5868bd 100644
--- a/packages/client/src/components/MkFollowButton.vue
+++ b/packages/client/src/components/MkFollowButton.vue
@@ -1,6 +1,7 @@
 <template>
 	<button
-		class="kpoogebi _button"
+		v-if="$i != null && $i.id != user.id"
+		class="kpoogebi _button follow-button"
 		:class="{
 			wait,
 			active: isFollowing || hasPendingFollowRequestFromYou,
@@ -10,40 +11,41 @@
 		}"
 		:disabled="wait"
 		@click="onClick"
+		:aria-label=" `${state} ${user.name || user.username}` "
 	>
 		<template v-if="!wait">
 			<template v-if="isBlocking">
-				<span v-if="full">{{ i18n.ts.blocked }}</span
+				<span v-if="full">{{ state = i18n.ts.blocked }}</span
 				><i class="ph-prohibit ph-bold ph-lg"></i>
 			</template>
 			<template
 				v-else-if="hasPendingFollowRequestFromYou && user.isLocked"
 			>
-				<span v-if="full">{{ i18n.ts.followRequestPending }}</span
+				<span v-if="full">{{ state = i18n.ts.followRequestPending }}</span
 				><i class="ph-hourglass-medium ph-bold ph-lg"></i>
 			</template>
 			<template
 				v-else-if="hasPendingFollowRequestFromYou && !user.isLocked"
 			>
 				<!-- つまりリモートフォローの場合。 -->
-				<span v-if="full">{{ i18n.ts.processing }}</span
+				<span v-if="full">{{ state = i18n.ts.processing }}</span
 				><i class="ph-circle-notch ph-bold ph-lg fa-pulse"></i>
 			</template>
 			<template v-else-if="isFollowing">
-				<span v-if="full">{{ i18n.ts.unfollow }}</span
+				<span v-if="full">{{ state = i18n.ts.unfollow }}</span
 				><i class="ph-minus ph-bold ph-lg"></i>
 			</template>
 			<template v-else-if="!isFollowing && user.isLocked">
-				<span v-if="full">{{ i18n.ts.followRequest }}</span
+				<span v-if="full">{{ state = i18n.ts.followRequest }}</span
 				><i class="ph-plus ph-bold ph-lg"></i>
 			</template>
 			<template v-else-if="!isFollowing && !user.isLocked">
-				<span v-if="full">{{ i18n.ts.follow }}</span
+				<span v-if="full">{{ state = i18n.ts.follow }}</span
 				><i class="ph-plus ph-bold ph-lg"></i>
 			</template>
 		</template>
 		<template v-else>
-			<span v-if="full">{{ i18n.ts.processing }}</span
+			<span v-if="full">{{ state = i18n.ts.processing }}</span
 			><i class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i>
 		</template>
 	</button>
@@ -55,6 +57,7 @@ import type * as Misskey from "calckey-js";
 import * as os from "@/os";
 import { stream } from "@/stream";
 import { i18n } from "@/i18n";
+import { $i } from "@/account";
 
 const emit = defineEmits(["refresh"]);
 const props = withDefaults(
@@ -71,6 +74,8 @@ const props = withDefaults(
 
 const isBlocking = computed(() => props.user.isBlocking);
 
+let state = $ref(i18n.ts.processing);
+
 let isFollowing = $ref(props.user.isFollowing);
 let hasPendingFollowRequestFromYou = $ref(
 	props.user.hasPendingFollowRequestFromYou
@@ -155,7 +160,7 @@ onBeforeUnmount(() => {
 </script>
 
 <style lang="scss" scoped>
-.kpoogebi {
+.follow-button {
 	position: relative;
 	display: inline-flex;
 	align-items: center;
@@ -164,13 +169,15 @@ onBeforeUnmount(() => {
 	color: var(--accent);
 	border: solid 1px var(--accent);
 	padding: 0;
-	height: 31px;
 	font-size: 16px;
-	border-radius: 32px;
+	width: 2em;
+	height: 2em;
+	border-radius: 100px;
 	background: var(--bg);
 
 	&.full {
-		padding: 0 8px 0 12px;
+		padding: 0.2em .7em;
+		width: auto;
 		font-size: 14px;
 	}
 
@@ -207,7 +214,7 @@ onBeforeUnmount(() => {
 	}
 
 	&.active {
-		color: #fff;
+		color: var(--fgOnAccent);
 		background: var(--accent);
 
 		&:hover {
diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index af3a38431..5de9b28d6 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -135,7 +135,6 @@
 						<div class="follow-container">
 							<div class="actions">
 								<MkFollowButton
-									v-if="$i != null && $i.id != user.id"
 									:user="user"
 									@refresh="emit('refresh')"
 									:inline="true"

From fd9d23f3cb3d00e583beb51517ad110f80953a36 Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Sun, 21 May 2023 19:17:13 +0200
Subject: [PATCH 08/58] Label deck and universal bar buttons for screen readers
 on mobile. Still needs translation and aria-selected

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

diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue
index 9de91fe56..f1cb40797 100644
--- a/packages/client/src/ui/deck.vue
+++ b/packages/client/src/ui/deck.vue
@@ -111,6 +111,7 @@
 
 		<div v-if="isMobile" class="buttons">
 			<button
+			aria-label="Menu"
 				class="button nav _button"
 				@click="drawerMenuShowing = true"
 			>
@@ -119,10 +120,11 @@
 					><i class="ph-circle ph-fill"></i
 				></span>
 			</button>
-			<button class="button home _button" @click="mainRouter.push('/')">
+			<button aria-label="Home" class="button home _button" @click="mainRouter.push('/')">
 				<i class="ph-house ph-bold ph-lg"></i>
 			</button>
 			<button
+			aria-label="Notifications"
 				class="button notifications _button"
 				@click="mainRouter.push('/my/notifications')"
 			>
@@ -131,7 +133,7 @@
 					><i class="ph-circle ph-fill"></i
 				></span>
 			</button>
-			<button class="button post _button" @click="os.post()">
+			<button aria-label="Post" class="button post _button" @click="os.post()">
 				<i class="ph-pencil ph-bold ph-lg"></i>
 			</button>
 		</div>
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index f42f49513..84dd742a5 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -36,6 +36,7 @@
 
 		<div v-if="isMobile" class="buttons">
 			<button
+			aria-label="Menu"
 				class="button nav _button"
 				@click="drawerMenuShowing = true"
 			>
@@ -47,6 +48,7 @@
 				</div>
 			</button>
 			<button
+			aria-label="Home"
 				class="button home _button"
 				@click="
 					mainRouter.currentRoute.value.name === 'index'
@@ -63,6 +65,7 @@
 				</div>
 			</button>
 			<button
+			aria-label="Notifications"
 				class="button notifications _button"
 				@click="
 					mainRouter.push('/my/notifications');
@@ -80,6 +83,7 @@
 				</div>
 			</button>
 			<button
+			aria-label="Chat"
 				class="button messaging _button"
 				@click="
 					mainRouter.push('/my/messaging');
@@ -99,6 +103,7 @@
 				</div>
 			</button>
 			<button
+			aria-label="Widgets"
 				class="button widget _button"
 				@click="widgetsShowing = true"
 			>
@@ -111,6 +116,7 @@
 		<button
 			v-if="isMobile && mainRouter.currentRoute.value.name === 'index'"
 			ref="postButton"
+			aria-label="Post"
 			class="postButton button post _button"
 			@click="os.post()"
 		>
@@ -122,6 +128,7 @@
 			"
 			ref="postButton"
 			class="postButton button post _button"
+			aria-label="New Chat"
 			@click="messagingStart"
 		>
 			<i class="ph-user-plus ph-bold ph-lg"></i>

From 9c1c001f2581bdb70fc69039feffffdb6c706635 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 21 May 2023 14:11:45 -0400
Subject: [PATCH 09/58] Set minimum size for buttons

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

diff --git a/packages/client/src/components/MkButton.vue b/packages/client/src/components/MkButton.vue
index 140b8ddb0..8a7fe6851 100644
--- a/packages/client/src/components/MkButton.vue
+++ b/packages/client/src/components/MkButton.vue
@@ -111,11 +111,12 @@ function onMousedown(evt: MouseEvent): void {
 	z-index: 1; // 他コンポーネントのbox-shadowに隠されないようにするため
 	display: block;
 	min-width: 100px;
+	min-height: 35px;
 	width: max-content;
 	padding: 8px 16px;
 	text-align: center;
 	font-weight: normal;
-	font-size: 1em;
+	font-size: max(12px, 1em);
 	box-shadow: none;
 	text-decoration: none;
 	background: var(--buttonBg);
@@ -193,7 +194,7 @@ function onMousedown(evt: MouseEvent): void {
 
 	&.mini {
 		padding: 4px 8px;
-		font-size: 0.9em;
+		font-size: max(12px, .9em);
 		border-radius: 100px;
 	}
 

From c240e37be9b13b794a223ecbe43966d10658b21e Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Sun, 21 May 2023 21:57:29 +0200
Subject: [PATCH 10/58] Accessible label in MKNote should be a computed value.
 Also Fixes renoted note labels

---
 packages/client/src/components/MkNote.vue | 30 ++++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index d267f2d4d..63aa8978d 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -461,21 +461,27 @@ function readPromo() {
 	isDeleted.value = true;
 }
 
-let accessibleLabel: string = getAccessibleLabel();
-
-function getAccessibleLabel(): string {
-	let label = `${note.user.name ? note.user.name : note.user.username}: `;
-	if (note.cw && note.isHidden) {
-		label += `Content Warning: ${note.cw}`;
-
+const accessibleLabel = computed(() => {
+	let label = `${props.note.user.username}; `;
+	if (props.note.renote) {
+		label += `boosted ${props.note.renote.user.username}; `;
+		if (props.note.renote.cw) {
+			label += `content warning: ${props.note.renote.cw}; `;
+		} else {
+			label += `${props.note.renote.text}; `;
+		}
 	} else {
-		label += `${note.text}`;
+		if (props.note.cw) {
+			label += `content warning: ${props.note.cw}; `;
+		} else {
+			label += `${props.note.text}; `;
+		}
 	}
-
-
-	label += `${note.createdAt.toLocaleUpperCase()}`;
+	const date = new Date(props.note.createdAt);
+	label += `${date.toDateString()}`;
 	return label;
-}
+})
+
 defineExpose({
 	focus,
 	blur,

From 0f82c4250ba53fe6ce6c0787aa6e587abe59f49d Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 21 May 2023 16:30:35 -0400
Subject: [PATCH 11/58] Add follow button to header

---
 .../src/components/global/MkPageHeader.vue     | 16 ++++++++++++++++
 packages/client/src/pages/note.vue             | 18 ++++++++----------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index eb4abf316..8300cc4af 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -85,6 +85,18 @@
 			</nav>
 		</template>
 		<div class="buttons right">
+			<template v-if="metadata.avatar">
+				<MkFollowButton
+					v-if="narrow"
+					:user="metadata.avatar"
+					:full="false"
+				></MkFollowButton>
+				<MkFollowButton
+					v-else
+					:user="metadata.avatar"
+					:full="true"
+				></MkFollowButton>
+			</template>
 			<template v-for="action in actions">
 				<button
 					v-tooltip.noDelay="action.text"
@@ -113,6 +125,7 @@ import {
 	reactive,
 } from "vue";
 import tinycolor from "tinycolor2";
+import MkFollowButton from "@/components/MkFollowButton.vue";
 import { popupMenu } from "@/os";
 import { scrollToTop } from "@/scripts/scroll";
 import { globalEvents } from "@/events";
@@ -379,6 +392,9 @@ onUnmounted(() => {
 
 		&.right {
 			margin-left: auto;
+			:deep(.follow-button) {
+				margin-right: 6px;
+			}
 		}
 
 		&:empty {
diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue
index 8dc944213..5b408bdaf 100644
--- a/packages/client/src/pages/note.vue
+++ b/packages/client/src/pages/note.vue
@@ -27,11 +27,10 @@
 								v-if="!showNext && hasNext"
 								class="load next"
 								@click="showNext = true"
-								v-tooltip="
-									`${i18n.ts.loadMore} (${i18n.ts.newer})`
-								"
-								><i class="ph-caret-up ph-bold ph-lg"></i
-							></MkButton>
+							>
+								<i class="ph-caret-up ph-bold ph-lg"></i>
+								{{ `${i18n.ts.loadMore} (${i18n.ts.newer})` }}
+							</MkButton>
 							<div class="note _gap">
 								<MkRemoteCaution
 									v-if="note.user.host != null"
@@ -47,11 +46,10 @@
 								v-if="!showPrev && hasPrev"
 								class="load prev"
 								@click="showPrev = true"
-								v-tooltip="
-									`${i18n.ts.loadMore} (${i18n.ts.older})`
-								"
-								><i class="ph-caret-down ph-bold ph-lg"></i
-							></MkButton>
+							>
+								<i class="ph-caret-down ph-bold ph-lg"></i>
+								{{ `${i18n.ts.loadMore} (${i18n.ts.older})` }}
+							</MkButton>
 						</div>
 
 						<div v-if="showPrev" class="_gap">

From a5ba2c3e8f60ff1f257265a26a00209fbc3a7e07 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 21 May 2023 16:48:25 -0400
Subject: [PATCH 12/58] padding fix

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

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 80202f279..892bcb183 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -626,7 +626,7 @@ onUnmounted(() => {
 		}
 
 		> :deep(.note-container) {
-			padding: 6px 0 0 0;
+			padding: 12px 0 0 0;
 			> .header > .body {
 				padding-left: 10px;
 			}

From 8806dc92f7242192217261b9c4206321bec48bcf Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Sun, 21 May 2023 23:02:22 +0200
Subject: [PATCH 13/58] Add translation to aria labels

---
 packages/client/src/components/MkNote.vue |  4 ++--
 packages/client/src/ui/universal.vue      | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 63aa8978d..c43ee0c3d 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -464,7 +464,7 @@ function readPromo() {
 const accessibleLabel = computed(() => {
 	let label = `${props.note.user.username}; `;
 	if (props.note.renote) {
-		label += `boosted ${props.note.renote.user.username}; `;
+		label += `${i18n.t("renoted")} ${props.note.renote.user.username}; `;
 		if (props.note.renote.cw) {
 			label += `content warning: ${props.note.renote.cw}; `;
 		} else {
@@ -478,7 +478,7 @@ const accessibleLabel = computed(() => {
 		}
 	}
 	const date = new Date(props.note.createdAt);
-	label += `${date.toDateString()}`;
+	label += `${date.toLocaleTimeString()}`;
 	return label;
 })
 
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 84dd742a5..6a39a739b 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -36,7 +36,7 @@
 
 		<div v-if="isMobile" class="buttons">
 			<button
-			aria-label="Menu"
+			:aria-label="i18n.t('menu')"
 				class="button nav _button"
 				@click="drawerMenuShowing = true"
 			>
@@ -48,7 +48,7 @@
 				</div>
 			</button>
 			<button
-			aria-label="Home"
+			:aria-label="i18n.t('home')"
 				class="button home _button"
 				@click="
 					mainRouter.currentRoute.value.name === 'index'
@@ -65,7 +65,7 @@
 				</div>
 			</button>
 			<button
-			aria-label="Notifications"
+			:aria-label="i18n.t('notifications')"
 				class="button notifications _button"
 				@click="
 					mainRouter.push('/my/notifications');
@@ -83,7 +83,7 @@
 				</div>
 			</button>
 			<button
-			aria-label="Chat"
+			:aria-label="i18n.t('messaging')"
 				class="button messaging _button"
 				@click="
 					mainRouter.push('/my/messaging');
@@ -103,7 +103,7 @@
 				</div>
 			</button>
 			<button
-			aria-label="Widgets"
+			:aria-label="i18n.t('_deck._columns.widgets')"
 				class="button widget _button"
 				@click="widgetsShowing = true"
 			>
@@ -116,7 +116,7 @@
 		<button
 			v-if="isMobile && mainRouter.currentRoute.value.name === 'index'"
 			ref="postButton"
-			aria-label="Post"
+			:aria-label="i18n.t('note')"
 			class="postButton button post _button"
 			@click="os.post()"
 		>
@@ -128,7 +128,7 @@
 			"
 			ref="postButton"
 			class="postButton button post _button"
-			aria-label="New Chat"
+			:aria-label="i18n.t('startMessaging')"
 			@click="messagingStart"
 		>
 			<i class="ph-user-plus ph-bold ph-lg"></i>

From 88f39b2b02899b21179063dceaf8902131880aaa Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 21 May 2023 18:23:17 -0400
Subject: [PATCH 14/58] Give article semantic to subnote

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

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 1a50e6f5f..d0aae4168 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -1,5 +1,5 @@
 <template>
-	<div
+	<article
 		v-if="!muted.muted || muted.what === 'reply'"
 		ref="el"
 		v-size="{ max: [450, 500] }"
@@ -150,7 +150,7 @@
 				></MkA>
 			</div>
 		</template>
-	</div>
+	</article>
 	<div v-else class="muted" @click="muted.muted = false">
 		<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
 			<template #name>

From 8b2ffa773e29dc22a9979ae989c9756154c05a49 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 21 May 2023 20:04:59 -0700
Subject: [PATCH 15/58] Close #10174

---
 locales/en-US.yml                       | 2 +-
 packages/client/src/pages/user-info.vue | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index b3944b1e5..1a6621d30 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -971,7 +971,7 @@ driveCapOverrideLabel: "Change the drive capacity for this user"
 driveCapOverrideCaption: "Reset the capacity to default by inputting a value of 0\
   \ or lower."
 requireAdminForView: "You must log in with an administrator account to view this."
-isSystemAccount: "An account created and automatically operated by the system."
+isSystemAccount: "This account is created and automatically operated by the system. Please do not moderate, edit, delete, or otherwise tamper with this account, or it may break your server."
 typeToConfirm: "Please enter {x} to confirm"
 deleteAccount: "Delete account"
 document: "Documentation"
diff --git a/packages/client/src/pages/user-info.vue b/packages/client/src/pages/user-info.vue
index 0edb85ba9..7a4ebdee9 100644
--- a/packages/client/src/pages/user-info.vue
+++ b/packages/client/src/pages/user-info.vue
@@ -41,6 +41,7 @@
 					<MkInfo
 						v-if="user.username.includes('.')"
 						class="_formBlock"
+						warn
 						>{{ i18n.ts.isSystemAccount }}</MkInfo
 					>
 

From 70f6a4808ca5329d861c81ddbfb05ce8dad7d5d2 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 21 May 2023 20:05:52 -0700
Subject: [PATCH 16/58] chore: formatting

---
 packages/client/src/components/MkButton.vue   |  2 +-
 .../client/src/components/MkFollowButton.vue  | 20 ++++++++++---------
 packages/client/src/components/MkTab.vue      |  8 +++++---
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/packages/client/src/components/MkButton.vue b/packages/client/src/components/MkButton.vue
index 8a7fe6851..682072f4c 100644
--- a/packages/client/src/components/MkButton.vue
+++ b/packages/client/src/components/MkButton.vue
@@ -194,7 +194,7 @@ function onMousedown(evt: MouseEvent): void {
 
 	&.mini {
 		padding: 4px 8px;
-		font-size: max(12px, .9em);
+		font-size: max(12px, 0.9em);
 		border-radius: 100px;
 	}
 
diff --git a/packages/client/src/components/MkFollowButton.vue b/packages/client/src/components/MkFollowButton.vue
index 0ef5868bd..5481568c7 100644
--- a/packages/client/src/components/MkFollowButton.vue
+++ b/packages/client/src/components/MkFollowButton.vue
@@ -11,41 +11,43 @@
 		}"
 		:disabled="wait"
 		@click="onClick"
-		:aria-label=" `${state} ${user.name || user.username}` "
+		:aria-label="`${state} ${user.name || user.username}`"
 	>
 		<template v-if="!wait">
 			<template v-if="isBlocking">
-				<span v-if="full">{{ state = i18n.ts.blocked }}</span
+				<span v-if="full">{{ (state = i18n.ts.blocked) }}</span
 				><i class="ph-prohibit ph-bold ph-lg"></i>
 			</template>
 			<template
 				v-else-if="hasPendingFollowRequestFromYou && user.isLocked"
 			>
-				<span v-if="full">{{ state = i18n.ts.followRequestPending }}</span
+				<span v-if="full">{{
+					(state = i18n.ts.followRequestPending)
+				}}</span
 				><i class="ph-hourglass-medium ph-bold ph-lg"></i>
 			</template>
 			<template
 				v-else-if="hasPendingFollowRequestFromYou && !user.isLocked"
 			>
 				<!-- つまりリモートフォローの場合。 -->
-				<span v-if="full">{{ state = i18n.ts.processing }}</span
+				<span v-if="full">{{ (state = i18n.ts.processing) }}</span
 				><i class="ph-circle-notch ph-bold ph-lg fa-pulse"></i>
 			</template>
 			<template v-else-if="isFollowing">
-				<span v-if="full">{{ state = i18n.ts.unfollow }}</span
+				<span v-if="full">{{ (state = i18n.ts.unfollow) }}</span
 				><i class="ph-minus ph-bold ph-lg"></i>
 			</template>
 			<template v-else-if="!isFollowing && user.isLocked">
-				<span v-if="full">{{ state = i18n.ts.followRequest }}</span
+				<span v-if="full">{{ (state = i18n.ts.followRequest) }}</span
 				><i class="ph-plus ph-bold ph-lg"></i>
 			</template>
 			<template v-else-if="!isFollowing && !user.isLocked">
-				<span v-if="full">{{ state = i18n.ts.follow }}</span
+				<span v-if="full">{{ (state = i18n.ts.follow) }}</span
 				><i class="ph-plus ph-bold ph-lg"></i>
 			</template>
 		</template>
 		<template v-else>
-			<span v-if="full">{{ state = i18n.ts.processing }}</span
+			<span v-if="full">{{ (state = i18n.ts.processing) }}</span
 			><i class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i>
 		</template>
 	</button>
@@ -176,7 +178,7 @@ onBeforeUnmount(() => {
 	background: var(--bg);
 
 	&.full {
-		padding: 0.2em .7em;
+		padding: 0.2em 0.7em;
 		width: auto;
 		font-size: 14px;
 	}
diff --git a/packages/client/src/components/MkTab.vue b/packages/client/src/components/MkTab.vue
index 5f7cd084f..7e7e12b6f 100644
--- a/packages/client/src/components/MkTab.vue
+++ b/packages/client/src/components/MkTab.vue
@@ -16,9 +16,10 @@ export default defineComponent({
 		return h(
 			"div",
 			{
-				class: ["pxhvhrfw", 
+				class: [
+					"pxhvhrfw",
 					{ chips: this.style === "chips" },
-					{ underline: this.style === "underline" }
+					{ underline: this.style === "underline" },
 				],
 				role: "tablist",
 			},
@@ -92,7 +93,8 @@ export default defineComponent({
 		}
 	}
 
-	&.chips, &.underline {
+	&.chips,
+	&.underline {
 		padding: 12px 32px;
 		font-size: 0.85em;
 		overflow-x: auto;

From 16c48307b61c089848c25e44e3b091ac2926d971 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 21 May 2023 20:07:25 -0700
Subject: [PATCH 17/58] Close #10175

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

diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index 8035dcdd7..95d570eb3 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -7,6 +7,7 @@ import * as fs from "node:fs";
 import * as http from "node:http";
 import Koa from "koa";
 import Router from "@koa/router";
+import cors from "@koa/cors";
 import mount from "koa-mount";
 import koaLogger from "koa-logger";
 import * as slow from "koa-slow";
@@ -41,6 +42,12 @@ app.proxy = true;
 
 app.use(removeTrailingSlash());
 
+app.use(
+	cors({
+		origin: "*",
+	}),
+);
+
 if (!["production", "test"].includes(process.env.NODE_ENV || "")) {
 	// Logger
 	app.use(

From 3d9212c0d686350050e96298d78f9b382a5f1b77 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 21 May 2023 20:07:46 -0700
Subject: [PATCH 18/58] dev15

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

diff --git a/package.json b/package.json
index 3b525b921..71cd9fe91 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev14",
+	"version": "14.0.0-dev15",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 6ef6b62fb20ae0045b11f2cffc02116969dd0389 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 21 May 2023 20:19:41 -0700
Subject: [PATCH 19/58] don't show underline if no tabs

---
 packages/client/src/components/MkNoteDetailed.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 892bcb183..ec14c76b0 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -33,7 +33,19 @@
 			detailedView
 		></MkNote>
 
-		<MkTab v-model="tab" :style="'underline'" @update:modelValue="loadTab">
+		<MkTab
+			v-model="tab"
+			:style="
+				appearNote.repliesCount > 0 &&
+				appearNote.renoteCount > 0 &&
+				reactionsCount > 0 &&
+				directQuotes?.length > 0 &&
+				clips?.length > 0
+					? 'underline'
+					: ''
+			"
+			@update:modelValue="loadTab"
+		>
 			<option value="replies" v-if="appearNote.repliesCount > 0">
 				<i class="ph-arrow-u-up-left ph-bold ph-lg"></i>
 				<span class="count">{{ appearNote.repliesCount }}</span>

From 892414f303e323240db6ded16c79f9e77a50874b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 21 May 2023 21:39:20 -0700
Subject: [PATCH 20/58] chore: up mfm-js in backend

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

diff --git a/packages/backend/package.json b/packages/backend/package.json
index e38e531f3..96edb7f02 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -85,7 +85,7 @@
 		"koa-send": "5.0.1",
 		"koa-slow": "2.1.0",
 		"koa-views": "7.0.2",
-		"mfm-js": "0.23.2",
+		"mfm-js": "0.23.3",
 		"mime-types": "2.1.35",
 		"multer": "1.4.4-lts.1",
 		"native-utils": "link:native-utils",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cf1ceb498..5210f89ad 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -264,8 +264,8 @@ importers:
         specifier: 7.0.2
         version: 7.0.2(@types/koa@2.13.5)(ejs@3.1.8)(pug@3.0.2)
       mfm-js:
-        specifier: 0.23.2
-        version: 0.23.2
+        specifier: 0.23.3
+        version: 0.23.3
       mime-types:
         specifier: 2.1.35
         version: 2.1.35
@@ -10424,17 +10424,10 @@ packages:
     engines: {node: '>= 0.6'}
     dev: false
 
-  /mfm-js@0.23.2:
-    resolution: {integrity: sha512-lfYvsMr6FIYbt0ZDL+nY+GWWqmcXpe9jrYLBLy5vvQHwGfPALpx43uNHj8hZsakgM82hPMo/zdx0e9tj+4Z4IA==}
-    dependencies:
-      twemoji-parser: 14.0.0
-    dev: false
-
   /mfm-js@0.23.3:
     resolution: {integrity: sha512-o8scYmbey6rMUmWAlT3k3ntt6khaCLdxlmHhAWV5wTTMj2OK1atQvZfRUq0SIVm1Jig08qlZg/ps71xUqrScNA==}
     dependencies:
       twemoji-parser: 14.0.0
-    dev: true
 
   /micromatch@3.1.10:
     resolution: {integrity: sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==}

From 1c275c91142d2961dee77ccdaf57457357bc99c8 Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Mon, 22 May 2023 10:54:42 +0200
Subject: [PATCH 21/58] Add translations to deck.vue aria labels

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

diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue
index f1cb40797..b669aae28 100644
--- a/packages/client/src/ui/deck.vue
+++ b/packages/client/src/ui/deck.vue
@@ -111,7 +111,7 @@
 
 		<div v-if="isMobile" class="buttons">
 			<button
-			aria-label="Menu"
+			:aria-label="i18n.t('menu')"
 				class="button nav _button"
 				@click="drawerMenuShowing = true"
 			>
@@ -120,11 +120,11 @@
 					><i class="ph-circle ph-fill"></i
 				></span>
 			</button>
-			<button aria-label="Home" class="button home _button" @click="mainRouter.push('/')">
+			<button :aria-label="i18n.t('home')" class="button home _button" @click="mainRouter.push('/')">
 				<i class="ph-house ph-bold ph-lg"></i>
 			</button>
 			<button
-			aria-label="Notifications"
+			:aria-label="i18n.t('notifications')"
 				class="button notifications _button"
 				@click="mainRouter.push('/my/notifications')"
 			>
@@ -133,7 +133,7 @@
 					><i class="ph-circle ph-fill"></i
 				></span>
 			</button>
-			<button aria-label="Post" class="button post _button" @click="os.post()">
+			<button :aria-label="i18n.t('note')" class="button post _button" @click="os.post()">
 				<i class="ph-pencil ph-bold ph-lg"></i>
 			</button>
 		</div>

From 4ae3eea8a33800465b47fc8e1ae17ff46aa0a974 Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Mon, 22 May 2023 10:56:42 +0200
Subject: [PATCH 22/58] Add translation to content warning in MKNote.vue

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

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index c43ee0c3d..cac0461b4 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -472,7 +472,7 @@ const accessibleLabel = computed(() => {
 		}
 	} else {
 		if (props.note.cw) {
-			label += `content warning: ${props.note.cw}; `;
+			label += `${i18n.t("cw")}: ${props.note.cw}; `;
 		} else {
 			label += `${props.note.text}; `;
 		}

From c6d6950006e474fd4aba48b06ef48a2f135eaed8 Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Mon, 22 May 2023 10:58:20 +0200
Subject: [PATCH 23/58] Add cw to english locale

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

diff --git a/locales/en-US.yml b/locales/en-US.yml
index b3944b1e5..9c658d668 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -69,6 +69,7 @@ followRequestAccepted: "Follow request accepted"
 mention: "Mention"
 mentions: "Mentions"
 directNotes: "Direct messages"
+cw: "Content warning"
 importAndExport: "Import/Export Data"
 import: "Import"
 export: "Export"

From 891cc62e0d68c24e767f28ca4c89f3cd429a7edd Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Mon, 22 May 2023 12:18:17 +0200
Subject: [PATCH 24/58] Emit event when cw is expanded

---
 packages/client/src/components/MkNote.vue     | 76 +++++++------------
 .../src/components/MkSubNoteContent.vue       |  2 +
 2 files changed, 30 insertions(+), 48 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index cac0461b4..8e6eb0d10 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -18,79 +18,47 @@
 				{{ i18n.ts.featured }}
 			</div>
 			<div v-if="pinned" class="info">
-				<i class="ph-push-pin ph-bold ph-lg"></i
-				>{{ i18n.ts.pinnedNote }}
+				<i class="ph-push-pin ph-bold ph-lg"></i>{{ i18n.ts.pinnedNote }}
 			</div>
 			<div v-if="isRenote" class="renote">
 				<i class="ph-repeat ph-bold ph-lg"></i>
 				<I18n :src="i18n.ts.renotedBy" tag="span">
 					<template #user>
-						<MkA
-							v-user-preview="note.userId"
-							class="name"
-							:to="userPage(note.user)"
-							@click.stop
-						>
+						<MkA v-user-preview="note.userId" class="name" :to="userPage(note.user)" @click.stop>
 							<MkUserName :user="note.user" />
 						</MkA>
 					</template>
 				</I18n>
 				<div class="info">
-					<button
-						ref="renoteTime"
-						class="_button time"
-						@click.stop="showRenoteMenu()"
-					>
-						<i
-							v-if="isMyRenote"
-							class="ph-dots-three-outline ph-bold ph-lg dropdownIcon"
-						></i>
+					<button ref="renoteTime" class="_button time" @click.stop="showRenoteMenu()">
+						<i v-if="isMyRenote" class="ph-dots-three-outline ph-bold ph-lg dropdownIcon"></i>
 						<MkTime :time="note.createdAt" />
 					</button>
 					<MkVisibility :note="note" />
 				</div>
 			</div>
 		</div>
-		<article
-			class="article"
-			@contextmenu.stop="onContextmenu"
-			@click="noteClick"
-		>
+		<article class="article" @contextmenu.stop="onContextmenu" @click="noteClick">
 			<div class="main">
 				<div class="header-container">
 					<MkAvatar class="avatar" :user="appearNote.user" />
-					<XNoteHeader
-						class="header"
-						:note="appearNote"
-						:mini="true"
-					/>
+					<XNoteHeader class="header" :note="appearNote" :mini="true" />
 				</div>
 				<div class="body">
-					<MkSubNoteContent
-						class="text"
-						:note="appearNote"
-						:detailed="true"
-						:detailedView="detailedView"
-						:parentId="appearNote.parentId"
-						@push="(e) => router.push(notePage(e))"
-						@focusfooter="footerEl.focus()"
-					></MkSubNoteContent>
+					<MkSubNoteContent class="text" :note="appearNote" :detailed="true" :detailedView="detailedView"
+						:parentId="appearNote.parentId" @push="(e) => router.push(notePage(e))"
+						@focusfooter="footerEl.focus()" @expanded="(e) => setPostExpanded(e)"></MkSubNoteContent>
 					<div v-if="translating || translation" class="translation">
 						<MkLoading v-if="translating" mini />
 						<div v-else class="translated">
-							<b
-								>{{
-									i18n.t("translatedFrom", {
-										x: translation.sourceLang,
-									})
-								}}:
+							<b>{{
+								i18n.t("translatedFrom", {
+									x: translation.sourceLang,
+								})
+							}}:
 							</b>
-							<Mfm
-								:text="translation.text"
-								:author="appearNote.user"
-								:i="$i"
-								:custom-emojis="appearNote.emojis"
-							/>
+							<Mfm :text="translation.text" :author="appearNote.user" :i="$i"
+								:custom-emojis="appearNote.emojis" />
 						</div>
 					</div>
 				</div>
@@ -461,18 +429,30 @@ function readPromo() {
 	isDeleted.value = true;
 }
 
+let postIsExpanded = false;
+
+function setPostExpanded(val: boolean) {
+	postIsExpanded = val;
+}
+
 const accessibleLabel = computed(() => {
 	let label = `${props.note.user.username}; `;
 	if (props.note.renote) {
 		label += `${i18n.t("renoted")} ${props.note.renote.user.username}; `;
 		if (props.note.renote.cw) {
 			label += `content warning: ${props.note.renote.cw}; `;
+			if (postIsExpanded) {
+				label += `${props.note.renote.text}; `;	
+			}
 		} else {
 			label += `${props.note.renote.text}; `;
 		}
 	} else {
 		if (props.note.cw) {
 			label += `${i18n.t("cw")}: ${props.note.cw}; `;
+			if (postIsExpanded) {
+				label += `${props.note.text}; `;
+			}
 		} else {
 			label += `${props.note.text}; `;
 		}
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index b162bca0b..5a46a319c 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -54,6 +54,7 @@
 				v-model="showContent"
 				:note="note"
 				v-on:keydown="focusFooter"
+				v-on:update:model-value="(val) => emit('expanded', val)"
 			/>
 			<div
 				class="body"
@@ -190,6 +191,7 @@ const props = defineProps<{
 const emit = defineEmits<{
 	(ev: "push", v): void;
 	(ev: "focusfooter"): void;
+	(ev: "expanded", v): void;
 }>();
 
 const cwButton = ref<HTMLElement>();

From fea1f993e21f376898ee339180360daec39d11e8 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 22 May 2023 06:21:41 -0400
Subject: [PATCH 25/58] Hide icons in note tabs, always show reply tab

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

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index ec14c76b0..beb7aea0f 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -46,28 +46,28 @@
 			"
 			@update:modelValue="loadTab"
 		>
-			<option value="replies" v-if="appearNote.repliesCount > 0">
-				<i class="ph-arrow-u-up-left ph-bold ph-lg"></i>
-				<span class="count">{{ appearNote.repliesCount }}</span>
+			<option value="replies">
+				<!-- <i class="ph-arrow-u-up-left ph-bold ph-lg"></i> -->
+				<span v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</span>
 				{{ i18n.ts._notification._types.reply }}
 			</option>
 			<option value="renotes" v-if="appearNote.renoteCount > 0">
-				<i class="ph-repeat ph-bold ph-lg"></i>
+				<!-- <i class="ph-repeat ph-bold ph-lg"></i> -->
 				<span class="count">{{ appearNote.renoteCount }}</span>
 				{{ i18n.ts._notification._types.renote }}
 			</option>
 			<option value="reactions" v-if="reactionsCount > 0">
-				<i class="ph-smiley ph-bold ph-lg"></i>
+				<!-- <i class="ph-smiley ph-bold ph-lg"></i> -->
 				<span class="count">{{ reactionsCount }}</span>
 				{{ i18n.ts.reaction }}
 			</option>
 			<option value="quotes" v-if="directQuotes?.length > 0">
-				<i class="ph-quotes ph-bold ph-lg"></i>
+				<!-- <i class="ph-quotes ph-bold ph-lg"></i> -->
 				<span class="count">{{ directQuotes.length }}</span>
 				{{ i18n.ts._notification._types.quote }}
 			</option>
 			<option value="clips" v-if="clips?.length > 0">
-				<i class="ph-paperclip ph-bold ph-lg"></i>
+				<!-- <i class="ph-paperclip ph-bold ph-lg"></i> -->
 				<span class="count">{{ clips.length }}</span>
 				{{ i18n.ts.clips }}
 			</option>

From ef17ff4e0524641ac191d149fcfee9f9b5889304 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 22 May 2023 06:26:17 -0400
Subject: [PATCH 26/58] fix

---
 packages/client/src/components/MkNoteDetailed.vue | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index beb7aea0f..2fcf8b0e7 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -35,15 +35,7 @@
 
 		<MkTab
 			v-model="tab"
-			:style="
-				appearNote.repliesCount > 0 &&
-				appearNote.renoteCount > 0 &&
-				reactionsCount > 0 &&
-				directQuotes?.length > 0 &&
-				clips?.length > 0
-					? 'underline'
-					: ''
-			"
+			:style="'underline'"
 			@update:modelValue="loadTab"
 		>
 			<option value="replies">

From 16bec67f27b24336f6b845d0a48224db51fb01b9 Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Mon, 22 May 2023 13:08:32 +0200
Subject: [PATCH 27/58] Set postIsExpanded to ref() for reactivity

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

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 8e6eb0d10..fa82c0e21 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -429,10 +429,10 @@ function readPromo() {
 	isDeleted.value = true;
 }
 
-let postIsExpanded = false;
+let postIsExpanded = ref(false);
 
 function setPostExpanded(val: boolean) {
-	postIsExpanded = val;
+	postIsExpanded.value = val;
 }
 
 const accessibleLabel = computed(() => {
@@ -440,8 +440,8 @@ const accessibleLabel = computed(() => {
 	if (props.note.renote) {
 		label += `${i18n.t("renoted")} ${props.note.renote.user.username}; `;
 		if (props.note.renote.cw) {
-			label += `content warning: ${props.note.renote.cw}; `;
-			if (postIsExpanded) {
+			label += `${i18n.t('cw')}: ${props.note.renote.cw}; `;
+			if (postIsExpanded.value) {
 				label += `${props.note.renote.text}; `;	
 			}
 		} else {
@@ -450,7 +450,7 @@ const accessibleLabel = computed(() => {
 	} else {
 		if (props.note.cw) {
 			label += `${i18n.t("cw")}: ${props.note.cw}; `;
-			if (postIsExpanded) {
+			if (postIsExpanded.value) {
 				label += `${props.note.text}; `;
 			}
 		} else {

From 561706bb2fc33f55fcd4c90b4e514a92dbbecd11 Mon Sep 17 00:00:00 2001
From: jolupa <jolupameister@gmail.com>
Date: Mon, 22 May 2023 04:49:14 +0000
Subject: [PATCH 28/58] chore: Translated using Weblate (Catalan)

Currently translated at 100.0% (1747 of 1747 strings)

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

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index cce91104a..de8246be3 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -1704,7 +1704,9 @@ 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.
+isSystemAccount: Aquest compte és creat i operat automàticament pel sistema. Si us
+  plau, no modereu, editeu, suprimiu o modifiqueu aquest compte de cap forma, o podria
+  trencar el vostre servidor.
 typeToConfirm: Introduïu {x} per confirmar
 deleteAccount: Suprimeix el compte
 document: Documentació
@@ -2056,3 +2058,4 @@ newer: Més nou
 older: Més antic
 silencedWarning: S'està mostrant aquesta pàgina per què aquest usuari és d'un servidor
   que l'administrador a silenciat, així que pot ser spam.
+jumpToPrevious: Vés a l'anterior

From 1ad166bfa35a0d1370a84ed7406be832e9bb16d8 Mon Sep 17 00:00:00 2001
From: Richard <galmt@protonmail.com>
Date: Mon, 22 May 2023 14:44:40 +0000
Subject: [PATCH 29/58] chore: Translated using Weblate (Dutch)

Currently translated at 24.9% (436 of 1747 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/nl/
---
 locales/nl-NL.yml | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index da447aa6f..e6cbd87a3 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -47,8 +47,8 @@ copyContent: "Kopiëren inhoud"
 copyLink: "Kopiëren link"
 delete: "Verwijderen"
 deleteAndEdit: "Verwijderen en bewerken"
-deleteAndEditConfirm: "Weet je zeker dat je deze notitie wilt verwijderen en dan bewerken?
-  Je verliest alle reacties, herdelingen en antwoorden erop."
+deleteAndEditConfirm: "Weet je zeker dat je deze post wilt verwijderen en dan bewerken?
+  Je verliest alle reacties, boosts en antwoorden erop."
 addToList: "Aan lijst toevoegen"
 sendMessage: "Verstuur bericht"
 copyUsername: "Kopiëren gebruikersnaam "
@@ -68,7 +68,7 @@ export: "Export"
 files: "Bestanden"
 download: "Downloaden"
 driveFileDeleteConfirm: "Weet je zeker dat je het bestand \"{name}\" wilt verwijderen?
-  Notities met dit bestand als bijlage worden ook verwijderd."
+  Posts met dit bestand als bijlage worden ook verwijderd."
 unfollowConfirm: "Weet je zeker dat je {name} wilt ontvolgen?"
 exportRequested: "Je hebt een export aangevraagd. Dit kan een tijdje duren. Het wordt
   toegevoegd aan je Drive zodra het is voltooid."
@@ -103,9 +103,9 @@ followRequestPending: "Wachten op goedkeuring volgverzoek"
 enterEmoji: "Voer een emoji in"
 renote: "Herdelen"
 unrenote: "Stop herdelen"
-renoted: "Herdeeld"
-cantRenote: "Dit bericht kan niet worden herdeeld"
-cantReRenote: "Een herdeling kan niet worden herdeeld"
+renoted: "Boosted."
+cantRenote: "Dit bericht kan niet worden geboost."
+cantReRenote: "Een boost kan niet worden geboost."
 quote: "Quote"
 pinnedNote: "Vastgemaakte notitie"
 pinned: "Vastmaken aan profielpagina"
@@ -139,8 +139,8 @@ flagAsCat: "Markeer dit account als een kat."
 flagAsCatDescription: "Zet deze vlag aan als je wilt aangeven dat dit account een
   kat is."
 flagShowTimelineReplies: "Toon antwoorden op de tijdlijn"
-flagShowTimelineRepliesDescription: "Als je dit vlag aanzet, toont de tijdlijn ook
-  antwoorden op andere en niet alleen jouw eigen notities."
+flagShowTimelineRepliesDescription: "Als je deze vlag aanzet, toont de tijdlijn ook
+  antwoorden op andere en niet alleen jouw eigen post."
 autoAcceptFollowed: "Accepteer verzoeken om jezelf te volgen vanzelf als je de verzoeker
   al volgt"
 addAccount: "Account toevoegen"
@@ -203,8 +203,8 @@ mutedUsers: "Gedempte gebruikers"
 blockedUsers: "Geblokkeerde gebruikers"
 noUsers: "Er zijn geen gebruikers."
 editProfile: "Bewerk Profiel"
-noteDeleteConfirm: "Ben je zeker dat je dit bericht wil verwijderen?"
-pinLimitExceeded: "Je kunt geen berichten meer vastprikken"
+noteDeleteConfirm: "Ben je zeker dat je deze post wil verwijderen?"
+pinLimitExceeded: "Je kunt geen posts meer vastprikken"
 intro: "Installatie van Calckey geëindigd! Maak nu een beheerder aan."
 done: "Klaar"
 processing: "Bezig met verwerken"
@@ -499,3 +499,21 @@ manageGroups: Beheer groepen
 subscribePushNotification: Pushmeldingen inschakelen
 unsubscribePushNotification: Pushmeldingen uitschakelen
 pushNotificationAlreadySubscribed: Pushmeldingen zijn al ingeschakeld
+antennaSource: Antenne bron
+antennaKeywords: Trefwoorden om naar te luisteren
+antennaExcludeKeywords: Trefwoorden om te negeren
+driveCapacityPerRemoteAccount: Schijfruimte per externe gebruiker
+backgroundImageUrl: Achtergrondafbeelding URL
+basicInfo: Basis informatie
+pinnedUsers: Vastgezette gebruikers
+pinnedPages: Vastgezette Pagina's
+driveCapacityPerLocalAccount: Schijfruimte per lokale gebruiker
+iconUrl: Icoon URL
+bannerUrl: Banner afbeelding URL
+manageAntennas: Beheer Antennes
+name: Naam
+notifyAntenna: Meld nieuwe posts
+withFileAntenna: Alleen posts met bestanden
+enableServiceworker: Schakel pushmeldingen voor je browser in
+renoteUnmute: Ontdemp boosts
+jumpToPrevious: Spring naar vorige

From d6c7d038f611176853a479158cc6ae7155f61f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?GayCookie=20=E2=9C=8C?= <contact@gaycookie.dev>
Date: Mon, 22 May 2023 11:19:59 +0000
Subject: [PATCH 30/58] chore: Translated using Weblate (Dutch)

Currently translated at 24.9% (436 of 1747 strings)

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

diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index e6cbd87a3..cea1d5f70 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -101,13 +101,13 @@ followRequests: "Volgverzoeken"
 unfollow: "Ontvolgen"
 followRequestPending: "Wachten op goedkeuring volgverzoek"
 enterEmoji: "Voer een emoji in"
-renote: "Herdelen"
+renote: "Boost"
 unrenote: "Stop herdelen"
 renoted: "Boosted."
 cantRenote: "Dit bericht kan niet worden geboost."
 cantReRenote: "Een boost kan niet worden geboost."
 quote: "Quote"
-pinnedNote: "Vastgemaakte notitie"
+pinnedNote: "Vastgemaakte post"
 pinned: "Vastmaken aan profielpagina"
 you: "Jij"
 clickToShow: "Klik om te bekijken"
@@ -116,7 +116,7 @@ add: "Toevoegen"
 reaction: "Reacties"
 reactionSettingDescription2: "Sleep om opnieuw te ordenen, Klik om te verwijderen,
   Druk op \"+\" om toe te voegen"
-rememberNoteVisibility: "Vergeet niet de notitie zichtbaarheidsinstellingen"
+rememberNoteVisibility: "Onthoud post zichtbaarheidsinstellingen"
 attachCancel: "Verwijder bijlage"
 markAsSensitive: "Markeren als NSFW"
 unmarkAsSensitive: "Geen NSFW"

From 9e946689113fa3c68a8918a86ae7bc8b249bab39 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 May 2023 08:22:21 -0700
Subject: [PATCH 31/58] chore: upgrade swiper

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

diff --git a/packages/client/package.json b/packages/client/package.json
index 69346651d..1af31dd09 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -67,7 +67,7 @@
 		"start-server-and-test": "1.15.2",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
-		"swiper": "^8.4.5",
+		"swiper": "9.3.2",
 		"syuilo-password-strength": "0.0.1",
 		"textarea-caret": "3.1.0",
 		"three": "0.146.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5210f89ad..493e9fc06 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -840,8 +840,8 @@ importers:
         specifier: 2.1.0
         version: 2.1.0
       swiper:
-        specifier: ^8.4.5
-        version: 8.4.5
+        specifier: 9.3.2
+        version: 9.3.2
       syuilo-password-strength:
         specifier: 0.0.1
         version: 0.0.1
@@ -6411,12 +6411,6 @@ packages:
       domhandler: 5.0.3
       entities: 4.4.0
 
-  /dom7@4.0.4:
-    resolution: {integrity: sha512-DSSgBzQ4rJWQp1u6o+3FVwMNnT5bzQbMb+o31TjYYeRi05uAcpF8koxdfzeoe5ElzPmua7W7N28YJhF7iEKqIw==}
-    dependencies:
-      ssr-window: 4.0.2
-    dev: true
-
   /domelementtype@1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: false
@@ -13587,12 +13581,10 @@ packages:
       webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1)
     dev: true
 
-  /swiper@8.4.5:
-    resolution: {integrity: sha512-zveyEFBBv4q1sVkbJHnuH4xCtarKieavJ4SxP0QEHvdpPLJRuD7j/Xg38IVVLbp7Db6qrPsLUePvxohYx39Agw==}
+  /swiper@9.3.2:
+    resolution: {integrity: sha512-Kj9Z4kXRmJR3YT/Wj+XLWj8P6IcRt+WG38uL8M3/Wny7+6sV0TlP9vnE1X+Co9c7VzNooojWGnFa+Wf/9+CUMA==}
     engines: {node: '>= 4.7.0'}
-    requiresBuild: true
     dependencies:
-      dom7: 4.0.4
       ssr-window: 4.0.2
     dev: true
 

From d88d74c8e07d96238401441faf7b1ce2753bba01 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 May 2023 08:23:00 -0700
Subject: [PATCH 32/58] chore: formatting

---
 packages/client/src/components/MkNote.vue     | 91 ++++++++++++++-----
 .../client/src/components/MkNoteDetailed.vue  | 10 +-
 packages/client/src/ui/deck.vue               | 16 +++-
 packages/client/src/ui/universal.vue          | 10 +-
 4 files changed, 89 insertions(+), 38 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index fa82c0e21..5c014e9d3 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -1,8 +1,20 @@
 <template>
-	<div :aria-label="accessibleLabel" v-if="!muted.muted" v-show="!isDeleted" ref="el" v-hotkey="keymap"
-		v-size="{ max: [500, 450, 350, 300] }" class="tkcbzcuz note-container" :tabindex="!isDeleted ? '-1' : null"
-		:class="{ renote: isRenote }">
-		<MkNoteSub v-if="appearNote.reply && !detailedView" :note="appearNote.reply" class="reply-to" />
+	<div
+		:aria-label="accessibleLabel"
+		v-if="!muted.muted"
+		v-show="!isDeleted"
+		ref="el"
+		v-hotkey="keymap"
+		v-size="{ max: [500, 450, 350, 300] }"
+		class="tkcbzcuz note-container"
+		:tabindex="!isDeleted ? '-1' : null"
+		:class="{ renote: isRenote }"
+	>
+		<MkNoteSub
+			v-if="appearNote.reply && !detailedView"
+			:note="appearNote.reply"
+			class="reply-to"
+		/>
 		<div v-if="!detailedView" class="note-context" @click="noteClick">
 			<div class="line"></div>
 			<div v-if="appearNote._prId_" class="info">
@@ -18,47 +30,80 @@
 				{{ i18n.ts.featured }}
 			</div>
 			<div v-if="pinned" class="info">
-				<i class="ph-push-pin ph-bold ph-lg"></i>{{ i18n.ts.pinnedNote }}
+				<i class="ph-push-pin ph-bold ph-lg"></i
+				>{{ i18n.ts.pinnedNote }}
 			</div>
 			<div v-if="isRenote" class="renote">
 				<i class="ph-repeat ph-bold ph-lg"></i>
 				<I18n :src="i18n.ts.renotedBy" tag="span">
 					<template #user>
-						<MkA v-user-preview="note.userId" class="name" :to="userPage(note.user)" @click.stop>
+						<MkA
+							v-user-preview="note.userId"
+							class="name"
+							:to="userPage(note.user)"
+							@click.stop
+						>
 							<MkUserName :user="note.user" />
 						</MkA>
 					</template>
 				</I18n>
 				<div class="info">
-					<button ref="renoteTime" class="_button time" @click.stop="showRenoteMenu()">
-						<i v-if="isMyRenote" class="ph-dots-three-outline ph-bold ph-lg dropdownIcon"></i>
+					<button
+						ref="renoteTime"
+						class="_button time"
+						@click.stop="showRenoteMenu()"
+					>
+						<i
+							v-if="isMyRenote"
+							class="ph-dots-three-outline ph-bold ph-lg dropdownIcon"
+						></i>
 						<MkTime :time="note.createdAt" />
 					</button>
 					<MkVisibility :note="note" />
 				</div>
 			</div>
 		</div>
-		<article class="article" @contextmenu.stop="onContextmenu" @click="noteClick">
+		<article
+			class="article"
+			@contextmenu.stop="onContextmenu"
+			@click="noteClick"
+		>
 			<div class="main">
 				<div class="header-container">
 					<MkAvatar class="avatar" :user="appearNote.user" />
-					<XNoteHeader class="header" :note="appearNote" :mini="true" />
+					<XNoteHeader
+						class="header"
+						:note="appearNote"
+						:mini="true"
+					/>
 				</div>
 				<div class="body">
-					<MkSubNoteContent class="text" :note="appearNote" :detailed="true" :detailedView="detailedView"
-						:parentId="appearNote.parentId" @push="(e) => router.push(notePage(e))"
-						@focusfooter="footerEl.focus()" @expanded="(e) => setPostExpanded(e)"></MkSubNoteContent>
+					<MkSubNoteContent
+						class="text"
+						:note="appearNote"
+						:detailed="true"
+						:detailedView="detailedView"
+						:parentId="appearNote.parentId"
+						@push="(e) => router.push(notePage(e))"
+						@focusfooter="footerEl.focus()"
+						@expanded="(e) => setPostExpanded(e)"
+					></MkSubNoteContent>
 					<div v-if="translating || translation" class="translation">
 						<MkLoading v-if="translating" mini />
 						<div v-else class="translated">
-							<b>{{
-								i18n.t("translatedFrom", {
-									x: translation.sourceLang,
-								})
-							}}:
+							<b
+								>{{
+									i18n.t("translatedFrom", {
+										x: translation.sourceLang,
+									})
+								}}:
 							</b>
-							<Mfm :text="translation.text" :author="appearNote.user" :i="$i"
-								:custom-emojis="appearNote.emojis" />
+							<Mfm
+								:text="translation.text"
+								:author="appearNote.user"
+								:i="$i"
+								:custom-emojis="appearNote.emojis"
+							/>
 						</div>
 					</div>
 				</div>
@@ -440,9 +485,9 @@ const accessibleLabel = computed(() => {
 	if (props.note.renote) {
 		label += `${i18n.t("renoted")} ${props.note.renote.user.username}; `;
 		if (props.note.renote.cw) {
-			label += `${i18n.t('cw')}: ${props.note.renote.cw}; `;
+			label += `${i18n.t("cw")}: ${props.note.renote.cw}; `;
 			if (postIsExpanded.value) {
-				label += `${props.note.renote.text}; `;	
+				label += `${props.note.renote.text}; `;
 			}
 		} else {
 			label += `${props.note.renote.text}; `;
@@ -460,7 +505,7 @@ const accessibleLabel = computed(() => {
 	const date = new Date(props.note.createdAt);
 	label += `${date.toLocaleTimeString()}`;
 	return label;
-})
+});
 
 defineExpose({
 	focus,
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 2fcf8b0e7..9f311a979 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -33,14 +33,12 @@
 			detailedView
 		></MkNote>
 
-		<MkTab
-			v-model="tab"
-			:style="'underline'"
-			@update:modelValue="loadTab"
-		>
+		<MkTab v-model="tab" :style="'underline'" @update:modelValue="loadTab">
 			<option value="replies">
 				<!-- <i class="ph-arrow-u-up-left ph-bold ph-lg"></i> -->
-				<span v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</span>
+				<span v-if="appearNote.repliesCount > 0" class="count">{{
+					appearNote.repliesCount
+				}}</span>
 				{{ i18n.ts._notification._types.reply }}
 			</option>
 			<option value="renotes" v-if="appearNote.renoteCount > 0">
diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue
index b669aae28..558193679 100644
--- a/packages/client/src/ui/deck.vue
+++ b/packages/client/src/ui/deck.vue
@@ -111,7 +111,7 @@
 
 		<div v-if="isMobile" class="buttons">
 			<button
-			:aria-label="i18n.t('menu')"
+				:aria-label="i18n.t('menu')"
 				class="button nav _button"
 				@click="drawerMenuShowing = true"
 			>
@@ -120,11 +120,15 @@
 					><i class="ph-circle ph-fill"></i
 				></span>
 			</button>
-			<button :aria-label="i18n.t('home')" class="button home _button" @click="mainRouter.push('/')">
+			<button
+				:aria-label="i18n.t('home')"
+				class="button home _button"
+				@click="mainRouter.push('/')"
+			>
 				<i class="ph-house ph-bold ph-lg"></i>
 			</button>
 			<button
-			:aria-label="i18n.t('notifications')"
+				:aria-label="i18n.t('notifications')"
 				class="button notifications _button"
 				@click="mainRouter.push('/my/notifications')"
 			>
@@ -133,7 +137,11 @@
 					><i class="ph-circle ph-fill"></i
 				></span>
 			</button>
-			<button :aria-label="i18n.t('note')" class="button post _button" @click="os.post()">
+			<button
+				:aria-label="i18n.t('note')"
+				class="button post _button"
+				@click="os.post()"
+			>
 				<i class="ph-pencil ph-bold ph-lg"></i>
 			</button>
 		</div>
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 6a39a739b..5b61c1b2c 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -36,7 +36,7 @@
 
 		<div v-if="isMobile" class="buttons">
 			<button
-			:aria-label="i18n.t('menu')"
+				:aria-label="i18n.t('menu')"
 				class="button nav _button"
 				@click="drawerMenuShowing = true"
 			>
@@ -48,7 +48,7 @@
 				</div>
 			</button>
 			<button
-			:aria-label="i18n.t('home')"
+				:aria-label="i18n.t('home')"
 				class="button home _button"
 				@click="
 					mainRouter.currentRoute.value.name === 'index'
@@ -65,7 +65,7 @@
 				</div>
 			</button>
 			<button
-			:aria-label="i18n.t('notifications')"
+				:aria-label="i18n.t('notifications')"
 				class="button notifications _button"
 				@click="
 					mainRouter.push('/my/notifications');
@@ -83,7 +83,7 @@
 				</div>
 			</button>
 			<button
-			:aria-label="i18n.t('messaging')"
+				:aria-label="i18n.t('messaging')"
 				class="button messaging _button"
 				@click="
 					mainRouter.push('/my/messaging');
@@ -103,7 +103,7 @@
 				</div>
 			</button>
 			<button
-			:aria-label="i18n.t('_deck._columns.widgets')"
+				:aria-label="i18n.t('_deck._columns.widgets')"
 				class="button widget _button"
 				@click="widgetsShowing = true"
 			>

From 299ee75d83906fb6ed84549d0e7d15451fe92b65 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 May 2023 08:23:18 -0700
Subject: [PATCH 33/58] dev17

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

diff --git a/package.json b/package.json
index 71cd9fe91..dc71d7188 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev15",
+	"version": "14.0.0-dev17",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 8526f0af067339be43095f3779a36e2a1f07f125 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 May 2023 08:24:04 -0700
Subject: [PATCH 34/58] chore: up pnpm

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

diff --git a/package.json b/package.json
index dc71d7188..7f8a2741b 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
 		"type": "git",
 		"url": "https://codeberg.org/calckey/calckey.git"
 	},
-	"packageManager": "pnpm@8.5.0",
+	"packageManager": "pnpm@8.5.1",
 	"private": true,
 	"scripts": {
 		"rebuild": "pnpm run clean && pnpm -r run build && pnpm run gulp",

From 161557d5598801f22d072c52ea46a2f2b00126bb Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Mon, 22 May 2023 15:57:56 +0000
Subject: [PATCH 35/58] Nyanize non[consonant]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🟨⬜🟪⬛

https://calckey.social/notes/9f2l6x5u8e
---
 packages/backend/src/misc/nyaize.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/misc/nyaize.ts b/packages/backend/src/misc/nyaize.ts
index b85f1d918..a8af59450 100644
--- a/packages/backend/src/misc/nyaize.ts
+++ b/packages/backend/src/misc/nyaize.ts
@@ -9,6 +9,7 @@ export function nyaize(text: string): string {
 			.replace(/(?<=n)a/gi, (x) => (x === "A" ? "YA" : "ya"))
 			.replace(/(?<=morn)ing/gi, (x) => (x === "ING" ? "YAN" : "yan"))
 			.replace(/(?<=every)one/gi, (x) => (x === "ONE" ? "NYAN" : "nyan"))
+			.replace(/non(?=[bcdfghjklmnpqrstvwxyz])/gi, (x) => (x === "NON" ? "NYAN" : "nyan"))
 			// ko-KR
 			.replace(/[나-낳]/g, (match) =>
 				String.fromCharCode(

From 9f360606a0a7364fcf0c899e5d63ada94d426eac Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 22 May 2023 15:20:05 -0400
Subject: [PATCH 36/58] fixes!!

---
 .../src/components/global/MkPageHeader.vue    | 278 ++++++++----------
 1 file changed, 129 insertions(+), 149 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 117da82f8..c96b62009 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -3,27 +3,28 @@
 		v-if="show"
 		ref="el"
 		class="fdidabkb"
-		:class="{ slim: narrow, thin: thin_ }"
+		:class="{ thin: thin_ }"
 		:style="{ background: bg }"
 		@click="onClick"
 	>
 		<div class="left">
-			<button
-				v-if="props.displayBackButton"
-				class="_button button icon backButton"
-				@click.stop="goBack()"
-				@touchstart="preventDrag"
-				v-tooltip.noDelay="i18n.ts.goBack"
-			>
-				<i class="ph-caret-left ph-bold ph-lg"></i>
-			</button>
-			<div v-if="narrow" class="buttons left" @click="openAccountMenu">
+			<div class="buttons">
+				<button
+					v-if="props.displayBackButton"
+					class="_button button icon backButton"
+					@click.stop="goBack()"
+					@touchstart="preventDrag"
+					v-tooltip.noDelay="i18n.ts.goBack"
+				>
+					<i class="ph-caret-left ph-bold ph-lg"></i>
+				</button>
 				<MkAvatar
-					v-if="props.displayMyAvatar && $i"
-					class="avatar"
+					v-if="narrow && props.displayMyAvatar && $i"
+					class="avatar button"
 					:user="$i"
 					:disable-preview="true"
 					disableLink
+					@click.stop="openAccountMenu"
 				/>
 			</div>
 			<div
@@ -92,11 +93,13 @@
 					v-if="narrow"
 					:user="metadata.avatar"
 					:full="false"
+					class="fullButton"
 				></MkFollowButton>
 				<MkFollowButton
 					v-else
 					:user="metadata.avatar"
 					:full="true"
+					class="fullButton"
 				></MkFollowButton>
 			</template>
 			<template v-for="action in actions">
@@ -295,10 +298,26 @@ onUnmounted(() => {
 .fdidabkb {
 	--height: 55px;
 	display: flex;
+	justify-content: space-between;
 	width: 100%;
 	height: var(--height);
-	max-width: 850px;
-	margin: auto;
+	padding-inline: 24px;
+	box-sizing: border-box;
+	overflow: hidden;
+	@media (max-width: 500px) {
+		padding-inline: 12px;
+		> .left {
+			// flex-basis: unset !important;
+			min-width: max-content !important;
+		}
+		.titleContainer {
+			min-width: 0;
+		}
+		.buttons:empty {
+			width: 0;
+			flex-basis: 0;
+		}
+	}
 
 	&::before {
 		content: "";
@@ -328,87 +347,33 @@ onUnmounted(() => {
 		}
 	}
 
-	&.slim {
-		> .left > .titleContainer {
-			flex: 1;
-			margin: 0 auto;
-
-			> *:first-child {
-				margin-left: auto;
-			}
-
-			> *:last-child {
-				margin-right: auto;
-			}
-		}
-		> .tabs {
-			padding-inline: 12px;
-			mask: linear-gradient(
-				to right,
-				transparent,
-				black 10px 80%,
-				transparent
-			);
-			-webkit-mask: linear-gradient(
-				to right,
-				transparent,
-				black 10px 80%,
-				transparent
-			);
-			margin-left: -10px;
-			padding-left: 22px;
-			scrollbar-width: none;
-			&::before {
-				content: unset;
-			}
-			&::-webkit-scrollbar {
-				display: none;
-			}
-			&::after {
-				// Force right padding
-				content: "";
-				display: inline-block;
-				min-width: 20%;
-			}
-		}
-	}
-
 	> .left {
 		display: flex;
 		> .buttons {
-			margin-right: auto;
-
+			&:not(:empty) {
+				margin-left: calc(0px - var(--margin));
+			}
 			> .avatar {
-				$size: 32px;
-				display: inline-block;
-				width: $size;
-				height: $size;
-				vertical-align: bottom;
-				margin: 0 8px;
-				pointer-events: none;
+				width: 32px;
+				height: 32px;
 			}
 		}
 	}
 
-	> .buttons {
+	.buttons {
 		--margin: 8px;
 		display: flex;
 		align-items: center;
 		height: var(--height);
-		margin: 0 var(--margin);
-
 		&.right {
 			justify-content: flex-end;
-			margin-left: auto;
-			:deep(.follow-button) {
-				margin-right: 6px;
+			// margin-right: calc(0px - var(--margin));
+			// margin-left: var(--margin);
+			> .button:last-child {
+				margin-right: calc(0px - var(--margin));
 			}
 		}
 
-		&:empty {
-			display: none;
-		}
-
 		> .button/*, @at-root .backButton*/ {
 			/* I don't know how to get this to work */
 			display: flex;
@@ -436,71 +401,81 @@ onUnmounted(() => {
 		}
 	}
 
-	> .backButton {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		margin-left: 1rem;
-	}
-
-	> .left > .titleContainer {
-		display: flex;
-		align-items: center;
-		max-width: 400px;
-		overflow: auto;
-		white-space: nowrap;
-		text-align: left;
-		font-weight: bold;
-		flex-shrink: 0;
-		margin-left: 24px;
-		margin-right: 1rem;
-
-		> .avatar {
-			$size: 32px;
-			display: inline-block;
-			width: $size;
-			height: $size;
-			vertical-align: bottom;
-			margin: 0 8px;
-			pointer-events: none;
+	> .left {
+		> .backButton {
+			display: flex;
+			align-items: center;
+			justify-content: center;
 		}
-
-		> .icon {
-			margin-right: 8px;
-			width: 16px;
-			text-align: center;
-			transform: translate(0em);
-		}
-
-		> .title {
-			min-width: 0;
-			overflow: hidden;
-			text-overflow: ellipsis;
+		> .titleContainer {
+			display: flex;
+			align-items: center;
+			max-width: 400px;
+			overflow: auto;
 			white-space: nowrap;
-			line-height: 1.1;
-
-			> .subtitle {
-				opacity: 0.6;
-				font-size: 0.8em;
-				font-weight: normal;
-				white-space: nowrap;
+			text-align: left;
+			font-weight: bold;
+			flex-shrink: 0;
+			margin-right: 1rem;
+			max-width: 20vw;
+	
+			> .avatar {
+				$size: 32px;
+				display: inline-block;
+				width: $size;
+				height: $size;
+				vertical-align: bottom;
+				margin: 0 8px;
+				pointer-events: none;
+			}
+	
+			> .icon {
+				margin-right: 8px;
+				width: 16px;
+				text-align: center;
+			}
+	
+			> .title {
+				min-width: 0;
 				overflow: hidden;
 				text-overflow: ellipsis;
-
-				&.activeTab {
-					text-align: center;
-
-					> .chevron {
-						display: inline-block;
-						margin-left: 6px;
+				white-space: nowrap;
+				line-height: 1.1;
+	
+				> .subtitle {
+					opacity: 0.6;
+					font-size: 0.8em;
+					font-weight: normal;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+	
+					&.activeTab {
+						text-align: center;
+	
+						> .chevron {
+							display: inline-block;
+							margin-left: 6px;
+						}
 					}
 				}
 			}
 		}
 	}
 
-	> .buttons, > .left {
-		width: 20%;
+
+	> .left, > .right {
+		flex-basis: 100%;
+		flex-shrink: 9999;
+	}
+	> .left {
+		// margin-right: auto;
+		min-width: 20%;
+		// min-width: max-content;
+	}
+	> .right {
+		// margin-left: auto;
+		min-width: max-content;
 	}
 
 	> .tabs {
@@ -508,31 +483,35 @@ onUnmounted(() => {
 		font-size: 1em;
 		overflow-x: auto;
 		white-space: nowrap;
-		contain: strict;
+		contain: content;
 		display: flex;
-		flex-grow: 1;
-		justify-content: center;
+		padding-inline: 20px;
+		margin-inline: -20px;
+		mask: linear-gradient(
+			to right,
+			transparent,
+			black 20px calc(100% - 20px),
+			transparent
+		);
+		-webkit-mask: linear-gradient(
+			to right,
+			transparent,
+			black 20px calc(100% - 20px),
+			transparent
+		);
+		scrollbar-width: none;
+
 		&.collapse {
 			--width: 38px;
 			> .tab {
 				width: 38px;
-				min-width: unset !important;
+				min-width: 38px !important;
 				&:not(.active) > .title {
 					opacity: 0;
 				}
 			}
 		}
 
-		// &::before {
-		// 	content: "";
-		// 	display: inline-block;
-		// 	height: 40%;
-		// 	border-left: 1px solid var(--divider);
-		// 	margin-right: 1em;
-		// 	margin-left: 10px;
-		// 	vertical-align: -1px;
-		// }
-
 		> .tab {
 			display: inline-flex;
 			align-items: center;
@@ -543,7 +522,7 @@ onUnmounted(() => {
 			font-weight: normal;
 			opacity: 0.7;
 			overflow: hidden;
-			transition: color 0.2s, opacity 0.2s, width 0.2s;
+			transition: color 0.2s, opacity 0.2s, width 0.2s, min-width .2s;
 
 			&:hover {
 				opacity: 1;
@@ -554,6 +533,7 @@ onUnmounted(() => {
 				color: var(--accent);
 				font-weight: 600;
 				width: var(--width);
+				min-width: var(--width) !important;
 			}
 
 			> .icon + .title {

From 4b56d34f93f8c5f637beb9b27c901aaa4509105d Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 22 May 2023 15:23:26 -0400
Subject: [PATCH 37/58] better way of doing that

Couldn't due before becuase of how css was done
---
 packages/client/src/components/global/MkPageHeader.vue | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index c96b62009..4ccd9b310 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -129,7 +129,6 @@ import {
 	nextTick,
 	reactive,
 } from "vue";
-import tinycolor from "tinycolor2";
 import MkFollowButton from "@/components/MkFollowButton.vue";
 import { popupMenu } from "@/os";
 import { scrollToTop } from "@/scripts/scroll";
@@ -257,15 +256,11 @@ onMounted(() => {
 						tabEl.style = `--width: ${tabSizeX}px`;
 					}
 					setTimeout(() => {
-						const parentRect = tabsEl.getBoundingClientRect();
-						const rect = tabEl.getBoundingClientRect();
-						const left =
-							rect.left - parentRect.left + tabsEl?.scrollLeft;
 						tabHighlightEl.style.width = tabSizeX + "px";
-						tabHighlightEl.style.transform = `translateX(${left}px)`;
+						tabHighlightEl.style.transform = `translateX(${tabEl.offsetLeft}px)`;
 						window.requestAnimationFrame(() => {
 							tabsEl?.scrollTo({
-								left: left - 60,
+								left: tabEl.offsetLeft - 60,
 								behavior: "smooth",
 							});
 						});

From 9db7962e3721f7a8b11786597eaaef6a379092eb Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 22 May 2023 15:35:03 -0400
Subject: [PATCH 38/58] more fix, actually

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

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 4ccd9b310..99f809fc3 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -308,10 +308,6 @@ onUnmounted(() => {
 		.titleContainer {
 			min-width: 0;
 		}
-		.buttons:empty {
-			width: 0;
-			flex-basis: 0;
-		}
 	}
 
 	&::before {
@@ -412,7 +408,6 @@ onUnmounted(() => {
 			font-weight: bold;
 			flex-shrink: 0;
 			margin-right: 1rem;
-			max-width: 20vw;
 	
 			> .avatar {
 				$size: 32px;
@@ -462,15 +457,20 @@ onUnmounted(() => {
 	> .left, > .right {
 		flex-basis: 100%;
 		flex-shrink: 9999;
+		overflow: hidden;
 	}
 	> .left {
 		// margin-right: auto;
 		min-width: 20%;
+		margin-left: -10px;
+		padding-left: 10px;
 		// min-width: max-content;
 	}
 	> .right {
 		// margin-left: auto;
 		min-width: max-content;
+		margin-right: -10px;
+		padding-right: 10px;
 	}
 
 	> .tabs {

From ddb52ca4e39829fd099fbe6f9d5fc139c39a7483 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 22 May 2023 15:40:36 -0400
Subject: [PATCH 39/58] add ::before & ::after to themeChanging class

---
 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 8191dac26..fbbae64fe 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -103,7 +103,7 @@ body::-webkit-scrollbar-thumb {
 }
 
 html._themeChanging_ {
-	&, * {
+	&, *, ::before, ::after {
 		transition: background 1s ease, border 1s ease !important;
 	}
 }

From e36ce8e8493f7957255c9864d6c467653fd853df Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 22 May 2023 15:45:39 -0400
Subject: [PATCH 40/58] fix avatar pos

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

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 99f809fc3..465015ce8 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -347,6 +347,7 @@ onUnmounted(() => {
 			> .avatar {
 				width: 32px;
 				height: 32px;
+				margin-left: var(--margin);
 			}
 		}
 	}

From 07ce15d30e16ee8a07c10fce4b8fe7ad5712e025 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 22 May 2023 16:38:11 -0400
Subject: [PATCH 41/58] this took longer than i would have liked.

---
 .../src/components/global/MkPageHeader.vue    | 33 ++++++++++++++-----
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 465015ce8..c1cf0e9a1 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -3,7 +3,7 @@
 		v-if="show"
 		ref="el"
 		class="fdidabkb"
-		:class="{ thin: thin_ }"
+		:class="{ thin: thin_, tabs: tabs?.length > 0 }"
 		:style="{ background: bg }"
 		@click="onClick"
 	>
@@ -300,13 +300,31 @@ onUnmounted(() => {
 	box-sizing: border-box;
 	overflow: hidden;
 	@media (max-width: 500px) {
-		padding-inline: 12px;
+		padding-inline: 12p
+	}
+	@media (max-width: 700px) {
 		> .left {
-			// flex-basis: unset !important;
-			min-width: max-content !important;
+			min-width: unset !important;
+			max-width: 40%;
 		}
-		.titleContainer {
-			min-width: 0;
+		> .left, > .right {
+			flex: unset !important;
+		}
+		&:not(.tabs) {
+			> .left {
+				width: 0 !important;
+				flex-grow: 1 !important;
+				max-width: unset !important;
+			}
+		}
+		&.tabs {
+			> .left {
+				flex-shrink: 0 !important;
+			}
+
+			.buttons ~ .titleContainer > .title {
+				display: none;
+			}
 		}
 	}
 
@@ -461,11 +479,9 @@ onUnmounted(() => {
 		overflow: hidden;
 	}
 	> .left {
-		// margin-right: auto;
 		min-width: 20%;
 		margin-left: -10px;
 		padding-left: 10px;
-		// min-width: max-content;
 	}
 	> .right {
 		// margin-left: auto;
@@ -519,6 +535,7 @@ onUnmounted(() => {
 			opacity: 0.7;
 			overflow: hidden;
 			transition: color 0.2s, opacity 0.2s, width 0.2s, min-width .2s;
+			--width: max-content;
 
 			&:hover {
 				opacity: 1;

From 452b0309a59915ef0f18df419be740fe7c248420 Mon Sep 17 00:00:00 2001
From: warrows <codeberg@warrows.fr>
Date: Wed, 10 May 2023 12:28:50 +0200
Subject: [PATCH 42/58] Doc : Add apache2 basic configuration to documentation

Signed-off-by: warrows <codeberg@warrows.fr>
---
 README.md | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 79bd8f86c..328c85aa6 100644
--- a/README.md
+++ b/README.md
@@ -168,31 +168,25 @@ In Calckey's directory, fill out the `sonic` section of `.config/default.yml` wi
 
 For migrating from Misskey v13, Misskey v12, and Foundkey, read [this document](https://codeberg.org/calckey/calckey/src/branch/develop/docs/migrate.md).
 
-## 🌐 Web proxy
+## Web proxy
 
-### 🍀 Nginx (recommended)
+Choose between NGINX or Apache (we recommend NGINX)
+
+### 🍀 NGINX
 
 - Run `sudo cp ./calckey.nginx.conf /etc/nginx/sites-available/ && cd /etc/nginx/sites-available/`
 - Edit `calckey.nginx.conf` to reflect your instance properly
 - Run `sudo ln -s ./calckey.nginx.conf ../sites-enabled/calckey.nginx.conf`
 - Run `sudo nginx -t` to validate that the config is valid, then restart the NGINX service.
 
-### 🪶 Apache
+### Apache 2
 
 - Run `sudo cp ./calckey.apache.conf /etc/apache2/sites-available/ && cd /etc/apache2/sites-available/`
 - Edit `calckey.apache.conf` to reflect your instance properly
 - Run `sudo a2ensite calckey.apache` to enable the site
 - Run `sudo service apache2 restart` to reload apache2 configuration
 
-### 🦦 Caddy
-
-- Add the following block to your `Caddyfile`, replacing `example.tld` with your own domain:
-```caddy
-example.tld {
-    reverse_proxy http://127.0.0.1:3000
-}
-```
-- Reload your caddy configuration
+</details>
 
 ## 🚀 Build and launch!
 

From 454fec34b9a1fa006e998c917bca028f9e3337a1 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 10 May 2023 17:08:16 -0700
Subject: [PATCH 43/58] docs: cleanup apache

---
 README.md | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 328c85aa6..b8fd09b77 100644
--- a/README.md
+++ b/README.md
@@ -83,14 +83,11 @@ If you have access to a server that supports one of the sources below, I recomme
 - Web Proxy (one of the following)
   - 🍀 Nginx (recommended)
   - 🪶 Apache
-  - 🦦 Caddy
 
 ### 😗 Optional dependencies
 
 - [FFmpeg](https://ffmpeg.org/) for video transcoding
-- Full text search (one of the following)
-  - 🦔 [Sonic](https://crates.io/crates/sonic-server) (recommended)
-  - [ElasticSearch](https://www.elastic.co/elasticsearch/)
+- [ElasticSearch](https://www.elastic.co/elasticsearch/) for full-text search
 
 ### 🏗️ Build dependencies
 
@@ -168,18 +165,16 @@ In Calckey's directory, fill out the `sonic` section of `.config/default.yml` wi
 
 For migrating from Misskey v13, Misskey v12, and Foundkey, read [this document](https://codeberg.org/calckey/calckey/src/branch/develop/docs/migrate.md).
 
-## Web proxy
+## 🌐 Web proxy
 
-Choose between NGINX or Apache (we recommend NGINX)
-
-### 🍀 NGINX
+### 🍀 Nginx (recommended)
 
 - Run `sudo cp ./calckey.nginx.conf /etc/nginx/sites-available/ && cd /etc/nginx/sites-available/`
 - Edit `calckey.nginx.conf` to reflect your instance properly
 - Run `sudo ln -s ./calckey.nginx.conf ../sites-enabled/calckey.nginx.conf`
 - Run `sudo nginx -t` to validate that the config is valid, then restart the NGINX service.
 
-### Apache 2
+### 🪶 Apache
 
 - Run `sudo cp ./calckey.apache.conf /etc/apache2/sites-available/ && cd /etc/apache2/sites-available/`
 - Edit `calckey.apache.conf` to reflect your instance properly

From e2552bdfbb9fafab161a9697d62dccc8b51c4215 Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Mon, 15 May 2023 13:18:58 +1000
Subject: [PATCH 44/58] Add MFM fade functionality

---
 .../src/components/global/MkMisskeyFlavoredMarkdown.vue      | 5 +++++
 packages/client/src/scripts/mfm-tags.ts                      | 1 +
 2 files changed, 6 insertions(+)

diff --git a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
index c235b4835..896891d5e 100644
--- a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
+++ b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
@@ -299,6 +299,11 @@ const props = withDefaults(
 		filter: hue-rotate(360deg) contrast(150%) saturate(150%);
 	}
 }
+
+@keyframes mfm-fade {
+	0% { opacity: 0; }
+	100% { opacity: 1; }
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/scripts/mfm-tags.ts b/packages/client/src/scripts/mfm-tags.ts
index b39c8b37b..da0bea818 100644
--- a/packages/client/src/scripts/mfm-tags.ts
+++ b/packages/client/src/scripts/mfm-tags.ts
@@ -19,4 +19,5 @@ export const MFM_TAGS = [
 	"rainbow",
 	"sparkle",
 	"rotate",
+	"fade",
 ];

From 03f41c12a4927af9e1c80caa25cbd36ef2109179 Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Mon, 15 May 2023 13:19:13 +1000
Subject: [PATCH 45/58] add fade description

---
 locales/ar-SA.yml | 2 ++
 locales/bn-BD.yml | 2 ++
 locales/cs-CZ.yml | 1 +
 locales/de-DE.yml | 2 ++
 locales/en-US.yml | 2 ++
 locales/es-ES.yml | 2 ++
 locales/fr-FR.yml | 2 ++
 locales/id-ID.yml | 2 ++
 locales/it-IT.yml | 2 ++
 locales/ja-JP.yml | 2 ++
 locales/ko-KR.yml | 2 ++
 locales/pl-PL.yml | 2 ++
 locales/sk-SK.yml | 2 ++
 locales/th-TH.yml | 2 ++
 locales/uk-UA.yml | 2 ++
 locales/vi-VN.yml | 2 ++
 locales/zh-CN.yml | 2 ++
 locales/zh-TW.yml | 2 ++
 18 files changed, 35 insertions(+)

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index 148cd32a0..f2bc4476d 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -919,6 +919,8 @@ _mfm:
   rainbowDescription: "اجعل المحتوى يظهر بألوان الطيف"
   rotate: "تدوير"
   rotateDescription: "يُدير المحتوى بزاوية معيّنة."
+  fade: "يختفي"
+  fadeDescription: "يتلاشى المحتوى للداخل والخارج."
 _instanceTicker:
   none: "لا تظهره بتاتًا"
   remote: "أظهر للمستخدمين البِعاد"
diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml
index cde425d7f..a9428eea5 100644
--- a/locales/bn-BD.yml
+++ b/locales/bn-BD.yml
@@ -974,6 +974,8 @@ _mfm:
   sparkleDescription: "বিষয়বস্তুকে একটি চিকচিকে কণা প্রভাব দেয়।"
   rotate: "ঘুরান"
   rotateDescription: "বিষয়বস্তুকে একটি নির্দিষ্ট কোনে ঘুরায়।"
+  fade: "বিবর্ণ"
+  fadeDescription: "ভিতরে এবং বাইরে বিষয়বস্তু বিবর্ণ।"
 _instanceTicker:
   none: "দেখাবেন না"
   remote: "রিমোট ব্যাবহারকারীদের জন্য দেখান"
diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index 1d12e69ab..70d56b66d 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -663,6 +663,7 @@ _mfm:
   blur: "Rozmazání"
   font: "Font"
   rainbow: "Duha"
+  fade: "Slábnout"
 _channel:
   featured: "Trendy"
 _menuDisplay:
diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index ed5a7334b..259eb8dc1 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -1171,6 +1171,8 @@ _mfm:
   sparkleDescription: "Verleiht Inhalt einen glitzernden Partikeleffekt."
   rotate: "Drehen"
   rotateDescription: "Dreht den Inhalt um einen angegebenen Winkel."
+  fade: "Ein-/Ausblenden"
+  fadeDescription: "Blended Inhalt ein and aus."
   plain: "Schlicht"
   plainDescription: "Deaktiviert jegliche MFM-Syntax, die sich innerhalb dieses MFM-Effekts\
     \ befindet."
diff --git a/locales/en-US.yml b/locales/en-US.yml
index b3944b1e5..b19801f75 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1266,6 +1266,8 @@ _mfm:
   sparkleDescription: "Gives content a sparkling particle effect."
   rotate: "Rotate"
   rotateDescription: "Turns content by a specified angle."
+  fade: "Fade"
+  fadeDescription: "Fades content in and out."
   position: "Position"
   positionDescription: "Move content by a specified amount."
   scale: "Scale"
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 49f51bff6..de2b14505 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -1151,6 +1151,8 @@ _mfm:
   sparkleDescription: "Aplica un efecto de partículas parpadeantes"
   rotate: "Rotar"
   rotateDescription: "Rota el contenido a un ángulo especificado."
+  fade: "Desvanecerse"
+  fadeDescription: "Desvanece el contenido hacia adentro y hacia afuera."
   plain: "Plano"
   plainDescription: "Desactiva los efectos de todo el contenido MFM con este efecto\
     \ MFM."
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index 33201d820..e7416f577 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -1077,6 +1077,8 @@ _mfm:
   sparkle: "Paillettes"
   sparkleDescription: "Ajoute un effet scintillant au contenu."
   rotate: "Pivoter"
+  fade: "Apparaître/Disparaître"
+  fadeDescription: "Fait apparaître et disparaître le contenu."
   plainDescription: Désactiver les effets de tous les MFM contenus dans cet effet
     MFM.
   rotateDescription: Pivoter le contenu d'un angle spécifique.
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index 4caca4439..edb9feace 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -1074,6 +1074,8 @@ _mfm:
   sparkleDescription: "Memberikan konten efek partikel kelap-kelip."
   rotate: "Putar"
   rotateDescription: "Putar konten sesuai sudut yang ditentukan."
+  fade: "Memudar"
+  fadeDescription: "Memudar konten masuk dan keluar."
 _instanceTicker:
   none: "Jangan tampilkan"
   remote: "Tampilkan untuk pengguna luar"
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index f526cac19..6dc4b68b5 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -910,6 +910,8 @@ _mfm:
   fontDescription: "Puoi scegliere il tipo di carattere per il contenuto."
   rainbow: "Arcobaleno"
   rotate: "Ruota"
+  fade: "Dissolvenza"
+  fadeDescription: "Dissolvenza in entrata e in uscita del contenuto."
 _instanceTicker:
   none: "Nascondi"
   remote: "Mostra solo per gli/le utenti remotə"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 84c894c7a..70854e42c 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1128,6 +1128,8 @@ _mfm:
   sparkleDescription: "キラキラしたパーティクルのエフェクトを追加します。"
   rotate: "回転"
   rotateDescription: "指定した角度で回転させます。"
+  fade: "フェード"
+  fadeDescription: "コンテンツをフェードインおよびフェードアウトします。"
   plain: "プレーン"
   plainDescription: "内側の構文を全て無効にします。"
   position: 位置
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 15e776faf..0a5fa26d9 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1042,6 +1042,8 @@ _mfm:
   sparkleDescription: "반짝이는 파티클 효과를 추가합니다."
   rotate: "회전"
   rotateDescription: "지정한 각도로 회전시킵니다."
+  fade: "바래다"
+  fadeDescription: "콘텐츠를 페이드 인 및 페이드 아웃합니다."
   plain: "평문"
   plainDescription: "안에 있는 MFM 구문을 모두 무시하고 평문으로 표시합니다."
 _instanceTicker:
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index c127c5a52..8ab065384 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -1069,6 +1069,8 @@ _mfm:
   sparkleDescription: "Nadaje zawartości efekt lśniącego brokatu."
   rotate: "Obrót"
   rotateDescription: "Obraca zawartość o określony kąt."
+  fade: "Znikać"
+  fadeDescription: "Pojawia się i znika zawartość."
   plain: "Zwyczajny"
   plainDescription: "Wyłącza efekty wszystkich MFM zawartych w tym efekcie MFM."
   inlineCodeDescription: Wyświetla podświetlanie składni dla kodu (programu) w linii.
diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
index a36caf1fd..51776c22a 100644
--- a/locales/sk-SK.yml
+++ b/locales/sk-SK.yml
@@ -1038,6 +1038,8 @@ _mfm:
   sparkleDescription: "Obsahu dodá trblietajúci efekt."
   rotate: "Otáčať"
   rotateDescription: "Otočí obsah o určitý uhol."
+  fade: "Vyblednúť"
+  fadeDescription: "Mizne obsah dovnútra a von."
   plain: "Obyčajné"
   plainDescription: "Bez akejkoľvej syntaxe"
 _instanceTicker:
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index b6d81d8f5..43e098319 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -1043,6 +1043,8 @@ _mfm:
   sparkleDescription: "ให้เนื้อหานั้นมีเอฟเฟกต์แบบอนุภาคประกาย"
   rotate: "หมุนหน้าจอ"
   rotateDescription: "เปลี่ยนเนื้อหาตามด้วยมุมที่ระบุไว้"
+  fade: "เลือนหายไป"
+  fadeDescription: "เลือนเนื้อหาเข้าและออก"
   plain: "เรียบง่าย"
   plainDescription: "ปิดการใช้งานเอฟเฟกต์ของ MFM ทั้งหมดที่มีอยู่ในเอฟเฟกต์ MFM นี้"
 _instanceTicker:
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index 0368a0897..f4b57f987 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -824,6 +824,8 @@ _mfm:
   font: "Шрифт"
   fontDescription: "Встановлює шрифт для контенту."
   rotate: "Обертати"
+  fade: "Зникати"
+  fadeDescription: "Розмиває вміст."
 _instanceTicker:
   none: "Не відображати"
   remote: "Відображати для віддалених користувачів"
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index 7662af409..fdf69b722 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -1043,6 +1043,8 @@ _mfm:
   sparkleDescription: "Làm cho nội dung hiệu ứng hạt lấp lánh."
   rotate: "Xoay"
   rotateDescription: "Xoay nội dung theo một góc cụ thể."
+  fade: "Phai màu"
+  fadeDescription: "Làm mờ dần nội dung trong và ngoài."
   plain: "Đơn giản"
   plainDescription: "Vô hiệu hóa mọi hiệu ứng MFM chứa trong hiệu ứng MFM này."
 _instanceTicker:
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 8ca19e596..b2af679bb 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1050,6 +1050,8 @@ _mfm:
   sparkleDescription: "添加发光粒子效果。"
   rotate: "旋转"
   rotateDescription: "旋转指定的角度。"
+  fade: "褪色"
+  fadeDescription: "淡入和淡出内容。"
   plain: "简洁"
   plainDescription: "禁用所有内部语法。"
 _instanceTicker:
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index fd5117f48..c33c3f302 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1052,6 +1052,8 @@ _mfm:
   sparkleDescription: "添加閃閃發光的粒子效果。"
   rotate: "旋轉"
   rotateDescription: "以指定的角度旋轉。"
+  fade: "褪色"
+  fadeDescription: "淡入和淡出內容。"
   plain: "簡潔"
   plainDescription: "停用全部的內部語法。"
   play: 播放 MFM

From 006358540ccc5daf020746d51930f8d68b6cc1ba Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Mon, 15 May 2023 13:19:27 +1000
Subject: [PATCH 46/58] add fade to cheat sheet

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

diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index 20f69a6ce..ea35a6210 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -353,6 +353,16 @@
 						</div>
 					</div>
 				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.fade }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.fadeDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_fade"/>
+							<MkTextarea v-model="preview_fade"><span>MFM</span></MkTextarea>
+						</div>
+					</div>
+				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.position }}</div>
 					<div class="content">
@@ -411,6 +421,14 @@
 								><span>MFM</span></MkTextarea
 							>
 						</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ i18n.ts._mfm.plain }}</div>
+				<div class="content">
+					<p>{{ i18n.ts._mfm.plainDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_plain"/>
+						<MkTextarea v-model="preview_plain"><span>MFM</span></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -479,6 +497,7 @@ let preview_bg = $ref("$[bg.color=ff0000 Background color]");
 let preview_plain = $ref(
 	"<plain>**bold** @mention #hashtag `code` $[x2 🍮]</plain>"
 );
+let preview_fade = $ref('$[fade 🍮] $[fade.out 🍮] $[fade.speed=5s 🍮]');
 
 definePageMetadata({
 	title: i18n.ts._mfm.cheatSheet,

From a4f075271f741dc402589c65719a2458a5622eb4 Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Mon, 15 May 2023 13:30:42 +1000
Subject: [PATCH 47/58] add fade to MFM options

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

diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index 7e3c14335..7275c6687 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -253,6 +253,16 @@ export default defineComponent({
 									style = `background-color: #${color};`;
 									break;
 								}
+								case "fade": {
+									const direction = token.props.args.out
+										? "alternate-reverse"
+										: "alternate";
+									const speed = validTime(token.props.args.speed) || "1.5s";
+									style =
+										this.$store.state.animatedMfm && !reducedMotion()
+											? `animation: mfm-fade ${speed} linear infinite; animation-direction: ${direction};`
+											: "";
+								}
 							}
 							if (style == null) {
 								return h("span", {}, [

From 5ee098e51f94da90f7e6baa5b8d1125ed967cc88 Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Mon, 22 May 2023 07:55:45 +1000
Subject: [PATCH 48/58] remove autogenerated translations

---
 locales/ar-SA.yml | 2 --
 locales/bn-BD.yml | 2 --
 locales/cs-CZ.yml | 1 -
 locales/es-ES.yml | 2 --
 locales/id-ID.yml | 2 --
 locales/ja-JP.yml | 2 --
 locales/ko-KR.yml | 2 --
 locales/pl-PL.yml | 2 --
 locales/sk-SK.yml | 2 --
 locales/th-TH.yml | 2 --
 locales/uk-UA.yml | 2 --
 locales/vi-VN.yml | 2 --
 locales/zh-CN.yml | 2 --
 locales/zh-TW.yml | 2 --
 14 files changed, 27 deletions(-)

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index f2bc4476d..148cd32a0 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -919,8 +919,6 @@ _mfm:
   rainbowDescription: "اجعل المحتوى يظهر بألوان الطيف"
   rotate: "تدوير"
   rotateDescription: "يُدير المحتوى بزاوية معيّنة."
-  fade: "يختفي"
-  fadeDescription: "يتلاشى المحتوى للداخل والخارج."
 _instanceTicker:
   none: "لا تظهره بتاتًا"
   remote: "أظهر للمستخدمين البِعاد"
diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml
index a9428eea5..cde425d7f 100644
--- a/locales/bn-BD.yml
+++ b/locales/bn-BD.yml
@@ -974,8 +974,6 @@ _mfm:
   sparkleDescription: "বিষয়বস্তুকে একটি চিকচিকে কণা প্রভাব দেয়।"
   rotate: "ঘুরান"
   rotateDescription: "বিষয়বস্তুকে একটি নির্দিষ্ট কোনে ঘুরায়।"
-  fade: "বিবর্ণ"
-  fadeDescription: "ভিতরে এবং বাইরে বিষয়বস্তু বিবর্ণ।"
 _instanceTicker:
   none: "দেখাবেন না"
   remote: "রিমোট ব্যাবহারকারীদের জন্য দেখান"
diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index 70d56b66d..1d12e69ab 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -663,7 +663,6 @@ _mfm:
   blur: "Rozmazání"
   font: "Font"
   rainbow: "Duha"
-  fade: "Slábnout"
 _channel:
   featured: "Trendy"
 _menuDisplay:
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index de2b14505..49f51bff6 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -1151,8 +1151,6 @@ _mfm:
   sparkleDescription: "Aplica un efecto de partículas parpadeantes"
   rotate: "Rotar"
   rotateDescription: "Rota el contenido a un ángulo especificado."
-  fade: "Desvanecerse"
-  fadeDescription: "Desvanece el contenido hacia adentro y hacia afuera."
   plain: "Plano"
   plainDescription: "Desactiva los efectos de todo el contenido MFM con este efecto\
     \ MFM."
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index edb9feace..4caca4439 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -1074,8 +1074,6 @@ _mfm:
   sparkleDescription: "Memberikan konten efek partikel kelap-kelip."
   rotate: "Putar"
   rotateDescription: "Putar konten sesuai sudut yang ditentukan."
-  fade: "Memudar"
-  fadeDescription: "Memudar konten masuk dan keluar."
 _instanceTicker:
   none: "Jangan tampilkan"
   remote: "Tampilkan untuk pengguna luar"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 70854e42c..84c894c7a 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1128,8 +1128,6 @@ _mfm:
   sparkleDescription: "キラキラしたパーティクルのエフェクトを追加します。"
   rotate: "回転"
   rotateDescription: "指定した角度で回転させます。"
-  fade: "フェード"
-  fadeDescription: "コンテンツをフェードインおよびフェードアウトします。"
   plain: "プレーン"
   plainDescription: "内側の構文を全て無効にします。"
   position: 位置
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 0a5fa26d9..15e776faf 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1042,8 +1042,6 @@ _mfm:
   sparkleDescription: "반짝이는 파티클 효과를 추가합니다."
   rotate: "회전"
   rotateDescription: "지정한 각도로 회전시킵니다."
-  fade: "바래다"
-  fadeDescription: "콘텐츠를 페이드 인 및 페이드 아웃합니다."
   plain: "평문"
   plainDescription: "안에 있는 MFM 구문을 모두 무시하고 평문으로 표시합니다."
 _instanceTicker:
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index 8ab065384..c127c5a52 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -1069,8 +1069,6 @@ _mfm:
   sparkleDescription: "Nadaje zawartości efekt lśniącego brokatu."
   rotate: "Obrót"
   rotateDescription: "Obraca zawartość o określony kąt."
-  fade: "Znikać"
-  fadeDescription: "Pojawia się i znika zawartość."
   plain: "Zwyczajny"
   plainDescription: "Wyłącza efekty wszystkich MFM zawartych w tym efekcie MFM."
   inlineCodeDescription: Wyświetla podświetlanie składni dla kodu (programu) w linii.
diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
index 51776c22a..a36caf1fd 100644
--- a/locales/sk-SK.yml
+++ b/locales/sk-SK.yml
@@ -1038,8 +1038,6 @@ _mfm:
   sparkleDescription: "Obsahu dodá trblietajúci efekt."
   rotate: "Otáčať"
   rotateDescription: "Otočí obsah o určitý uhol."
-  fade: "Vyblednúť"
-  fadeDescription: "Mizne obsah dovnútra a von."
   plain: "Obyčajné"
   plainDescription: "Bez akejkoľvej syntaxe"
 _instanceTicker:
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index 43e098319..b6d81d8f5 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -1043,8 +1043,6 @@ _mfm:
   sparkleDescription: "ให้เนื้อหานั้นมีเอฟเฟกต์แบบอนุภาคประกาย"
   rotate: "หมุนหน้าจอ"
   rotateDescription: "เปลี่ยนเนื้อหาตามด้วยมุมที่ระบุไว้"
-  fade: "เลือนหายไป"
-  fadeDescription: "เลือนเนื้อหาเข้าและออก"
   plain: "เรียบง่าย"
   plainDescription: "ปิดการใช้งานเอฟเฟกต์ของ MFM ทั้งหมดที่มีอยู่ในเอฟเฟกต์ MFM นี้"
 _instanceTicker:
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index f4b57f987..0368a0897 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -824,8 +824,6 @@ _mfm:
   font: "Шрифт"
   fontDescription: "Встановлює шрифт для контенту."
   rotate: "Обертати"
-  fade: "Зникати"
-  fadeDescription: "Розмиває вміст."
 _instanceTicker:
   none: "Не відображати"
   remote: "Відображати для віддалених користувачів"
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index fdf69b722..7662af409 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -1043,8 +1043,6 @@ _mfm:
   sparkleDescription: "Làm cho nội dung hiệu ứng hạt lấp lánh."
   rotate: "Xoay"
   rotateDescription: "Xoay nội dung theo một góc cụ thể."
-  fade: "Phai màu"
-  fadeDescription: "Làm mờ dần nội dung trong và ngoài."
   plain: "Đơn giản"
   plainDescription: "Vô hiệu hóa mọi hiệu ứng MFM chứa trong hiệu ứng MFM này."
 _instanceTicker:
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index b2af679bb..8ca19e596 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1050,8 +1050,6 @@ _mfm:
   sparkleDescription: "添加发光粒子效果。"
   rotate: "旋转"
   rotateDescription: "旋转指定的角度。"
-  fade: "褪色"
-  fadeDescription: "淡入和淡出内容。"
   plain: "简洁"
   plainDescription: "禁用所有内部语法。"
 _instanceTicker:
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index c33c3f302..fd5117f48 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1052,8 +1052,6 @@ _mfm:
   sparkleDescription: "添加閃閃發光的粒子效果。"
   rotate: "旋轉"
   rotateDescription: "以指定的角度旋轉。"
-  fade: "褪色"
-  fadeDescription: "淡入和淡出內容。"
   plain: "簡潔"
   plainDescription: "停用全部的內部語法。"
   play: 播放 MFM

From 45a8b9831e33919df35c1864ff2bd1c4c34a6f42 Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Tue, 23 May 2023 07:05:43 +1000
Subject: [PATCH 49/58] clean up rebase

---
 README.md                                     | 15 +++++++++++++--
 packages/client/src/pages/mfm-cheat-sheet.vue | 14 ++------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index b8fd09b77..79bd8f86c 100644
--- a/README.md
+++ b/README.md
@@ -83,11 +83,14 @@ If you have access to a server that supports one of the sources below, I recomme
 - Web Proxy (one of the following)
   - 🍀 Nginx (recommended)
   - 🪶 Apache
+  - 🦦 Caddy
 
 ### 😗 Optional dependencies
 
 - [FFmpeg](https://ffmpeg.org/) for video transcoding
-- [ElasticSearch](https://www.elastic.co/elasticsearch/) for full-text search
+- Full text search (one of the following)
+  - 🦔 [Sonic](https://crates.io/crates/sonic-server) (recommended)
+  - [ElasticSearch](https://www.elastic.co/elasticsearch/)
 
 ### 🏗️ Build dependencies
 
@@ -181,7 +184,15 @@ For migrating from Misskey v13, Misskey v12, and Foundkey, read [this document](
 - Run `sudo a2ensite calckey.apache` to enable the site
 - Run `sudo service apache2 restart` to reload apache2 configuration
 
-</details>
+### 🦦 Caddy
+
+- Add the following block to your `Caddyfile`, replacing `example.tld` with your own domain:
+```caddy
+example.tld {
+    reverse_proxy http://127.0.0.1:3000
+}
+```
+- Reload your caddy configuration
 
 ## 🚀 Build and launch!
 
diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index ea35a6210..5492a3722 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -416,19 +416,9 @@
 					<div class="content">
 						<p>{{ i18n.ts._mfm.plainDescription }}</p>
 						<div class="preview">
-							<Mfm :text="preview_plain" />
-							<MkTextarea v-model="preview_plain"
-								><span>MFM</span></MkTextarea
-							>
+							<Mfm :text="preview_plain"/>
+							<MkTextarea v-model="preview_plain"><span>MFM</span></MkTextarea>
 						</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.plain }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.plainDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_plain"/>
-						<MkTextarea v-model="preview_plain"><span>MFM</span></MkTextarea>
 					</div>
 				</div>
 			</div>

From ccfdf9564264aaba248d1496e3556509cdbb354f Mon Sep 17 00:00:00 2001
From: jolupa <jolupameister@gmail.com>
Date: Mon, 22 May 2023 17:11:58 +0000
Subject: [PATCH 50/58] chore: Translated using Weblate (Catalan)

Currently translated at 100.0% (1748 of 1748 strings)

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

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index de8246be3..91cccb5ee 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -1290,7 +1290,7 @@ loadRawImages: Carregar les imatges originals en comptes de mostrar les miniatur
 noteFavoritesCount: Nombre de notes afegides a favorits
 useSystemFont: Fes servir la font per defecte del sistema
 contact: Contacte
-clips: Clips
+clips: Retalls
 experimentalFeatures: Característiques experimentals
 developer: Desenvolupador
 makeExplorableDescription: Si desactives aquesta funció el teu compte no sortirà a
@@ -1496,7 +1496,7 @@ gallery: Galeria
 popularPosts: Pàgines populars
 shareWithNote: Comparteix amb una publicació
 expiration: Data límit
-memo: Memo
+memo: Recordatori
 priority: Prioritat
 high: Alta
 middle: Mitjana
@@ -1537,7 +1537,7 @@ incorrectPassword: Contrasenya incorrecta.
 clickToFinishEmailVerification: Feu clic a [{ok}] per completar la verificació del
   correu electrònic.
 overridedDeviceKind: Tipus de dispositiu
-smartphone: Smartphone
+smartphone: Telèfon intel·ligent
 tablet: Tauleta
 auto: Automàtic
 recentNHours: Últimes {n} hores
@@ -1625,7 +1625,7 @@ customKaTeXMacroDescription: "Configura macros per escriure expressions matemàt
 objectStorageRegion: Regió
 objectStoragePrefix: Prefix
 objectStoragePrefixDesc: Els fitxers es guardaran dins de carpetes amb aquest prefix.
-objectStorageEndpoint: Endpoint
+objectStorageEndpoint: Extrem
 newNoteRecived: Hi han notes noves
 sounds: Sons
 listen: Escoltar
@@ -1748,7 +1748,7 @@ 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
+clip: Retall
 createNew: Crear una nova
 optional: Opcional
 jumpToSpecifiedDate: Vés a una data concreta
@@ -2059,3 +2059,4 @@ older: Més antic
 silencedWarning: S'està mostrant aquesta pàgina per què aquest usuari és d'un servidor
   que l'administrador a silenciat, així que pot ser spam.
 jumpToPrevious: Vés a l'anterior
+cw: Avís de contingut

From f27611b00b97aa7a7ebd3e02230dba1117cf193c Mon Sep 17 00:00:00 2001
From: Richard <galmt@protonmail.com>
Date: Mon, 22 May 2023 17:36:30 +0000
Subject: [PATCH 51/58] chore: Translated using Weblate (Dutch)

Currently translated at 25.0% (438 of 1748 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/nl/
---
 locales/nl-NL.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index cea1d5f70..6837f1e86 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -13,7 +13,7 @@ password: "Wachtwoord"
 forgotPassword: "Wachtwoord vergeten"
 fetchingAsApObject: "Ophalen vanuit de Fediverse"
 ok: "Ok"
-gotIt: "Begrepen"
+gotIt: "Begrepen!"
 cancel: "Annuleren"
 enterUsername: "Voer een gebruikersnaam in"
 renotedBy: "Hergedeeld door {user}"
@@ -51,8 +51,8 @@ deleteAndEditConfirm: "Weet je zeker dat je deze post wilt verwijderen en dan be
   Je verliest alle reacties, boosts en antwoorden erop."
 addToList: "Aan lijst toevoegen"
 sendMessage: "Verstuur bericht"
-copyUsername: "Kopiëren gebruikersnaam "
-searchUser: "Zoeken een gebruiker"
+copyUsername: "Gebruikersnaam kopiëren"
+searchUser: "Zoek een gebruiker"
 reply: "Antwoord"
 loadMore: "Laad meer"
 showMore: "Toon meer"
@@ -517,3 +517,5 @@ withFileAntenna: Alleen posts met bestanden
 enableServiceworker: Schakel pushmeldingen voor je browser in
 renoteUnmute: Ontdemp boosts
 jumpToPrevious: Spring naar vorige
+caseSensitive: Hoofdlettergevoelig
+cw: Inhoudswaarschuwing

From afaf22ee23421a7efe420c9e832ba5d06e60ce7f Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 22 May 2023 19:40:38 -0400
Subject: [PATCH 52/58] padding fix

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

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 9f311a979..e716f7860 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -518,7 +518,7 @@ onUnmounted(() => {
 			cursor: unset;
 			padding-bottom: 0;
 		}
-		&:first-of-type {
+		&:first-child {
 			padding-top: 28px;
 		}
 	}

From 549802e5faefc75a60e76649ef91f3e461df6ebf Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 May 2023 16:58:44 -0700
Subject: [PATCH 53/58] Close #10177

---
 packages/client/src/router.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts
index 952925816..cee863c43 100644
--- a/packages/client/src/router.ts
+++ b/packages/client/src/router.ts
@@ -199,6 +199,11 @@ export const routes = [
 				name: "api",
 				component: page(() => import("./pages/settings/api.vue")),
 			},
+			{
+				path: "/apps",
+				name: "apps",
+				component: page(() => import("./pages/settings/apps.vue")),
+			},
 			{
 				path: "/webhook/edit/:webhookId",
 				name: "webhook",

From 79fe1dcd61f2a296c99ecca37a284165cda7c70b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 May 2023 17:00:50 -0700
Subject: [PATCH 54/58] chore: formatting

---
 package.json                                  |  2 +-
 packages/backend/src/misc/nyaize.ts           |  4 ++-
 .../global/MkMisskeyFlavoredMarkdown.vue      |  8 +++--
 .../src/components/global/MkPageHeader.vue    | 32 +++++++++++--------
 packages/client/src/pages/mfm-cheat-sheet.vue | 14 +++++---
 5 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 7f8a2741b..236e6cc79 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev17",
+	"version": "14.0.0-dev18",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/backend/src/misc/nyaize.ts b/packages/backend/src/misc/nyaize.ts
index a8af59450..dd0c5bbdf 100644
--- a/packages/backend/src/misc/nyaize.ts
+++ b/packages/backend/src/misc/nyaize.ts
@@ -9,7 +9,9 @@ export function nyaize(text: string): string {
 			.replace(/(?<=n)a/gi, (x) => (x === "A" ? "YA" : "ya"))
 			.replace(/(?<=morn)ing/gi, (x) => (x === "ING" ? "YAN" : "yan"))
 			.replace(/(?<=every)one/gi, (x) => (x === "ONE" ? "NYAN" : "nyan"))
-			.replace(/non(?=[bcdfghjklmnpqrstvwxyz])/gi, (x) => (x === "NON" ? "NYAN" : "nyan"))
+			.replace(/non(?=[bcdfghjklmnpqrstvwxyz])/gi, (x) =>
+				x === "NON" ? "NYAN" : "nyan",
+			)
 			// ko-KR
 			.replace(/[나-낳]/g, (match) =>
 				String.fromCharCode(
diff --git a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
index 896891d5e..4a5c2ec0f 100644
--- a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
+++ b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
@@ -301,8 +301,12 @@ const props = withDefaults(
 }
 
 @keyframes mfm-fade {
-	0% { opacity: 0; }
-	100% { opacity: 1; }
+	0% {
+		opacity: 0;
+	}
+	100% {
+		opacity: 1;
+	}
 }
 </style>
 
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index c1cf0e9a1..1892ec0c0 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -69,7 +69,12 @@
 			</div>
 		</div>
 		<template v-if="metadata">
-			<nav ref="tabsEl" v-if="hasTabs" class="tabs" :class="{collapse: hasTabs && tabs.length > 3}">
+			<nav
+				ref="tabsEl"
+				v-if="hasTabs"
+				class="tabs"
+				:class="{ collapse: hasTabs && tabs.length > 3 }"
+			>
 				<button
 					v-for="tab in tabs"
 					:ref="(el) => (tabRefs[tab.key] = el)"
@@ -300,14 +305,15 @@ onUnmounted(() => {
 	box-sizing: border-box;
 	overflow: hidden;
 	@media (max-width: 500px) {
-		padding-inline: 12p
+		padding-inline: 12p;
 	}
 	@media (max-width: 700px) {
 		> .left {
 			min-width: unset !important;
 			max-width: 40%;
 		}
-		> .left, > .right {
+		> .left,
+		> .right {
 			flex: unset !important;
 		}
 		&:not(.tabs) {
@@ -342,7 +348,7 @@ onUnmounted(() => {
 		position: absolute;
 		inset: 0;
 		background: var(--bg);
-		opacity: .85;
+		opacity: 0.85;
 		z-index: -2;
 	}
 
@@ -427,7 +433,7 @@ onUnmounted(() => {
 			font-weight: bold;
 			flex-shrink: 0;
 			margin-right: 1rem;
-	
+
 			> .avatar {
 				$size: 32px;
 				display: inline-block;
@@ -437,20 +443,20 @@ onUnmounted(() => {
 				margin: 0 8px;
 				pointer-events: none;
 			}
-	
+
 			> .icon {
 				margin-right: 8px;
 				width: 16px;
 				text-align: center;
 			}
-	
+
 			> .title {
 				min-width: 0;
 				overflow: hidden;
 				text-overflow: ellipsis;
 				white-space: nowrap;
 				line-height: 1.1;
-	
+
 				> .subtitle {
 					opacity: 0.6;
 					font-size: 0.8em;
@@ -458,10 +464,10 @@ onUnmounted(() => {
 					white-space: nowrap;
 					overflow: hidden;
 					text-overflow: ellipsis;
-	
+
 					&.activeTab {
 						text-align: center;
-	
+
 						> .chevron {
 							display: inline-block;
 							margin-left: 6px;
@@ -472,8 +478,8 @@ onUnmounted(() => {
 		}
 	}
 
-
-	> .left, > .right {
+	> .left,
+	> .right {
 		flex-basis: 100%;
 		flex-shrink: 9999;
 		overflow: hidden;
@@ -534,7 +540,7 @@ onUnmounted(() => {
 			font-weight: normal;
 			opacity: 0.7;
 			overflow: hidden;
-			transition: color 0.2s, opacity 0.2s, width 0.2s, min-width .2s;
+			transition: color 0.2s, opacity 0.2s, width 0.2s, min-width 0.2s;
 			--width: max-content;
 
 			&:hover {
diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index 5492a3722..50bb43fcd 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -358,8 +358,10 @@
 					<div class="content">
 						<p>{{ i18n.ts._mfm.fadeDescription }}</p>
 						<div class="preview">
-							<Mfm :text="preview_fade"/>
-							<MkTextarea v-model="preview_fade"><span>MFM</span></MkTextarea>
+							<Mfm :text="preview_fade" />
+							<MkTextarea v-model="preview_fade"
+								><span>MFM</span></MkTextarea
+							>
 						</div>
 					</div>
 				</div>
@@ -416,8 +418,10 @@
 					<div class="content">
 						<p>{{ i18n.ts._mfm.plainDescription }}</p>
 						<div class="preview">
-							<Mfm :text="preview_plain"/>
-							<MkTextarea v-model="preview_plain"><span>MFM</span></MkTextarea>
+							<Mfm :text="preview_plain" />
+							<MkTextarea v-model="preview_plain"
+								><span>MFM</span></MkTextarea
+							>
 						</div>
 					</div>
 				</div>
@@ -487,7 +491,7 @@ let preview_bg = $ref("$[bg.color=ff0000 Background color]");
 let preview_plain = $ref(
 	"<plain>**bold** @mention #hashtag `code` $[x2 🍮]</plain>"
 );
-let preview_fade = $ref('$[fade 🍮] $[fade.out 🍮] $[fade.speed=5s 🍮]');
+let preview_fade = $ref("$[fade 🍮] $[fade.out 🍮] $[fade.speed=5s 🍮]");
 
 definePageMetadata({
 	title: i18n.ts._mfm.cheatSheet,

From b5eb374e62753f980fcf24f3b0b732ec95b3a01e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 May 2023 17:26:27 -0700
Subject: [PATCH 55/58] fix fade

---
 packages/client/src/components/mfm.ts      | 18 ++++++++----------
 packages/client/src/scripts/extract-mfm.ts |  1 +
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index 7275c6687..d9d78846e 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -156,6 +156,14 @@ export default defineComponent({
 									}
 									return h(MkSparkle, {}, genEl(token.children));
 								}
+								case "fade": {
+									const direction = token.props.args.out
+										? "alternate-reverse"
+										: "alternate";
+									const speed = validTime(token.props.args.speed) || "1.5s";
+									style = `animation: mfm-fade ${speed} linear infinite; animation-direction: ${direction};`;
+									break;
+								}
 								case "flip": {
 									const transform =
 										token.props.args.h && token.props.args.v
@@ -253,16 +261,6 @@ export default defineComponent({
 									style = `background-color: #${color};`;
 									break;
 								}
-								case "fade": {
-									const direction = token.props.args.out
-										? "alternate-reverse"
-										: "alternate";
-									const speed = validTime(token.props.args.speed) || "1.5s";
-									style =
-										this.$store.state.animatedMfm && !reducedMotion()
-											? `animation: mfm-fade ${speed} linear infinite; animation-direction: ${direction};`
-											: "";
-								}
 							}
 							if (style == null) {
 								return h("span", {}, [
diff --git a/packages/client/src/scripts/extract-mfm.ts b/packages/client/src/scripts/extract-mfm.ts
index c70d1e7b8..c62547cdb 100644
--- a/packages/client/src/scripts/extract-mfm.ts
+++ b/packages/client/src/scripts/extract-mfm.ts
@@ -9,6 +9,7 @@ const animatedMfm = [
 	"jump",
 	"bounce",
 	"rainbow",
+	"fade",
 ];
 
 export function extractMfmWithAnimation(nodes: mfm.MfmNode[]): string[] {

From 28750dddc8305c7484e1cccba7493aca84ad003c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 May 2023 17:36:19 -0700
Subject: [PATCH 56/58] why was that ever there??

---
 packages/client/src/ui/_common_/navbar.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index a51ff5e7d..30ea4ccf1 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -402,7 +402,6 @@ function more(ev: MouseEvent) {
 						position: relative;
 						width: 32px;
 						margin-right: 8px;
-						transform: translateY(0.15em);
 					}
 
 					> .indicator {
@@ -524,7 +523,6 @@ function more(ev: MouseEvent) {
 					> .icon {
 						position: relative;
 						color: var(--fgOnAccent);
-						transform: translate(0.15em, 0em);
 					}
 
 					> .text {

From 97e69144f6dc7caf32bbd05171fbee72b0c4e1f9 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 22 May 2023 17:40:59 -0700
Subject: [PATCH 57/58] docs: notes

---
 README.md | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 79bd8f86c..6fd004e01 100644
--- a/README.md
+++ b/README.md
@@ -82,8 +82,8 @@ If you have access to a server that supports one of the sources below, I recomme
 - 🍱 At least [Redis](https://redis.io/) v6 (v7 recommend)
 - Web Proxy (one of the following)
   - 🍀 Nginx (recommended)
-  - 🪶 Apache
   - 🦦 Caddy
+  - 🪶 Apache
 
 ### 😗 Optional dependencies
 
@@ -107,7 +107,8 @@ git clone --depth 1 https://codeberg.org/calckey/calckey.git
 cd calckey/
 ```
 
-By default, you're on the development branch. Run `git checkout beta` or `git checkout main` to switch to the Beta/Main branches.
+> **Note**
+> By default, you're on the main branch. Run `git checkout beta` or `git checkout develop` to switch to the Beta/Develop branches.
 
 ## 📩 Install dependencies
 
@@ -128,11 +129,18 @@ npm i -g pm2
 pm2 install pm2-logrotate
 ```
 
-[`pm2-logrotate`](https://github.com/keymetrics/pm2-logrotate/blob/master/README.md) ensures that log files don't infinitely gather size, as Calckey produces a lot of logs.
+> **Note**
+> [`pm2-logrotate`](https://github.com/keymetrics/pm2-logrotate/blob/master/README.md) ensures that log files don't infinitely gather size, as Calckey produces a lot of logs.
 
 ## 🐘 Create database
 
-Assuming you set up PostgreSQL correctly, all you have to run is:
+In PostgreSQL (`psql`), run the following command:
+
+```sql
+CREATE DATABASE calckey WITH encoding = 'UTF8';
+```
+
+or run the following from the command line:
 
 ```sh
 psql postgres -c "create database calckey with encoding = 'UTF8';"
@@ -144,7 +152,8 @@ In Calckey's directory, fill out the `db` section of `.config/default.yml` with
 
 Follow sonic's [installation guide](https://github.com/valeriansaliou/sonic#installation)
 
-If you use IPv4: in Sonic's directory, edit the `config.cfg` file to change `inet` to `"0.0.0.0:1491"`.
+> **Note**
+> If you use IPv4: in Sonic's directory, edit the `config.cfg` file to change `inet` to `"0.0.0.0:1491"`.
 
 In Calckey's directory, fill out the `sonic` section of `.config/default.yml` with the correct information.
 
@@ -177,13 +186,6 @@ For migrating from Misskey v13, Misskey v12, and Foundkey, read [this document](
 - Run `sudo ln -s ./calckey.nginx.conf ../sites-enabled/calckey.nginx.conf`
 - Run `sudo nginx -t` to validate that the config is valid, then restart the NGINX service.
 
-### 🪶 Apache
-
-- Run `sudo cp ./calckey.apache.conf /etc/apache2/sites-available/ && cd /etc/apache2/sites-available/`
-- Edit `calckey.apache.conf` to reflect your instance properly
-- Run `sudo a2ensite calckey.apache` to enable the site
-- Run `sudo service apache2 restart` to reload apache2 configuration
-
 ### 🦦 Caddy
 
 - Add the following block to your `Caddyfile`, replacing `example.tld` with your own domain:
@@ -194,6 +196,15 @@ example.tld {
 ```
 - Reload your caddy configuration
 
+### 🪶 Apache
+
+> **Warning**
+> Apache has some known problems with Calckey. Only use it if you have to.
+
+- Run `sudo cp ./calckey.apache.conf /etc/apache2/sites-available/ && cd /etc/apache2/sites-available/`
+- Edit `calckey.apache.conf` to reflect your instance properly
+- Run `sudo a2ensite calckey.apache` to enable the site
+- Run `sudo service apache2 restart` to reload apache2 configuration
 ## 🚀 Build and launch!
 
 ### 🐢 NodeJS + pm2

From 1773ae14e32eab0bddcdaa8fca33fecf095d99d1 Mon Sep 17 00:00:00 2001
From: Natty <natty.sh.git@gmail.com>
Date: Thu, 20 Apr 2023 21:16:36 +0200
Subject: [PATCH 58/58] Renote button optimization

---
 .../backend/src/server/api/endpoints/notes/renotes.ts | 11 +++++++++--
 packages/client/src/components/MkRenoteButton.vue     |  6 +++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/notes/renotes.ts b/packages/backend/src/server/api/endpoints/notes/renotes.ts
index f313616be..df801c7fc 100644
--- a/packages/backend/src/server/api/endpoints/notes/renotes.ts
+++ b/packages/backend/src/server/api/endpoints/notes/renotes.ts
@@ -38,6 +38,7 @@ export const paramDef = {
 	type: "object",
 	properties: {
 		noteId: { type: "string", format: "misskey:id" },
+		userId: { type: "string", format: "misskey:id" },
 		limit: { type: "integer", minimum: 1, maximum: 100, default: 10 },
 		sinceId: { type: "string", format: "misskey:id" },
 		untilId: { type: "string", format: "misskey:id" },
@@ -52,13 +53,19 @@ export default define(meta, paramDef, async (ps, user) => {
 		throw err;
 	});
 
-	const query = makePaginationQuery(
+	let query = makePaginationQuery(
 		Notes.createQueryBuilder("note"),
 		ps.sinceId,
 		ps.untilId,
 	)
 		.andWhere("note.renoteId = :renoteId", { renoteId: note.id })
-		.innerJoinAndSelect("note.user", "user")
+		.innerJoinAndSelect("note.user", "user");
+
+	if (ps.userId) {
+		query.andWhere("user.id = :userId", { userId: ps.userId });
+	}
+
+	query
 		.leftJoinAndSelect("user.avatar", "avatar")
 		.leftJoinAndSelect("user.banner", "banner")
 		.leftJoinAndSelect("note.reply", "reply")
diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue
index 881566693..e21611b81 100644
--- a/packages/client/src/components/MkRenoteButton.vue
+++ b/packages/client/src/components/MkRenoteButton.vue
@@ -69,11 +69,11 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
 
 	const renotes = await os.api("notes/renotes", {
 		noteId: props.note.id,
-		limit: 11,
+		userId: $i.id,
+		limit: 1,
 	});
 
-	const users = renotes.map((x) => x.user.id);
-	const hasRenotedBefore = users.includes($i.id);
+	const hasRenotedBefore = renotes.length > 0;
 
 	let buttonActions: Array<MenuItem> = [];