movedTo -> movedToUri
This commit is contained in:
parent
a4916d8024
commit
77d088ee12
|
@ -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,
|
||||
|
|
|
@ -96,7 +96,7 @@ export const packedUserDetailedNotMeOnlySchema = {
|
|||
format: 'uri',
|
||||
nullable: true, optional: false,
|
||||
},
|
||||
movedTo: {
|
||||
movedToUri: {
|
||||
type: 'string',
|
||||
format: 'uri',
|
||||
nullable: true, optional: false,
|
||||
|
|
|
@ -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>;
|
||||
|
||||
|
|
|
@ -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',
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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">
|
||||
|
|
Loading…
Reference in New Issue