From aa66bded69a1c86444ff51a00011d996ef4017d9 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 17 Nov 2022 13:54:25 -0800
Subject: [PATCH] init

---
 packages/backend/src/remote/activitypub/models/person.ts   | 2 ++
 packages/backend/src/remote/activitypub/renderer/index.ts  | 1 +
 packages/backend/src/remote/activitypub/renderer/person.ts | 1 +
 packages/backend/src/remote/activitypub/type.ts            | 1 +
 4 files changed, 5 insertions(+)

diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts
index 6097e3b6e..0b3654489 100644
--- a/packages/backend/src/remote/activitypub/models/person.ts
+++ b/packages/backend/src/remote/activitypub/models/person.ts
@@ -172,6 +172,7 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
 				lastFetchedAt: new Date(),
 				name: truncate(person.name, nameLength),
 				isLocked: !!person.manuallyApprovesFollowers,
+				movedTo: null,
 				isExplorable: !!person.discoverable,
 				username: person.preferredUsername,
 				usernameLower: person.preferredUsername!.toLowerCase(),
@@ -343,6 +344,7 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
 		isBot: getApType(object) === 'Service',
 		isCat: (person as any).isCat === true,
 		isLocked: !!person.manuallyApprovesFollowers,
+		movedTo: person.movedTo,
 		isExplorable: !!person.discoverable,
 	} as Partial<User>;
 
diff --git a/packages/backend/src/remote/activitypub/renderer/index.ts b/packages/backend/src/remote/activitypub/renderer/index.ts
index f100b77ce..893b6fd75 100644
--- a/packages/backend/src/remote/activitypub/renderer/index.ts
+++ b/packages/backend/src/remote/activitypub/renderer/index.ts
@@ -19,6 +19,7 @@ export const renderActivity = (x: any): IActivity | null => {
 			{
 				// as non-standards
 				manuallyApprovesFollowers: 'as:manuallyApprovesFollowers',
+				movedTo: 'as:movedTo',
 				sensitive: 'as:sensitive',
 				Hashtag: 'as:Hashtag',
 				quoteUrl: 'as:quoteUrl',
diff --git a/packages/backend/src/remote/activitypub/renderer/person.ts b/packages/backend/src/remote/activitypub/renderer/person.ts
index cd2fd74d4..dfabd910e 100644
--- a/packages/backend/src/remote/activitypub/renderer/person.ts
+++ b/packages/backend/src/remote/activitypub/renderer/person.ts
@@ -71,6 +71,7 @@ export async function renderPerson(user: ILocalUser) {
 		image: banner ? renderImage(banner) : null,
 		tag,
 		manuallyApprovesFollowers: user.isLocked,
+		movedTo: user.moved_to_account_id,
 		discoverable: !!user.isExplorable,
 		publicKey: renderKey(user, keypair, `#main-key`),
 		isCat: user.isCat,
diff --git a/packages/backend/src/remote/activitypub/type.ts b/packages/backend/src/remote/activitypub/type.ts
index de7eb0ed8..2c4935a87 100644
--- a/packages/backend/src/remote/activitypub/type.ts
+++ b/packages/backend/src/remote/activitypub/type.ts
@@ -156,6 +156,7 @@ export interface IActor extends IObject {
 	name?: string;
 	preferredUsername?: string;
 	manuallyApprovesFollowers?: boolean;
+	movedTo?: string;
 	discoverable?: boolean;
 	inbox: string;
 	sharedInbox?: string;	// 後方互換性のため