From dbb950d0ebc1f6fac4285658d5698f04dcec0c99 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator <kainoa@t1c.dev> Date: Sun, 4 Dec 2022 17:20:36 -0800 Subject: [PATCH] movedTo -> movedToUri --- packages/backend/src/models/repositories/user.ts | 2 +- packages/backend/src/models/schema/user.ts | 2 +- packages/backend/src/remote/activitypub/models/person.ts | 4 ++-- packages/backend/src/remote/activitypub/renderer/index.ts | 2 +- packages/backend/src/remote/activitypub/renderer/person.ts | 2 +- packages/backend/src/remote/activitypub/type.ts | 2 +- packages/client/src/pages/user/home.vue | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts index 023ec7eb0..6810728e1 100644 --- a/packages/backend/src/models/repositories/user.ts +++ b/packages/backend/src/models/repositories/user.ts @@ -361,7 +361,7 @@ export const UserRepository = db.getRepository(User).extend({ ...(opts.detail ? { url: profile!.url, uri: user.uri, - movedTo: user.movedToUri ? await this.userFromURI(user.movedToUri) : null, + movedToUri: user.movedToUri ? await this.userFromURI(user.movedToUri) : null, alsoKnownAs: user.alsoKnownAs, createdAt: user.createdAt.toISOString(), updatedAt: user.updatedAt ? user.updatedAt.toISOString() : null, diff --git a/packages/backend/src/models/schema/user.ts b/packages/backend/src/models/schema/user.ts index 95827272f..b70210a0f 100644 --- a/packages/backend/src/models/schema/user.ts +++ b/packages/backend/src/models/schema/user.ts @@ -96,7 +96,7 @@ export const packedUserDetailedNotMeOnlySchema = { format: 'uri', nullable: true, optional: false, }, - movedTo: { + movedToUri: { type: 'string', format: 'uri', nullable: true, optional: false, diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts index 2719f50d2..1634592c1 100644 --- a/packages/backend/src/remote/activitypub/models/person.ts +++ b/packages/backend/src/remote/activitypub/models/person.ts @@ -172,7 +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, + movedToUri: null, isExplorable: !!person.discoverable, username: person.preferredUsername, usernameLower: person.preferredUsername!.toLowerCase(), @@ -344,7 +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, + movedToUri: person.movedToUri, 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 893b6fd75..e6f976f5f 100644 --- a/packages/backend/src/remote/activitypub/renderer/index.ts +++ b/packages/backend/src/remote/activitypub/renderer/index.ts @@ -19,7 +19,7 @@ export const renderActivity = (x: any): IActivity | null => { { // as non-standards manuallyApprovesFollowers: 'as:manuallyApprovesFollowers', - movedTo: 'as:movedTo', + movedToUri: '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 dfabd910e..1be2b2c18 100644 --- a/packages/backend/src/remote/activitypub/renderer/person.ts +++ b/packages/backend/src/remote/activitypub/renderer/person.ts @@ -71,7 +71,7 @@ export async function renderPerson(user: ILocalUser) { image: banner ? renderImage(banner) : null, tag, manuallyApprovesFollowers: user.isLocked, - movedTo: user.moved_to_account_id, + movedToUri: 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 aabbd0679..3ccc85acc 100644 --- a/packages/backend/src/remote/activitypub/type.ts +++ b/packages/backend/src/remote/activitypub/type.ts @@ -156,7 +156,7 @@ export interface IActor extends IObject { name?: string; preferredUsername?: string; manuallyApprovesFollowers?: boolean; - movedTo?: string; + movedToUri?: string; alsoKnownAs?: string[]; discoverable?: boolean; inbox: string; diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue index 00fd43039..3a969de3d 100644 --- a/packages/client/src/pages/user/home.vue +++ b/packages/client/src/pages/user/home.vue @@ -8,7 +8,7 @@ <div class="profile"> <MkRemoteCaution v-if="user.host != null" :href="user.url" class="warn"/> - <MkMoved v-if="user.movedTo" :acct="user.movedTo" /> + <MkMoved v-if="user.movedToUri" :acct="user.movedToUri" /> <div :key="user.id" class="_block main"> <div class="banner-container" :style="style">