From 8e7c6d3a9b980184f977874b2bd7524059833aa8 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 6 Dec 2022 20:12:44 -0800
Subject: [PATCH 01/17] Fix icons + formatting

fix more icons
---
 package.json                                  |  2 +-
 packages/client/src/components/MkInfo.vue     |  2 +-
 packages/client/src/components/MkMoved.vue    | 15 ++++++++----
 .../client/src/pages/admin/proxy-account.vue  | 24 ++++++++++---------
 packages/client/src/pages/explore.users.vue   | 18 +++++++-------
 packages/client/src/pages/messaging/index.vue |  4 ++--
 .../client/src/pages/settings/integration.vue |  6 ++---
 packages/client/src/pages/user/index.vue      |  2 +-
 8 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/package.json b/package.json
index 1212633b2..635d3614a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.0.0-b4",
+	"version": "13.0.0-b5",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/MkInfo.vue b/packages/client/src/components/MkInfo.vue
index 98dfef967..0790e58e3 100644
--- a/packages/client/src/components/MkInfo.vue
+++ b/packages/client/src/components/MkInfo.vue
@@ -9,7 +9,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 
-const props = defineProps<{
+defineProps<{
 	warn?: boolean;
 }>();
 </script>
diff --git a/packages/client/src/components/MkMoved.vue b/packages/client/src/components/MkMoved.vue
index 103853c4d..6251d93a8 100644
--- a/packages/client/src/components/MkMoved.vue
+++ b/packages/client/src/components/MkMoved.vue
@@ -1,23 +1,28 @@
 <template>
-<div class="_block" :class="$style.mkmoved"><i class="fas fa-info-circle" style="margin-right: 8px;"></i>{{ i18n.ts.accountMoved }}<MkMention :class="$style.link" class="link" :username="acct" :host="host"/></div>
+<div class="_block msjugskdqo">
+	<i class="ph-airplane-takeoff-bold ph-lg" style="margin-right: 8px;"/>
+	{{ i18n.ts.accountMoved }}
+	<MkMention :class="$style.link" class="link" :username="acct" :host="host"/>
+</div>
 </template>
 
 <script lang="ts" setup>
-import { i18n } from '@/i18n';
 import MkMention from './MkMention.vue';
-const props = defineProps<{
+import { i18n } from '@/i18n';
+
+defineProps<{
 	acct: string;
 	host: string;
 }>();
-const href = $computed(() => `/${props.acct}`);
 </script>
 
 <style lang="scss" module>
-.mkmoved {
+.msjugskdqo {
 	font-size: 0.8em;
 	padding: 16px;
 	background: var(--infoBg);
 	color: var(--infoFg);
+
 	> .link {
 		margin-left: 4px;
 		color: var(--accent);
diff --git a/packages/client/src/pages/admin/proxy-account.vue b/packages/client/src/pages/admin/proxy-account.vue
index faa89cb5e..a141d4a31 100644
--- a/packages/client/src/pages/admin/proxy-account.vue
+++ b/packages/client/src/pages/admin/proxy-account.vue
@@ -1,16 +1,18 @@
-<template><MkStickyContainer>
+<template>
+<MkStickyContainer>
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-		<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
-	<FormSuspense :p="init">
-		<MkInfo class="_formBlock">{{ i18n.ts.proxyAccountDescription }}</MkInfo>
-		<MkKeyValue class="_formBlock">
-			<template #key>{{ i18n.ts.proxyAccount }}</template>
-			<template #value>{{ proxyAccount ? `@${proxyAccount.username}` : i18n.ts.none }}</template>
-		</MkKeyValue>
+	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
+		<FormSuspense :p="init">
+			<MkInfo class="_formBlock">{{ i18n.ts.proxyAccountDescription }}</MkInfo>
+			<MkKeyValue class="_formBlock">
+				<template #key>{{ i18n.ts.proxyAccount }}</template>
+				<template #value>{{ proxyAccount ? `@${proxyAccount.username}` : i18n.ts.none }}</template>
+			</MkKeyValue>
 
-		<FormButton primary class="_formBlock" @click="chooseProxyAccount">{{ i18n.ts.selectAccount }}</FormButton>
-	</FormSuspense>
-</MkSpacer></MkStickyContainer>
+			<FormButton primary class="_formBlock" @click="chooseProxyAccount">{{ i18n.ts.selectAccount }}</FormButton>
+		</FormSuspense>
+	</MkSpacer>
+</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
diff --git a/packages/client/src/pages/explore.users.vue b/packages/client/src/pages/explore.users.vue
index 8a636517d..0c512a74f 100644
--- a/packages/client/src/pages/explore.users.vue
+++ b/packages/client/src/pages/explore.users.vue
@@ -9,26 +9,26 @@
 	<div v-if="origin === 'local'">
 		<template v-if="tag == null">
 			<MkFolder class="_gap" persist-key="explore-pinned-users">
-				<template #header><i class="fas fa-bookmark fa-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.pinnedUsers }}</template>
+				<template #header><i class="ph-bookmark-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.pinnedUsers }}</template>
 				<XUserList :pagination="pinnedUsers"/>
 			</MkFolder>
 			<MkFolder v-if="$i != null" class="_gap" persist-key="explore-popular-users">
-				<template #header><i class="fas fa-chart-line fa-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularUsers }}</template>
+				<template #header><i class="ph-chart-line-up-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularUsers }}</template>
 				<XUserList :pagination="popularUsers"/>
 			</MkFolder>
 			<MkFolder v-if="$i != null" class="_gap" persist-key="explore-recently-updated-users">
-				<template #header><i class="fas fa-comment-alt fa-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyUpdatedUsers }}</template>
+				<template #header><i class="ph-activity-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyUpdatedUsers }}</template>
 				<XUserList :pagination="recentlyUpdatedUsers"/>
 			</MkFolder>
 			<MkFolder v-if="$i != null" class="_gap" persist-key="explore-recently-registered-users">
-				<template #header><i class="fas fa-plus fa-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyRegisteredUsers }}</template>
+				<template #header><i class="ph-butterfly-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyRegisteredUsers }}</template>
 				<XUserList :pagination="recentlyRegisteredUsers"/>
 			</MkFolder>
 		</template>
 	</div>
 	<div v-else>
 		<MkFolder ref="tagsEl" :foldable="true" :expanded="false" class="_gap">
-			<template #header><i class="fas fa-hashtag fa-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularTags }}</template>
+			<template #header><i class="ph-hash-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularTags }}</template>
 
 			<div class="vxjfqztj">
 				<MkA v-for="tag in tagsLocal" :key="'local:' + tag.tag" :to="`/explore/tags/${tag.tag}`" class="local">{{ tag.tag }}</MkA>
@@ -37,21 +37,21 @@
 		</MkFolder>
 
 		<MkFolder v-if="tag != null" :key="`${tag}`" class="_gap">
-			<template #header><i class="fas fa-hashtag fa-fw" style="margin-right: 0.5em;"></i>{{ tag }}</template>
+			<template #header><i class="ph-hash-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ tag }}</template>
 			<XUserList :pagination="tagUsers"/>
 		</MkFolder>
 
 		<template v-if="tag == null && $i != null">
 			<MkFolder class="_gap">
-				<template #header><i class="fas fa-chart-line fa-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularUsers }}</template>
+				<template #header><i class="ph-chart-line-up-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularUsers }}</template>
 				<XUserList :pagination="popularUsersF"/>
 			</MkFolder>
 			<MkFolder class="_gap">
-				<template #header><i class="fas fa-comment-alt fa-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyUpdatedUsers }}</template>
+				<template #header><i class="ph-activity-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyUpdatedUsers }}</template>
 				<XUserList :pagination="recentlyUpdatedUsersF"/>
 			</MkFolder>
 			<MkFolder class="_gap">
-				<template #header><i class="fas fa-rocket fa-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyDiscoveredUsers }}</template>
+				<template #header><i class="ph-rocke-launch-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyDiscoveredUsers }}</template>
 				<XUserList :pagination="recentlyRegisteredUsersF"/>
 			</MkFolder>
 		</template>
diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index fd0c02225..de4b6f90a 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -130,11 +130,11 @@ function onRead(ids): void {
 function startMenu(ev) {
 	os.popupMenu([{
 		text: i18n.ts.messagingWithUser,
-		icon: 'fas fa-user',
+		icon: 'ph-user-bold ph-lg',
 		action: () => { startUser(); },
 	}, {
 		text: i18n.ts.messagingWithGroup,
-		icon: 'fas fa-users',
+		icon: 'ph-users-three-bold ph-lg',
 		action: () => { startGroup(); },
 	}], ev.currentTarget ?? ev.target);
 }
diff --git a/packages/client/src/pages/settings/integration.vue b/packages/client/src/pages/settings/integration.vue
index 2e872af31..816ae40cd 100644
--- a/packages/client/src/pages/settings/integration.vue
+++ b/packages/client/src/pages/settings/integration.vue
@@ -1,21 +1,21 @@
 <template>
 <div class="_formRoot">
 	<FormSection v-if="instance.enableTwitterIntegration">
-		<template #label><i class="fab fa-twitter"></i> Twitter</template>
+		<template #label><i class="ph-twitter-logo-bold ph-lg"></i> Twitter</template>
 		<p v-if="integrations.twitter">{{ i18n.ts.connectedTo }}: <a :href="`https://twitter.com/${integrations.twitter.screenName}`" rel="nofollow noopener" target="_blank">@{{ integrations.twitter.screenName }}</a></p>
 		<MkButton v-if="integrations.twitter" danger @click="disconnectTwitter">{{ i18n.ts.disconnectService }}</MkButton>
 		<MkButton v-else primary @click="connectTwitter">{{ i18n.ts.connectService }}</MkButton>
 	</FormSection>
 
 	<FormSection v-if="instance.enableDiscordIntegration">
-		<template #label><i class="fab fa-discord"></i> Discord</template>
+		<template #label><i class="ph-discord-logo-bold ph-lg"></i> Discord</template>
 		<p v-if="integrations.discord">{{ i18n.ts.connectedTo }}: <a :href="`https://discord.com/users/${integrations.discord.id}`" rel="nofollow noopener" target="_blank">@{{ integrations.discord.username }}#{{ integrations.discord.discriminator }}</a></p>
 		<MkButton v-if="integrations.discord" danger @click="disconnectDiscord">{{ i18n.ts.disconnectService }}</MkButton>
 		<MkButton v-else primary @click="connectDiscord">{{ i18n.ts.connectService }}</MkButton>
 	</FormSection>
 
 	<FormSection v-if="instance.enableGithubIntegration">
-		<template #label><i class="fab fa-github"></i> GitHub</template>
+		<template #label><i class="ph-github-logo-bold ph-lg"></i> GitHub</template>
 		<p v-if="integrations.github">{{ i18n.ts.connectedTo }}: <a :href="`https://github.com/${integrations.github.login}`" rel="nofollow noopener" target="_blank">@{{ integrations.github.login }}</a></p>
 		<MkButton v-if="integrations.github" danger @click="disconnectGithub">{{ i18n.ts.disconnectService }}</MkButton>
 		<MkButton v-else primary @click="connectGithub">{{ i18n.ts.connectService }}</MkButton>
diff --git a/packages/client/src/pages/user/index.vue b/packages/client/src/pages/user/index.vue
index 7de1bca3d..5028df037 100644
--- a/packages/client/src/pages/user/index.vue
+++ b/packages/client/src/pages/user/index.vue
@@ -112,7 +112,7 @@ definePageMetadata(
 	computed(() =>
 		user
 			? {
-				icon: 'fas fa-user',
+				icon: 'ph-user-bold ph-lg',
 				title: user.name
 					? `${user.name} (@${user.username})`
 					: `@${user.username}`,

From ccb126999196cc1ab133570cf97a77d38b02c5ec Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Wed, 7 Dec 2022 18:16:23 +0100
Subject: [PATCH 02/17] fix remote move queue

---
 .../backend/src/models/repositories/user.ts   | 12 +++++
 .../remote/activitypub/kernel/move/index.ts   | 49 +++++++++++++------
 .../src/remote/activitypub/models/person.ts   | 32 ++++++------
 .../src/server/activitypub/following.ts       |  4 +-
 4 files changed, 63 insertions(+), 34 deletions(-)

diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts
index 046a82149..138929c4b 100644
--- a/packages/backend/src/models/repositories/user.ts
+++ b/packages/backend/src/models/repositories/user.ts
@@ -60,12 +60,24 @@ const birthdaySchema = { type: 'string', pattern: /^([0-9]{4})-([0-9]{2})-([0-9]
 
 function isLocalUser(user: User): user is ILocalUser;
 function isLocalUser<T extends { host: User['host'] }>(user: T): user is T & { host: null; };
+/**
+ * Returns true if the user is local.
+ *
+ * @param user The user to check.
+ * @returns True if the user is local.
+ */
 function isLocalUser(user: User | { host: User['host'] }): boolean {
 	return user.host == null;
 }
 
 function isRemoteUser(user: User): user is IRemoteUser;
 function isRemoteUser<T extends { host: User['host'] }>(user: T): user is T & { host: string; };
+/**
+ * Returns true if the user is remote.
+ *
+ * @param user The user to check.
+ * @returns True if the user is remote.
+ */
 function isRemoteUser(user: User | { host: User['host'] }): boolean {
 	return !isLocalUser(user);
 }
diff --git a/packages/backend/src/remote/activitypub/kernel/move/index.ts b/packages/backend/src/remote/activitypub/kernel/move/index.ts
index 501ee694b..1ca97e5c0 100644
--- a/packages/backend/src/remote/activitypub/kernel/move/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/move/index.ts
@@ -12,27 +12,44 @@ import { ApiError } from '@/server/api/error.js';
 import { meta } from '@/server/api/endpoints/following/create.js';
 import { IObject, IActor } from '../../type.js';
 import type { IMove } from '../../type.js';
+import Resolver from '@/remote/activitypub/resolver.js';
 
 export default async (actor: CacheableRemoteUser, activity: IMove): Promise<string> => {
 	// ※ There is a block target in activity.object, which should be a local user that exists.
 
 	const dbResolver = new DbResolver();
+	const resolver = new Resolver();
 	let new_acc = await dbResolver.getUserFromApId(activity.target);
-	if (!new_acc) new_acc = await getRemoteUser(<string>activity.target);
+	let actor_new;
+	let actor_old;
+	if (!new_acc) actor_new = await resolver.resolve(<string>activity.target) as IActor;
 
-	let old_acc = await dbResolver.getUserFromApId(activity.actor);
-	if (!old_acc) new_acc = await getRemoteUser(<string>activity.actor);
+	let old_acc = actor;
+	if (!old_acc) actor_old = await resolver.resolve(<string>activity.actor) as IActor;
 
-	if (!new_acc || new_acc.uri === null) {
+	if ((!new_acc || new_acc.uri === null) && (!actor_new || actor_new.id === null)) {
 		return 'move: new acc not found';
 	}
-	if (!old_acc || old_acc.uri === null) {
+	if ((!old_acc || old_acc.uri === null) && (!actor_old || actor_old.id === null)) {
 		return 'move: old acc not found';
 	}
-	await updatePerson(new_acc.uri);
-	await updatePerson(old_acc.uri);
-	new_acc = await getRemoteUser(new_acc.uri);
-	old_acc = await getRemoteUser(old_acc.uri);
+
+	let newUri: string | null | undefined
+	let oldUri: string | null | undefined
+	newUri = new_acc ? new_acc.uri :
+		actor_new?.url?.toString();
+
+	oldUri = old_acc ? old_acc.uri :
+		actor_old?.url?.toString();
+
+	if(newUri === null || newUri === undefined) return 'move: new acc not found #2';
+	if(oldUri === null || oldUri === undefined) return 'move: old acc not found #2';
+
+	await updatePerson(newUri);
+	await updatePerson(oldUri);
+
+	new_acc = await getRemoteUser(newUri);
+	old_acc = await getRemoteUser(oldUri);
 
 	if (old_acc === null || old_acc.uri === null || !new_acc.alsoKnownAs?.includes(old_acc.uri)) return 'move: accounts invalid';
 
@@ -45,18 +62,18 @@ export default async (actor: CacheableRemoteUser, activity: IMove): Promise<stri
 	const followings = await query
 		.getMany();
 
-	followings.forEach(following => {
-		if (!following.follower?.host) {
+	followings.forEach(async following => {
+		if (following.follower?.host) {
 			const follower = following.follower;
-			deleteFollowing(follower!, old_acc!);
+			await deleteFollowing(follower!, old_acc!);
 			try {
-				create(follower!, new_acc!);
+				await create(follower!, new_acc!);
 			} catch (e) {
 				if (e instanceof IdentifiableError) {
-					if (e.id === '710e8fb0-b8c3-4922-be49-d5d93d8e6a6e') throw new ApiError(meta.errors.blocking);
-					if (e.id === '3338392a-f764-498d-8855-db939dcf8c48') throw new ApiError(meta.errors.blocked);
+					if (e.id === '710e8fb0-b8c3-4922-be49-d5d93d8e6a6e') return meta.errors.blocking;
+					if (e.id === '3338392a-f764-498d-8855-db939dcf8c48') return meta.errors.blocked;
 				}
-				throw e;
+				return e;
 			}
 		}
 	});
diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts
index 3566410ed..21ef83af7 100644
--- a/packages/backend/src/remote/activitypub/models/person.ts
+++ b/packages/backend/src/remote/activitypub/models/person.ts
@@ -279,21 +279,21 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
 }
 
 /**
- * Personの情報を更新します。
- * Misskeyに対象のPersonが登録されていなければ無視します。
+ * Update Person data from remote.
+ * If the target Person is not registered in Calckey, it is ignored.
  * @param uri URI of Person
  * @param resolver Resolver
- * @param hint Hint of Person object (この値が正当なPersonの場合、Remote resolveをせずに更新に利用します)
+ * @param hint Hint of Person object (If this value is a valid Person, it is used for updating without Remote resolve)
  */
 export async function updatePerson(uri: string, resolver?: Resolver | null, hint?: IObject): Promise<void> {
 	if (typeof uri !== 'string') throw new Error('uri is not string');
 
-	// URIがこのサーバーを指しているならスキップ
+	// Skip if the URI points to this server
 	if (uri.startsWith(config.url + '/')) {
 		return;
 	}
 
-	//#region このサーバーに既に登録されているか
+	//#region Already registered on this server?
 	const exist = await Users.findOneBy({ uri }) as IRemoteUser;
 
 	if (exist == null) {
@@ -309,7 +309,7 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
 
 	logger.info(`Updating the Person: ${person.id}`);
 
-	// アバターとヘッダー画像をフェッチ
+	// Fetch avatar and header image
 	const [avatar, banner] = await Promise.all([
 		person.icon,
 		person.image,
@@ -319,7 +319,7 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
 			: resolveImage(exist, img).catch(() => null),
 	));
 
-	// カスタム絵文字取得
+	// Custom pictogram acquisition
 	const emojis = await extractEmojis(person.tag || [], exist.host).catch(e => {
 		logger.info(`extractEmojis: ${e}`);
 		return [] as Emoji[];
@@ -378,10 +378,10 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
 
 	publishInternalEvent('remoteUserUpdated', { id: exist.id });
 
-	// ハッシュタグ更新
+	// Hashtag Update
 	updateUsertags(exist, tags);
 
-	// 該当ユーザーが既にフォロワーになっていた場合はFollowingもアップデートする
+	// If the user in question is a follower, followers will also be updated.
 	await Followings.update({
 		followerId: exist.id,
 	}, {
@@ -392,15 +392,15 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
 }
 
 /**
- * Personを解決します。
+ * Resolve Person.
  *
- * Misskeyに対象のPersonが登録されていればそれを返し、そうでなければ
- * リモートサーバーからフェッチしてMisskeyに登録しそれを返します。
+ * If the target person is registered in Calckey, it returns it; 
+ * otherwise, it fetches it from the remote server, registers it in Calckey, and returns it.
  */
 export async function resolvePerson(uri: string, resolver?: Resolver): Promise<CacheableUser> {
 	if (typeof uri !== 'string') throw new Error('uri is not string');
 
-	//#region このサーバーに既に登録されていたらそれを返す
+	//#region If already registered on this server, return it.
 	const exist = await fetchPerson(uri);
 
 	if (exist) {
@@ -408,7 +408,7 @@ export async function resolvePerson(uri: string, resolver?: Resolver): Promise<C
 	}
 	//#endregion
 
-	// リモートサーバーからフェッチしてきて登録
+	// Fetched from remote server and registered
 	if (resolver == null) resolver = new Resolver();
 	return await createPerson(uri, resolver);
 }
@@ -486,14 +486,14 @@ export async function updateFeatured(userId: User['id'], resolver?: Resolver) {
 	// Resolve and regist Notes
 	const limit = promiseLimit<Note | null>(2);
 	const featuredNotes = await Promise.all(items
-		.filter(item => getApType(item) === 'Note')	// TODO: Noteでなくてもいいかも
+		.filter(item => getApType(item) === 'Note')	// TODO: Maybe it doesn't have to be a Note.
 		.slice(0, 5)
 		.map(item => limit(() => resolveNote(item, resolver))));
 
 	await db.transaction(async transactionalEntityManager => {
 		await transactionalEntityManager.delete(UserNotePining, { userId: user.id });
 
-		// とりあえずidを別の時間で生成して順番を維持
+		// For now, generate the id at a different time and maintain the order.
 		let td = 0;
 		for (const note of featuredNotes.filter(note => note != null)) {
 			td -= 1000;
diff --git a/packages/backend/src/server/activitypub/following.ts b/packages/backend/src/server/activitypub/following.ts
index f843d79f0..26cee819b 100644
--- a/packages/backend/src/server/activitypub/following.ts
+++ b/packages/backend/src/server/activitypub/following.ts
@@ -61,7 +61,7 @@ export default async (ctx: Router.RouterContext) => {
 			followerId: user.id,
 		} as FindOptionsWhere<Following>;
 
-		// カーソルが指定されている場合
+		// If a cursor is specified
 		if (cursor) {
 			query.id = LessThan(cursor);
 		}
@@ -73,7 +73,7 @@ export default async (ctx: Router.RouterContext) => {
 			order: { id: -1 },
 		});
 
-		// 「次のページ」があるかどうか
+		// Whether there is a "next page" or not
 		const inStock = followings.length === limit + 1;
 		if (inStock) followings.pop();
 

From 421553b8cda59e3f7731053a20c8aceb6a2ef2e0 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Thu, 8 Dec 2022 01:05:07 +0100
Subject: [PATCH 03/17] WIP move api call

forgot to merge this
---
 .../src/server/api/endpoints/i/move.ts        | 46 +++++++++++++++++++
 .../src/server/api/endpoints/notes/create.ts  |  2 +-
 packages/backend/src/services/note/create.ts  | 22 ++++-----
 3 files changed, 58 insertions(+), 12 deletions(-)
 create mode 100644 packages/backend/src/server/api/endpoints/i/move.ts

diff --git a/packages/backend/src/server/api/endpoints/i/move.ts b/packages/backend/src/server/api/endpoints/i/move.ts
new file mode 100644
index 000000000..a1ee31d51
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/i/move.ts
@@ -0,0 +1,46 @@
+import { In } from 'typeorm';
+import { User } from '@/models/entities/user.js';
+import { Users, DriveFiles, Notes, Channels, Blockings } from '@/models/index.js';
+import { ApiError } from '../../error.js';
+import define from '../../define.js';
+import { DAY } from '@/const.js';
+
+export const meta = {
+	tags: ['notes'],
+
+	secure: true,
+	requireCredential: true,
+
+	limit: {
+		duration: DAY,
+		max: 1,
+	},
+
+	errors: {
+		noSuchMoveTarget: {
+			message: 'No such move target.',
+			code: 'NO_SUCH_MOVE_TARGET',
+			id: 'b5c90186-4ab0-49c8-9bba-a1f76c202ba4',
+		},
+		remoteAccountForbids: {
+			message: 'Remote account doesn\'t have proper known As.',
+			code: 'REMOTE_ACCOUNT_FORBIDS',
+			id: 'b5c90186-4ab0-49c8-9bba-a1f766282ba4',
+		},
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		alsoKnownAs: { type: 'string' },
+	},
+	required: ['alsoKnownAs'],
+} as const;
+
+// eslint-disable-next-line import/no-default-export
+export default define(meta, paramDef, async (ps, user) => {
+
+
+	return;
+});
diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts
index 82540f96b..da34f3c8d 100644
--- a/packages/backend/src/server/api/endpoints/notes/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/create.ts
@@ -250,7 +250,7 @@ export default define(meta, paramDef, async (ps, user) => {
 		}
 	}
 
-	// 投稿を作成
+	// Create a post
 	const note = await create(user, {
 		createdAt: new Date(),
 		files: files,
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 8ba2963d5..fa8ba6bf1 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -127,8 +127,8 @@ type Option = {
 };
 
 export default async (user: { id: User['id']; username: User['username']; host: User['host']; isSilenced: User['isSilenced']; createdAt: User['createdAt']; }, data: Option, silent = false) => new Promise<Note>(async (res, rej) => {
-	// チャンネル外にリプライしたら対象のスコープに合わせる
-	// (クライアントサイドでやっても良い処理だと思うけどとりあえずサーバーサイドで)
+	// If you reply outside the channel, match the scope of the target.
+	// TODO (I think it's a process that could be done on the client side, but it's server side for now.)
 	if (data.reply && data.channel && data.reply.channelId !== data.channel.id) {
 		if (data.reply.channelId) {
 			data.channel = await Channels.findOneBy({ id: data.reply.channelId });
@@ -137,8 +137,8 @@ export default async (user: { id: User['id']; username: User['username']; host:
 		}
 	}
 
-	// チャンネル内にリプライしたら対象のスコープに合わせる
-	// (クライアントサイドでやっても良い処理だと思うけどとりあえずサーバーサイドで)
+	// When you reply in a channel, match the scope of the target
+	// TODO (I think it's a process that could be done on the client side, but it's server side for now.)
 	if (data.reply && (data.channel == null) && data.reply.channelId) {
 		data.channel = await Channels.findOneBy({ id: data.reply.channelId });
 	}
@@ -150,37 +150,37 @@ export default async (user: { id: User['id']; username: User['username']; host:
 	if (data.channel != null) data.visibleUsers = [];
 	if (data.channel != null) data.localOnly = true;
 
-	// サイレンス
+	// enforce silent clients on server
 	if (user.isSilenced && data.visibility === 'public' && data.channel == null) {
 		data.visibility = 'home';
 	}
 
-	// Renote対象が「ホームまたは全体」以外の公開範囲ならreject
+	// Reject if the target of the renote is a public range other than "Home or Entire".
 	if (data.renote && data.renote.visibility !== 'public' && data.renote.visibility !== 'home' && data.renote.userId !== user.id) {
 		return rej('Renote target is not public or home');
 	}
 
-	// Renote対象がpublicではないならhomeにする
+	// If the target of the renote is not public, make it home.
 	if (data.renote && data.renote.visibility !== 'public' && data.visibility === 'public') {
 		data.visibility = 'home';
 	}
 
-	// Renote対象がfollowersならfollowersにする
+	// If the target of Renote is followers, make it followers.
 	if (data.renote && data.renote.visibility === 'followers') {
 		data.visibility = 'followers';
 	}
 
-	// 返信対象がpublicではないならhomeにする
+	// If the reply target is not public, make it home.
 	if (data.reply && data.reply.visibility !== 'public' && data.visibility === 'public') {
 		data.visibility = 'home';
 	}
 
-	// ローカルのみをRenoteしたらローカルのみにする
+	// Renote local only if you Renote local only.
 	if (data.renote && data.renote.localOnly && data.channel == null) {
 		data.localOnly = true;
 	}
 
-	// ローカルのみにリプライしたらローカルのみにする
+	// If you reply to local only, make it local only.
 	if (data.reply && data.reply.localOnly && data.channel == null) {
 		data.localOnly = true;
 	}

From 178a39347e04a74a27a272483e2abb5c287205fb Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Thu, 8 Dec 2022 15:53:37 +0100
Subject: [PATCH 04/17] change move sql query

---
 packages/backend/src/remote/activitypub/kernel/move/index.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/remote/activitypub/kernel/move/index.ts b/packages/backend/src/remote/activitypub/kernel/move/index.ts
index 1ca97e5c0..1b7f02b7a 100644
--- a/packages/backend/src/remote/activitypub/kernel/move/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/move/index.ts
@@ -55,9 +55,8 @@ export default async (actor: CacheableRemoteUser, activity: IMove): Promise<stri
 
 	old_acc.movedToUri = new_acc.uri;
 
-	const query = makePaginationQuery(Followings.createQueryBuilder('following'))
-		.andWhere('following.followeeId = :userId', { userId: old_acc.id })
-		.innerJoinAndSelect('following.follower', 'follower');
+	const query = Followings.createQueryBuilder('following')
+		.where('following.followeeId = :userId', { userId: old_acc.id });
 
 	const followings = await query
 		.getMany();

From 016c328d28f2f23b6cd059bbe82190ef01602653 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Thu, 8 Dec 2022 19:28:48 +0100
Subject: [PATCH 05/17] fix queue?

maybe pls

debug log

fixed stupidness again

fix ??

fix import

im a idiot lol

make remote mig work
---
 .../remote/activitypub/kernel/move/index.ts   | 54 ++++++++++---------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/packages/backend/src/remote/activitypub/kernel/move/index.ts b/packages/backend/src/remote/activitypub/kernel/move/index.ts
index 1b7f02b7a..bdd82d9be 100644
--- a/packages/backend/src/remote/activitypub/kernel/move/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/move/index.ts
@@ -7,6 +7,7 @@ import { Followings, Users } from '@/models/index.js';
 import { makePaginationQuery } from '@/server/api/common/make-pagination-query.js';
 import deleteFollowing from '@/services/following/delete.js';
 import create from '@/services/following/create.js';
+import { getUser } from '@/server/api/common/getters.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { ApiError } from '@/server/api/error.js';
 import { meta } from '@/server/api/endpoints/following/create.js';
@@ -21,52 +22,55 @@ export default async (actor: CacheableRemoteUser, activity: IMove): Promise<stri
 	const resolver = new Resolver();
 	let new_acc = await dbResolver.getUserFromApId(activity.target);
 	let actor_new;
-	let actor_old;
 	if (!new_acc) actor_new = await resolver.resolve(<string>activity.target) as IActor;
 
-	let old_acc = actor;
-	if (!old_acc) actor_old = await resolver.resolve(<string>activity.actor) as IActor;
-
 	if ((!new_acc || new_acc.uri === null) && (!actor_new || actor_new.id === null)) {
 		return 'move: new acc not found';
 	}
-	if ((!old_acc || old_acc.uri === null) && (!actor_old || actor_old.id === null)) {
-		return 'move: old acc not found';
-	}
 
 	let newUri: string | null | undefined
-	let oldUri: string | null | undefined
 	newUri = new_acc ? new_acc.uri :
 		actor_new?.url?.toString();
 
-	oldUri = old_acc ? old_acc.uri :
-		actor_old?.url?.toString();
-
 	if(newUri === null || newUri === undefined) return 'move: new acc not found #2';
-	if(oldUri === null || oldUri === undefined) return 'move: old acc not found #2';
 
 	await updatePerson(newUri);
-	await updatePerson(oldUri);
+	await updatePerson(actor.uri!);
 
-	new_acc = await getRemoteUser(newUri);
-	old_acc = await getRemoteUser(oldUri);
+	new_acc = await dbResolver.getUserFromApId(newUri);
+	let old = await dbResolver.getUserFromApId(actor.uri!);
 
-	if (old_acc === null || old_acc.uri === null || !new_acc.alsoKnownAs?.includes(old_acc.uri)) return 'move: accounts invalid';
+	if (old === null || old.uri === null || !new_acc?.alsoKnownAs?.includes(old.uri)) return 'move: accounts invalid';
 
-	old_acc.movedToUri = new_acc.uri;
+	old.movedToUri = new_acc.uri;
 
-	const query = Followings.createQueryBuilder('following')
-		.where('following.followeeId = :userId', { userId: old_acc.id });
+	const followee = await getUser(actor.id).catch(e => {
+		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+		throw e;
+	});
 
-	const followings = await query
-		.getMany();
+	const followeeNew = await getUser(new_acc.id).catch(e => {
+		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+		throw e;
+	});
+
+	const followings = await Followings.findBy({
+		followeeId: followee.id,
+	});
+
+	//TODO remove this
+	console.log(followings);
 
 	followings.forEach(async following => {
-		if (following.follower?.host) {
-			const follower = following.follower;
-			await deleteFollowing(follower!, old_acc!);
+		//if follower is local
+		if (!following.followerHost) {
+			const follower = await getUser(following.followerId).catch(e => {
+				if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+				throw e;
+			});
+			await deleteFollowing(follower!, followee);
 			try {
-				await create(follower!, new_acc!);
+				await create(follower!, followeeNew);
 			} catch (e) {
 				if (e instanceof IdentifiableError) {
 					if (e.id === '710e8fb0-b8c3-4922-be49-d5d93d8e6a6e') return meta.errors.blocking;

From 279a5cac350bd3f64b74cdc9c66df1d77f3803f6 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 9 Dec 2022 14:28:50 -0800
Subject: [PATCH 06/17] Initial migration UI

b6

Style improvements to moved
---
 locales/en-US.yml                             | 10 +-
 package.json                                  |  2 +-
 .../src/server/api/endpoints/i/move.ts        |  3 +-
 packages/client/src/components/MkMoved.vue    | 13 ++-
 .../client/src/components/MkRemoteCaution.vue |  1 -
 packages/client/src/pages/admin/migration.vue | 91 +++++++++++++++++++
 packages/client/src/pages/settings/index.vue  |  5 +
 .../client/src/pages/settings/security.vue    |  8 +-
 packages/client/src/pages/user/home.vue       |  2 +-
 packages/client/src/router.ts                 |  4 +
 10 files changed, 122 insertions(+), 17 deletions(-)
 create mode 100644 packages/client/src/pages/admin/migration.vue

diff --git a/locales/en-US.yml b/locales/en-US.yml
index aaef40b34..e6040cf0a 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -149,7 +149,7 @@ addAccount: "Add account"
 loginFailed: "Failed to sign in"
 showOnRemote: "View on remote instance"
 general: "General"
-accountMoved: "User has moved to a new account."
+accountMoved: "User has moved to a new account:"
 wallpaper: "Wallpaper"
 setWallpaper: "Set wallpaper"
 removeWallpaper: "Remove wallpaper"
@@ -921,6 +921,14 @@ swipeOnDesktop: "Allow mobile-style swiping on desktop"
 logoImageUrl: "Logo image URL"
 showAdminUpdates: "Indicate a new Calckey version is avaliable (admin only)"
 replayTutorial: "Replay tutorial"
+migration: "Migration"
+moveTo: "Move current account to new account"
+moveToLabel: "Account you're moving to"
+moveAccount: "Move account!"
+moveAccountDescription: "This process is irriversable. Make sure you've set up an alias for this account on your new account before moving. Please enter the tag of the account formatted like @person@instance.com"
+moveFrom: "Move to this account from an older account"
+moveFromLabel: "Old account"
+moveFromDescription: "This will set an alias of your old account so that you can move from that account to this current one. Please enter the tag of the account formatted like @person@instance.com"
 
 _sensitiveMediaDetection:
   description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server."
diff --git a/package.json b/package.json
index 635d3614a..9940402ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.0.0-b5",
+	"version": "13.0.0-b6",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/backend/src/server/api/endpoints/i/move.ts b/packages/backend/src/server/api/endpoints/i/move.ts
index a1ee31d51..c67a7bdf5 100644
--- a/packages/backend/src/server/api/endpoints/i/move.ts
+++ b/packages/backend/src/server/api/endpoints/i/move.ts
@@ -40,7 +40,6 @@ export const paramDef = {
 
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
-
-
+	// TODO
 	return;
 });
diff --git a/packages/client/src/components/MkMoved.vue b/packages/client/src/components/MkMoved.vue
index 6251d93a8..7789af001 100644
--- a/packages/client/src/components/MkMoved.vue
+++ b/packages/client/src/components/MkMoved.vue
@@ -1,8 +1,8 @@
 <template>
-<div class="_block msjugskdqo">
+<div class="msjugskd _block">
 	<i class="ph-airplane-takeoff-bold ph-lg" style="margin-right: 8px;"/>
 	{{ i18n.ts.accountMoved }}
-	<MkMention :class="$style.link" class="link" :username="acct" :host="host"/>
+	<MkMention class="link" :username="acct" :host="host"/>
 </div>
 </template>
 
@@ -16,12 +16,11 @@ defineProps<{
 }>();
 </script>
 
-<style lang="scss" module>
-.msjugskdqo {
-	font-size: 0.8em;
+<style lang="scss" scoped>
+.msjugskd {
 	padding: 16px;
-	background: var(--infoBg);
-	color: var(--infoFg);
+	background: var(--infoWarnBg);
+	color: var(--error);
 
 	> .link {
 		margin-left: 4px;
diff --git a/packages/client/src/components/MkRemoteCaution.vue b/packages/client/src/components/MkRemoteCaution.vue
index eeb097dec..4c141b7d4 100644
--- a/packages/client/src/components/MkRemoteCaution.vue
+++ b/packages/client/src/components/MkRemoteCaution.vue
@@ -12,7 +12,6 @@ defineProps<{
 
 <style lang="scss" scoped>
 .jmgmzlwq {
-	font-size: 0.8em;
 	padding: 16px;
 	background: var(--infoWarnBg);
 	color: var(--infoWarnFg);
diff --git a/packages/client/src/pages/admin/migration.vue b/packages/client/src/pages/admin/migration.vue
new file mode 100644
index 000000000..5fca8b837
--- /dev/null
+++ b/packages/client/src/pages/admin/migration.vue
@@ -0,0 +1,91 @@
+<template>
+<div class="_formRoot">
+	<FormSection>
+		<template #label>{{ i18n.ts.moveTo }}</template>
+		<FormInput v-model="alsoKnownAs" class="_formBlock">
+			<template #prefix><i class="ph-airplane-takeoff-bold ph-lg"></i></template>
+			<template #label>{{ i18n.ts.moveToLabel }}</template>
+		</FormInput>
+		<FormButton primary danger @click="move()">{{ i18n.ts.moveAccount }}</FormButton>
+		<template #caption>{{ i18n.ts.moveAccountDescription }}</template>
+	</FormSection>
+
+	<FormSection>
+		<template #label>{{ i18n.ts.moveFrom }}</template>
+		<FormInput v-model="accountAlias" class="_formBlock">
+			<template #prefix><i class="ph-airplane-landing-bold ph-lg"></i></template>
+			<template #label>{{ i18n.ts.moveFromLabel }}</template>
+		</FormInput>
+		<FormButton class="button" inline primary @click="save(accountAlias)"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
+		<template #caption>{{ i18n.ts.moveFromDescription }}</template>
+	</FormSection>
+</div>
+</template>
+
+<script lang="ts" setup>
+import FormSection from '@/components/form/section.vue';
+import FormInput from '@/components/form/input.vue';
+import FormButton from '@/components/MkButton.vue';
+import * as os from '@/os';
+import { i18n } from '@/i18n';
+import { definePageMetadata } from '@/scripts/page-metadata';
+
+let alsoKnownAs = $ref('');
+let accountAlias = $ref('');
+
+async function save(): Promise<void> {
+	// os.apiWithDialog('i/move', {
+	// 	alsoKnownAs: alsoKnownAs,
+	// });
+}
+
+async function move(): Promise<void> {
+	// TODO: PROMPT FOR CONFIRMATION
+	os.api('i/move', {
+		alsoKnownAs: alsoKnownAs,
+	});
+}
+
+definePageMetadata({
+	title: i18n.ts.security,
+	icon: 'ph-lock-bold ph-lg',
+});
+</script>
+
+	<style lang="scss" scoped>
+	.timnmucd {
+		padding: 16px;
+
+		&:first-child {
+			border-top-left-radius: 6px;
+			border-top-right-radius: 6px;
+		}
+
+		&:last-child {
+			border-bottom-left-radius: 6px;
+			border-bottom-right-radius: 6px;
+		}
+
+		&:not(:last-child) {
+			border-bottom: solid 0.5px var(--divider);
+		}
+
+		> header {
+			display: flex;
+			align-items: center;
+
+			> .icon {
+				width: 1em;
+				margin-right: 0.75em;
+
+				&.succ {
+					color: var(--success);
+				}
+
+				&.fail {
+					color: var(--error);
+				}
+			}
+		}
+	}
+	</style>
diff --git a/packages/client/src/pages/settings/index.vue b/packages/client/src/pages/settings/index.vue
index 9a03c8f28..f6ca654ef 100644
--- a/packages/client/src/pages/settings/index.vue
+++ b/packages/client/src/pages/settings/index.vue
@@ -134,6 +134,11 @@ const menuDef = computed(() => [{
 }, {
 	title: i18n.ts.otherSettings,
 	items: [{
+		icon: 'ph-airplane-takeoff-bold ph-lg',
+		text: i18n.ts.migration,
+		to: '/settings/migration',
+		active: currentPage?.route.name === 'migration',
+	}, {
 		icon: 'ph-package-bold ph-lg',
 		text: i18n.ts.importAndExport,
 		to: '/settings/import-export',
diff --git a/packages/client/src/pages/settings/security.vue b/packages/client/src/pages/settings/security.vue
index db59f9b8a..a5fbc774e 100644
--- a/packages/client/src/pages/settings/security.vue
+++ b/packages/client/src/pages/settings/security.vue
@@ -9,7 +9,7 @@
 		<template #label>{{ i18n.ts.twoStepAuthentication }}</template>
 		<X2fa/>
 	</FormSection>
-	
+
 	<FormSection>
 		<template #label>{{ i18n.ts.signinHistory }}</template>
 		<MkPagination :pagination="pagination" disable-auto-load>
@@ -52,7 +52,7 @@ const pagination = {
 	limit: 5,
 };
 
-async function change() {
+async function change(): Promise<void> {
 	const { canceled: canceled1, result: currentPassword } = await os.inputText({
 		title: i18n.ts.currentPassword,
 		type: 'password',
@@ -78,14 +78,14 @@ async function change() {
 		});
 		return;
 	}
-	
+
 	os.apiWithDialog('i/change-password', {
 		currentPassword,
 		newPassword,
 	});
 }
 
-function regenerateToken() {
+function regenerateToken(): void {
 	os.inputText({
 		title: i18n.ts.password,
 		type: 'password',
diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index 8877bce72..65ccdb88b 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -7,8 +7,8 @@
 			<!-- <div class="punished" v-if="user.isSilenced"><i class="ph-warning-bold ph-lg" style="margin-right: 8px;"></i> {{ i18n.ts.userSilenced }}</div> -->
 
 			<div class="profile">
-				<MkRemoteCaution v-if="user.host != null" :href="user.url" class="warn"/>
 				<MkMoved v-if="user.movedToUri" :host="user.movedToUri.host" :acct="user.movedToUri.username" />
+				<MkRemoteCaution v-if="user.host != null" :href="user.url" class="warn"/>
 
 				<div :key="user.id" class="_block main">
 					<div class="banner-container" :style="style">
diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts
index 6f6034eed..625d65211 100644
--- a/packages/client/src/router.ts
+++ b/packages/client/src/router.ts
@@ -180,6 +180,10 @@ export const routes = [{
 		path: '/preferences-backups',
 		name: 'preferences-backups',
 		component: page(() => import('./pages/settings/preferences-backups.vue')),
+	}, {
+		path: '/migration',
+		name: 'migration',
+		component: page(() => import('./pages/settings/migration.vue')),
 	}, {
 		path: '/custom-css',
 		name: 'general',

From b2affc42073b2ad8d26b7fad6267703f80d0d13a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 10 Dec 2022 11:23:57 -0800
Subject: [PATCH 07/17] fix path

---
 package.json                                                | 2 +-
 packages/client/src/pages/{admin => settings}/migration.vue | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/client/src/pages/{admin => settings}/migration.vue (100%)

diff --git a/package.json b/package.json
index 9940402ba..ca83dcae9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.0.0-b6",
+	"version": "13.0.0-b7",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/admin/migration.vue b/packages/client/src/pages/settings/migration.vue
similarity index 100%
rename from packages/client/src/pages/admin/migration.vue
rename to packages/client/src/pages/settings/migration.vue

From c47c6a4efa0f2aeea09698b4f15bb6f7ef9a18c1 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Wed, 7 Dec 2022 04:28:56 +0000
Subject: [PATCH 08/17] DragonflyDB

Update 'README.md'

Redis v6 is minimum

Update 'README.md'

Nvm, dragonfly needs more work...

Update 'CALCKEY.md'
---
 CALCKEY.md | 39 ++++++++++++++++++++++-----------------
 README.md  |  2 +-
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index 8dc0ebce3..018858dcc 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -2,23 +2,28 @@
 
 ## Planned
 
-- MFM button
-- Sonic search support
-- Use Cassandra for storing notes
-- Federate with note edits
-- Classic mode make instance icon bring up new context menu
-- Exclude self from antenna
-- Backfill remote users
-- User "choices" (recommended users) like Mastodon and Soapbox
-- Option to publicize instance blocks
-- Fully revamp non-logged-in screen
-- Personal notes for all accounts
-- Non-nyaify cat mode
-- Timeline filters
-- Filter notifications by user
-- Join Reason system like Mastodon/Pleroma
-- Build flag to remove NSFW/AI stuff
-- [Rat mode?](https://stop.voring.me/notes/933fx97bmd)
+- Stucture
+	- Sonic search support
+	- DragonflyDB support
+	- Use Cassandra for storing notes
+	- Rewrite backend in Rust and Axum
+- Function
+	- Federate with note edits
+	- User "choices" (recommended users) like Mastodon and Soapbox
+	- Join Reason system like Mastodon/Pleroma
+	- Option to publicize instance blocks
+	- Backfill remote users
+	- Build flag to remove NSFW/AI stuff
+	- Timeline filters
+	- Filter notifications by user
+	- Non-nyaify cat mode
+	- Exclude self from antenna
+- Form
+	- MFM button
+	- Personal notes for all accounts
+	- Fully revamp non-logged-in screen
+	- Classic mode make instance icon bring up new context menu
+	- [Rat mode?](https://stop.voring.me/notes/933fx97bmd)
 
 ## Work in progress
 
diff --git a/README.md b/README.md
index 835b991df..4c5239a21 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ This guide will work for both **starting from scratch** and **migrating from Mis
 - 🐢 At least [NodeJS](https://nodejs.org/en/) v18.12.1 (v19 recommended)
   - 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) or [Titan](https://github.com/distributedio/titan)
+- 🍱 At least [Redis](https://redis.io/) v6 (v7 recommend)
 
 ### 😗 Optional dependencies
 

From 27b9c6c7ad567c2697a9755f833503d552387db0 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Wed, 7 Dec 2022 05:07:17 +0000
Subject: [PATCH 09/17] Cl

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

diff --git a/CALCKEY.md b/CALCKEY.md
index 018858dcc..5deaff1e3 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -3,6 +3,7 @@
 ## Planned
 
 - Stucture
+	- Weblate project
 	- Sonic search support
 	- DragonflyDB support
 	- Use Cassandra for storing notes

From 483b9c53fa3a308c20c6f5f462df9919be8dd752 Mon Sep 17 00:00:00 2001
From: Undefined <undefined@pnyhf.eu>
Date: Thu, 8 Dec 2022 15:17:00 +0100
Subject: [PATCH 10/17] Use redis 7.0-alpine in docker-compose.yml

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7f55e8b7d..f9b64e75c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,7 +19,7 @@ services:
 
   redis:
     restart: always
-    image: docker.io/redis:4.0-alpine
+    image: docker.io/redis:7.0-alpine
     networks:
       - network
     volumes:

From 433bceeac2809ec5e1dc52928fd8015afb4efa25 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 9 Dec 2022 22:42:43 +0000
Subject: [PATCH 11/17] CL progress + links

---
 CALCKEY.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index 5deaff1e3..52cccf2e1 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -3,11 +3,10 @@
 ## Planned
 
 - Stucture
-	- Weblate project
-	- Sonic search support
-	- DragonflyDB support
-	- Use Cassandra for storing notes
-	- Rewrite backend in Rust and Axum
+	- [Sonic](https://github.com/valeriansaliou/sonic) support
+	- [DragonflyDB](https://github.com/dragonflydb/dragonfly) support
+	- Use [ScyllaDB](https://www.scylladb.com/open-source-nosql-database/) for storing notes
+	- Rewrite backend in Rust and [Axum](https://github.com/tokio-rs/axum)
 - Function
 	- Federate with note edits
 	- User "choices" (recommended users) like Mastodon and Soapbox
@@ -29,6 +28,7 @@
 ## Work in progress
 
 - Account migration
+- Weblate project
 - Link verification
 - Better Messaging UI
 - Better API Documentation

From b4dac66b08acee3b92664ed907a12b9c46bf3f5c Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 9 Dec 2022 22:44:05 +0000
Subject: [PATCH 12/17] =?UTF-8?q?docs:=20=F0=9F=93=9D=20better=20links?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/CALCKEY.md b/CALCKEY.md
index 52cccf2e1..99ad2fab4 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -3,8 +3,8 @@
 ## Planned
 
 - Stucture
-	- [Sonic](https://github.com/valeriansaliou/sonic) support
-	- [DragonflyDB](https://github.com/dragonflydb/dragonfly) support
+	- [Sonic](https://crates.io/crates/sonic-server) support
+	- [DragonflyDB](https://dragonflydb.io/) support
 	- Use [ScyllaDB](https://www.scylladb.com/open-source-nosql-database/) for storing notes
 	- Rewrite backend in Rust and [Axum](https://github.com/tokio-rs/axum)
 - Function

From cfed18d612972009e17c0238fb4479285820fc3e Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 9 Dec 2022 22:44:47 +0000
Subject: [PATCH 13/17] =?UTF-8?q?docs:=20=F0=9F=93=9D=20be=20more=20descri?=
 =?UTF-8?q?ptive=20with=20new=20techs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/CALCKEY.md b/CALCKEY.md
index 99ad2fab4..42c77715a 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -3,8 +3,8 @@
 ## Planned
 
 - Stucture
-	- [Sonic](https://crates.io/crates/sonic-server) support
-	- [DragonflyDB](https://dragonflydb.io/) support
+	- [Sonic](https://crates.io/crates/sonic-server) support as an ElasticSearch alternative
+	- [DragonflyDB](https://dragonflydb.io/) support as a Redis alternative
 	- Use [ScyllaDB](https://www.scylladb.com/open-source-nosql-database/) for storing notes
 	- Rewrite backend in Rust and [Axum](https://github.com/tokio-rs/axum)
 - Function

From 8c882c269803045798fd9a3fa598207de0ede8ee Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 9 Dec 2022 22:45:36 +0000
Subject: [PATCH 14/17] =?UTF-8?q?docs:=20=F0=9F=93=9D=20scylla=20will=20be?=
 =?UTF-8?q?=20optional?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/CALCKEY.md b/CALCKEY.md
index 42c77715a..c1faa5a0a 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -5,7 +5,7 @@
 - Stucture
 	- [Sonic](https://crates.io/crates/sonic-server) support as an ElasticSearch alternative
 	- [DragonflyDB](https://dragonflydb.io/) support as a Redis alternative
-	- Use [ScyllaDB](https://www.scylladb.com/open-source-nosql-database/) for storing notes
+	- Optionally use [ScyllaDB](https://www.scylladb.com/open-source-nosql-database/) for storing notes
 	- Rewrite backend in Rust and [Axum](https://github.com/tokio-rs/axum)
 - Function
 	- Federate with note edits

From 06746e73b553dd21563a9d2f453319af8356c850 Mon Sep 17 00:00:00 2001
From: chimiana <chimiana@noreply.codeberg.org>
Date: Sat, 10 Dec 2022 03:18:45 +0000
Subject: [PATCH 15/17] Update Dockerfile with python3 dependency required for
 docker-compose build step to succeed

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

diff --git a/Dockerfile b/Dockerfile
index 5ca634c4f..44fb1ef8a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ COPY . ./
 
 # Install Dependencies
 RUN apk update
-RUN apk add git ffmpeg tini alpine-sdk
+RUN apk add git ffmpeg tini alpine-sdk python3
 
 # Configure corepack and yarn
 RUN corepack enable

From 91e39fa829ddc588f1e1efc03879a4e2dcf70942 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Mon, 12 Dec 2022 01:42:40 +0100
Subject: [PATCH 16/17] integrate migration ui and api backend

---
 package.json                                  |  1 +
 packages/backend/package.json                 |  1 +
 packages/backend/src/server/api/endpoints.ts  |  6 ++
 .../src/server/api/endpoints/i/known-as.ts    | 85 +++++++++++++++++++
 .../src/server/api/endpoints/i/move.ts        | 59 +++++++++++--
 .../client/src/pages/settings/migration.vue   | 12 +--
 6 files changed, 153 insertions(+), 11 deletions(-)
 create mode 100644 packages/backend/src/server/api/endpoints/i/known-as.ts

diff --git a/package.json b/package.json
index ca83dcae9..9428bbd30 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
 		"start:test": "yarn workspace backend run start:test",
 		"init": "yarn migrate",
 		"migrate": "yarn workspace backend run migrate",
+		"revertMig": "yarn workspace backend run revertMig",
 		"migrateandstart": "yarn migrate && yarn start",
 		"gulp": "gulp build",
 		"watch": "yarn dev",
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 2f7a11984..2348e963e 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -7,6 +7,7 @@
 		"start": "node ./built/index.js",
 		"start:test": "NODE_ENV=test node ./built/index.js",
 		"migrate": "typeorm migration:run -d ormconfig.js",
+		"revertMig": "typeorm migration:revert -d ormconfig.js",
 		"build": "tsc -p tsconfig.json || echo done. && tsc-alias -p tsconfig.json",
 		"watch": "node watch.mjs",
 		"lint": "eslint --quiet \"src/**/*.ts\"",
diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index d56dd316e..912998376 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -325,6 +325,10 @@ import * as ep___users_stats from './endpoints/users/stats.js';
 import * as ep___fetchRss from './endpoints/fetch-rss.js';
 import * as ep___admin_driveCapOverride from './endpoints/admin/drive-capacity-override.js';
 
+//Calckey Move
+import * as ep___i_move from './endpoints/i/move.js';
+import * as ep___i_known_as from './endpoints/i/known-as.js';
+
 const eps = [
 	['admin/meta', ep___admin_meta],
 	['admin/abuse-user-reports', ep___admin_abuseUserReports],
@@ -489,6 +493,8 @@ const eps = [
 	['hashtags/trend', ep___hashtags_trend],
 	['hashtags/users', ep___hashtags_users],
 	['i', ep___i],
+	['i/known-as', ep___i_known_as],
+	['i/move', ep___i_move],
 	['i/2fa/done', ep___i_2fa_done],
 	['i/2fa/key-done', ep___i_2fa_keyDone],
 	['i/2fa/password-less', ep___i_2fa_passwordLess],
diff --git a/packages/backend/src/server/api/endpoints/i/known-as.ts b/packages/backend/src/server/api/endpoints/i/known-as.ts
new file mode 100644
index 000000000..924d74de8
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/i/known-as.ts
@@ -0,0 +1,85 @@
+import { In } from 'typeorm';
+import { User } from '@/models/entities/user.js';
+import { Users, DriveFiles, Notes, Channels, Blockings } from '@/models/index.js';
+import { resolveUser } from '@/remote/resolve-user.js';
+import { ApiError } from '../../error.js';
+import acceptAllFollowRequests from '@/services/following/requests/accept-all.js';
+import { publishToFollowers } from '@/services/i/update.js';
+import { apiLogger } from '../../logger.js';
+import { publishMainStream, publishUserEvent } from '@/services/stream.js';
+import define from '../../define.js';
+import { DAY } from '@/const.js';
+
+export const meta = {
+	tags: ['users'],
+
+	secure: true,
+	requireCredential: true,
+
+	limit: {
+		duration: DAY,
+		max: 30,
+	},
+
+	errors: {
+		noSuchUser: {
+			message: 'No such user.',
+			code: 'NO_SUCH_USER',
+			id: 'fcd2eef9-a9b2-4c4f-8624-038099e90aa5',
+		},
+		notRemote: {
+			message: 'User not remote.',
+			code: 'NOT_REMOTE',
+			id: '4362f8dc-731f-4ad8-a694-be2a88922a24',
+		},
+	}
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		alsoKnownAs: { type: 'string' },
+	},
+	required: ['alsoKnownAs'],
+} as const;
+
+// eslint-disable-next-line import/no-default-export
+export default define(meta, paramDef, async (ps, user) => {
+
+	if(!ps.alsoKnownAs) throw new ApiError(meta.errors.noSuchUser);
+
+	let unfiltered: string = ps.alsoKnownAs;
+
+	if(unfiltered.startsWith('@')) unfiltered = unfiltered.substring(1);
+	if(!unfiltered.includes('@')) throw new ApiError(meta.errors.notRemote);
+
+	let userAddress: string[] = unfiltered.split("@");
+
+	const knownAs: User = await resolveUser(userAddress[0], userAddress[1]).catch(e => {
+		apiLogger.warn(`failed to resolve remote user: ${e}`);
+		throw new ApiError(meta.errors.noSuchUser);
+	});
+
+	const updates = {} as Partial<User>;
+
+	if(!knownAs.uri) knownAs.uri = "";
+	updates.alsoKnownAs = [knownAs.uri];
+
+	await Users.update(user.id, updates);
+
+	const iObj = await Users.pack<true, true>(user.id, user, {
+		detail: true,
+		includeSecrets: true,
+	});
+
+	// Publish meUpdated event
+	publishMainStream(user.id, 'meUpdated', iObj);
+
+	if (user.isLocked === false) {
+		acceptAllFollowRequests(user);
+	}
+
+	publishToFollowers(user.id);
+
+	return iObj;
+});
diff --git a/packages/backend/src/server/api/endpoints/i/move.ts b/packages/backend/src/server/api/endpoints/i/move.ts
index c67a7bdf5..c29966cfe 100644
--- a/packages/backend/src/server/api/endpoints/i/move.ts
+++ b/packages/backend/src/server/api/endpoints/i/move.ts
@@ -2,11 +2,15 @@ import { In } from 'typeorm';
 import { User } from '@/models/entities/user.js';
 import { Users, DriveFiles, Notes, Channels, Blockings } from '@/models/index.js';
 import { ApiError } from '../../error.js';
+import { resolveUser } from '@/remote/resolve-user.js';
 import define from '../../define.js';
 import { DAY } from '@/const.js';
+import DeliverManager from '@/remote/activitypub/deliver-manager.js';
+import { renderActivity } from '@/remote/activitypub/renderer/index.js';
+import { apiLogger } from '../../logger.js';
 
 export const meta = {
-	tags: ['notes'],
+	tags: ['users'],
 
 	secure: true,
 	requireCredential: true,
@@ -27,19 +31,64 @@ export const meta = {
 			code: 'REMOTE_ACCOUNT_FORBIDS',
 			id: 'b5c90186-4ab0-49c8-9bba-a1f766282ba4',
 		},
+		notRemote: {
+			message: 'User not remote.',
+			code: 'NOT_REMOTE',
+			id: '4362f8dc-731f-4ad8-a694-be2a88922a24',
+		},
 	},
 } as const;
 
 export const paramDef = {
 	type: 'object',
 	properties: {
-		alsoKnownAs: { type: 'string' },
+		moveToAccount: { type: 'string' },
 	},
-	required: ['alsoKnownAs'],
+	required: ['moveToAccount'],
 } as const;
 
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
-	// TODO
-	return;
+
+	if(!ps.moveToAccount) throw new ApiError(meta.errors.noSuchMoveTarget);
+
+	let unfiltered: string = ps.moveToAccount;
+
+	if(unfiltered.startsWith('@')) unfiltered = unfiltered.substring(1);
+	if(!unfiltered.includes('@')) throw new ApiError(meta.errors.notRemote);
+	let userAddress: string[] = unfiltered.split("@");
+
+	const moveTo: User = await resolveUser(userAddress[0], userAddress[1]).catch(e => {
+		apiLogger.warn(`failed to resolve remote user: ${e}`);
+		throw new ApiError(meta.errors.noSuchMoveTarget);
+	});
+
+	let allowed = false;
+
+	moveTo.alsoKnownAs?.array.forEach(element => {
+		if(user.uri?.includes(element)) allowed = true;
+	});
+
+	if(!allowed || !moveTo.uri || !user.uri) throw new ApiError(meta.errors.remoteAccountForbids);
+
+		(async () => {
+			const moveAct = await moveActivity(moveTo.uri!, user.uri!);
+			const dm = new DeliverManager(user, moveAct);
+			dm.addFollowersRecipe();
+			dm.execute();
+		})();
+	return true;
 });
+
+async function moveActivity(to: string, from: string) {
+
+	const activity = {
+		id: `foo`,
+		actor: from,
+		type: 'Move',
+		object: from,
+		target: to,
+	} as any;
+
+	return renderActivity(activity);
+}
diff --git a/packages/client/src/pages/settings/migration.vue b/packages/client/src/pages/settings/migration.vue
index 5fca8b837..d71a8aaf9 100644
--- a/packages/client/src/pages/settings/migration.vue
+++ b/packages/client/src/pages/settings/migration.vue
@@ -2,7 +2,7 @@
 <div class="_formRoot">
 	<FormSection>
 		<template #label>{{ i18n.ts.moveTo }}</template>
-		<FormInput v-model="alsoKnownAs" class="_formBlock">
+		<FormInput v-model="moveToAccount" class="_formBlock">
 			<template #prefix><i class="ph-airplane-takeoff-bold ph-lg"></i></template>
 			<template #label>{{ i18n.ts.moveToLabel }}</template>
 		</FormInput>
@@ -30,19 +30,19 @@ import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 
-let alsoKnownAs = $ref('');
+let moveToAccount = $ref('');
 let accountAlias = $ref('');
 
 async function save(): Promise<void> {
-	// os.apiWithDialog('i/move', {
-	// 	alsoKnownAs: alsoKnownAs,
-	// });
+	os.apiWithDialog('i/known-as', {
+		alsoKnownAs: accountAlias,
+	});
 }
 
 async function move(): Promise<void> {
 	// TODO: PROMPT FOR CONFIRMATION
 	os.api('i/move', {
-		alsoKnownAs: alsoKnownAs,
+		moveToAccount: moveToAccount,
 	});
 }
 

From 792fcc9f9c10c548352d36996a9a1db0f4998cad Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Mon, 12 Dec 2022 02:00:28 +0100
Subject: [PATCH 17/17] Change Version to release candidate 1

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

diff --git a/package.json b/package.json
index 9428bbd30..c1c749ce6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.0.0-b7",
+	"version": "13.0.0-rc1",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",