diff options
| author | Marie <marie@kaifa.ch> | 2024-05-31 18:32:51 +0000 |
|---|---|---|
| committer | Marie <marie@kaifa.ch> | 2024-05-31 18:32:51 +0000 |
| commit | 86ccbd94875bada532862ceaa01008ea0d8d0142 (patch) | |
| tree | c9dce3d972d6c9ef47fc9594de5e0dc0519efeaf /packages/backend/src/server/api/mastodon | |
| parent | merge: lint our MRs (!506) (diff) | |
| parent | renamed toMastoHtml to toMastoApiHtml to clear up what it does (diff) | |
| download | sharkey-86ccbd94875bada532862ceaa01008ea0d8d0142.tar.gz sharkey-86ccbd94875bada532862ceaa01008ea0d8d0142.tar.bz2 sharkey-86ccbd94875bada532862ceaa01008ea0d8d0142.zip | |
merge: Fix/fixing mastodon api search mfm (!532)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/532
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
Diffstat (limited to 'packages/backend/src/server/api/mastodon')
| -rw-r--r-- | packages/backend/src/server/api/mastodon/converters.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/backend/src/server/api/mastodon/converters.ts b/packages/backend/src/server/api/mastodon/converters.ts index ea219b933d..cca9505846 100644 --- a/packages/backend/src/server/api/mastodon/converters.ts +++ b/packages/backend/src/server/api/mastodon/converters.ts @@ -110,7 +110,7 @@ export class MastoConverters { private async encodeField(f: Entity.Field): Promise<Entity.Field> { return { name: f.name, - value: await this.mfmService.toMastoHtml(mfm.parse(f.value), [], true) ?? escapeMFM(f.value), + value: await this.mfmService.toMastoApiHtml(mfm.parse(f.value), [], true) ?? escapeMFM(f.value), verified_at: null, }; } @@ -179,7 +179,7 @@ export class MastoConverters { const files = this.driveFileEntityService.packManyByIds(edit.fileIds); const item = { account: noteUser, - content: this.mfmService.toMastoHtml(mfm.parse(edit.newText ?? ''), JSON.parse(note.mentionedRemoteUsers)).then(p => p ?? ''), + content: this.mfmService.toMastoApiHtml(mfm.parse(edit.newText ?? ''), JSON.parse(note.mentionedRemoteUsers)).then(p => p ?? ''), created_at: lastDate.toISOString(), emojis: [], sensitive: files.then(files => files.length > 0 ? files.some((f) => f.isSensitive) : false), @@ -240,7 +240,7 @@ export class MastoConverters { }); const content = note.text !== null - ? quoteUri.then(quoteUri => this.mfmService.toMastoHtml(mfm.parse(note.text!), JSON.parse(note.mentionedRemoteUsers), false, quoteUri)) + ? quoteUri.then(quoteUri => this.mfmService.toMastoApiHtml(mfm.parse(note.text!), JSON.parse(note.mentionedRemoteUsers), false, quoteUri)) .then(p => p ?? escapeMFM(note.text!)) : ''; |