e2net/iceshrimp
3
0
Fork 0
forked from mirrors/iceshrimp
Code Pull requests Activity

[mastodon-client] Prefer status url over uri

Browse source
This commit is contained in:
Laura Hausmann 2023-10-21 23:24:08 +02:00
parent 04fa6bef15
commit d8f13b6a06
Signed by: zotan
GPG key ID: D044E84C5BE01605
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/backend/src/server/api/mastodon/converters/note.ts
View file

@ -90,7 +90,7 @@ export class NoteConverter {
const quoteUri = Promise.resolve(renote).then(renote => { const quoteUri = Promise.resolve(renote).then(renote => {
if (!renote || !isQuote(note)) return null; 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 const content = note.text !== null
@ -114,8 +114,8 @@ export class NoteConverter {
// noinspection ES6MissingAwait // noinspection ES6MissingAwait
return await awaitAll({ return await awaitAll({
id: note.id, id: note.id,
uri: note.uri ? note.uri : `https://${config.host}/notes/${note.id}`, uri: note.uri ?? `https://${config.host}/notes/${note.id}`,
url: note.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)), account: Promise.resolve(noteUser).then(p => UserConverter.encode(p, ctx)),
in_reply_to_id: note.replyId, in_reply_to_id: note.replyId,
in_reply_to_account_id: note.replyUserId, in_reply_to_account_id: note.replyUserId,