From e1f5b3387a0bf1bb91663a6ec653db1a53515302 Mon Sep 17 00:00:00 2001
From: yawhn <kordaris@gmail.com>
Date: Fri, 25 Nov 2022 13:46:10 +0200
Subject: [PATCH 01/29] hover text in note buttons

---
 packages/client/src/components/MkNote.vue         | 6 +++---
 packages/client/src/components/MkNoteDetailed.vue | 6 +++---
 packages/client/src/components/MkQuoteButton.vue  | 2 ++
 packages/client/src/components/MkRenoteButton.vue | 1 +
 packages/client/src/components/MkStarButton.vue   | 4 +++-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 80441f34d..52ac0d412 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -71,21 +71,21 @@
 			</div>
 			<footer class="footer">
 				<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
-				<button class="button _button" @click="reply()">
+				<button class="button _button" v-tooltip.noDelay.bottom="i18n.ts.reply" @click="reply()">
 					<template v-if="appearNote.reply"><i class="ph-arrow-u-up-left-bold ph-lg"></i></template>
 					<template v-else><i class="ph-arrow-bend-up-left-bold ph-lg"></i></template>
 					<p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p>
 				</button>
 				<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
 				<XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/>
-				<button v-if="appearNote.myReaction == null" ref="reactButton" class="button _button" @click="react()">
+				<button v-if="appearNote.myReaction == null" ref="reactButton" class="button _button" v-tooltip.noDelay.bottom="i18n.ts.reaction" @click="react()">
 					<i class="ph-smiley-bold ph-lg"></i>
 				</button>
 				<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
 					<i class="ph-minus-bold ph-lg"></i>
 				</button>
 				<XQuoteButton class="button" :note="appearNote"/>
-				<button ref="menuButton" class="button _button" @click="menu()">
+				<button ref="menuButton" class="button _button" v-tooltip.noDelay.bottom="i18n.ts.more" @click="menu()">
 					<i class="ph-dots-three-outline-bold ph-lg"></i>
 				</button>
 			</footer>
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 19feacec4..443f98de4 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -81,21 +81,21 @@
 					</MkA>
 				</div>
 				<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
-				<button class="button _button" @click="reply()">
+				<button class="button _button" v-tooltip.noDelay.bottom="i18n.ts.reply" @click="reply()">
 					<template v-if="appearNote.reply"><i class="ph-arrow-u-up-left-bold ph-lg"></i></template>
 					<template v-else><i class="ph-arrow-bend-up-left-bold ph-lg"></i></template>
 					<p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p>
 				</button>
 				<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
 				<XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/>
-				<button v-if="appearNote.myReaction == null" ref="reactButton" class="button _button" @click="react()">
+				<button v-if="appearNote.myReaction == null" ref="reactButton" class="button _button" v-tooltip.noDelay.bottom="i18n.ts.reaction" @click="react()">
 					<i class="ph-smiley-bold ph-lg"></i>
 				</button>
 				<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
 					<i class="ph-minus-bold ph-lg"></i>
 				</button>
 				<XQuoteButton class="button" :note="appearNote"/>
-				<button ref="menuButton" class="button _button" @click="menu()">
+				<button ref="menuButton" class="button _button" v-tooltip.noDelay.bottom="i18n.ts.more" @click="menu()">
 					<i class="ph-dots-three-outline-bold ph-lg"></i>
 				</button>
 			</footer>
diff --git a/packages/client/src/components/MkQuoteButton.vue b/packages/client/src/components/MkQuoteButton.vue
index d397cad02..6b08694ea 100644
--- a/packages/client/src/components/MkQuoteButton.vue
+++ b/packages/client/src/components/MkQuoteButton.vue
@@ -2,6 +2,7 @@
 <button
 	v-if="canRenote && $store.state.seperateRenoteQuote"
 	class="eddddedb _button"
+	v-tooltip.noDelay.bottom="i18n.ts.quote"
 	@click="quote()"
 >
 	<i class="ph-quotes-bold ph-lg"></i>
@@ -14,6 +15,7 @@ import type { Note } from 'misskey-js/built/entities';
 import { pleaseLogin } from '@/scripts/please-login';
 import * as os from '@/os';
 import { $i } from '@/account';
+import { i18n } from '@/i18n';
 
 const props = defineProps<{
 	note: Note;
diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue
index 9cee5e137..83ac1ecac 100644
--- a/packages/client/src/components/MkRenoteButton.vue
+++ b/packages/client/src/components/MkRenoteButton.vue
@@ -3,6 +3,7 @@
 	v-if="canRenote"
 	ref="buttonRef"
 	class="eddddedb _button canRenote"
+	v-tooltip.noDelay.bottom="i18n.ts.renote"
 	@click="renote(false, $event)"
 >
 	<i class="ph-repeat-bold ph-lg"></i>
diff --git a/packages/client/src/components/MkStarButton.vue b/packages/client/src/components/MkStarButton.vue
index 6f076839b..1ecd09014 100644
--- a/packages/client/src/components/MkStarButton.vue
+++ b/packages/client/src/components/MkStarButton.vue
@@ -1,5 +1,5 @@
 <template>
-<button class="skdfgljsdkf _button" @click="star($event)">
+<button class="skdfgljsdkf _button" v-tooltip.noDelay.bottom="text" @click="star($event)">
 	<i class="ph-star-bold ph-lg"></i>
 </button>
 </template>
@@ -10,6 +10,8 @@ import Ripple from '@/components/MkRipple.vue';
 import { pleaseLogin } from '@/scripts/please-login';
 import * as os from '@/os';
 
+const text = 'Like';
+
 const props = defineProps<{
 	note: Note;
 }>();

From 729210b1c6ee99f4b239f0dd9fd72bd6da697d8c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 26 Nov 2022 09:31:54 -0800
Subject: [PATCH 02/29] temp notification api fix, thank you @supakaity

---
 .../src/models/repositories/notification.ts   | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/packages/backend/src/models/repositories/notification.ts b/packages/backend/src/models/repositories/notification.ts
index 42b47ab15..efa3e860b 100644
--- a/packages/backend/src/models/repositories/notification.ts
+++ b/packages/backend/src/models/repositories/notification.ts
@@ -1,14 +1,14 @@
 import { In, Repository } from 'typeorm';
-import { Users, Notes, UserGroupInvitations, AccessTokens, NoteReactions } from '../index.js';
 import { Notification } from '@/models/entities/notification.js';
 import { awaitAll } from '@/prelude/await-all.js';
-import { Packed } from '@/misc/schema.js';
-import { Note } from '@/models/entities/note.js';
-import { NoteReaction } from '@/models/entities/note-reaction.js';
-import { User } from '@/models/entities/user.js';
+import type { Packed } from '@/misc/schema.js';
+import type { Note } from '@/models/entities/note.js';
+import type { NoteReaction } from '@/models/entities/note-reaction.js';
+import type { User } from '@/models/entities/user.js';
 import { aggregateNoteEmojis, prefetchEmojis } from '@/misc/populate-emojis.js';
 import { notificationTypes } from '@/types.js';
 import { db } from '@/db/postgre.js';
+import { Users, Notes, UserGroupInvitations, AccessTokens, NoteReactions } from '../index.js';
 
 export const NotificationRepository = db.getRepository(Notification).extend({
 	async pack(
@@ -17,7 +17,7 @@ export const NotificationRepository = db.getRepository(Notification).extend({
 			_hintForEachNotes_?: {
 				myReactions: Map<Note['id'], NoteReaction | null>;
 			};
-		}
+		},
 	): Promise<Packed<'Notification'>> {
 		const notification = typeof src === 'object' ? src : await this.findOneByOrFail({ id: src });
 		const token = notification.appAccessTokenId ? await AccessTokens.findOneByOrFail({ id: notification.appAccessTokenId }) : null;
@@ -86,7 +86,7 @@ export const NotificationRepository = db.getRepository(Notification).extend({
 
 	async packMany(
 		notifications: Notification[],
-		meId: User['id']
+		meId: User['id'],
 	) {
 		if (notifications.length === 0) return [];
 
@@ -106,10 +106,15 @@ export const NotificationRepository = db.getRepository(Notification).extend({
 
 		await prefetchEmojis(aggregateNoteEmojis(notes));
 
-		return await Promise.all(notifications.map(x => this.pack(x, {
-			_hintForEachNotes_: {
-				myReactions: myReactionsMap,
-			},
-		})));
+		const results = await Promise.all(notifications
+			.map(x =>
+				this.pack(x, {
+					_hintForEachNotes_: {
+						myReactions: myReactionsMap,
+					},
+				}).catch(e => null),
+			),
+		);
+		return results.filter(x => x != null);
 	},
 });

From b2f7ff82e3bf0bd02d6501302963a2603abff6ff Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 26 Nov 2022 09:33:55 -0800
Subject: [PATCH 03/29] .7

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

diff --git a/package.json b/package.json
index 9ea51419a..2e0022e62 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.17.6",
+	"version": "12.119.0-calc.17.7",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From d4d23969b18a8c1865588f8c4f19aa5277c30e20 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 26 Nov 2022 21:37:23 -0800
Subject: [PATCH 04/29] fix problems from #9146

---
 package.json                                      | 2 +-
 packages/client/src/components/MkNote.vue         | 8 ++++----
 packages/client/src/components/MkNoteDetailed.vue | 8 ++++----
 packages/client/src/components/MkQuoteButton.vue  | 2 +-
 packages/client/src/components/MkRenoteButton.vue | 6 +++---
 packages/client/src/components/MkStarButton.vue   | 5 ++---
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 2e0022e62..0f1be2c40 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.17.7",
+	"version": "12.119.0-calc.17.8",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index e63572dec..20d2bbee4 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -71,21 +71,21 @@
 			</div>
 			<footer class="footer">
 				<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
-				<button class="button _button" v-tooltip.noDelay.bottom="i18n.ts.reply" @click="reply()">
+				<button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()">
 					<template v-if="appearNote.reply"><i class="ph-arrow-u-up-left-bold ph-lg"></i></template>
 					<template v-else><i class="ph-arrow-bend-up-left-bold ph-lg"></i></template>
 					<p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p>
 				</button>
 				<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
 				<XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/>
-				<button v-if="appearNote.myReaction == null" ref="reactButton" class="button _button" v-tooltip.noDelay.bottom="i18n.ts.reaction" @click="react()">
+				<button v-if="appearNote.myReaction == null" ref="reactButton" v-tooltip.noDelay.bottom="i18n.ts.reaction" class="button _button" @click="react()">
 					<i class="ph-smiley-bold ph-lg"></i>
 				</button>
 				<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
 					<i class="ph-minus-bold ph-lg"></i>
 				</button>
 				<XQuoteButton class="button" :note="appearNote"/>
-				<button ref="menuButton" class="button _button" v-tooltip.noDelay.bottom="i18n.ts.more" @click="menu()">
+				<button ref="menuButton" v-tooltip.noDelay.bottom="i18n.ts.more" class="button _button" @click="menu()">
 					<i class="ph-dots-three-outline-bold ph-lg"></i>
 				</button>
 			</footer>
@@ -427,7 +427,7 @@ function readPromo() {
 		display: flex;
 		padding: 28px 32px 18px;
 		cursor: pointer;
-		
+
 		> .avatar {
 			flex-shrink: 0;
 			display: block;
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 1c99383c4..54d7ec0ca 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -81,21 +81,21 @@
 					</MkA>
 				</div>
 				<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
-				<button class="button _button" v-tooltip.noDelay.bottom="i18n.ts.reply" @click="reply()">
+				<button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()">
 					<template v-if="appearNote.reply"><i class="ph-arrow-u-up-left-bold ph-lg"></i></template>
 					<template v-else><i class="ph-arrow-bend-up-left-bold ph-lg"></i></template>
 					<p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p>
 				</button>
 				<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
 				<XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/>
-				<button v-if="appearNote.myReaction == null" ref="reactButton" class="button _button" v-tooltip.noDelay.bottom="i18n.ts.reaction" @click="react()">
+				<button v-if="appearNote.myReaction == null" ref="reactButton" v-tooltip.noDelay.bottom="i18n.ts.reaction" class="button _button" @click="react()">
 					<i class="ph-smiley-bold ph-lg"></i>
 				</button>
 				<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
 					<i class="ph-minus-bold ph-lg"></i>
 				</button>
 				<XQuoteButton class="button" :note="appearNote"/>
-				<button ref="menuButton" class="button _button" v-tooltip.noDelay.bottom="i18n.ts.more" @click="menu()">
+				<button ref="menuButton" v-tooltip.noDelay.bottom="i18n.ts.more" class="button _button" @click="menu()">
 					<i class="ph-dots-three-outline-bold ph-lg"></i>
 				</button>
 			</footer>
@@ -117,7 +117,7 @@
 <script lang="ts" setup>
 import { computed, inject, onMounted, onUnmounted, reactive, ref } from 'vue';
 import * as mfm from 'mfm-js';
-import * as misskey from 'misskey-js';
+import type * as misskey from 'misskey-js';
 import MkNoteSub from '@/components/MkNoteSub.vue';
 import XNoteSimple from '@/components/MkNoteSimple.vue';
 import XReactionsViewer from '@/components/MkReactionsViewer.vue';
diff --git a/packages/client/src/components/MkQuoteButton.vue b/packages/client/src/components/MkQuoteButton.vue
index 6b08694ea..d9db2f4c5 100644
--- a/packages/client/src/components/MkQuoteButton.vue
+++ b/packages/client/src/components/MkQuoteButton.vue
@@ -1,8 +1,8 @@
 <template>
 <button
 	v-if="canRenote && $store.state.seperateRenoteQuote"
-	class="eddddedb _button"
 	v-tooltip.noDelay.bottom="i18n.ts.quote"
+	class="eddddedb _button"
 	@click="quote()"
 >
 	<i class="ph-quotes-bold ph-lg"></i>
diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue
index 83ac1ecac..c3cc5794e 100644
--- a/packages/client/src/components/MkRenoteButton.vue
+++ b/packages/client/src/components/MkRenoteButton.vue
@@ -2,8 +2,8 @@
 <button
 	v-if="canRenote"
 	ref="buttonRef"
-	class="eddddedb _button canRenote"
 	v-tooltip.noDelay.bottom="i18n.ts.renote"
+	class="eddddedb _button canRenote"
 	@click="renote(false, $event)"
 >
 	<i class="ph-repeat-bold ph-lg"></i>
@@ -16,7 +16,7 @@
 
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
-import * as misskey from 'misskey-js';
+import type * as misskey from 'misskey-js';
 import Ripple from '@/components/MkRipple.vue';
 import XDetails from '@/components/MkUsersTooltip.vue';
 import { pleaseLogin } from '@/scripts/please-login';
@@ -24,7 +24,7 @@ import * as os from '@/os';
 import { $i } from '@/account';
 import { useTooltip } from '@/scripts/use-tooltip';
 import { i18n } from '@/i18n';
-import { defaultStore } from "@/store";
+import { defaultStore } from '@/store';
 
 const props = defineProps<{
 		note: misskey.entities.Note;
diff --git a/packages/client/src/components/MkStarButton.vue b/packages/client/src/components/MkStarButton.vue
index 1ecd09014..36a4c6be2 100644
--- a/packages/client/src/components/MkStarButton.vue
+++ b/packages/client/src/components/MkStarButton.vue
@@ -1,5 +1,5 @@
 <template>
-<button class="skdfgljsdkf _button" v-tooltip.noDelay.bottom="text" @click="star($event)">
+<button v-tooltip.noDelay.bottom="i18n.ts._gallery.like" class="skdfgljsdkf _button" @click="star($event)">
 	<i class="ph-star-bold ph-lg"></i>
 </button>
 </template>
@@ -9,8 +9,7 @@ import type { Note } from 'misskey-js/built/entities';
 import Ripple from '@/components/MkRipple.vue';
 import { pleaseLogin } from '@/scripts/please-login';
 import * as os from '@/os';
-
-const text = 'Like';
+import { i18n } from '@/i18n';
 
 const props = defineProps<{
 	note: Note;

From b0b14909f2b68ee86f22678bcc318c733088ed3b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 26 Nov 2022 21:39:31 -0800
Subject: [PATCH 05/29] https://stop.voring.me/notes/982hod4cgo

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

diff --git a/packages/client/src/components/MkInstanceTicker.vue b/packages/client/src/components/MkInstanceTicker.vue
index ed9d30b8c..5c53b5fb3 100644
--- a/packages/client/src/components/MkInstanceTicker.vue
+++ b/packages/client/src/components/MkInstanceTicker.vue
@@ -64,6 +64,7 @@ const bg = {
 		font-size: 0.9em;
 		vertical-align: top;
 		font-weight: bold;
+		text-overflow: clip;
 	}
 }
 </style>

From c6447a2de2dcfebb7ca07fd0ba23b0ae86e1fe94 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 26 Nov 2022 21:45:17 -0800
Subject: [PATCH 06/29] disable blurEffect on mobile due to it causing problems

---
 package.json                | 2 +-
 packages/client/src/init.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 0f1be2c40..68098faab 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.17.8",
+	"version": "12.119.0-calc.17.9",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index 1dc22874f..85acc568a 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -296,7 +296,7 @@ import { getAccountFromId } from '@/scripts/get-account-from-id';
 	}, { immediate: true });
 
 	watch(defaultStore.reactiveState.useBlurEffect, v => {
-		if (v) {
+		if (v && deviceKind !== 'smartphone') {
 			document.documentElement.style.removeProperty('--blur');
 		} else {
 			document.documentElement.style.setProperty('--blur', 'none');

From fcfbfe40013f8a9e2efd35a6e55c80d3756f27be Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 26 Nov 2022 21:52:47 -0800
Subject: [PATCH 07/29] rename icons.css to icons.scss

---
 packages/client/src/{icons.css => icons.scss} | 0
 packages/client/src/init.ts                   | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/client/src/{icons.css => icons.scss} (100%)

diff --git a/packages/client/src/icons.css b/packages/client/src/icons.scss
similarity index 100%
rename from packages/client/src/icons.css
rename to packages/client/src/icons.scss
diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index 85acc568a..8bff608e7 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -3,7 +3,7 @@
  */
 
 import '@/style.scss';
-import '@/icons.css';
+import '@/icons.scss';
 
 //#region account indexedDB migration
 import { set } from '@/scripts/idb-proxy';

From 37e4c05cf7a071247fca4e780db5d2f41024a3d2 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 27 Nov 2022 11:51:57 -0800
Subject: [PATCH 08/29] =?UTF-8?q?docs:=20=F0=9F=93=9D=20improve=20install?=
 =?UTF-8?q?=20instructions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 863354727..34e83c8f8 100644
--- a/README.md
+++ b/README.md
@@ -48,14 +48,25 @@ This guide will work for both **starting from scratch** and **migrating from Mis
 
 ## 📦 Dependencies
 
-- At least 🐢 [NodeJS](https://nodejs.org/en/) v18.12.1 (v19.1.0 recommended)
+- 🐢 At least [NodeJS](https://nodejs.org/en/) v18.12.1 (v19.1.0 recommended)
+  - Best installed with [nvm](https://github.com/nvm-sh/nvm)
 
 - 🐘 At least [PostgreSQL](https://www.postgresql.org/) v12
 
 - 🍱 At least [Redis](https://redis.io/) v6 (v7 recommended)
 
+- 📗 (Optional) [FFmpeg](https://ffmpeg.org/)
+
 - 🛰️ (Optional, for non-Docker) [pm2](https://pm2.io/)
 
+### 🏗️ Build dependencies
+
+- 🦬 C/C++ compiler & build tools
+  - `build-essential` on Debian/Ubuntu Linux
+  - `base-devel` on Arch Linux
+
+- 🐍 Python 3
+
 ## 👀 Get folder ready
 
 ```sh
@@ -71,6 +82,14 @@ cd calckey/
 corepack enable
 ```
 
+## 🐘 Create database
+
+Assuming you set up PostgreSQL correctly, all you have to run is:
+
+```sh
+psql postgres -c "create database calckey with encoding = 'UTF8';"
+```
+
 ## 💅 Customize
 
 - To add custom CSS for all users, edit `./custom/instance.css`.

From 7decc11a6e3a4110d0bfab11999d85a609387043 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 27 Nov 2022 11:55:45 -0800
Subject: [PATCH 09/29] =?UTF-8?q?docs:=20=F0=9F=93=9D=20formatting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 34e83c8f8..d371cc8d4 100644
--- a/README.md
+++ b/README.md
@@ -49,14 +49,10 @@ This guide will work for both **starting from scratch** and **migrating from Mis
 ## 📦 Dependencies
 
 - 🐢 At least [NodeJS](https://nodejs.org/en/) v18.12.1 (v19.1.0 recommended)
-  - Best installed with [nvm](https://github.com/nvm-sh/nvm)
-
+  - Install with [nvm](https://github.com/nvm-sh/nvm)
 - 🐘 At least [PostgreSQL](https://www.postgresql.org/) v12
-
 - 🍱 At least [Redis](https://redis.io/) v6 (v7 recommended)
-
 - 📗 (Optional) [FFmpeg](https://ffmpeg.org/)
-
 - 🛰️ (Optional, for non-Docker) [pm2](https://pm2.io/)
 
 ### 🏗️ Build dependencies
@@ -64,8 +60,7 @@ This guide will work for both **starting from scratch** and **migrating from Mis
 - 🦬 C/C++ compiler & build tools
   - `build-essential` on Debian/Ubuntu Linux
   - `base-devel` on Arch Linux
-
-- 🐍 Python 3
+- 🐍 [Python 3](https://www.python.org/)
 
 ## 👀 Get folder ready
 

From 2fd60c21add8b84f64a43ec1f48c9c933d28c2d9 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 27 Nov 2022 12:04:08 -0800
Subject: [PATCH 10/29] =?UTF-8?q?docs:=20=F0=9F=93=9D=20optional=20deps?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index d371cc8d4..9bf408347 100644
--- a/README.md
+++ b/README.md
@@ -52,8 +52,16 @@ This guide will work for both **starting from scratch** and **migrating from Mis
   - Install with [nvm](https://github.com/nvm-sh/nvm)
 - 🐘 At least [PostgreSQL](https://www.postgresql.org/) v12
 - 🍱 At least [Redis](https://redis.io/) v6 (v7 recommended)
-- 📗 (Optional) [FFmpeg](https://ffmpeg.org/)
-- 🛰️ (Optional, for non-Docker) [pm2](https://pm2.io/)
+
+### 😗 Optional dependencies
+
+- 📗 [FFmpeg](https://ffmpeg.org/) for video transcoding
+- 🔍 [ElasticSearch](https://www.elastic.co/elasticsearch/) for full-text search
+  - OpenSearch/Sonic are not supported as of right now
+- 🥡 Management (choose one of the following)
+  - 🛰️ [pm2](https://pm2.io/)
+  - 🐳 [Docker](https://docker.com)
+  - 📐 Service manager (systemd, openrc, etc)
 
 ### 🏗️ Build dependencies
 
@@ -117,7 +125,7 @@ cp -r ../misskey/files . # if you don't use object storage
 
 ## 🚀 Build and launch!
 
-### 🐢 NodeJS
+### 🐢 NodeJS + pm2
 
 #### `git pull` and run these steps to update Calckey in the future!
 

From 5bb08d8973b2ca1497d9abb347583aa1cedae7d0 Mon Sep 17 00:00:00 2001
From: CherryKitten <git@cherrykitten.dev>
Date: Mon, 28 Nov 2022 23:43:24 +0100
Subject: [PATCH 11/29] Don't hardcode locales

---
 locales/index.js | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/locales/index.js b/locales/index.js
index 92cd9b467..3be17d471 100644
--- a/locales/index.js
+++ b/locales/index.js
@@ -13,33 +13,14 @@ const merge = (...args) => args.reduce((a, c) => ({
 		.reduce((a, [k, v]) => (a[k] = merge(v, c[k]), a), {})
 }), {});
 
-const languages = [
-	'ar-SA',
-	'cs-CZ',
-	'da-DK',
-	'de-DE',
-	'en-US',
-	'es-ES',
-	'fr-FR',
-	'id-ID',
-	'it-IT',
-	'ja-JP',
-	'ja-KS',
-	'kab-KAB',
-	'kn-IN',
-	'ko-KR',
-	'nl-NL',
-	'no-NO',
-	'pl-PL',
-	'pt-PT',
-	'ru-RU',
-	'sk-SK',
-	'ug-CN',
-	'uk-UA',
-	'vi-VN',
-	'zh-CN',
-	'zh-TW',
-];
+languages = []
+
+fs.readdirSync(__dirname).forEach((file) => {
+	if (file.includes('.yml')){
+		file = file.slice(0, file.indexOf('.'))
+		languages.push(file)
+	}
+})
 
 const primaries = {
 	'en': 'US',

From 84e5189c9a33aa2e28e74595ccf81768812d28ab Mon Sep 17 00:00:00 2001
From: CherryKitten <git@cherrykitten.dev>
Date: Tue, 29 Nov 2022 01:05:16 +0100
Subject: [PATCH 12/29] Add custom locales

---
 .gitignore       |  1 +
 locales/index.js | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index a4e031399..fcab9e323 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,6 +52,7 @@ api-docs.json
 ormconfig.json
 /custom
 packages/backend/assets/instance.css
+/locales/custom
 
 # blender backups
 *.blend1
diff --git a/locales/index.js b/locales/index.js
index 3be17d471..94643a76e 100644
--- a/locales/index.js
+++ b/locales/index.js
@@ -4,6 +4,8 @@
 
 const fs = require('fs');
 const yaml = require('js-yaml');
+let languages = []
+let languages_custom = []
 
 const merge = (...args) => args.reduce((a, c) => ({
 	...a,
@@ -13,12 +15,18 @@ const merge = (...args) => args.reduce((a, c) => ({
 		.reduce((a, [k, v]) => (a[k] = merge(v, c[k]), a), {})
 }), {});
 
-languages = []
 
 fs.readdirSync(__dirname).forEach((file) => {
 	if (file.includes('.yml')){
 		file = file.slice(0, file.indexOf('.'))
-		languages.push(file)
+		languages.push(file);
+	}
+})
+
+fs.readdirSync(__dirname + '/custom').forEach((file) => {
+	if (file.includes('.yml')){
+		file = file.slice(0, file.indexOf('.'))
+		languages_custom.push(file);
 	}
 })
 
@@ -32,6 +40,8 @@ const primaries = {
 const clean = (text) => text.replace(new RegExp(String.fromCodePoint(0x08), 'g'), '');
 
 const locales = languages.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(`${__dirname}/${c}.yml`, 'utf-8'))) || {}, a), {});
+const locales_custom = languages_custom.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(`${__dirname}/custom/${c}.yml`, 'utf-8'))) || {}, a), {});
+Object.assign(locales, locales_custom)
 
 module.exports = Object.entries(locales)
 	.reduce((a, [k ,v]) => (a[k] = (() => {

From c6a3e0a5e09e9f6d6379cdcb9f04f29a5433c5bc Mon Sep 17 00:00:00 2001
From: CherryKitten <git@cherrykitten.dev>
Date: Tue, 29 Nov 2022 01:15:07 +0100
Subject: [PATCH 13/29] docs: custom locales

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

diff --git a/README.md b/README.md
index 9bf408347..a62a56d66 100644
--- a/README.md
+++ b/README.md
@@ -97,6 +97,7 @@ psql postgres -c "create database calckey with encoding = 'UTF8';"
 
 - To add custom CSS for all users, edit `./custom/instance.css`.
 - To add static assets (such as images for the splash screen), place them in the `./custom/` directory. They'll then be avaliable on `https://yourinstance.tld/static-assets/filename.ext`.
+- To add custom locales, create a directory `/locales/custom/` and place custom locale files in there. If you name your custom locale the same as an existing locale, it will overwrite it. If you give it a unique name, it will be added to the list.
 - To update custom assets without rebuilding, just run `yarn run gulp`.
 
 ## 🧑‍🔬 Configuring a new instance

From 1acb89c807ae041994e3fb3c6512017be2b9775d Mon Sep 17 00:00:00 2001
From: CherryKitten <git@cherrykitten.dev>
Date: Tue, 29 Nov 2022 22:27:08 +0100
Subject: [PATCH 14/29] Docs: Add info for custom locale naming

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

diff --git a/README.md b/README.md
index a62a56d66..a9d1397b3 100644
--- a/README.md
+++ b/README.md
@@ -97,7 +97,7 @@ psql postgres -c "create database calckey with encoding = 'UTF8';"
 
 - To add custom CSS for all users, edit `./custom/instance.css`.
 - To add static assets (such as images for the splash screen), place them in the `./custom/` directory. They'll then be avaliable on `https://yourinstance.tld/static-assets/filename.ext`.
-- To add custom locales, create a directory `/locales/custom/` and place custom locale files in there. If you name your custom locale the same as an existing locale, it will overwrite it. If you give it a unique name, it will be added to the list.
+- To add custom locales, create a directory `/locales/custom/` and place custom locale files in there. If you name your custom locale the same as an existing locale, it will overwrite it. If you give it a unique name, it will be added to the list. Also make sure that the first part of the filename matches the locale you're basing it on. (Example: `en-FOO.yml`)
 - To update custom assets without rebuilding, just run `yarn run gulp`.
 
 ## 🧑‍🔬 Configuring a new instance

From b296e2766f93f6bed4c77d9b4d7193fac79a0036 Mon Sep 17 00:00:00 2001
From: CherryKitten <git@cherrykitten.dev>
Date: Tue, 29 Nov 2022 23:08:37 +0100
Subject: [PATCH 15/29] Rework `custom` behaviour

---
 .gitignore                       | 1 -
 custom/{ => assets}/instance.css | 0
 custom/locales/.gitkeep          | 0
 gulpfile.js                      | 2 +-
 locales/index.js                 | 4 ++--
 5 files changed, 3 insertions(+), 4 deletions(-)
 rename custom/{ => assets}/instance.css (100%)
 create mode 100644 custom/locales/.gitkeep

diff --git a/.gitignore b/.gitignore
index fcab9e323..a4e031399 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,7 +52,6 @@ api-docs.json
 ormconfig.json
 /custom
 packages/backend/assets/instance.css
-/locales/custom
 
 # blender backups
 *.blend1
diff --git a/custom/instance.css b/custom/assets/instance.css
similarity index 100%
rename from custom/instance.css
rename to custom/assets/instance.css
diff --git a/custom/locales/.gitkeep b/custom/locales/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/gulpfile.js b/gulpfile.js
index 86f860e56..89a6acb83 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -16,7 +16,7 @@ gulp.task('copy:backend:views', () =>
 );
 
 gulp.task('copy:backend:custom', () =>
-	gulp.src('./custom/*').pipe(gulp.dest('./packages/backend/assets/'))
+	gulp.src('./custom/assets/*').pipe(gulp.dest('./packages/backend/assets/'))
 );
 
 gulp.task('copy:client:fonts', () =>
diff --git a/locales/index.js b/locales/index.js
index 94643a76e..7399bb5a1 100644
--- a/locales/index.js
+++ b/locales/index.js
@@ -23,7 +23,7 @@ fs.readdirSync(__dirname).forEach((file) => {
 	}
 })
 
-fs.readdirSync(__dirname + '/custom').forEach((file) => {
+fs.readdirSync(__dirname + '/../custom/locales').forEach((file) => {
 	if (file.includes('.yml')){
 		file = file.slice(0, file.indexOf('.'))
 		languages_custom.push(file);
@@ -40,7 +40,7 @@ const primaries = {
 const clean = (text) => text.replace(new RegExp(String.fromCodePoint(0x08), 'g'), '');
 
 const locales = languages.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(`${__dirname}/${c}.yml`, 'utf-8'))) || {}, a), {});
-const locales_custom = languages_custom.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(`${__dirname}/custom/${c}.yml`, 'utf-8'))) || {}, a), {});
+const locales_custom = languages_custom.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(`${__dirname}/../custom/locales/${c}.yml`, 'utf-8'))) || {}, a), {});
 Object.assign(locales, locales_custom)
 
 module.exports = Object.entries(locales)

From ecd6ed77166987c50a4d17536ed7af5b4c4db844 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 29 Nov 2022 18:13:08 -0800
Subject: [PATCH 16/29] respect reduced motion

---
 package.json                                         |  2 +-
 packages/backend/src/server/web/style.css            | 12 +++++++++++-
 .../components/global/MkMisskeyFlavoredMarkdown.vue  |  6 ++++++
 packages/client/src/ui/_common_/common.vue           |  2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 68098faab..7e0d15401 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.17.9",
+	"version": "12.119.0-calc.18",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/backend/src/server/web/style.css b/packages/backend/src/server/web/style.css
index cfdaac600..5072e0ad4 100644
--- a/packages/backend/src/server/web/style.css
+++ b/packages/backend/src/server/web/style.css
@@ -42,7 +42,7 @@ html {
 	width: 28px;
 	height: 28px;
 	transform: translateY(110px);
-	display: none !important;
+	display: none;
 	color: var(--accent);
 }
 #splashSpinner > .spinner {
@@ -101,6 +101,16 @@ html {
 	}
 }
 
+@media(prefers-reduced-motion) {
+	#splashSpinner {
+		display: block;
+	}
+
+	#splashIcon {
+		animation: none;
+	}
+}
+
 #splashText {
 	position: absolute;
 	top: 0;
diff --git a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
index 70d0108e9..5ec3caf67 100644
--- a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
+++ b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
@@ -156,6 +156,12 @@ const props = withDefaults(defineProps<{
 	0% { filter: hue-rotate(0deg) contrast(150%) saturate(150%); }
 	100% { filter: hue-rotate(360deg) contrast(150%) saturate(150%); }
 }
+
+@media(prefers-reduced-motion) {
+	div[class^='mfm'], div[class*=' mfm'] {
+		animation: none;
+	}
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/ui/_common_/common.vue b/packages/client/src/ui/_common_/common.vue
index 63eb22ad3..38ad0591b 100644
--- a/packages/client/src/ui/_common_/common.vue
+++ b/packages/client/src/ui/_common_/common.vue
@@ -11,7 +11,7 @@
 
 <XStreamIndicator/>
 
-<div v-if="pendingApiRequestsCount > 0" id="wait"></div>
+<!-- <div v-if="pendingApiRequestsCount > 0" id="wait"></div> -->
 
 <div v-if="dev" id="devTicker"><span>DEV BUILD</span></div>
 </template>

From 8ee2a3a7b9ffd0e6286f282e2859c076b7aad487 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 29 Nov 2022 18:13:29 -0800
Subject: [PATCH 17/29] rc

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

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

From d997ae558541083c97587b6753e8a49f60c55103 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 29 Nov 2022 18:15:18 -0800
Subject: [PATCH 18/29] cl

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

diff --git a/CALCKEY.md b/CALCKEY.md
index 3b6afb177..976cad22b 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -87,6 +87,7 @@
 - AVIF support
 - Page drafts
 - Patron list
+- Animations respect reduced motion
 - Obliteration of Ai-chan
 - [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996)
 - [Tapping avatar in mobile opens account modal](https://github.com/misskey-dev/misskey/pull/9056)

From eba3e97550880d0160106f859ebec2305720fd74 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 29 Nov 2022 18:15:57 -0800
Subject: [PATCH 19/29] docs: a11y

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

diff --git a/README.md b/README.md
index 9bf408347..cb558cf68 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@
   - Improved UI/UX (especially on mobile)
   - Improved notifications
   - Improved instance security
+  - Improved accessibility
   - Recommended Instances timeline
   - OCR image captioning
   - New and improved Groups

From d72d5f3f494defc45eb35366c3532c2245fba105 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 29 Nov 2022 18:25:37 -0800
Subject: [PATCH 20/29] fix

---
 package.json                                  |  2 +-
 packages/client/src/components/MkSparkle.vue  | 57 ++++++++++---------
 .../global/MkMisskeyFlavoredMarkdown.vue      |  2 +-
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/package.json b/package.json
index 05e4f5199..97ca67510 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.18-rc.1",
+	"version": "12.119.0-calc.18-rc.2",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/MkSparkle.vue b/packages/client/src/components/MkSparkle.vue
index db38864a3..ba6089ab6 100644
--- a/packages/client/src/components/MkSparkle.vue
+++ b/packages/client/src/components/MkSparkle.vue
@@ -71,38 +71,41 @@ const el = ref<HTMLElement>();
 const width = ref(0);
 const height = ref(0);
 const colors = ['#eb6f92', '#9ccfd8', '#f6c177', '#f6c177', '#f6c177'];
+const reducedQuery = window.matchMedia('(prefers-reduced-motion: reduce)');
 let stop = false;
 let ro: ResizeObserver | undefined;
 
 onMounted(() => {
-	ro = new ResizeObserver((entries, observer) => {
-		width.value = el.value?.offsetWidth + 64;
-		height.value = el.value?.offsetHeight + 64;
-	});
-	ro.observe(el.value);
-	const add = () => {
-		if (stop) return;
-		const x = (Math.random() * (width.value - 64));
-		const y = (Math.random() * (height.value - 64));
-		const sizeFactor = Math.random();
-		const particle = {
-			id: Math.random().toString(),
-			x,
-			y,
-			size: 0.2 + ((sizeFactor / 10) * 3),
-			dur: 1000 + (sizeFactor * 1000),
-			color: colors[Math.floor(Math.random() * colors.length)],
-		};
-		particles.value.push(particle);
-		window.setTimeout(() => {
-			particles.value = particles.value.filter(x => x.id !== particle.id);
-		}, particle.dur - 100);
+	if (!reducedQuery.matches) {
+		ro = new ResizeObserver((entries, observer) => {
+			width.value = el.value?.offsetWidth + 64;
+			height.value = el.value?.offsetHeight + 64;
+		});
+		ro.observe(el.value);
+		const add = () => {
+			if (stop) return;
+			const x = (Math.random() * (width.value - 64));
+			const y = (Math.random() * (height.value - 64));
+			const sizeFactor = Math.random();
+			const particle = {
+				id: Math.random().toString(),
+				x,
+				y,
+				size: 0.2 + ((sizeFactor / 10) * 3),
+				dur: 1000 + (sizeFactor * 1000),
+				color: colors[Math.floor(Math.random() * colors.length)],
+			};
+			particles.value.push(particle);
+			window.setTimeout(() => {
+				particles.value = particles.value.filter(x => x.id !== particle.id);
+			}, particle.dur - 100);
 
-		window.setTimeout(() => {
-			add();
-		}, 500 + (Math.random() * 500));
-	};
-	add();
+			window.setTimeout(() => {
+				add();
+			}, 500 + (Math.random() * 500));
+		};
+		add();
+	}
 });
 
 onUnmounted(() => {
diff --git a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
index 5ec3caf67..9077b0152 100644
--- a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
+++ b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
@@ -158,7 +158,7 @@ const props = withDefaults(defineProps<{
 }
 
 @media(prefers-reduced-motion) {
-	div[class^='mfm'], div[class*=' mfm'] {
+	span[class^='mfm'], div[class*=' mfm'] {
 		animation: none;
 	}
 }

From 687ae2c74b990e59b3d91636ec9f001a11e9b8b8 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 29 Nov 2022 18:29:12 -0800
Subject: [PATCH 21/29] reduce motion for tada

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

diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index ffea050e5..0f2d106ca 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -568,6 +568,30 @@ hr {
 	}
 }
 
+@media(prefers-reduced-motion) {
+	@keyframes tada {
+		from {
+			transform: scale3d(1, 1, 1);
+		}
+
+		25% {
+			transform: scale3d(0.9, 0.9, 0.9);
+		}
+
+		50% {
+			transform: scale3d(1.1, 1.1, 1.1);
+		}
+
+		75% {
+			transform: scale3d(0.9, 0.9, 0.9);
+		}
+
+		to {
+			transform: scale3d(1, 1, 1);
+		}
+	}
+}
+
 ._anime_bounce {
 	will-change: transform;
   animation: bounce ease 0.7s;

From 009fb9eb0ff88c0532535011ea773ff24bd60b83 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 29 Nov 2022 18:31:12 -0800
Subject: [PATCH 22/29] .3

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

diff --git a/package.json b/package.json
index 97ca67510..b587e2d9f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.18-rc.2",
+	"version": "12.119.0-calc.18-rc.3",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
index 9077b0152..f527b7dc4 100644
--- a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
+++ b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
@@ -158,8 +158,8 @@ const props = withDefaults(defineProps<{
 }
 
 @media(prefers-reduced-motion) {
-	span[class^='mfm'], div[class*=' mfm'] {
-		animation: none;
+	span[class^='mfm'], span[class*=' mfm'] {
+		animation: none !important;
 	}
 }
 </style>

From 0d032b90d0d1875fef13c8b12d2a58258a7ee42a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 29 Nov 2022 18:40:12 -0800
Subject: [PATCH 23/29] moved reduced motion query to script

---
 package.json                                  |  2 +-
 packages/client/src/components/MkSparkle.vue  |  4 +-
 .../global/MkMisskeyFlavoredMarkdown.vue      |  6 ---
 packages/client/src/components/mfm.ts         | 40 ++++++++++---------
 packages/client/src/scripts/reduced-motion.ts |  3 ++
 5 files changed, 27 insertions(+), 28 deletions(-)
 create mode 100644 packages/client/src/scripts/reduced-motion.ts

diff --git a/package.json b/package.json
index b587e2d9f..48ea31199 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.18-rc.3",
+	"version": "12.119.0-calc.18-rc.4",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/MkSparkle.vue b/packages/client/src/components/MkSparkle.vue
index ba6089ab6..2311adce8 100644
--- a/packages/client/src/components/MkSparkle.vue
+++ b/packages/client/src/components/MkSparkle.vue
@@ -65,18 +65,18 @@
 
 <script lang="ts" setup>
 import { onMounted, onUnmounted, ref } from 'vue';
+import { reducedMotion } from '@/scripts/reduced-motion';
 
 const particles = ref([]);
 const el = ref<HTMLElement>();
 const width = ref(0);
 const height = ref(0);
 const colors = ['#eb6f92', '#9ccfd8', '#f6c177', '#f6c177', '#f6c177'];
-const reducedQuery = window.matchMedia('(prefers-reduced-motion: reduce)');
 let stop = false;
 let ro: ResizeObserver | undefined;
 
 onMounted(() => {
-	if (!reducedQuery.matches) {
+	if (!reducedMotion()) {
 		ro = new ResizeObserver((entries, observer) => {
 			width.value = el.value?.offsetWidth + 64;
 			height.value = el.value?.offsetHeight + 64;
diff --git a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
index f527b7dc4..70d0108e9 100644
--- a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
+++ b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
@@ -156,12 +156,6 @@ const props = withDefaults(defineProps<{
 	0% { filter: hue-rotate(0deg) contrast(150%) saturate(150%); }
 	100% { filter: hue-rotate(360deg) contrast(150%) saturate(150%); }
 }
-
-@media(prefers-reduced-motion) {
-	span[class^='mfm'], span[class*=' mfm'] {
-		animation: none !important;
-	}
-}
 </style>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index 5b1e6839c..fc4881255 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -1,5 +1,6 @@
-import { VNode, defineComponent, h } from 'vue';
+import { defineComponent, h } from 'vue';
 import * as mfm from 'mfm-js';
+import type { VNode } from 'vue';
 import MkUrl from '@/components/global/MkUrl.vue';
 import MkLink from '@/components/MkLink.vue';
 import MkMention from '@/components/MkMention.vue';
@@ -12,6 +13,7 @@ import MkSparkle from '@/components/MkSparkle.vue';
 import MkA from '@/components/global/MkA.vue';
 import { host } from '@/config';
 import { MFM_TAGS } from '@/scripts/mfm-tags';
+import { reducedMotion } from '@/scripts/reduced-motion';
 
 export default defineComponent({
 	props: {
@@ -92,22 +94,22 @@ export default defineComponent({
 					switch (token.props.name) {
 						case 'tada': {
 							const speed = validTime(token.props.args.speed) || '1s';
-							style = 'font-size: 150%;' + (this.$store.state.animatedMfm ? `animation: tada ${speed} linear infinite both;` : '');
+							style = 'font-size: 150%;' + (this.$store.state.animatedMfm && !reducedMotion() ? `animation: tada ${speed} linear infinite both;` : '');
 							break;
 						}
 						case 'jelly': {
 							const speed = validTime(token.props.args.speed) || '1s';
-							style = (this.$store.state.animatedMfm ? `animation: mfm-rubberBand ${speed} linear infinite both;` : '');
+							style = (this.$store.state.animatedMfm && !reducedMotion() ? `animation: mfm-rubberBand ${speed} linear infinite both;` : '');
 							break;
 						}
 						case 'twitch': {
 							const speed = validTime(token.props.args.speed) || '0.5s';
-							style = this.$store.state.animatedMfm ? `animation: mfm-twitch ${speed} ease infinite;` : '';
+							style = this.$store.state.animatedMfm && !reducedMotion() ? `animation: mfm-twitch ${speed} ease infinite;` : '';
 							break;
 						}
 						case 'shake': {
 							const speed = validTime(token.props.args.speed) || '0.5s';
-							style = this.$store.state.animatedMfm ? `animation: mfm-shake ${speed} ease infinite;` : '';
+							style = this.$store.state.animatedMfm && !reducedMotion() ? `animation: mfm-shake ${speed} ease infinite;` : '';
 							break;
 						}
 						case 'spin': {
@@ -120,19 +122,30 @@ export default defineComponent({
 								token.props.args.y ? 'mfm-spinY' :
 								'mfm-spin';
 							const speed = validTime(token.props.args.speed) || '1.5s';
-							style = this.$store.state.animatedMfm ? `animation: ${anime} ${speed} linear infinite; animation-direction: ${direction};` : '';
+							style = this.$store.state.animatedMfm && !reducedMotion() ? `animation: ${anime} ${speed} linear infinite; animation-direction: ${direction};` : '';
 							break;
 						}
 						case 'jump': {
 							const speed = validTime(token.props.args.speed) || '0.75s';
-							style = this.$store.state.animatedMfm ? `animation: mfm-jump ${speed} linear infinite;` : '';
+							style = this.$store.state.animatedMfm && !reducedMotion() ? `animation: mfm-jump ${speed} linear infinite;` : '';
 							break;
 						}
 						case 'bounce': {
 							const speed = validTime(token.props.args.speed) || '0.75s';
-							style = this.$store.state.animatedMfm ? `animation: mfm-bounce ${speed} linear infinite; transform-origin: center bottom;` : '';
+							style = this.$store.state.animatedMfm && !reducedMotion() ? `animation: mfm-bounce ${speed} linear infinite; transform-origin: center bottom;` : '';
 							break;
 						}
+						case 'rainbow': {
+							const speed = validTime(token.props.args.speed) || '1s';
+							style = this.$store.state.animatedMfm && !reducedMotion() ? `animation: mfm-rainbow ${speed} linear infinite;` : '';
+							break;
+						}
+						case 'sparkle': {
+							if (!this.$store.state.animatedMfm && !reducedMotion()) {
+								return genEl(token.children);
+							}
+							return h(MkSparkle, {}, genEl(token.children));
+						}
 						case 'flip': {
 							const transform =
 								(token.props.args.h && token.props.args.v) ? 'scale(-1, -1)' :
@@ -173,17 +186,6 @@ export default defineComponent({
 								class: '_mfm_blur_',
 							}, genEl(token.children));
 						}
-						case 'rainbow': {
-							const speed = validTime(token.props.args.speed) || '1s';
-							style = this.$store.state.animatedMfm ? `animation: mfm-rainbow ${speed} linear infinite;` : '';
-							break;
-						}
-						case 'sparkle': {
-							if (!this.$store.state.animatedMfm) {
-								return genEl(token.children);
-							}
-							return h(MkSparkle, {}, genEl(token.children));
-						}
 						case 'rotate': {
 							const rotate =
 								token.props.args.x ? 'perspective(128px) rotateX' :
diff --git a/packages/client/src/scripts/reduced-motion.ts b/packages/client/src/scripts/reduced-motion.ts
new file mode 100644
index 000000000..cccbb2cab
--- /dev/null
+++ b/packages/client/src/scripts/reduced-motion.ts
@@ -0,0 +1,3 @@
+export function reducedMotion(): boolean {
+	return window.matchMedia('(prefers-reduced-motion: reduce)').matches;
+}

From 5534d760029cae004d46f9456f6ef82c3fcdd7fc Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 29 Nov 2022 18:48:49 -0800
Subject: [PATCH 24/29] enable tada animation for reduced motion (as it has a
 reduced motion version)

---
 package.json                          | 2 +-
 packages/client/src/components/mfm.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 48ea31199..2debccd43 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.18-rc.4",
+	"version": "12.119.0-calc.18-rc.5",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index fc4881255..103c78bf6 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -94,7 +94,7 @@ export default defineComponent({
 					switch (token.props.name) {
 						case 'tada': {
 							const speed = validTime(token.props.args.speed) || '1s';
-							style = 'font-size: 150%;' + (this.$store.state.animatedMfm && !reducedMotion() ? `animation: tada ${speed} linear infinite both;` : '');
+							style = 'font-size: 150%;' + (this.$store.state.animatedMfm ? `animation: tada ${speed} linear infinite both;` : '');
 							break;
 						}
 						case 'jelly': {

From e810ae2269063fa3fa007ba5d87c6007e048109c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 29 Nov 2022 18:51:24 -0800
Subject: [PATCH 25/29] further simplify tada for reduced motion

---
 package.json                   | 2 +-
 packages/client/src/style.scss | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 2debccd43..05510cafb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.18-rc.5",
+	"version": "12.119.0-calc.18-rc.6",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index 0f2d106ca..48babbe2a 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -574,18 +574,10 @@ hr {
 			transform: scale3d(1, 1, 1);
 		}
 
-		25% {
-			transform: scale3d(0.9, 0.9, 0.9);
-		}
-
 		50% {
 			transform: scale3d(1.1, 1.1, 1.1);
 		}
 
-		75% {
-			transform: scale3d(0.9, 0.9, 0.9);
-		}
-
 		to {
 			transform: scale3d(1, 1, 1);
 		}

From a96348023eb33d28def4ecac2658f97574a923cf Mon Sep 17 00:00:00 2001
From: CherryKitten <git@cherrykitten.dev>
Date: Wed, 30 Nov 2022 19:51:12 +0100
Subject: [PATCH 26/29] docs: reflect last change in readme

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index a9d1397b3..5c4037a2c 100644
--- a/README.md
+++ b/README.md
@@ -95,9 +95,9 @@ psql postgres -c "create database calckey with encoding = 'UTF8';"
 
 ## 💅 Customize
 
-- To add custom CSS for all users, edit `./custom/instance.css`.
-- To add static assets (such as images for the splash screen), place them in the `./custom/` directory. They'll then be avaliable on `https://yourinstance.tld/static-assets/filename.ext`.
-- To add custom locales, create a directory `/locales/custom/` and place custom locale files in there. If you name your custom locale the same as an existing locale, it will overwrite it. If you give it a unique name, it will be added to the list. Also make sure that the first part of the filename matches the locale you're basing it on. (Example: `en-FOO.yml`)
+- To add custom CSS for all users, edit `./custom/assets/instance.css`.
+- To add static assets (such as images for the splash screen), place them in the `./custom/assets/` directory. They'll then be avaliable on `https://yourinstance.tld/static-assets/filename.ext`.
+- To add custom locales, place them in the `./custom/locales/` directory. If you name your custom locale the same as an existing locale, it will overwrite it. If you give it a unique name, it will be added to the list. Also make sure that the first part of the filename matches the locale you're basing it on. (Example: `en-FOO.yml`)
 - To update custom assets without rebuilding, just run `yarn run gulp`.
 
 ## 🧑‍🔬 Configuring a new instance

From 0ad0ddfee9e314ac74f72098e950a370fe2469f6 Mon Sep 17 00:00:00 2001
From: skeh <skeh@is.nota.live>
Date: Thu, 1 Dec 2022 07:45:08 +0000
Subject: [PATCH 27/29] Merge pull request 'hotfix/misskey-forkbomb' (#8) from
 hotfix/misskey-forkbomb into stage

Reviewed-on: https://code.vtopia.live/Vtopia/MissV/pulls/8
---
 .../backend/src/remote/activitypub/kernel/update/index.ts | 2 +-
 packages/backend/src/remote/activitypub/models/person.ts  | 8 ++++----
 .../backend/src/remote/activitypub/models/question.ts     | 4 ++--
 packages/backend/src/remote/activitypub/resolver.ts       | 8 ++++++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/backend/src/remote/activitypub/kernel/update/index.ts b/packages/backend/src/remote/activitypub/kernel/update/index.ts
index 9e8a81bb3..022be0ad8 100644
--- a/packages/backend/src/remote/activitypub/kernel/update/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/update/index.ts
@@ -26,7 +26,7 @@ export default async (actor: CacheableRemoteUser, activity: IUpdate): Promise<st
 		await updatePerson(actor.uri!, resolver, object);
 		return `ok: Person updated`;
 	} else if (getApType(object) === 'Question') {
-		await updateQuestion(object).catch(e => console.log(e));
+		await updateQuestion(object, resolver).catch(e => console.log(e));
 		return `ok: Question updated`;
 	} else {
 		return `skip: Unknown type: ${getApType(object)}`;
diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts
index 6097e3b6e..5ef04588e 100644
--- a/packages/backend/src/remote/activitypub/models/person.ts
+++ b/packages/backend/src/remote/activitypub/models/person.ts
@@ -271,7 +271,7 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
 	});
 	//#endregion
 
-	await updateFeatured(user!.id).catch(err => logger.error(err));
+	await updateFeatured(user!.id, resolver).catch(err => logger.error(err));
 
 	return user!;
 }
@@ -384,7 +384,7 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
 		followerSharedInbox: person.sharedInbox || (person.endpoints ? person.endpoints.sharedInbox : undefined),
 	});
 
-	await updateFeatured(exist.id).catch(err => logger.error(err));
+	await updateFeatured(exist.id, resolver).catch(err => logger.error(err));
 }
 
 /**
@@ -462,14 +462,14 @@ export function analyzeAttachments(attachments: IObject | IObject[] | undefined)
 	return { fields, services };
 }
 
-export async function updateFeatured(userId: User['id']) {
+export async function updateFeatured(userId: User['id'], resolver?: Resolver) {
 	const user = await Users.findOneByOrFail({ id: userId });
 	if (!Users.isRemoteUser(user)) return;
 	if (!user.featured) return;
 
 	logger.info(`Updating the featured: ${user.uri}`);
 
-	const resolver = new Resolver();
+	if (resolver == null) resolver = new Resolver();
 
 	// Resolve to (Ordered)Collection Object
 	const collection = await resolver.resolveCollection(user.featured);
diff --git a/packages/backend/src/remote/activitypub/models/question.ts b/packages/backend/src/remote/activitypub/models/question.ts
index f0321fdf2..94a50d4f7 100644
--- a/packages/backend/src/remote/activitypub/models/question.ts
+++ b/packages/backend/src/remote/activitypub/models/question.ts
@@ -40,7 +40,7 @@ export async function extractPollFromQuestion(source: string | IObject, resolver
  * @param uri URI of AP Question object
  * @returns true if updated
  */
-export async function updateQuestion(value: any) {
+export async function updateQuestion(value: any, resolver?: Resolver) {
 	const uri = typeof value === 'string' ? value : value.id;
 
 	// URIがこのサーバーを指しているならスキップ
@@ -55,7 +55,7 @@ export async function updateQuestion(value: any) {
 	//#endregion
 
 	// resolve new Question object
-	const resolver = new Resolver();
+	if (resolver == null) resolver = new Resolver();
 	const question = await resolver.resolve(value) as IQuestion;
 	apLogger.debug(`fetched question: ${JSON.stringify(question, null, 2)}`);
 
diff --git a/packages/backend/src/remote/activitypub/resolver.ts b/packages/backend/src/remote/activitypub/resolver.ts
index 5c9d44292..94227e4db 100644
--- a/packages/backend/src/remote/activitypub/resolver.ts
+++ b/packages/backend/src/remote/activitypub/resolver.ts
@@ -19,9 +19,11 @@ import renderFollow from '@/remote/activitypub/renderer/follow.js';
 export default class Resolver {
 	private history: Set<string>;
 	private user?: ILocalUser;
+	private recursionLimit?: number;
 
-	constructor() {
+	constructor(recursionLimit = 100) {
 		this.history = new Set();
+		this.recursionLimit = recursionLimit;
 	}
 
 	public getHistory(): string[] {
@@ -59,7 +61,9 @@ export default class Resolver {
 		if (this.history.has(value)) {
 			throw new Error('cannot resolve already resolved one');
 		}
-
+		if (this.recursionLimit && this.history.size > this.recursionLimit) {
+			throw new Error('hit recursion limit');
+		}
 		this.history.add(value);
 
 		const host = extractDbHost(value);

From 5833703f7c45c045ff692247dbdcd303901334cc Mon Sep 17 00:00:00 2001
From: thatonecalculator <kainoa@t1c.dev>
Date: Thu, 1 Dec 2022 00:32:28 -0800
Subject: [PATCH 28/29] Thank you MissV for forkbomb fix

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

diff --git a/CALCKEY.md b/CALCKEY.md
index 976cad22b..892c79607 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -89,6 +89,7 @@
 - Patron list
 - Animations respect reduced motion
 - Obliteration of Ai-chan
+- MissV: [fix Misskey Forkbomb](https://code.vtopia.live/Vtopia/MissV/commit/40b23c070bd4adbb3188c73546c6c625138fb3c1)
 - [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996)
 - [Tapping avatar in mobile opens account modal](https://github.com/misskey-dev/misskey/pull/9056)
 - [OAuth bearer token authentication](https://github.com/misskey-dev/misskey/pull/9021)

From b039674f15e4a364ec05cd8dc4abfde2bbc85704 Mon Sep 17 00:00:00 2001
From: thatonecalculator <kainoa@t1c.dev>
Date: Thu, 1 Dec 2022 00:34:37 -0800
Subject: [PATCH 29/29] 7

---
 package.json                                                   | 2 +-
 packages/client/src/pages/messaging/messaging-room.message.vue | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 05510cafb..2651c05f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.18-rc.6",
+	"version": "12.119.0-calc.18-rc.7",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/messaging/messaging-room.message.vue b/packages/client/src/pages/messaging/messaging-room.message.vue
index 9e2af5046..7e66dfcc2 100644
--- a/packages/client/src/pages/messaging/messaging-room.message.vue
+++ b/packages/client/src/pages/messaging/messaging-room.message.vue
@@ -90,7 +90,6 @@ function del(): void {
 			min-height: 38px;
 			border-radius: 16px;
 			max-width: 100%;
-			margin-left: 4%;
 
 			& + * {
 				clear: both;
@@ -215,8 +214,6 @@ function del(): void {
 
 			> .balloon {
 				$color: var(--X4);
-				margin-right: 4%;
-				margin-left: 0%;
 				background: $color;
 
 				&.noText {