diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-04-02 10:36:11 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-02 10:36:11 +0900 |
| commit | 1f4ae2f63a609d51942daa23772439379496064e (patch) | |
| tree | 55e67e216bd30b8a5c95f769e8696c4b885d1e61 /src/server/api/endpoints/i | |
| parent | tweak avatar generation (diff) | |
| download | sharkey-1f4ae2f63a609d51942daa23772439379496064e.tar.gz sharkey-1f4ae2f63a609d51942daa23772439379496064e.tar.bz2 sharkey-1f4ae2f63a609d51942daa23772439379496064e.zip | |
Use mfm-js for MFM parsing (#7415)
* wip
* Update mfm.ts
* wip
* update mfmjs
* refactor
* nanka
* Update mfm.ts
* Update to-html.ts
* Update to-html.ts
* wip
* fix test
* fix test
Diffstat (limited to 'src/server/api/endpoints/i')
| -rw-r--r-- | src/server/api/endpoints/i/update.ts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts index 0554fe76fb..2c20da41c5 100644 --- a/src/server/api/endpoints/i/update.ts +++ b/src/server/api/endpoints/i/update.ts @@ -1,11 +1,11 @@ import $ from 'cafy'; +import * as mfm from 'mfm-js'; import { ID } from '@/misc/cafy-id'; import { publishMainStream, publishUserEvent } from '../../../../services/stream'; import acceptAllFollowRequests from '../../../../services/following/requests/accept-all'; import { publishToFollowers } from '../../../../services/i/update'; import define from '../../define'; -import { parse, parsePlain } from '../../../../mfm/parse'; -import extractEmojis from '@/misc/extract-emojis'; +import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mfm'; import extractHashtags from '@/misc/extract-hashtags'; import * as langmap from 'langmap'; import { updateUsertags } from '../../../../services/update-hashtag'; @@ -291,13 +291,13 @@ export default define(meta, async (ps, _user, token) => { const newDescription = profileUpdates.description === undefined ? profile.description : profileUpdates.description; if (newName != null) { - const tokens = parsePlain(newName); - emojis = emojis.concat(extractEmojis(tokens!)); + const tokens = mfm.parsePlain(newName); + emojis = emojis.concat(extractCustomEmojisFromMfm(tokens!)); } if (newDescription != null) { - const tokens = parse(newDescription); - emojis = emojis.concat(extractEmojis(tokens!)); + const tokens = mfm.parse(newDescription); + emojis = emojis.concat(extractCustomEmojisFromMfm(tokens!)); tags = extractHashtags(tokens!).map(tag => normalizeForSearch(tag)).splice(0, 32); } |