From d8f13b6a068eb4f06d1621b343b8b79b688460ec Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Sat, 21 Oct 2023 23:24:08 +0200 Subject: [PATCH] [mastodon-client] Prefer status url over uri --- packages/backend/src/server/api/mastodon/converters/note.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/backend/src/server/api/mastodon/converters/note.ts b/packages/backend/src/server/api/mastodon/converters/note.ts index 0386026d0..1e1dc3c3f 100644 --- a/packages/backend/src/server/api/mastodon/converters/note.ts +++ b/packages/backend/src/server/api/mastodon/converters/note.ts @@ -90,7 +90,7 @@ export class NoteConverter { const quoteUri = Promise.resolve(renote).then(renote => { if (!renote || !isQuote(note)) return null; - return renote.uri ? renote.uri : `${config.url}/notes/${renote.id}`; + return renote.url ?? renote.uri ?? `${config.url}/notes/${renote.id}`; }); const content = note.text !== null @@ -114,8 +114,8 @@ export class NoteConverter { // noinspection ES6MissingAwait return await awaitAll({ id: note.id, - uri: note.uri ? note.uri : `https://${config.host}/notes/${note.id}`, - url: note.uri ? note.uri : `https://${config.host}/notes/${note.id}`, + uri: note.uri ?? `https://${config.host}/notes/${note.id}`, + url: note.url ?? `https://${config.host}/notes/${note.id}`, account: Promise.resolve(noteUser).then(p => UserConverter.encode(p, ctx)), in_reply_to_id: note.replyId, in_reply_to_account_id: note.replyUserId,