161sh/trashposs
1
0
Fork 0
mirror of https://iceshrimp.dev/crimekillz/trashposs synced 2024-11-22 00:43:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[mastodon-client] Don't duplicate RE: for pleroma/akkoma quotes

Browse Source
This commit is contained in:
Laura Hausmann 2023-11-04 23:41:58 +01:00
parent 35c75bbebf
commit 734c6685f7
No known key found for this signature in database
GPG Key ID: D044E84C5BE01605
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/backend/src/server/api/mastodon/converters/note.ts
View File

@ -93,10 +93,12 @@ export class NoteConverter {
return renote.url ?? renote.uri ?? `${config.url}/notes/${renote.id}`; return renote.url ?? renote.uri ?? `${config.url}/notes/${renote.id}`;
}); });
const content = note.text !== null const text = quoteUri.then(quoteUri => note.text !== null ? quoteUri !== null ? note.text.replaceAll(`RE: ${quoteUri}`, '').replaceAll(quoteUri, '').trimEnd() : note.text : null)
? quoteUri.then(quoteUri => MfmHelpers.toHtml(mfm.parse(note.text!), JSON.parse(note.mentionedRemoteUsers), note.userHost, false, quoteUri)
.then(p => p ?? escapeMFM(note.text!))) const content = text.then(text => text !== null
: ""; ? quoteUri.then(quoteUri => MfmHelpers.toHtml(mfm.parse(text), JSON.parse(note.mentionedRemoteUsers), note.userHost, false, quoteUri))
.then(p => p ?? escapeMFM(text))
: "");
const isPinned = user && note.userId === user.id const isPinned = user && note.userId === user.id
? UserNotePinings.exist({ where: { userId: user.id, noteId: note.id } }) ? UserNotePinings.exist({ where: { userId: user.id, noteId: note.id } })
@ -122,7 +124,7 @@ export class NoteConverter {
reblog: reblog.then(reblog => !isQuote(note) ? reblog : null), reblog: reblog.then(reblog => !isQuote(note) ? reblog : null),
content: content, content: content,
content_type: 'text/x.misskeymarkdown', content_type: 'text/x.misskeymarkdown',
text: note.text, text: text,
created_at: note.createdAt.toISOString(), created_at: note.createdAt.toISOString(),
emojis: noteEmoji, emojis: noteEmoji,
replies_count: note.repliesCount, replies_count: note.repliesCount,