Merge branch 'develop' of codeberg.org:calckey/calckey into develop
This commit is contained in:
commit
1702aa6a6a
|
@ -157,7 +157,7 @@ export async function createNote(value: string | IObject, resolver?: Resolver, s
|
|||
// Quote
|
||||
let quote: Note | undefined | null;
|
||||
|
||||
if (note._misskey_quote || note.quoteUrl) {
|
||||
if (note._misskey_quote || note.quoteUrl || 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, s
|
|||
}
|
||||
};
|
||||
|
||||
const uris = unique([note._misskey_quote, note.quoteUrl].filter((x): x is string => typeof x === 'string'));
|
||||
const uris = unique([note._misskey_quote, note.quoteUrl, 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);
|
||||
|
|
|
@ -22,6 +22,7 @@ export const renderActivity = (x: any): IActivity | null => {
|
|||
movedToUri: 'as:movedTo',
|
||||
sensitive: 'as:sensitive',
|
||||
Hashtag: 'as:Hashtag',
|
||||
quoteUri: 'fedibird:quoteUri',
|
||||
quoteUrl: 'as:quoteUrl',
|
||||
// Mastodon
|
||||
toot: 'http://joinmastodon.org/ns#',
|
||||
|
|
|
@ -142,6 +142,7 @@ export default async function renderNote(note: Note, dive = true, isTalk = false
|
|||
mediaType: "text/x.misskeymarkdown",
|
||||
},
|
||||
_misskey_quote: quote,
|
||||
quoteUri: quote,
|
||||
quoteUrl: quote,
|
||||
published: note.createdAt.toISOString(),
|
||||
to,
|
||||
|
|
|
@ -112,6 +112,7 @@ export interface IPost extends IObject {
|
|||
};
|
||||
_misskey_quote?: string;
|
||||
quoteUrl?: string;
|
||||
quoteUri?: string;
|
||||
_misskey_talk: boolean;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue