natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

movedTo -> movedToUri

This commit is contained in:
ThatOneCalculator 2022-12-04 17:20:36 -08:00
parent a4916d8024
commit 77d088ee12
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/src/models/repositories/user.ts
View File

@ -361,7 +361,7 @@ export const UserRepository = db.getRepository(User).extend({
...(opts.detail ? { ...(opts.detail ? {
url: profile!.url, url: profile!.url,
uri: user.uri, uri: user.uri,
movedTo: user.movedToUri ? await this.userFromURI(user.movedToUri) : null, movedToUri: user.movedToUri ? await this.userFromURI(user.movedToUri) : null,
alsoKnownAs: user.alsoKnownAs, alsoKnownAs: user.alsoKnownAs,
createdAt: user.createdAt.toISOString(), createdAt: user.createdAt.toISOString(),
updatedAt: user.updatedAt ? user.updatedAt.toISOString() : null, updatedAt: user.updatedAt ? user.updatedAt.toISOString() : null,

2
packages/backend/src/models/schema/user.ts
View File

@ -96,7 +96,7 @@ export const packedUserDetailedNotMeOnlySchema = {
format: 'uri', format: 'uri',
nullable: true, optional: false, nullable: true, optional: false,
}, },
movedTo: { movedToUri: {
type: 'string', type: 'string',
format: 'uri', format: 'uri',
nullable: true, optional: false, nullable: true, optional: false,

4
packages/backend/src/remote/activitypub/models/person.ts
View File

@ -172,7 +172,7 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
lastFetchedAt: new Date(), lastFetchedAt: new Date(),
name: truncate(person.name, nameLength), name: truncate(person.name, nameLength),
isLocked: !!person.manuallyApprovesFollowers, isLocked: !!person.manuallyApprovesFollowers,
movedTo: null, movedToUri: null,
isExplorable: !!person.discoverable, isExplorable: !!person.discoverable,
username: person.preferredUsername, username: person.preferredUsername,
usernameLower: person.preferredUsername!.toLowerCase(), usernameLower: person.preferredUsername!.toLowerCase(),
@ -344,7 +344,7 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
isBot: getApType(object) === 'Service', isBot: getApType(object) === 'Service',
isCat: (person as any).isCat === true, isCat: (person as any).isCat === true,
isLocked: !!person.manuallyApprovesFollowers, isLocked: !!person.manuallyApprovesFollowers,
movedTo: person.movedTo, movedToUri: person.movedToUri,
isExplorable: !!person.discoverable, isExplorable: !!person.discoverable,
} as Partial<User>; } as Partial<User>;

2
packages/backend/src/remote/activitypub/renderer/index.ts
View File

@ -19,7 +19,7 @@ export const renderActivity = (x: any): IActivity | null => {
{ {
// as non-standards // as non-standards
manuallyApprovesFollowers: 'as:manuallyApprovesFollowers', manuallyApprovesFollowers: 'as:manuallyApprovesFollowers',
movedTo: 'as:movedTo', movedToUri: 'as:movedTo',
sensitive: 'as:sensitive', sensitive: 'as:sensitive',
Hashtag: 'as:Hashtag', Hashtag: 'as:Hashtag',
quoteUrl: 'as:quoteUrl', quoteUrl: 'as:quoteUrl',

2
packages/backend/src/remote/activitypub/renderer/person.ts
View File

@ -71,7 +71,7 @@ export async function renderPerson(user: ILocalUser) {
image: banner ? renderImage(banner) : null, image: banner ? renderImage(banner) : null,
tag, tag,
manuallyApprovesFollowers: user.isLocked, manuallyApprovesFollowers: user.isLocked,
movedTo: user.moved_to_account_id, movedToUri: user.moved_to_account_id,
discoverable: !!user.isExplorable, discoverable: !!user.isExplorable,
publicKey: renderKey(user, keypair, `#main-key`), publicKey: renderKey(user, keypair, `#main-key`),
isCat: user.isCat, isCat: user.isCat,

2
packages/backend/src/remote/activitypub/type.ts
View File

@ -156,7 +156,7 @@ export interface IActor extends IObject {
name?: string; name?: string;
preferredUsername?: string; preferredUsername?: string;
manuallyApprovesFollowers?: boolean; manuallyApprovesFollowers?: boolean;
movedTo?: string; movedToUri?: string;
alsoKnownAs?: string[]; alsoKnownAs?: string[];
discoverable?: boolean; discoverable?: boolean;
inbox: string; inbox: string;

2
packages/client/src/pages/user/home.vue
View File

@ -8,7 +8,7 @@
<div class="profile"> <div class="profile">
<MkRemoteCaution v-if="user.host != null" :href="user.url" class="warn"/> <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 :key="user.id" class="_block main">
<div class="banner-container" :style="style"> <div class="banner-container" :style="style">