Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Introduce list of MFM Functions (#7882)

Browse source 
* introduce list of MFM Functions

* add note
This commit is contained in:
marihachi 2021-11-01 23:47:13 +09:00 • committed by GitHub
parent 34ea3cf226
commit 1c38c7010d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/services/note/create.ts
View file

@ -34,6 +34,7 @@ import { deliverToRelays } from '../relay';
import { Channel } from '@/models/entities/channel';
import { normalizeForSearch } from '@/misc/normalize-for-search';
import { getAntennas } from '@/misc/antenna-cache';
import { fnNameList } from '@/mfm/fn-name-list';
type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';
@ -182,10 +183,10 @@ export default async (user: { id: User['id']; username: User['username']; host:
// Parse MFM if needed
if (!tags || !emojis || !mentionedUsers) {
const tokens = data.text ? mfm.parse(data.text)! : [];
const cwTokens = data.cw ? mfm.parse(data.cw)! : [];
const tokens = data.text ? mfm.parse(data.text, { fnNameList })! : [];
const cwTokens = data.cw ? mfm.parse(data.cw, { fnNameList })! : [];
const choiceTokens = data.poll && data.poll.choices
? concat(data.poll.choices.map(choice => mfm.parse(choice)!))
? concat(data.poll.choices.map(choice => mfm.parse(choice, { fnNameList })!))
: [];
const combinedTokens = tokens.concat(cwTokens).concat(choiceTokens);