diff options
| author | Mar0xy <marie@kaifa.ch> | 2023-10-01 02:06:04 +0200 |
|---|---|---|
| committer | Mar0xy <marie@kaifa.ch> | 2023-10-01 02:06:04 +0200 |
| commit | 099b86ff3c5f63c0471bcd5e5624bbbcd27ab2f9 (patch) | |
| tree | 8a7bb4df37c2a6f344a056f9cb7941ac43ffcbd8 /packages/backend/src/server/api/mastodon | |
| parent | upd: add MFM to HTML support and Mentions parsing to mastodon api (#33) (diff) | |
| download | sharkey-099b86ff3c5f63c0471bcd5e5624bbbcd27ab2f9.tar.gz sharkey-099b86ff3c5f63c0471bcd5e5624bbbcd27ab2f9.tar.bz2 sharkey-099b86ff3c5f63c0471bcd5e5624bbbcd27ab2f9.zip | |
chore: lint
Diffstat (limited to 'packages/backend/src/server/api/mastodon')
| -rw-r--r-- | packages/backend/src/server/api/mastodon/MastodonApiServerService.ts | 8 | ||||
| -rw-r--r-- | packages/backend/src/server/api/mastodon/converters.ts | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/packages/backend/src/server/api/mastodon/MastodonApiServerService.ts b/packages/backend/src/server/api/mastodon/MastodonApiServerService.ts index 2653bbdbdf..b0b5147a48 100644 --- a/packages/backend/src/server/api/mastodon/MastodonApiServerService.ts +++ b/packages/backend/src/server/api/mastodon/MastodonApiServerService.ts @@ -263,8 +263,8 @@ export class MastodonApiServerService { // displayed without being logged in try { const data = await client.search((_request.query as any).acct, { type: 'accounts' }); - const profile = await this.userProfilesRepository.findOneBy({userId: data.data.accounts[0].id}); - data.data.accounts[0].fields = profile?.fields.map(f => ({...f, verified_at: null})) || []; + const profile = await this.userProfilesRepository.findOneBy({ userId: data.data.accounts[0].id }); + data.data.accounts[0].fields = profile?.fields.map(f => ({ ...f, verified_at: null })) || []; reply.send(convertAccount(data.data.accounts[0])); } catch (e: any) { /* console.error(e); */ @@ -302,8 +302,8 @@ export class MastodonApiServerService { try { const sharkId = convertId(_request.params.id, IdType.SharkeyId); const data = await client.getAccount(sharkId); - const profile = await this.userProfilesRepository.findOneBy({userId: sharkId}); - data.data.fields = profile?.fields.map(f => ({...f, verified_at: null})) || []; + const profile = await this.userProfilesRepository.findOneBy({ userId: sharkId }); + data.data.fields = profile?.fields.map(f => ({ ...f, verified_at: null })) || []; reply.send(convertAccount(data.data)); } catch (e: any) { /* console.error(e); diff --git a/packages/backend/src/server/api/mastodon/converters.ts b/packages/backend/src/server/api/mastodon/converters.ts index 4f4524736d..69b0ad93ff 100644 --- a/packages/backend/src/server/api/mastodon/converters.ts +++ b/packages/backend/src/server/api/mastodon/converters.ts @@ -67,7 +67,7 @@ export class MastoConverters { public async getUser(id: string): Promise<MiUser> { return this.GetterService.getUser(id).then(p => { return p; - }) + }); } public async convertStatus(status: Entity.Status) { @@ -94,7 +94,7 @@ export class MastoConverters { id: convertId(mention.id, IdConvertType.MastodonId), })); const convertedMFM = this.MfmService.toHtml(parse(status.content), JSON.parse(note.mentionedRemoteUsers)); - status.content = status.content ? convertedMFM?.replace(/&/g , "&").replaceAll(`<span>&</span><a href="${this.config.url}/tags/39;" rel="tag">#39;</a>` , "<span>\'</span>")! : status.content; + status.content = status.content ? convertedMFM?.replace(/&/g, "&").replaceAll(`<span>&</span><a href="${this.config.url}/tags/39;" rel="tag">#39;</a>`, "<span>\'</span>") as string : status.content; if (status.poll) status.poll = convertPoll(status.poll); if (status.reblog) status.reblog = convertStatus(status.reblog); |