diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts index 20db3c8df..f5426da3c 100644 --- a/packages/backend/src/remote/activitypub/models/note.ts +++ b/packages/backend/src/remote/activitypub/models/note.ts @@ -157,7 +157,7 @@ export async function createNote(value: string | IObject, resolver: Resolver, si // 引用 let quote: Note | undefined | null; - if (note._misskey_quote || note.quoteUrl) { + if (note._misskey_quote || note.quoteUri) { const tryResolveNote = async (uri: string): Promise<{ status: 'ok'; res: Note | null; @@ -184,7 +184,7 @@ export async function createNote(value: string | IObject, resolver: Resolver, si } }; - const uris = unique([note._misskey_quote, note.quoteUrl].filter((x): x is string => typeof x === 'string')); + const uris = unique([note._misskey_quote, note.quoteUri].filter((x): x is string => typeof x === 'string')); const results = await Promise.all(uris.map(uri => tryResolveNote(uri))); quote = results.filter((x): x is { status: 'ok', res: Note | null } => x.status === 'ok').map(x => x.res).find(x => x); diff --git a/packages/backend/src/remote/activitypub/renderer/index.ts b/packages/backend/src/remote/activitypub/renderer/index.ts index bf31c2227..37e73d37b 100644 --- a/packages/backend/src/remote/activitypub/renderer/index.ts +++ b/packages/backend/src/remote/activitypub/renderer/index.ts @@ -21,12 +21,14 @@ export const renderActivity = (x: any): IActivity | null => { manuallyApprovesFollowers: 'as:manuallyApprovesFollowers', sensitive: 'as:sensitive', Hashtag: 'as:Hashtag', - quoteUrl: 'as:quoteUrl', // Mastodon toot: 'http://joinmastodon.org/ns#', Emoji: 'toot:Emoji', featured: 'toot:featured', discoverable: 'toot:discoverable', + // Fedibird + fedibird: 'http://fedibird.com/ns#', + quoteUri: 'fedibird:quoteUri', // schema schema: 'http://schema.org#', PropertyValue: 'schema:PropertyValue', diff --git a/packages/backend/src/remote/activitypub/renderer/note.ts b/packages/backend/src/remote/activitypub/renderer/note.ts index 62dc9ebc4..0d53cfe5e 100644 --- a/packages/backend/src/remote/activitypub/renderer/note.ts +++ b/packages/backend/src/remote/activitypub/renderer/note.ts @@ -141,7 +141,7 @@ export default async function renderNote(note: Note, dive = true, isTalk = false mediaType: 'text/x.misskeymarkdown', }, _misskey_quote: quote, - quoteUrl: quote, + quoteUri: quote, published: note.createdAt.toISOString(), to, cc, diff --git a/packages/backend/src/remote/activitypub/type.ts b/packages/backend/src/remote/activitypub/type.ts index de7eb0ed8..f5b411639 100644 --- a/packages/backend/src/remote/activitypub/type.ts +++ b/packages/backend/src/remote/activitypub/type.ts @@ -111,7 +111,7 @@ export interface IPost extends IObject { mediaType: string; }; _misskey_quote?: string; - quoteUrl?: string; + quoteUri?: string; _misskey_talk: boolean; } @@ -122,7 +122,7 @@ export interface IQuestion extends IObject { mediaType: string; }; _misskey_quote?: string; - quoteUrl?: string; + quoteUri?: string; oneOf?: IQuestionChoice[]; anyOf?: IQuestionChoice[]; endTime?: Date;