diff options
| author | marihachi <marihachi0620@gmail.com> | 2021-11-01 23:47:13 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-01 23:47:13 +0900 |
| commit | 1c38c7010d9a9604df979faa867cd8f9e7d825c9 (patch) | |
| tree | d4083b7255f69eaaf0eb5cedcf3591a344fd0762 /src/remote | |
| parent | add some locales (diff) | |
| download | sharkey-1c38c7010d9a9604df979faa867cd8f9e7d825c9.tar.gz sharkey-1c38c7010d9a9604df979faa867cd8f9e7d825c9.tar.bz2 sharkey-1c38c7010d9a9604df979faa867cd8f9e7d825c9.zip | |
refactor: Introduce list of MFM Functions (#7882)
* introduce list of MFM Functions
* add note
Diffstat (limited to 'src/remote')
| -rw-r--r-- | src/remote/activitypub/misc/get-note-html.ts | 3 | ||||
| -rw-r--r-- | src/remote/activitypub/renderer/person.ts | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/remote/activitypub/misc/get-note-html.ts b/src/remote/activitypub/misc/get-note-html.ts index 043335a5be..a24ec43a69 100644 --- a/src/remote/activitypub/misc/get-note-html.ts +++ b/src/remote/activitypub/misc/get-note-html.ts @@ -1,9 +1,10 @@ import * as mfm from 'mfm-js'; +import { fnNameList } from '@/mfm/fn-name-list'; import { Note } from '@/models/entities/note'; import { toHtml } from '../../../mfm/to-html'; export default function(note: Note) { - let html = note.text ? toHtml(mfm.parse(note.text), JSON.parse(note.mentionedRemoteUsers)) : null; + let html = note.text ? toHtml(mfm.parse(note.text, { fnNameList }), JSON.parse(note.mentionedRemoteUsers)) : null; if (html == null) html = '<p>.</p>'; return html; diff --git a/src/remote/activitypub/renderer/person.ts b/src/remote/activitypub/renderer/person.ts index f2a283a870..7e94abddfc 100644 --- a/src/remote/activitypub/renderer/person.ts +++ b/src/remote/activitypub/renderer/person.ts @@ -11,6 +11,7 @@ import { IIdentifier } from '../models/identifier'; import renderHashtag from './hashtag'; import { DriveFiles, UserProfiles } from '@/models/index'; import { getUserKeypair } from '@/misc/keypair-store'; +import { fnNameList } from '@/mfm/fn-name-list'; export async function renderPerson(user: ILocalUser) { const id = `${config.url}/users/${user.id}`; @@ -66,7 +67,7 @@ export async function renderPerson(user: ILocalUser) { url: `${config.url}/@${user.username}`, preferredUsername: user.username, name: user.name, - summary: profile.description ? toHtml(mfm.parse(profile.description)) : null, + summary: profile.description ? toHtml(mfm.parse(profile.description, { fnNameList })) : null, icon: avatar ? renderImage(avatar) : null, image: banner ? renderImage(banner) : null, tag, |